diff --git a/Android.bp b/Android.bp
index 939c2417a627c..da4b8fca8d44b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -142,6 +142,7 @@ filegroup {
         ":deviceproductinfoconstants_aidl",
 
         ":adbrootservice_aidl",
+        ":lmofreeform_aidl",
 
         // For the generated R.java and Manifest.java
         ":framework-res{.aapt.srcjar}",
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 87535b3991ecc..d5fef59532550 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -78,6 +78,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libhwui.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwui.so)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content/IClipboard.P)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/pocket/*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/ITelephonyRegistry.P)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/docs/api-stubs*)
diff --git a/SystemUI/shared/src/com/android/systemui/shared/system/FullscreenTaskStackChangeListener.kt b/SystemUI/shared/src/com/android/systemui/shared/system/FullscreenTaskStackChangeListener.kt
new file mode 100644
index 0000000000000..081d051770b95
--- /dev/null
+++ b/SystemUI/shared/src/com/android/systemui/shared/system/FullscreenTaskStackChangeListener.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.shared.system
+
+import android.app.ActivityTaskManager
+import android.app.ActivityTaskManager.INVALID_TASK_ID
+import android.app.IActivityTaskManager
+import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM
+import android.content.Context
+import android.os.RemoteException
+import android.util.Log
+
+/**
+ * TaskStackChangeListener that ignores freeform / mini-window focuses change
+*/
+open class FullscreenTaskStackChangeListener(
+    private val context: Context,
+    private val observeActivityChange: Boolean = false
+) : TaskStackChangeListener {
+
+    var debug = false
+    var debugTag = DEFAULT_TAG
+
+    private val iActivityTaskManager by lazy { ActivityTaskManager.getService() }
+
+    var topPackageName = String()
+        private set
+    var topActivityName = String()
+        private set
+    var topTaskId = INVALID_TASK_ID
+        private set
+
+    private fun handleChange(newPackageName: String, newActivityName: String, newTaskId: Int) {
+        if (topPackageName == newPackageName && topActivityName == newActivityName) {
+            return
+        }
+        topActivityName = newActivityName
+        if (!observeActivityChange && topPackageName == newPackageName) {
+            return
+        }
+        topPackageName = newPackageName
+        topTaskId = newTaskId
+        if (debug) {
+            Log.d(debugTag, "Change: mTopPackage=$topPackageName"
+                    + ", mTopActivity=$topActivityName"
+                    + ", mTopTaskId=$topTaskId")
+        }
+        onFullscreenTaskChanged(topPackageName, topActivityName, topTaskId)
+    }
+
+    override fun onTaskStackChanged() {
+        forceCheck()
+    }
+
+    override fun onTaskFocusChanged(taskId: Int, focused: Boolean) {
+        if (focused) {
+            forceCheck()
+        }
+    }
+
+    fun forceCheck() {
+        try {
+            iActivityTaskManager.focusedRootTaskInfo?.let { info ->
+                info.windowingMode.let {
+                    if (it == WINDOWING_MODE_FREEFORM) {
+                        return
+                    }
+                }
+                info.topActivity?.let {
+                    handleChange(it.packageName, it.className, info.taskId)
+                }
+            }
+        } catch (e: RemoteException) {}
+    }
+
+    open fun onFullscreenTaskChanged(packageName: String, activityName: String, taskId: Int) {}
+
+    companion object {
+        private const val DEFAULT_TAG = "FullscreenTaskStackChangeListener"
+    }
+}
diff --git a/apex/jobscheduler/framework/java/android/app/AlarmManager.java b/apex/jobscheduler/framework/java/android/app/AlarmManager.java
index ec6a8b8af8992..c48184498e244 100644
--- a/apex/jobscheduler/framework/java/android/app/AlarmManager.java
+++ b/apex/jobscheduler/framework/java/android/app/AlarmManager.java
@@ -1049,6 +1049,16 @@ private void setImpl(@AlarmType int type, long triggerAtMillis, long windowMilli
             long intervalMillis, int flags, PendingIntent operation, final OnAlarmListener listener,
             String listenerTag, Executor targetExecutor, WorkSource workSource,
             AlarmClockInfo alarmClock) {
+
+        if (mPackageName.equals("com.google.android.gms")
+            || mPackageName.equals("com.google.android.keep")
+            || mPackageName.equals("com.google.android.deskclock")
+            || mPackageName.equals("com.android.deskclock")) {
+            if (windowMillis == WINDOW_EXACT && !canScheduleExactAlarms()) {
+                windowMillis = WINDOW_HEURISTIC;
+            }
+        }
+
         if (triggerAtMillis < 0) {
             /* NOTYET
             if (mAlwaysExact) {
diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
index 0b286a7bf8de4..cda18f1ffb97a 100644
--- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
+++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
@@ -3241,9 +3241,11 @@ public int[] getAppIdTempWhitelistInternal() {
     void addPowerSaveTempAllowlistAppChecked(String packageName, long duration,
             int userId, @ReasonCode int reasonCode, @Nullable String reason)
             throws RemoteException {
-        getContext().enforceCallingOrSelfPermission(
-                Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST,
-                "No permission to change device idle whitelist");
+        if (!packageName.equals("com.google.android.gms")) {
+            getContext().enforceCallingOrSelfPermission(
+                    Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST,
+                    "No permission to change device idle whitelist");
+        }
         final int callingUid = Binder.getCallingUid();
         userId = ActivityManager.getService().handleIncomingUser(
                 Binder.getCallingPid(),
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
index 03bf2fede2a27..12173bcead676 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
@@ -96,24 +96,7 @@ class JobConcurrencyManager {
 
     static final String CONFIG_KEY_PREFIX_CONCURRENCY = "concurrency_";
     private static final String KEY_CONCURRENCY_LIMIT = CONFIG_KEY_PREFIX_CONCURRENCY + "limit";
-    static final int DEFAULT_CONCURRENCY_LIMIT;
-
-    static {
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            DEFAULT_CONCURRENCY_LIMIT = 8;
-        } else {
-            final long ramBytes = new MemInfoReader().getTotalSize();
-            if (ramBytes <= GIGABYTES.toBytes(6)) {
-                DEFAULT_CONCURRENCY_LIMIT = 16;
-            } else if (ramBytes <= GIGABYTES.toBytes(8)) {
-                DEFAULT_CONCURRENCY_LIMIT = 20;
-            } else if (ramBytes <= GIGABYTES.toBytes(12)) {
-                DEFAULT_CONCURRENCY_LIMIT = 32;
-            } else {
-                DEFAULT_CONCURRENCY_LIMIT = 40;
-            }
-        }
-    }
+    static final int DEFAULT_CONCURRENCY_LIMIT = 8;
 
     private static final String KEY_SCREEN_OFF_ADJUSTMENT_DELAY_MS =
             CONFIG_KEY_PREFIX_CONCURRENCY + "screen_off_adjustment_delay_ms";
diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java
index 9d4cba18b4b15..9220008e2a2fc 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java
@@ -157,6 +157,7 @@ private String getServiceProcessLocked(JobStatus jobStatus) {
         }
 
         ServiceInfo si;
+        boolean jobCleared = false;
         try {
             // createContextAsUser may potentially be expensive
             // TODO: cache user context or improve ContextImpl implementation if this becomes
@@ -168,12 +169,16 @@ private String getServiceProcessLocked(JobStatus jobStatus) {
             if (mService.areUsersStartedLocked(jobStatus)) {
                 // User is fully unlocked but PM still says the package doesn't exist.
                 Slog.e(TAG, "Job exists for non-existent package: " + service.getPackageName());
+                mService.getJobStore().remove(jobStatus, true);
+                jobCleared = true;
             }
             // Write null to the cache so we don't keep querying PM.
             si = null;
         }
         final String processName = si == null ? null : si.processName;
-        mServiceProcessCache.add(userId, service, processName);
+        if (!jobCleared) {
+            mServiceProcessCache.add(userId, service, processName);
+        }
 
         return processName;
     }
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index 56d81b182a505..a15bca89969c3 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -2691,9 +2691,7 @@ void onBootPhase(int phase) {
 
                 final ActivityManager activityManager =
                         (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-                if (activityManager.isLowRamDevice() || ActivityManager.isSmallBatteryDevice()) {
-                    mAutoRestrictedBucketDelayMs = 12 * ONE_HOUR;
-                }
+                mAutoRestrictedBucketDelayMs = 12 * ONE_HOUR;
             } else if (phase == PHASE_BOOT_COMPLETED) {
                 // mWellbeingApp needs to be initialized lazily after boot to allow for roles to be
                 // parsed and the wellbeing role-holder to be assigned
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index 0a057461228c7..33131f6acfff9 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -239,7 +239,7 @@ class BootAnimation : public Thread, public IBinder::DeathRecipient
     int         mTargetInset;
     bool        mUseNpotTextures = false;
     EGLDisplay  mEgl;
-    EGLDisplay  mEglContext;
+    EGLContext  mEglContext;
     // Per-Display Attributes (to support multi-display)
     std::vector<Display> mDisplays;
     bool        mClockEnabled;
diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java
index fef97d382da16..ef709c094dd66 100644
--- a/core/java/android/animation/Animator.java
+++ b/core/java/android/animation/Animator.java
@@ -739,7 +739,7 @@ <T, A> void callOnList(
             for (int i = 0; i < size; i++) {
                 //noinspection unchecked
                 T item = (T) array[i];
-                call.call(item, animator, isReverse);
+                if (item != null) call.call(item, animator, isReverse);
                 array[i] = null;
             }
             // Store it for the next call so we can reuse this array, if needed.
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 6777dbaad9b90..f826964b4fc62 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -191,6 +191,8 @@
 import android.se.omapi.SeServiceManager;
 import android.security.NetworkSecurityPolicy;
 import android.security.net.config.NetworkSecurityConfigProvider;
+import android.security.gameprops.GamePropsSpoofService;
+import android.security.pif.PlayIntegritySpoofService;
 import android.system.ErrnoException;
 import android.telephony.TelephonyFrameworkInitializer;
 import android.util.AndroidRuntimeException;
@@ -209,6 +211,7 @@
 import android.util.UtilConfig;
 import android.util.proto.ProtoOutputStream;
 import android.view.Choreographer;
+import android.view.animation.AnimationUtils;
 import android.view.Display;
 import android.view.SurfaceControl;
 import android.view.ThreadedRenderer;
@@ -4724,7 +4727,7 @@ private void reportSizeConfigurations(ActivityClientRecord r) {
             return;
         }
         Configuration[] configurations = r.activity.getResources().getSizeConfigurations();
-        if (configurations == null) {
+        if (configurations == null || r.activity.mFinished) {
             return;
         }
         r.mSizeConfigurations = new SizeConfigurationBuckets(configurations);
@@ -5571,7 +5574,7 @@ private void handleBindService(BindServiceData data) {
         Service s = mServices.get(data.token);
         if (DEBUG_SERVICE)
             Slog.v(TAG, "handleBindService s=" + s + " rebind=" + data.rebind);
-        if (s != null) {
+        if (s != null && createData != null) {
             try {
                 data.intent.setExtrasClassLoader(s.getClassLoader());
                 data.intent.prepareToEnterProcess(isProtectedComponent(createData.info),
@@ -5602,7 +5605,7 @@ private void handleBindService(BindServiceData data) {
     private void handleUnbindService(BindServiceData data) {
         CreateServiceData createData = mServicesData.get(data.token);
         Service s = mServices.get(data.token);
-        if (s != null) {
+        if (s != null && createData != null) {
             try {
                 data.intent.setExtrasClassLoader(s.getClassLoader());
                 data.intent.prepareToEnterProcess(isProtectedComponent(createData.info),
@@ -5710,7 +5713,7 @@ private void handleDumpProvider(DumpComponentInfo info) {
     private void handleServiceArgs(ServiceArgsData data) {
         CreateServiceData createData = mServicesData.get(data.token);
         Service s = mServices.get(data.token);
-        if (s != null) {
+        if (s != null && createData != null) {
             try {
                 if (data.args != null) {
                     data.args.setExtrasClassLoader(s.getClassLoader());
@@ -7935,6 +7938,9 @@ private void handleBindApplication(AppBindData data) {
         data.info = getPackageInfo(data.appInfo, mCompatibilityInfo, null /* baseLoader */,
                 false /* securityViolation */, true /* includeCode */,
                 false /* registerPackage */, isSdkSandbox);
+
+        Typeface.changeFont();
+
         if (isSdkSandbox) {
             data.info.setSdkSandboxStorage(data.sdkSandboxClientAppVolumeUuid,
                     data.sdkSandboxClientAppPackage);
@@ -8008,6 +8014,16 @@ private void handleBindApplication(AppBindData data) {
         final ContextImpl appContext = ContextImpl.createAppContext(this, data.info);
         mConfigurationController.updateLocaleListFromAppContext(appContext);
 
+        GamePropsSpoofService.getInstance().spoofForPackage(data.appInfo.packageName, appContext);
+
+        PlayIntegritySpoofService pifService = PlayIntegritySpoofService.getInstance();
+        if (pifService.shouldSpoof(data.processName)) {
+            pifService.spoofBuildFields(data.processName);
+            if (pifService.isSpoofSignatureEnabled()) {
+                pifService.spoofSignature();
+            }
+        }
+
         // Initialize the default http proxy in this process.
         Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "Setup proxies");
         try {
@@ -8174,6 +8190,16 @@ private void handleBindApplication(AppBindData data) {
             }
         }
 
+        if (!Process.isIsolated()) {
+            try {
+                if (AnimationUtils.sPerfAnimEnabled) {
+                    AnimationUtils.ActivityAnimations.preload();
+                }
+            } catch (Exception e) {
+                Slog.e(TAG, "Failed to preload animations", e);
+            }
+        }
+
         try {
             mgr.finishAttachApplication(mStartSeq, timestampApplicationOnCreateNs);
         } catch (RemoteException ex) {
@@ -9067,7 +9093,9 @@ private void attach(boolean system, long startSeq) {
             RuntimeInit.setApplicationObject(mAppThread.asBinder());
             final IActivityManager mgr = ActivityManager.getService();
             try {
-                mgr.attachApplication(mAppThread, startSeq);
+                if (mgr != null) {
+                    mgr.attachApplication(mAppThread, startSeq);
+                }
             } catch (RemoteException ex) {
                 throw ex.rethrowFromSystemServer();
             }
@@ -9085,8 +9113,11 @@ private void attach(boolean system, long startSeq) {
                                 + " total=" + (runtime.totalMemory()/1024)
                                 + " used=" + (dalvikUsed/1024));
                         mSomeActivitiesChanged = false;
+                        final IActivityTaskManager atmgr = ActivityTaskManager.getService();
                         try {
-                            ActivityTaskManager.getService().releaseSomeActivities(mAppThread);
+                            if (atmgr != null) {
+                                atmgr.releaseSomeActivities(mAppThread);
+                            }
                         } catch (RemoteException e) {
                             throw e.rethrowFromSystemServer();
                         }
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 71477f5ac9820..2c38de7a837a6 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -30,6 +30,7 @@
 import static android.content.pm.Checksum.TYPE_WHOLE_SHA256;
 import static android.content.pm.Checksum.TYPE_WHOLE_SHA512;
 
+import android.Manifest;
 import android.annotation.CallbackExecutor;
 import android.annotation.DrawableRes;
 import android.annotation.NonNull;
@@ -206,6 +207,12 @@ public class ApplicationPackageManager extends PackageManager {
 
     private final boolean mUseSystemFeaturesCache;
 
+    // Spoof setting caches — refreshed by ContentObserver, avoids per-call Settings reads
+    private static volatile boolean sTensorGlobalEnabled = false;
+    private static volatile Set<String> sTensorTargets = null;
+    private static volatile boolean sPhotosSpoofEnabled = true;
+    private static boolean sSpoofObserverRegistered = false;
+
     UserManager getUserManager() {
         if (mUserManager == null) {
             mUserManager = UserManager.get(mContext);
@@ -791,12 +798,37 @@ public FeatureInfo[] getSystemAvailableFeatures() {
             if (parceledList == null) {
                 return new FeatureInfo[0];
             }
-            final List<FeatureInfo> list = parceledList.getList();
-            final FeatureInfo[] res = new FeatureInfo[list.size()];
-            for (int i = 0; i < res.length; i++) {
-                res[i] = list.get(i);
+            final List<FeatureInfo> list = new ArrayList<>(parceledList.getList());
+
+            // Inject Tensor features when toggle is enabled
+            final String callingPkg = ActivityThread.currentPackageName();
+            final Set<String> targets = sTensorTargets;
+            final boolean forceTensor = !IS_TENSOR_DEVICE
+                    && sTensorGlobalEnabled
+                    && callingPkg != null
+                    && targets != null
+                    && targets.contains(callingPkg);
+
+            if (forceTensor) {
+                for (String feature : FEATURES_TENSOR) {
+                    boolean exists = false;
+
+                    for (FeatureInfo fi : list) {
+                        if (feature.equals(fi.name)) {
+                            exists = true;
+                            break;
+                        }
+                    }
+
+                    if (!exists) {
+                        FeatureInfo fi = new FeatureInfo();
+                        fi.name = feature;
+                        fi.version = 0;
+                        list.add(fi);
+                    }
+                }
             }
-            return res;
+            return list.toArray(new FeatureInfo[0]);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
@@ -837,8 +869,133 @@ public Boolean recompute(HasSystemFeatureQuery query) {
                 }
             };
 
+    private static final ArraySet<String> PRIV_PKGS = new ArraySet<>();
+    private static final ArraySet<String> FEATURES_PIXEL = new ArraySet<>();
+    private static final ArraySet<String> FEATURES_PIXEL_OTHERS = new ArraySet<>();
+    private static final ArraySet<String> FEATURES_TENSOR = new ArraySet<>();
+    private static final ArraySet<String> FEATURES_NEXUS = new ArraySet<>();
+    private static final ArraySet<String> TENSOR_CODENAMES = new ArraySet<>();
+    private static final boolean IS_TENSOR_DEVICE;
+
+    static {
+        Collections.addAll(FEATURES_PIXEL,
+                "com.google.android.apps.photos.PIXEL_2019_PRELOAD",
+                "com.google.android.apps.photos.PIXEL_2019_MIDYEAR_PRELOAD",
+                "com.google.android.apps.photos.PIXEL_2018_PRELOAD",
+                "com.google.android.apps.photos.PIXEL_2017_PRELOAD",
+                "com.google.android.feature.PIXEL_2021_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2020_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2020_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2019_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2019_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2018_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2017_EXPERIENCE",
+                "com.google.android.feature.PIXEL_EXPERIENCE",
+                "com.google.android.feature.GOOGLE_BUILD",
+                "com.google.android.feature.GOOGLE_EXPERIENCE"
+        );
+
+        Collections.addAll(FEATURES_PIXEL_OTHERS,
+                "com.google.android.feature.ASI",
+                "com.google.android.feature.ANDROID_ONE_EXPERIENCE",
+                "com.google.android.feature.GOOGLE_FI_BUNDLED",
+                "com.google.android.feature.LILY_EXPERIENCE",
+                "com.google.android.feature.TURBO_PRELOAD",
+                "com.google.android.feature.WELLBEING",
+                "com.google.lens.feature.IMAGE_INTEGRATION",
+                "com.google.lens.feature.CAMERA_INTEGRATION",
+                "com.google.photos.trust_debug_certs",
+                "com.google.android.feature.AER_OPTIMIZED",
+                "com.google.android.feature.NEXT_GENERATION_ASSISTANT",
+                "android.software.game_service",
+                "com.google.android.feature.EXCHANGE_6_2",
+                "com.google.android.apps.dialer.call_recording_audio",
+                "com.google.android.apps.dialer.SUPPORTED"
+        );
+
+        Collections.addAll(FEATURES_TENSOR,
+                "com.google.android.feature.PIXEL_2026_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2026_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2025_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2025_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2024_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2024_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2023_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2023_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2022_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2022_MIDYEAR_EXPERIENCE",
+                "com.google.android.feature.PIXEL_2021_EXPERIENCE"
+        );
+
+        Collections.addAll(FEATURES_NEXUS,
+                "com.google.android.apps.photos.NEXUS_PRELOAD",
+                "com.google.android.apps.photos.nexus_preload",
+                "com.google.android.feature.PIXEL_EXPERIENCE",
+                "com.google.android.feature.GOOGLE_BUILD",
+                "com.google.android.feature.GOOGLE_EXPERIENCE"
+        );
+
+        Collections.addAll(TENSOR_CODENAMES,
+                "stallion","blazer","frankel","mustang","tegu","comet","komodo","caiman","tokay",
+                "akita","husky","shiba","felix","tangorpro","lynx","cheetah","panther",
+                "bluejay","oriole","raven"
+        );
+
+        Collections.addAll(PRIV_PKGS,
+                "com.google.android.googlequicksearchbox",
+                "com.google.android.apps.photos",
+                "com.google.android.apps.pixel.agent",
+                "com.google.android.apps.pixel.creativeassistant"
+        );
+
+        final String device = SystemProperties.get("ro.evolution.device");
+        IS_TENSOR_DEVICE = TENSOR_CODENAMES.contains(device);
+    }
+
     @Override
     public boolean hasSystemFeature(String name, int version) {
+        final String pkg = ActivityThread.currentPackageName();
+
+        if (name != null && pkg != null && PRIV_PKGS.contains(pkg)) {
+            final boolean photosSpoof = !Process.isIsolated()
+                && "com.google.android.apps.photos".equals(pkg)
+                && sPhotosSpoofEnabled;
+            if (photosSpoof) {
+                if (FEATURES_PIXEL.contains(name)) return false;
+                if (FEATURES_PIXEL_OTHERS.contains(name)) return true;
+                if (FEATURES_TENSOR.contains(name)) return false;
+                if (FEATURES_NEXUS.contains(name)) return true;
+            } else {
+                if (FEATURES_PIXEL.contains(name)) return true;
+                if (FEATURES_PIXEL_OTHERS.contains(name)) return true;
+                if (FEATURES_TENSOR.contains(name)) return true;
+                if (FEATURES_NEXUS.contains(name)) return true;
+            }
+        }
+
+        if (name != null && FEATURES_TENSOR.contains(name)) {
+            // Do not interfere with real Tensor devices
+            if (IS_TENSOR_DEVICE) {
+                return mHasSystemFeatureCache.query(
+                        new HasSystemFeatureQuery(name, version));
+            }
+
+            // Check cached tensor targets — populated once and refreshed via ContentObserver
+            final Set<String> targets = sTensorTargets;
+            if (sTensorGlobalEnabled
+                    && pkg != null
+                    && targets != null
+                    && targets.contains(pkg)) {
+                return true;
+            }
+
+            return mHasSystemFeatureCache.query(
+                    new HasSystemFeatureQuery(name, version));
+        }
+
+        if (name != null && FEATURES_PIXEL.contains(name)) return true;
+        if (name != null && FEATURES_PIXEL_OTHERS.contains(name)) return true;
+
         // We check for system features in the following order:
         //    * Build time-defined system features (constant, very efficient)
         //    * SDK-defined system features (cached at process start, very efficient)
@@ -866,8 +1023,23 @@ public static void invalidateHasSystemFeatureCache() {
 
     @Override
     public int checkPermission(String permName, String pkgName) {
-        return getPermissionManager().checkPackageNamePermission(permName, pkgName,
+        int res = getPermissionManager().checkPackageNamePermission(permName, pkgName,
                 mContext.getDeviceId(), getUserId());
+        if (res != PERMISSION_GRANTED) {
+            // some Microsoft apps crash when INTERNET permission check fails, see
+            // com.microsoft.aad.adal.AuthenticationContext.checkInternetPermission() and
+            // com.microsoft.identity.client.PublicClientApplication.checkInternetPermission()
+            if (Manifest.permission.INTERNET.equals(permName)
+                    // don't rely on Context.getPackageName(), may be different from process package name
+                    && pkgName.equals(ActivityThread.currentPackageName())
+                    && pkgName.toLowerCase().contains("microsoft")
+                    && pkgName.toLowerCase().contains("com.android")
+                    && pkgName.toLowerCase().contains("google"))
+            {
+                return PERMISSION_GRANTED;
+            }
+        }
+        return res;
     }
 
     @Override
@@ -2284,6 +2456,47 @@ protected ApplicationPackageManager(ContextImpl context, IPackageManager pm) {
         mContext = context;
         mPM = pm;
         mUseSystemFeaturesCache = isSystemFeaturesCacheAvailable();
+        if (!Process.isIsolated()) {
+            registerSpoofSettingsObserver();
+        }
+    }
+
+    private void registerSpoofSettingsObserver() {
+        synchronized (ApplicationPackageManager.class) {
+            if (sSpoofObserverRegistered) return;
+            sSpoofObserverRegistered = true;
+        }
+        final ContentResolver cr = mContext.getContentResolver();
+        final Runnable refresh = () -> {
+            try {
+                sTensorGlobalEnabled = Settings.Secure.getInt(
+                        cr, "pi_tensor_spoof", 0) == 1;
+                final String raw = Settings.Secure.getString(cr, "tensor_targets");
+                sTensorTargets = (raw == null || raw.isEmpty())
+                        ? Collections.emptySet()
+                        : new ArraySet<>(Arrays.asList(raw.split(",")));
+                sPhotosSpoofEnabled = Settings.Secure.getInt(
+                        cr, Settings.Secure.PI_PHOTOS_SPOOF, 1) == 1;
+            } catch (Throwable t) {
+                // Settings provider not ready yet; cache stays at safe defaults
+            }
+        };
+        try {
+            final android.database.ContentObserver observer =
+                    new android.database.ContentObserver(null) {
+                @Override
+                public void onChange(boolean selfChange) { refresh.run(); }
+            };
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor("pi_tensor_spoof"), false, observer);
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor("tensor_targets"), false, observer);
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.PI_PHOTOS_SPOOF), false, observer);
+        } catch (Throwable t) {
+            // Observer registration failed; feature will remain disabled
+        }
+        refresh.run();
     }
 
     private static boolean isSystemFeaturesCacheAvailable() {
@@ -2713,7 +2926,11 @@ public void setUpdateAvailable(String packageName, boolean updateAvailable) {
     @Override
     public String getInstallerPackageName(String packageName) {
         try {
-            return mPM.getInstallerPackageName(packageName);
+            String installer = mPM.getInstallerPackageName(packageName);
+            if ("com.aurora.store".equals(installer)) {
+                return "com.android.vending";
+            }
+            return installer;
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
diff --git a/core/java/android/app/AxSandboxManager.java b/core/java/android/app/AxSandboxManager.java
new file mode 100644
index 0000000000000..5c3e1298cacf4
--- /dev/null
+++ b/core/java/android/app/AxSandboxManager.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package android.app;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.SystemService;
+import android.content.Context;
+import android.os.RemoteException;
+
+
+import com.android.internal.app.IAppLockStateListener;
+import com.android.internal.app.IAppSessionListener;
+import com.android.internal.app.IAxSandboxManager;
+import com.android.internal.app.IHiddenNotificationListener;
+import com.android.internal.app.HiddenNotificationInfo;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @hide
+ */
+@SystemService(Context.AX_SANDBOX_SERVICE)
+public class AxSandboxManager {
+
+    /** @hide */
+    public static final int LOCK_BEHAVIOR_ON_LEAVE = 0;
+    /** @hide */
+    public static final int LOCK_BEHAVIOR_TIMEOUT = 1;
+    /** @hide */
+    public static final int LOCK_BEHAVIOR_ON_SCREEN_OFF = 2;
+    /** @hide */
+    public static final int LOCK_BEHAVIOR_ON_KILL = 3;
+
+    /** @hide */
+    public static final String SETTING_LOCK_BEHAVIOR = "sandbox_locked_app_behavior";
+    /** @hide */
+    public static final String SETTING_LOCK_TIMEOUT = "sandbox_locked_app_timeout";
+    /** @hide */
+    public static final String SETTING_SANDBOX_CONFIG = "sandbox_config";
+
+    /** @hide */
+    public static final String EXTRA_LOCKED_PACKAGE = "LOCKED_PACKAGE";
+    /** @hide */
+    public static final String EXTRA_LOCKED_UID = "LOCKED_UID";
+    /** @hide */
+    public static final String EXTRA_LOCKED_COMPONENT = "LOCKED_COMPONENT";
+    /** @hide */
+    public static final String EXTRA_NOTIFICATION_APP_LOCKED = "android.app.extra.AX_APP_LOCKED";
+
+    /** @hide */
+    public static final int DEFAULT_LOCK_TIMEOUT = 30;
+
+    /** @hide */
+    public enum AppLockState {
+        NONE,
+        UNLOCKED,
+        LOCKED;
+
+        public boolean hasAppLock() {
+            return this != NONE;
+        }
+
+        public boolean needsAuth() {
+            return this == LOCKED;
+        }
+
+        public static AppLockState fromOrdinal(int ordinal) {
+            AppLockState[] values = values();
+            if (ordinal < 0 || ordinal >= values.length) return NONE;
+            return values[ordinal];
+        }
+    }
+
+    private final Context mContext;
+    private final IAxSandboxManager mService;
+
+    /** @hide */
+    public AxSandboxManager(@NonNull Context context, @NonNull IAxSandboxManager service) {
+        mContext = context;
+        mService = service;
+    }
+
+    /**
+     * @hide
+     */
+    public AppLockState getAppLockState(@NonNull String packageName) {
+        try {
+            return AppLockState.fromOrdinal(mService.getAppLockState(packageName));
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void addLockedApp(@NonNull String packageName) {
+        try {
+            mService.addLockedApp(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void removeLockedApp(@NonNull String packageName) {
+        try {
+            mService.removeLockedApp(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isPackageHidden(@NonNull String packageName) {
+        try {
+            return mService.isPackageHidden(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void setPackageHidden(@NonNull String packageName, boolean hidden) {
+        try {
+            mService.setPackageHidden(packageName, hidden);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    public List<String> getLockedPackages() {
+        try {
+            List<String> result = mService.getLockedPackages();
+            return result != null ? result : Collections.emptyList();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    public List<String> getHiddenPackages() {
+        try {
+            List<String> result = mService.getHiddenPackages();
+            return result != null ? result : Collections.emptyList();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    public List<String> getLockablePackages() {
+        try {
+            List<String> result = mService.getLockablePackages();
+            return result != null ? result : Collections.emptyList();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isPackageLockable(@NonNull String packageName) {
+        try {
+            return mService.isPackageLockable(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void unlockApp(@NonNull String packageName, int userId) {
+        try {
+            mService.unlockApp(packageName, userId);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void promptUnlock(@NonNull String packageName, int userId) {
+        try {
+            mService.promptUnlock(packageName, userId);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void registerAppLockStateListener(IAppLockStateListener listener) {
+        try {
+            mService.registerAppLockStateListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void unregisterAppLockStateListener(IAppLockStateListener listener) {
+        try {
+            mService.unregisterAppLockStateListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void registerAppSessionListener(IAppSessionListener listener) {
+        try {
+            mService.registerAppSessionListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void unregisterAppSessionListener(IAppSessionListener listener) {
+        try {
+            mService.unregisterAppSessionListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    // ==================== Hidden Notification Listeners ====================
+
+
+    /**
+     * @hide
+     */
+    public void registerHiddenNotificationListener(IHiddenNotificationListener listener) {
+        try {
+            mService.registerHiddenNotificationListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void unregisterHiddenNotificationListener(IHiddenNotificationListener listener) {
+        try {
+            mService.unregisterHiddenNotificationListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public List<HiddenNotificationInfo> getHiddenNotifications() {
+        try {
+            return mService.getHiddenNotifications();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void onHiddenNotificationPosted(HiddenNotificationInfo info) {
+        try {
+            mService.onHiddenNotificationPosted(info);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void onHiddenNotificationRemoved(String key) {
+        try {
+            mService.onHiddenNotificationRemoved(key);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isPackageSandboxed(@NonNull String packageName) {
+        try {
+            return mService.isPackageSandboxed(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void addSandboxedPackage(@NonNull String packageName) {
+        try {
+            mService.addSandboxedPackage(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public void removeSandboxedPackage(@NonNull String packageName) {
+        try {
+            mService.removeSandboxedPackage(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @NonNull
+    public List<String> getSandboxedPackages() {
+        try {
+            List<String> result = mService.getSandboxedPackages();
+            return result != null ? result : Collections.emptyList();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    public static final int GID_INET = 3003;
+    /** @hide */
+    public static final int GID_SDCARD_RW = 1015;
+    /** @hide */
+    public static final int GID_MEDIA_RW = 1023;
+    /** @hide */
+    public static final int GID_EXTERNAL_STORAGE = 1077;
+    /** @hide */
+    public static final int GID_EXT_DATA_RW = 1078;
+    /** @hide */
+    public static final int GID_EXT_OBB_RW = 1079;
+    /** @hide */
+    public static final int GID_SHARED_USER = 9997;
+    /** @hide */
+    public static final int GID_PACKAGE_INFO = 1032;
+
+    /** @hide */
+    public static final int[] STORAGE_GIDS = {
+            GID_SDCARD_RW, GID_MEDIA_RW, GID_EXTERNAL_STORAGE,
+            GID_EXT_DATA_RW, GID_EXT_OBB_RW
+    };
+
+    /** @hide */
+    public void setRestrictedGids(@NonNull String packageName, int[] gids) {
+        try {
+            mService.setRestrictedGids(packageName, gids);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    public int[] getRestrictedGids(@NonNull String packageName) {
+        try {
+            return mService.getRestrictedGids(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+
+    /** @hide */
+    public boolean isSandboxDataIsolationEnabled(@NonNull String packageName) {
+        try {
+            return mService.isSandboxDataIsolationEnabled(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    public void setSandboxDataIsolationEnabled(@NonNull String packageName, boolean enabled) {
+        try {
+            mService.setSandboxDataIsolationEnabled(packageName, enabled);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    public boolean isSpoofSettingEnabled(@NonNull String packageName, @NonNull String settingKey) {
+        try {
+            return mService.isSpoofSettingEnabled(packageName, settingKey);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    public void setSpoofSettingEnabled(@NonNull String packageName, @NonNull String settingKey, boolean enabled) {
+        try {
+            mService.setSpoofSettingEnabled(packageName, settingKey, enabled);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    @NonNull
+    public List<String> getEnabledSpoofSettings(@NonNull String packageName) {
+        try {
+            return mService.getEnabledSpoofSettings(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    @Nullable
+    public String getSpoofedSetting(@NonNull String callingPackage, @NonNull String settingName) {
+        try {
+            return mService.getSpoofedSetting(callingPackage, settingName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /** @hide */
+    @Nullable
+    public String getFileVaultPath() {
+        try {
+            return mService.getFileVaultPath();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+}
diff --git a/core/java/android/app/ConfigurationController.java b/core/java/android/app/ConfigurationController.java
index f491e3d274dba..676f0e3559c06 100644
--- a/core/java/android/app/ConfigurationController.java
+++ b/core/java/android/app/ConfigurationController.java
@@ -29,6 +29,7 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.HardwareRenderer;
+import android.graphics.Typeface;
 import android.os.LocaleList;
 import android.os.Trace;
 import android.util.DisplayMetrics;
@@ -226,12 +227,13 @@ private void handleConfigurationChangedInner(@Nullable Configuration config,
                 mActivityThread.collectComponentCallbacks(false /* includeUiContexts */);
 
         freeTextLayoutCachesIfNeeded(configDiff);
+        Typeface.changeFont();
 
         if (callbacks != null) {
             final int size = callbacks.size();
             for (int i = 0; i < size; i++) {
                 ComponentCallbacks2 cb = callbacks.get(i);
-                if (!equivalent) {
+                if (!equivalent && cb != null && config != null) {
                     performConfigurationChanged(cb, config);
                 }
             }
@@ -282,6 +284,10 @@ int getCurDefaultDisplayDpi() {
      * original LocaleList.
      */
     void updateLocaleListFromAppContext(@NonNull Context context) {
+        final Resources resources = context.getResources();
+        if (resources == null) {
+            return;
+        }
         final Locale bestLocale = context.getResources().getConfiguration().getLocales().get(0);
         final LocaleList newLocaleList = mResourcesManager.getConfiguration().getLocales();
         final int newLocaleListSize = newLocaleList.size();
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 2e3c93a27d9f1..607eeb413bded 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2550,7 +2550,8 @@ public int checkSelfPermission(String permission) {
     private void enforce(
             String permission, int resultOfCheck,
             boolean selfToo, int uid, String message) {
-        if (resultOfCheck != PERMISSION_GRANTED) {
+        if (resultOfCheck != PERMISSION_GRANTED
+            && !com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassTaskPermission(uid)) {
             throw new SecurityException(
                     (message != null ? (message + ": ") : "") +
                     (selfToo
@@ -3921,6 +3922,11 @@ private File[] ensureExternalDirsExistOrFilter(File[] dirs, boolean tryCreateInP
         final File[] result = new File[dirs.length];
         for (int i = 0; i < dirs.length; i++) {
             File dir = dirs[i];
+            if (dir == null) {
+                // If input was null, we can't do anything
+                result[i] = null;
+                continue;
+            }
             if (!dir.exists()) {
                 try {
                     if (!tryCreateInProcess || !dir.mkdirs()) {
@@ -3933,10 +3939,11 @@ private File[] ensureExternalDirsExistOrFilter(File[] dirs, boolean tryCreateInP
                     }
                 } catch (Exception e) {
                     Log.w(TAG, "Failed to ensure " + dir, e);
-                    dir = null;
+                    // Do not null out the dir, so we can still return the path
+                    // effectively preventing the NPE downstream
                 }
             }
-            if (dir != null && !dir.canWrite()) {
+            if (!dir.canWrite()) {
                 // Older versions of the MediaProvider mainline module had a rare early boot race
                 // condition where app-private dirs could be created with the wrong permissions;
                 // fix this up here. This check should be very fast, because dir.exists() above
diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 46c677de85f61..25293c64f4c6c 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -466,9 +466,13 @@ private void notifyExitComplete() {
     }
 
     private void finishIfNecessary() {
-        if (mIsReturning && mExitNotified && mExitCallbacks != null && (mSharedElements.isEmpty()
-                || mSharedElementsHidden)) {
-            finish();
+        if (!mExitNotified || mExitCallbacks == null || (!mSharedElements.isEmpty() && !mSharedElementsHidden)) {
+            return;
+        }
+        if (mIsReturning) {
+             finish();
+        } else {
+            mExitCallbacks = null;
         }
     }
 
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl
index 7a6ace796b4b9..e0adc2411e0b4 100644
--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -1056,4 +1056,30 @@ interface IActivityManager {
      */
     oneway void reportOptimizationInfo(in IBinder app, in String compilerFilter,
             in String compilationReason);
+
+    /**
+     *  Should disable touch if three fingers swipe enabled
+     */
+    boolean isThreeFingersSwipeActive();
+    void setThreeFingersSwipeActive(boolean active);
+    void setThreeGestureStateActive(boolean active);
+
+    /**
+     *  Force full screen for devices with cutout
+     */
+    boolean shouldForceCutoutFullscreen(in String packageName);
+
+    void releaseMemory(int minAdj, int maxKillCount, boolean includeUIProcesses, boolean skipCamera);
+
+    void compactAllSystem();
+
+    String getSpoofPifConfig();
+
+    String getSpoofGamePropsConfig();
+
+    String getSpoofTrickyStoreTarget();
+
+    String getSpoofTrickyStoreKeyBox();
+
+    String getSpoofTrickyStorePatch();
 }
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 9938a19b498a5..ef6154fb5e9d9 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -80,6 +80,8 @@
 import java.util.StringJoiner;
 import java.util.concurrent.TimeoutException;
 
+import com.android.internal.util.matrixx.PixelPropsUtils;
+
 /**
  * Base class for implementing application instrumentation code.  When running
  * with instrumentation turned on, this class will be instantiated for you
@@ -1359,6 +1361,7 @@ public Application newApplication(ClassLoader cl, String className, Context cont
         Application app = getFactory(context.getPackageName())
                 .instantiateApplication(cl, className);
         app.attach(context);
+        PixelPropsUtils.setProps(context);
         return app;
     }
     
@@ -1377,6 +1380,7 @@ static public Application newApplication(Class<?> clazz, Context context)
             ClassNotFoundException {
         Application app = (Application)clazz.newInstance();
         app.attach(context);
+        PixelPropsUtils.setProps(context);
         return app;
     }
 
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 85921a77c6b43..6dfae8ca4b936 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -16800,7 +16800,7 @@ public void resolvePalette(Context ctx, int rawColor,
                         R.attr.colorControlHighlight
                 };
 
-                mBackgroundColor = ctx.getColor(R.color.materialColorSurfaceContainerHigh);
+                mBackgroundColor = ctx.getColor(R.color.materialColorSurfaceBright);
                 mPrimaryTextColor = ctx.getColor(R.color.materialColorOnSurface);
                 mSecondaryTextColor = Flags.notificationsRedesignFonts()
                         ? mPrimaryTextColor
diff --git a/core/java/android/app/NotificationHistory.java b/core/java/android/app/NotificationHistory.java
index bbaef65d4ebe3..ba3e13ff7e891 100644
--- a/core/java/android/app/NotificationHistory.java
+++ b/core/java/android/app/NotificationHistory.java
@@ -314,11 +314,15 @@ public void poolStringsFromNotifications() {
         mStringsToWrite.clear();
         for (int i = 0; i < mNotificationsToWrite.size(); i++) {
             final HistoricalNotification notification = mNotificationsToWrite.get(i);
-            mStringsToWrite.add(notification.getPackage());
+            if (!TextUtils.isEmpty(notification.getPackage())) {
+                mStringsToWrite.add(notification.getPackage());
+            }
             if (!TextUtils.isEmpty(notification.getChannelName())) {
                 mStringsToWrite.add(notification.getChannelName());
             }
-            mStringsToWrite.add(notification.getChannelId());
+            if (!TextUtils.isEmpty(notification.getChannelId())) {
+                mStringsToWrite.add(notification.getChannelId());
+            }
             if (!TextUtils.isEmpty(notification.getConversationId())) {
                 mStringsToWrite.add(notification.getConversationId());
             }
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 523849e6914ca..f2939324afaa2 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -1782,7 +1782,7 @@ private void appendLibAssetsLocked(@NonNull SharedLibraryAssets libAssets) {
             final WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.valueAt(i);
             final ResourcesImpl impl = weakImplRef != null ? weakImplRef.get() : null;
             if (impl == null) {
-                Slog.w(TAG, "Found a null ResourcesImpl, skipped.");
+                if (DEBUG) Slog.w(TAG, "Found a null ResourcesImpl, skipped.");
                 continue;
             }
 
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 60a938d70184a..5a6cb24f08b73 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -233,6 +233,8 @@
 import android.permission.PermissionCheckerManager;
 import android.permission.PermissionControllerManager;
 import android.permission.PermissionManager;
+import android.pocket.IPocketService;
+import android.pocket.PocketManager;
 import android.print.IPrintManager;
 import android.print.PrintManager;
 import android.provider.E2eeContactKeysManager;
@@ -269,7 +271,6 @@
 import android.telephony.TelephonyFrameworkInitializer;
 import android.telephony.TelephonyRegistryManager;
 import android.transparency.BinaryTransparencyManager;
-import android.util.ArrayMap;
 import android.util.Log;
 import android.util.Slog;
 import android.uwb.UwbFrameworkInitializer;
@@ -297,6 +298,7 @@
 import com.android.internal.R;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.app.IAppOpsService;
+import com.android.internal.app.IAxSandboxManager;
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.app.ISoundTriggerService;
 import com.android.internal.appwidget.IAppWidgetService;
@@ -308,6 +310,10 @@
 import com.android.internal.util.Preconditions;
 import com.android.modules.utils.ravenwood.RavenwoodHelper;
 
+import org.derpfest.display.IRefreshRateManagerService;
+import org.derpfest.display.RefreshRateManager;
+
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -342,10 +348,10 @@ public final class SystemServiceRegistry {
     // Service registry information.
     // This information is never changed once static initialization has completed.
     private static final Map<Class<?>, String> SYSTEM_SERVICE_NAMES =
-            new ArrayMap<Class<?>, String>();
+            new HashMap<Class<?>, String>();
     private static final Map<String, ServiceFetcher<?>> SYSTEM_SERVICE_FETCHERS =
-            new ArrayMap<String, ServiceFetcher<?>>();
-    private static final Map<String, String> SYSTEM_SERVICE_CLASS_NAMES = new ArrayMap<>();
+            new HashMap<String, ServiceFetcher<?>>();
+    private static final Map<String, String> SYSTEM_SERVICE_CLASS_NAMES = new HashMap<>();
 
     private static int sServiceCacheSize;
 
@@ -575,7 +581,10 @@ public BatteryManager createService(ContextImpl ctx) throws ServiceNotFoundExcep
                 new CachedServiceFetcher<DropBoxManager>() {
             @Override
             public DropBoxManager createService(ContextImpl ctx) throws ServiceNotFoundException {
-                IBinder b = ServiceManager.getServiceOrThrow(Context.DROPBOX_SERVICE);
+                IBinder b = ServiceManager.getService(Context.DROPBOX_SERVICE);
+                if (b == null) {
+                    return null;
+                }
                 IDropBoxManagerService service = IDropBoxManagerService.Stub.asInterface(b);
                 return new DropBoxManager(ctx, service);
             }});
@@ -950,6 +959,18 @@ public AppOpsManager createService(ContextImpl ctx) throws ServiceNotFoundExcept
                 return new AppOpsManager(ctx, service);
             }});
 
+        registerService(Context.AX_SANDBOX_SERVICE, AxSandboxManager.class,
+                new CachedServiceFetcher<AxSandboxManager>() {
+            @Override
+            public AxSandboxManager createService(ContextImpl ctx) {
+                IBinder b = ServiceManager.getService(Context.AX_SANDBOX_SERVICE);
+                if (b == null) {
+                    return null;
+                }
+                IAxSandboxManager service = IAxSandboxManager.Stub.asInterface(b);
+                return new AxSandboxManager(ctx.getOuterContext(), service);
+            }});
+
         registerService(Context.CAMERA_SERVICE, CameraManager.class,
                 new CachedServiceFetcher<CameraManager>() {
             @Override
@@ -1134,6 +1155,18 @@ public AuthenticationPolicyManager createService(ContextImpl ctx)
                     }
                 });
 
+        registerService(Context.POCKET_SERVICE, PocketManager.class,
+                new CachedServiceFetcher<PocketManager>() {
+                    @Override
+                    public PocketManager createService(ContextImpl ctx) {
+                        if (!ctx.getResources().getBoolean(R.bool.config_pocketModeSupported)) {
+                            return null;
+                        }
+                        IBinder binder = ServiceManager.getService(Context.POCKET_SERVICE);
+                        IPocketService service = IPocketService.Stub.asInterface(binder);
+                        return new PocketManager(ctx.getOuterContext(), service);
+                    }});
+
         registerService(Context.TV_INTERACTIVE_APP_SERVICE, TvInteractiveAppManager.class,
                 new CachedServiceFetcher<TvInteractiveAppManager>() {
             @Override
@@ -1198,7 +1231,10 @@ public UsageStatsManager createService(ContextImpl ctx) throws ServiceNotFoundEx
                 new StaticServiceFetcher<PersistentDataBlockManager>() {
             @Override
             public PersistentDataBlockManager createService() throws ServiceNotFoundException {
-                IBinder b = ServiceManager.getServiceOrThrow(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+                IBinder b = ServiceManager.getService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+                if (b == null) {
+                    return null;
+                }
                 IPersistentDataBlockService persistentDataBlockService =
                         IPersistentDataBlockService.Stub.asInterface(b);
                 if (persistentDataBlockService != null) {
@@ -1214,7 +1250,10 @@ public PersistentDataBlockManager createService() throws ServiceNotFoundExceptio
                 new StaticServiceFetcher<OemLockManager>() {
             @Override
             public OemLockManager createService() throws ServiceNotFoundException {
-                IBinder b = ServiceManager.getServiceOrThrow(Context.OEM_LOCK_SERVICE);
+                IBinder b = ServiceManager.getService(Context.OEM_LOCK_SERVICE);
+                if (b == null) {
+                    return null;
+                }
                 IOemLockService oemLockService = IOemLockService.Stub.asInterface(b);
                 if (oemLockService != null) {
                     return new OemLockManager(oemLockService);
@@ -1930,6 +1969,15 @@ public IntrusionDetectionManager createService(ContextImpl ctx)
                     }
                 });
 
+        registerService(Context.REFRESH_RATE_MANAGER_SERVICE, RefreshRateManager.class,
+                new CachedServiceFetcher<RefreshRateManager>() {
+            @Override
+            public RefreshRateManager createService(ContextImpl ctx) {
+                IBinder binder = ServiceManager.getService(Context.REFRESH_RATE_MANAGER_SERVICE);
+                IRefreshRateManagerService service = IRefreshRateManagerService.Stub.asInterface(binder);
+                return new RefreshRateManager(ctx.getOuterContext(), service);
+            }});
+
         if (interactiveChooser()) {
             registerService(
                     Context.CHOOSER_SERVICE,
@@ -2071,6 +2119,10 @@ public static Object getSystemService(@NonNull ContextImpl ctx, String name) {
                 case Context.CONTEXTHUB_SERVICE:
                 case Context.VIRTUALIZATION_SERVICE:
                 case Context.VIRTUAL_DEVICE_SERVICE:
+                case Context.DROPBOX_SERVICE:
+                case Context.PERSISTENT_DATA_BLOCK_SERVICE:
+                case Context.OEM_LOCK_SERVICE:
+                case Context.AX_SANDBOX_SERVICE:
                     return null;
                 case Context.VCN_MANAGEMENT_SERVICE:
                     if (!hasSystemFeatureOpportunistic(ctx,
diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java
index 6c71a2b377a25..962977647c552 100644
--- a/core/java/android/app/TaskInfo.java
+++ b/core/java/android/app/TaskInfo.java
@@ -409,6 +409,11 @@ public class TaskInfo {
      */
     public boolean isAppBubble;
 
+    /**
+     * @hide
+     */
+    public boolean isTopAppLocked;
+
     /**
      * The top activity's main window frame if it doesn't match the top activity bounds.
      * {@code null}, otherwise.
@@ -652,6 +657,7 @@ void readTaskFromParcel(Parcel source) {
         appCompatTaskInfo = source.readTypedObject(AppCompatTaskInfo.CREATOR);
         topActivityMainWindowFrame = source.readTypedObject(Rect.CREATOR);
         isAppBubble = source.readBoolean();
+        isTopAppLocked = source.readBoolean();
     }
 
     /**
@@ -710,6 +716,7 @@ public void writeTaskToParcel(Parcel dest, int flags) {
         dest.writeTypedObject(appCompatTaskInfo, flags);
         dest.writeTypedObject(topActivityMainWindowFrame, flags);
         dest.writeBoolean(isAppBubble);
+        dest.writeBoolean(isTopAppLocked);
     }
 
     @Override
@@ -760,6 +767,7 @@ public String toString() {
                 + " appCompatTaskInfo=" + appCompatTaskInfo
                 + " topActivityMainWindowFrame=" + topActivityMainWindowFrame
                 + " isAppBubble=" + isAppBubble
+                + " isTopAppLocked=" + isTopAppLocked
                 + "}";
     }
 }
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index ba04c78adf318..49e16dbefb178 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -3284,17 +3284,26 @@ public void sendWallpaperCommand(IBinder windowToken, String action,
     @Keep
     @TestApi
     public void setWallpaperZoomOut(@NonNull IBinder windowToken, float zoom) {
-        if (zoom < 0 || zoom > 1f) {
-            throw new IllegalArgumentException("zoom must be between 0 and 1: " + zoom);
+        final float mZoom = isDepthWallpaperEnabled() ? 1 : zoom;
+        if (mZoom < 0 || mZoom > 1f) {
+            throw new IllegalArgumentException("zoom must be between 0 and 1: " + mZoom);
         }
         if (windowToken == null) {
             throw new IllegalArgumentException("windowToken must not be null");
         }
         try {
-            WindowManagerGlobal.getWindowSession().setWallpaperZoomOut(windowToken, zoom);
+            WindowManagerGlobal.getWindowSession().setWallpaperZoomOut(windowToken, mZoom);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
+
+      }
+        private boolean isDepthWallpaperEnabled() {
+        boolean depthWallpaperEnabled = android.provider.Settings.System.getInt(mContext.getContentResolver(), 
+                "depth_wallpaper_enabled", 0) == 1;
+        String depthWallpaperUri = android.provider.Settings.System.getString(mContext.getContentResolver(),
+                "depth_wallpaper_subject_image_uri");
+        return depthWallpaperEnabled && depthWallpaperUri != null && !depthWallpaperUri.isEmpty();
     }
 
     /**
diff --git a/core/java/android/app/contextualsearch/ContextualSearchState.aidl b/core/java/android/app/contextualsearch/ContextualSearchState.aidl
index 7f64484b0f387..47980f62f2277 100644
--- a/core/java/android/app/contextualsearch/ContextualSearchState.aidl
+++ b/core/java/android/app/contextualsearch/ContextualSearchState.aidl
@@ -16,4 +16,4 @@
 
 package android.app.contextualsearch;
 
-parcelable ContextualSearchState;
\ No newline at end of file
+parcelable ContextualSearchState;
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index f41e6a1d47257..33f9de093bffc 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -4668,6 +4668,7 @@ public abstract boolean startInstrumentation(@NonNull ComponentName className,
                 MEDIA_QUALITY_SERVICE,
                 ADVANCED_PROTECTION_SERVICE,
                 ANOMALY_DETECTOR_SERVICE,
+                REFRESH_RATE_MANAGER_SERVICE,
             })
     @Retention(RetentionPolicy.SOURCE)
     public @interface ServiceName {}
@@ -6258,6 +6259,11 @@ public final <T> T getSystemService(@NonNull Class<T> serviceClass) {
      */
     public static final String APP_OPS_SERVICE = "appops";
 
+    /**
+     * @hide
+     */
+    public static final String AX_SANDBOX_SERVICE = "ax_sandbox";
+
     /**
      * Use with {@link #getSystemService(String)} to retrieve a {@link android.app.role.RoleManager}
      * for managing roles.
@@ -6936,6 +6942,16 @@ public final <T> T getSystemService(@NonNull Class<T> serviceClass) {
      */
     public static final String DISPLAY_HASH_SERVICE = "display_hash";
 
+    /**
+     * Use with {@link #getSystemService} to retrieve a
+     * {@link android.os.PocketManager} for accessing and listening to device pocket state.
+     *
+     * @hide
+     * @see #getSystemService
+     * @see android.os.PocketManager
+     */
+    public static final String POCKET_SERVICE = "pocket";
+
     /**
      * Use with {@link #getSystemService(String)} to retrieve a
      * {@link android.app.LocaleManager}.
@@ -7209,6 +7225,16 @@ public final <T> T getSystemService(@NonNull Class<T> serviceClass) {
     @FlaggedApi(android.media.tv.flags.Flags.FLAG_MEDIA_QUALITY_FW)
     public static final String MEDIA_QUALITY_SERVICE = "media_quality";
 
+    /**
+     * Use with {@link #getSystemService(String)} to retrieve a
+     * {@link org.derpfest.display.RefreshRateManager} for managing display refresh rate.
+     *
+     * @hide
+     * @see #getSystemService
+     * @see org.derpfest.display.RefreshRateManager
+     */
+    public static final String REFRESH_RATE_MANAGER_SERVICE = "refresh_rate_ext";
+
     /**
      * Service to perform operations needed for dynamic instrumentation.
      * @hide
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 9b50fafe007aa..d9b5962e62db6 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -4549,6 +4549,13 @@ public static Intent createChooser(Intent target, CharSequence title, IntentSend
      */
     public static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";
 
+    /**
+     * Broadcast Action: Display power state has changed.
+     * @hide
+     */
+    public static final String ACTION_DISPLAY_STATE_CHANGED =
+            "android.intent.action.DISPLAY_STATE_CHANGED";
+
     /**
      * Activity Action: Allow the user to select and return one or more existing
      * documents. When invoked, the system will display the various
diff --git a/core/java/android/content/pm/InstallSourceInfo.java b/core/java/android/content/pm/InstallSourceInfo.java
index 006d7cdcb2b67..f165afe62887a 100644
--- a/core/java/android/content/pm/InstallSourceInfo.java
+++ b/core/java/android/content/pm/InstallSourceInfo.java
@@ -139,6 +139,8 @@ public String getOriginatingPackageName() {
      */
     @Nullable
     public String getInstallingPackageName() {
+        if ("com.aurora.store".equals(mInstallingPackageName))
+            return "com.android.vending";
         return mInstallingPackageName;
     }
 
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index c944767993db3..0a6aaac55565d 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3599,11 +3599,7 @@ private boolean parseBaseApplication(Package owner, Resources res,
             ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ALLOW_CLEAR_USER_DATA_ON_FAILED_RESTORE;
         }
 
-        if (sa.getBoolean(
-                R.styleable.AndroidManifestApplication_allowAudioPlaybackCapture,
-                owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q)) {
-            ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE;
-        }
+        ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE;
 
         if (sa.getBoolean(
                 R.styleable.AndroidManifestApplication_requestLegacyExternalStorage,
@@ -4637,43 +4633,7 @@ private Activity parseActivity(Package owner, Resources res,
     }
 
     private void setActivityResizeMode(ActivityInfo aInfo, TypedArray sa, Package owner) {
-        final boolean appExplicitDefault = (owner.applicationInfo.privateFlags
-                & (PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE
-                | PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_UNRESIZEABLE)) != 0;
-
-        if (sa.hasValue(R.styleable.AndroidManifestActivity_resizeableActivity)
-                || appExplicitDefault) {
-            // Activity or app explicitly set if it is resizeable or not;
-            final boolean appResizeable = (owner.applicationInfo.privateFlags
-                    & PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE) != 0;
-            if (sa.getBoolean(R.styleable.AndroidManifestActivity_resizeableActivity,
-                    appResizeable)) {
-                aInfo.resizeMode = RESIZE_MODE_RESIZEABLE;
-            } else {
-                aInfo.resizeMode = RESIZE_MODE_UNRESIZEABLE;
-            }
-            return;
-        }
-
-        if ((owner.applicationInfo.privateFlags
-                & PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION) != 0) {
-            // The activity or app didn't explicitly set the resizing option, however we want to
-            // make it resize due to the sdk version it is targeting.
-            aInfo.resizeMode = RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;
-            return;
-        }
-
-        // resize preference isn't set and target sdk version doesn't support resizing apps by
-        // default. For the app to be resizeable if it isn't fixed orientation or immersive.
-        if (aInfo.isFixedOrientationPortrait()) {
-            aInfo.resizeMode = RESIZE_MODE_FORCE_RESIZABLE_PORTRAIT_ONLY;
-        } else if (aInfo.isFixedOrientationLandscape()) {
-            aInfo.resizeMode = RESIZE_MODE_FORCE_RESIZABLE_LANDSCAPE_ONLY;
-        } else if (aInfo.isFixedOrientation()) {
-            aInfo.resizeMode = RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION;
-        } else {
-            aInfo.resizeMode = RESIZE_MODE_FORCE_RESIZEABLE;
-        }
+        aInfo.resizeMode = RESIZE_MODE_RESIZEABLE;
     }
 
     /**
@@ -4681,10 +4641,8 @@ private void setActivityResizeMode(ActivityInfo aInfo, TypedArray sa, Package ow
      * ratio set.
      */
     private void setMaxAspectRatio(Package owner) {
-        // Default to (1.86) 16.7:9 aspect ratio for pre-O apps and unset for O and greater.
-        // NOTE: 16.7:9 was the max aspect ratio Android devices can support pre-O per the CDD.
-        float maxAspectRatio = owner.applicationInfo.targetSdkVersion < O
-                ? DEFAULT_PRE_O_MAX_ASPECT_RATIO : 0;
+        // Start at an unlimited aspect ratio unless we get a more restrictive one
+        float maxAspectRatio = 0;
 
         if (owner.applicationInfo.maxAspectRatio != 0) {
             // Use the application max aspect ration as default if set.
@@ -5565,6 +5523,20 @@ private Bundle parseMetaData(Resources res,
 
         if (data == null) {
             data = new Bundle();
+            data.putBoolean("batch_opted_out_by_default", true);
+            data.putBoolean("com.ad4screen.no_geoloc", true);
+            data.putBoolean("com.facebook.sdk.AutoLogAppEventsEnabled", false);
+            data.putBoolean("com.mixpanel.android.MPConfig.UseIpAddressForGeolocation", false);
+            data.putBoolean("com.webengage.sdk.android.location_tracking", false);
+            data.putBoolean("firebase_analytics_collection_deactivated", true);
+            data.putBoolean("firebase_analytics_collection_enabled", false);
+            data.putBoolean("firebase_crash_collection_enabled", false);
+            data.putBoolean("firebase_performance_collection_deactivated", true);
+            data.putBoolean("google_analytics_adid_collection_enabled", false);
+            data.putBoolean("google_analytics_ssaid_collection_enabled", false);
+            data.putBoolean("google_analytics_default_allow_ad_personalization_signals", false);
+            data.putString("com.ad4screen.tracking_mode", "Restricted");
+            data.putString("com.sprooki.LOCATION_SERVICES", "disable");
         }
 
         String name = sa.getNonConfigurationString(
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index a500ced2ca037..a5075900c6ec8 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -84,7 +84,7 @@ public final class AssetManager implements AutoCloseable {
     public static final String FRAMEWORK_APK_PATH = getFrameworkApkPath();
     private static final String FRAMEWORK_APK_PATH_DEVICE = "/system/framework/framework-res.apk";
     private static final String FRAMEWORK_APK_PATH_RAVENWOOD = "ravenwood-data/framework-res.apk";
-    private static final String LINEAGE_APK_PATH = "/system/framework/org.lineageos.platform-res.apk";
+    private static final String PLATFORM_EXT_APK_PATH = "/system/framework/org.lineageos.platform-res.apk";
 
     private static final Object sSync = new Object();
 
@@ -292,7 +292,7 @@ public static void createSystemAssetsInZygoteLocked(boolean reinitialize,
             for (String idmapPath : systemIdmapPaths) {
                 apkAssets.add(ApkAssets.loadOverlayFromPath(idmapPath, ApkAssets.PROPERTY_SYSTEM));
             }
-            apkAssets.add(ApkAssets.loadFromPath(LINEAGE_APK_PATH, ApkAssets.PROPERTY_SYSTEM));
+            apkAssets.add(ApkAssets.loadFromPath(PLATFORM_EXT_APK_PATH, ApkAssets.PROPERTY_SYSTEM));
 
             sSystemApkAssetsSet = new ArraySet<>(apkAssets);
             sSystemApkAssets = apkAssets.toArray(new ApkAssets[0]);
@@ -973,8 +973,14 @@ public boolean containsAllocatedTable() {
 
     @Nullable
     CharSequence getPooledStringForCookie(int cookie, int id) {
-        // Cookies map to ApkAssets starting at 1.
-        return getApkAssets()[cookie - 1].getStringFromPool(id);
+        ApkAssets[] apkAssets = getApkAssets();
+
+        if (cookie > 0 && cookie <= apkAssets.length) {
+            // map cookies starting at 1.
+            return apkAssets[cookie - 1].getStringFromPool(id);
+        }
+
+        return null;
     }
 
     /**
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index d9ad0313ddc48..bb160f7ec23db 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -213,7 +213,7 @@ public static int selectDefaultTheme(int curTheme, int targetSdkVersion) {
                 com.android.internal.R.style.Theme,
                 com.android.internal.R.style.Theme_Holo,
                 com.android.internal.R.style.Theme_DeviceDefault,
-                com.android.internal.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+                com.android.internal.R.style.Theme_DeviceDefault_System);
     }
 
     /** @hide */
@@ -501,11 +501,11 @@ public ConfigurationBoundResourceCache<StateListAnimator> getStateListAnimatorCa
             if (typeface != null) {
                 return typeface;
             }
+        } catch (Exception e) {
         } finally {
             releaseTempTypedValue(value);
         }
-        throw new NotFoundException("Font resource ID #0x"
-                + Integer.toHexString(id));
+        return Typeface.SANS_SERIF;
     }
 
     @NonNull
diff --git a/core/java/android/content/res/StringBlock.java b/core/java/android/content/res/StringBlock.java
index daa898e9e300d..ceb9c99ffcb74 100644
--- a/core/java/android/content/res/StringBlock.java
+++ b/core/java/android/content/res/StringBlock.java
@@ -107,7 +107,7 @@ public CharSequence get(int idx) {
     @Nullable
     public CharSequence getSequence(int idx) {
         synchronized (this) {
-            if (mStrings != null) {
+            if (mStrings != null && idx < mStrings.length) {
                 CharSequence res = mStrings[idx];
                 if (res != null) {
                     return res;
@@ -190,7 +190,7 @@ public CharSequence getSequence(int idx) {
                 res = applyStyles(str, style, mStyleIDs);
             }
             if (res != null) {
-                if (mStrings != null) mStrings[idx] = res;
+                if (mStrings != null && idx < mStrings.length) mStrings[idx] = res;
                 else mSparseStrings.put(idx, res);
             }
             return res;
diff --git a/core/java/android/content/res/ThemedResourceCache.java b/core/java/android/content/res/ThemedResourceCache.java
index c7fcc1a382446..0a6c511ec2251 100644
--- a/core/java/android/content/res/ThemedResourceCache.java
+++ b/core/java/android/content/res/ThemedResourceCache.java
@@ -27,6 +27,9 @@
 import android.util.LongSparseArray;
 
 import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Data structure used for caching data against themes.
@@ -37,7 +40,7 @@
 abstract class ThemedResourceCache<T> {
     public static final int UNDEFINED_GENERATION = -1;
     @UnsupportedAppUsage
-    private ArrayMap<ThemeKey, LongSparseArray<WeakReference<T>>> mThemedEntries;
+    private HashMap<ThemeKey, LongSparseArray<WeakReference<T>>> mThemedEntries;
     private LongSparseArray<WeakReference<T>> mUnthemedEntries;
     private LongSparseArray<WeakReference<T>> mNullThemedEntries;
 
@@ -176,7 +179,7 @@ private LongSparseArray<WeakReference<T>> getThemedLocked(@Nullable Theme t, boo
 
         if (mThemedEntries == null) {
             if (create) {
-                mThemedEntries = new ArrayMap<>(1);
+                mThemedEntries = new HashMap<>(1);
             } else {
                 return null;
             }
@@ -220,9 +223,12 @@ private LongSparseArray<WeakReference<T>> getUnthemedLocked(boolean create) {
      */
     private boolean pruneLocked(@Config int configChanges) {
         if (mThemedEntries != null) {
-            for (int i = mThemedEntries.size() - 1; i >= 0; i--) {
-                if (pruneEntriesLocked(mThemedEntries.valueAt(i), configChanges)) {
-                    mThemedEntries.removeAt(i);
+            Iterator<ThemeKey> iterator = mThemedEntries.keySet().iterator();
+            while (iterator.hasNext()) {
+                ThemeKey key = iterator.next();
+                LongSparseArray<WeakReference<T>> value = mThemedEntries.get(key);
+                if (pruneEntriesLocked(value, configChanges)) {
+                    iterator.remove();
                 }
             }
         }
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 432954036912a..7c948f709b706 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -496,10 +496,8 @@ private SQLiteDatabase(@Nullable final String path, @Nullable final int openFlag
         mConfigurationLocked.lookasideSlotCount = lookasideSlotCount;
 
         // Disable lookaside allocator on low-RAM devices
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            mConfigurationLocked.lookasideSlotCount = 0;
-            mConfigurationLocked.lookasideSlotSize = 0;
-        }
+        mConfigurationLocked.lookasideSlotCount = 0;
+        mConfigurationLocked.lookasideSlotSize = 0;
         long effectiveTimeoutMs = Long.MAX_VALUE;
         // Never close idle connections for in-memory databases
         if (!mConfigurationLocked.isInMemoryDb()) {
@@ -844,6 +842,9 @@ private void beginTransaction(@Nullable SQLiteTransactionListener listener, int
             boolean readOnly = (mode == SQLiteSession.TRANSACTION_MODE_DEFERRED);
             getThreadSession().beginTransaction(mode, listener,
                     getThreadDefaultConnectionFlags(readOnly), null);
+        } catch (SQLiteDatabaseCorruptException ex) {
+            onCorruption();
+            throw ex;
         } finally {
             releaseReference();
         }
@@ -857,6 +858,9 @@ public void endTransaction() {
         acquireReference();
         try {
             getThreadSession().endTransaction(null);
+        } catch (SQLiteDatabaseCorruptException ex) {
+            onCorruption();
+            throw ex;
         } finally {
             releaseReference();
         }
@@ -974,6 +978,9 @@ private boolean yieldIfContendedHelper(boolean throwIfUnsafe, long sleepAfterYie
         acquireReference();
         try {
             return getThreadSession().yieldTransaction(sleepAfterYieldDelay, throwIfUnsafe, null);
+        } catch (SQLiteDatabaseCorruptException ex) {
+            onCorruption();
+            throw ex;
         } finally {
             releaseReference();
         }
diff --git a/core/java/android/graphics/fonts/FontManager.java b/core/java/android/graphics/fonts/FontManager.java
index beb7f36142c71..7794aeabe67aa 100644
--- a/core/java/android/graphics/fonts/FontManager.java
+++ b/core/java/android/graphics/fonts/FontManager.java
@@ -303,6 +303,17 @@ private FontManager(@NonNull IFontManager iFontManager) {
         }
     }
 
+    /**
+     * @hide
+     */
+    public void clearUpdates() {
+        try {
+            mIFontManager.clearUpdates();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     /**
      * Factory method of the FontManager.
      *
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 14d8a28546bec..c1b220f9ae954 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -178,6 +178,10 @@ public class Camera {
     private static final int CAMERA_MSG_RAW_IMAGE_NOTIFY = 0x200;
     private static final int CAMERA_MSG_PREVIEW_METADATA = 0x400;
     private static final int CAMERA_MSG_FOCUS_MOVE       = 0x800;
+    /* ### QC ADD-ONS: START */
+    private static final int CAMERA_MSG_STATS_DATA       = 0x1000;
+    private static final int CAMERA_MSG_META_DATA        = 0x2000;
+    /* ### QC ADD-ONS: END */
 
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
     private long mNativeContext; // accessed by native methods
@@ -209,6 +213,17 @@ public class Camera {
     private boolean mShutterSoundEnabledFromApp = true;
 
     private static final int NO_ERROR = 0;
+    private static final int EACCESS = -13;
+    private static final int ENODEV = -19;
+    private static final int EBUSY = -16;
+    private static final int EINVAL = -22;
+    private static final int ENOSYS = -38;
+    private static final int EUSERS = -87;
+    private static final int EOPNOTSUPP = -95;
+    /* ### QC ADD-ONS: START */
+    private CameraDataCallback mCameraDataCallback;
+    private CameraMetaDataCallback mCameraMetaDataCallback;
+    /* ### QC ADD-ONS: END */
 
     /**
      * Broadcast Action:  A new picture is taken by the camera, and the entry of
@@ -419,6 +434,17 @@ public static class CameraInfo {
          */
         public static final int CAMERA_FACING_FRONT = 1;
 
+         /* ### QC ADD-ONS: START TBD*/
+        /** @hide
+         *  camera is in ZSL mode.
+         */
+        public static final int CAMERA_SUPPORT_MODE_ZSL = 2;
+
+        /** @hide
+         * camera is in non-ZSL mode.
+         */
+        public static final int CAMERA_SUPPORT_MODE_NONZSL = 3;
+         /* ### QC ADD-ONS: END */
         /**
          * The direction that the camera faces. It should be
          * CAMERA_FACING_BACK or CAMERA_FACING_FRONT.
@@ -584,6 +610,10 @@ private int cameraInit(int cameraId, Context context, CameraCompatibilityInfo co
         mPostviewCallback = null;
         mUsingPreviewAllocation = false;
         mZoomListener = null;
+        /* ### QC ADD-ONS: START */
+        mCameraDataCallback = null;
+        mCameraMetaDataCallback = null;
+        /* ### QC ADD-ONS: END */
 
         Looper looper;
         if ((looper = Looper.myLooper()) != null) {
@@ -1232,7 +1262,23 @@ public void handleMessage(Message msg) {
                     mAutoFocusMoveCallback.onAutoFocusMoving(msg.arg1 == 0 ? false : true, mCamera);
                 }
                 return;
+            /* ### QC ADD-ONS: START */
+            case CAMERA_MSG_STATS_DATA:
+                int statsdata[] = new int[257];
+                for(int i =0; i<257; i++ ) {
+                   statsdata[i] = byteToInt( (byte[])msg.obj, i*4);
+                }
+                if (mCameraDataCallback != null) {
+                     mCameraDataCallback.onCameraData(statsdata, mCamera);
+                }
+                return;
 
+            case CAMERA_MSG_META_DATA:
+                if (mCameraMetaDataCallback != null) {
+                    mCameraMetaDataCallback.onCameraMetaData((byte[])msg.obj, mCamera);
+                }
+                return;
+            /* ### QC ADD-ONS: END */
             default:
                 Log.e(TAG, "Unknown message type " + msg.what);
                 return;
@@ -1743,7 +1789,11 @@ private void updateAppOpsPlayAudio() {
                     } catch (RemoteException e) {
                         Log.e(TAG, "Audio service is unavailable for queries");
                     }
-                    _enableShutterSound(false);
+                    try {
+                        _enableShutterSound(false);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Couldn't disable shutter sound");
+                    }
                 } else {
                     enableShutterSound(mShutterSoundEnabledFromApp);
                 }
@@ -1751,6 +1801,20 @@ private void updateAppOpsPlayAudio() {
         }
     }
 
+    /**
+     * Send a vendor-specific camera command
+     *
+     * @hide
+     */
+    public final void sendVendorCommand(int cmd, int arg1, int arg2) {
+        if (cmd < 1000) {
+            throw new IllegalArgumentException("Command numbers must be at least 1000");
+        }
+        _sendVendorCommand(cmd, arg1, arg2);
+    }
+
+    private native final void _sendVendorCommand(int cmd, int arg1, int arg2);
+
     /**
      * Callback interface for zoom changes during a smooth zoom operation.
      *
@@ -1973,6 +2037,23 @@ public Face() {
          * as a set. Either they are all valid, or none of them are.
          */
         public Point mouth = null;
+
+        /**
+         * {@hide}
+         */
+        public int smileDegree = 0;
+        /**
+         * {@hide}
+         */
+        public int smileScore = 0;
+        /**
+         * {@hide}
+         */
+        public int blinkDetected = 0;
+        /**
+         * {@hide}
+         */
+        public int faceRecognised = 0;
     }
 
     /**
@@ -2097,6 +2178,27 @@ public Parameters getParameters() {
         return p;
     }
 
+    /** @hide
+     * Returns the current cct value of white balance.
+     *
+     * If it's in AWB mode, cct is determined by stats/awb module.
+     *
+     * If it's in Manual WB mode, it actually returns cct value
+     *     set by user via {@link #setParameters(Camera.Parameters)}.
+     */
+    public int getWBCurrentCCT() {
+        Parameters p = new Parameters();
+        String s = native_getParameters();
+        p.unflatten(s);
+
+        int cct = 0;
+        if (p.getWBCurrentCCT() != null) {
+            cct = Integer.parseInt(p.getWBCurrentCCT());
+        }
+
+        return cct;
+    }
+
     /**
      * Returns an empty {@link Parameters} for testing purpose.
      *
@@ -2110,6 +2212,157 @@ public static Parameters getEmptyParameters() {
         return camera.new Parameters();
     }
 
+    /* ### QC ADD-ONS: START */
+    private static int byteToInt(byte[] b, int offset) {
+        int value = 0;
+        for (int i = 0; i < 4; i++) {
+            int shift = (4 - 1 - i) * 8;
+            value += (b[(3-i) + offset] & 0x000000FF) << shift;
+        }
+        return value;
+    }
+    /** @hide
+     * Handles the callback for when Camera Data is available.
+     * data is read from the camera.
+     */
+    public interface CameraDataCallback {
+        /**
+         * Callback for when camera data is available.
+         *
+         * @param data   a int array of the camera data
+         * @param camera the Camera service object
+         */
+        void onCameraData(int[] data, Camera camera);
+    };
+
+    /** @hide
+     * Set camera histogram mode and registers a callback function to run.
+     *  Only valid after startPreview() has been called.
+     *
+     * @param cb the callback to run
+     */
+    public final void setHistogramMode(CameraDataCallback cb)
+    {
+        mCameraDataCallback = cb;
+        native_setHistogramMode(cb!=null);
+    }
+    private native final void native_setHistogramMode(boolean mode);
+
+    /** @hide
+     * Set camera histogram command to send data.
+     *
+     */
+    public final void sendHistogramData()
+    {
+        native_sendHistogramData();
+    }
+    private native final void native_sendHistogramData();
+
+    /** @hide
+     * Handles the callback for when Camera Meta Data is available.
+     * Meta data is read from the camera.
+     */
+    public interface CameraMetaDataCallback {
+        /**
+         * Callback for when camera meta data is available.
+         *
+         * @param data   a byte array of the camera meta data
+         * @param camera the Camera service object
+         */
+        void onCameraMetaData(byte[] data, Camera camera);
+    };
+
+    /** @hide
+     * Set camera meta data and registers a callback function to run.
+     *  Only valid after startPreview() has been called.
+     *
+     * @param cb the callback to run
+     */
+    public final void setMetadataCb(CameraMetaDataCallback cb)
+    {
+        mCameraMetaDataCallback = cb;
+        native_setMetadataCb(cb!=null);
+    }
+    private native final void native_setMetadataCb(boolean mode);
+
+    /** @hide
+     * Set camera face detection command to send meta data.
+     */
+    public final void sendMetaData()
+    {
+        native_sendMetaData();
+    }
+    private native final void native_sendMetaData();
+
+    /** @hide
+     * Configure longshot mode. Available only in ZSL.
+     *
+     * @param enable enable/disable this mode
+     */
+    public final void setLongshot(boolean enable)
+    {
+        native_setLongshot(enable);
+    }
+    private native final void native_setLongshot(boolean enable);
+
+     /** @hide
+     * Handles the Touch Co-ordinate.
+     */
+     public class Coordinate {
+        /**
+         * Sets the x,y co-ordinates for a touch event
+         *
+         * @param x the x co-ordinate (pixels)
+         * @param y the y co-ordinate (pixels)
+         */
+        public Coordinate(int x, int y) {
+            xCoordinate = x;
+            yCoordinate = y;
+        }
+        /**
+         * Compares {@code obj} to this co-ordinate.
+         *
+         * @param obj the object to compare this co-ordinate with.
+         * @return {@code true} if the xCoordinate and yCoordinate of {@code obj} is the
+         *         same as those of this coordinate. {@code false} otherwise.
+         */
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof Coordinate)) {
+                return false;
+            }
+            Coordinate c = (Coordinate) obj;
+            return xCoordinate == c.xCoordinate && yCoordinate == c.yCoordinate;
+        }
+
+        /** x co-ordinate for the touch event*/
+        public int xCoordinate;
+
+        /** y co-ordinate for the touch event */
+        public int yCoordinate;
+    };
+
+    /** @hide
+     * Returns the current focus position.
+     *
+     * If it's in AF mode, it's the lens position after af is done.
+     *
+     * If it's in Manual Focus mode, it actually returns the value
+     *     set by user via {@link #setParameters(Camera.Parameters)}.
+     */
+    public int getCurrentFocusPosition() {
+        Parameters p = new Parameters();
+        String s = native_getParameters();
+        p.unflatten(s);
+
+        int focus_pos = -1;
+        if (p.getCurrentFocusPosition() != null) {
+            focus_pos = Integer.parseInt(p.getCurrentFocusPosition());
+        }
+        return focus_pos;
+    }
+
+    /* ### QC ADD-ONS: END */
     /**
      * Returns a copied {@link Parameters}; for shim use only.
      *
@@ -2374,6 +2627,10 @@ public class Parameters {
         public static final String WHITE_BALANCE_CLOUDY_DAYLIGHT = "cloudy-daylight";
         public static final String WHITE_BALANCE_TWILIGHT = "twilight";
         public static final String WHITE_BALANCE_SHADE = "shade";
+        /** @hide
+         * wb manual cct mode.
+         */
+        public static final String WHITE_BALANCE_MANUAL_CCT = "manual-cct";
 
         // Values for color effect settings.
         public static final String EFFECT_NONE = "none";
@@ -2421,6 +2678,11 @@ public class Parameters {
          */
         public static final String FLASH_MODE_TORCH = "torch";
 
+        /** @hide
+         * Scene mode is off.
+         */
+        public static final String SCENE_MODE_ASD = "asd";
+
         /**
          * Scene mode is off.
          */
@@ -2497,6 +2759,14 @@ public class Parameters {
          * Capture the naturally warm color of scenes lit by candles.
          */
         public static final String SCENE_MODE_CANDLELIGHT = "candlelight";
+        /** @hide
+        * SCENE_MODE_BACKLIGHT
+        **/
+        public static final String SCENE_MODE_BACKLIGHT = "backlight";
+        /** @hide
+        * SCENE_MODE_FLOWERS
+        **/
+        public static final String SCENE_MODE_FLOWERS = "flowers";
 
         /**
          * Applications are looking for a barcode. Camera driver will be
@@ -2539,6 +2809,13 @@ public class Parameters {
          */
         public static final String FOCUS_MODE_FIXED = "fixed";
 
+        /** @hide
+         * Normal focus mode. Applications should call
+         * {@link #autoFocus(AutoFocusCallback)} to start the focus in this
+         * mode.
+         */
+        public static final String FOCUS_MODE_NORMAL = "normal";
+
         /**
          * Extended depth of field (EDOF). Focusing is done digitally and
          * continuously. Applications should not call {@link
@@ -2591,6 +2868,11 @@ public class Parameters {
          */
         public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";
 
+        /** @hide
+         *  manual focus mode
+         */
+        public static final String FOCUS_MODE_MANUAL_POSITION = "manual";
+
         // Indices for focus distance array.
         /**
          * The array index of near focus distance for use with
@@ -2627,11 +2909,15 @@ public class Parameters {
         // Formats for setPreviewFormat and setPictureFormat.
         private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";
         private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";
+        private static final String PIXEL_FORMAT_YUV420SP_ADRENO = "yuv420sp-adreno";
         private static final String PIXEL_FORMAT_YUV422I = "yuv422i-yuyv";
         private static final String PIXEL_FORMAT_YUV420P = "yuv420p";
         private static final String PIXEL_FORMAT_RGB565 = "rgb565";
         private static final String PIXEL_FORMAT_JPEG = "jpeg";
         private static final String PIXEL_FORMAT_BAYER_RGGB = "bayer-rggb";
+        private static final String PIXEL_FORMAT_RAW = "raw";
+        private static final String PIXEL_FORMAT_YV12 = "yv12";
+        private static final String PIXEL_FORMAT_NV12 = "nv12";
 
         /**
          * Order matters: Keys that are {@link #set(String, String) set} later
@@ -3451,8 +3737,11 @@ public void setGpsProcessingMethod(String processing_method) {
          * parameters.
          */
         public void removeGpsData() {
+            remove(KEY_QC_GPS_LATITUDE_REF);
             remove(KEY_GPS_LATITUDE);
+            remove(KEY_QC_GPS_LONGITUDE_REF);
             remove(KEY_GPS_LONGITUDE);
+            remove(KEY_QC_GPS_ALTITUDE_REF);
             remove(KEY_GPS_ALTITUDE);
             remove(KEY_GPS_TIMESTAMP);
             remove(KEY_GPS_PROCESSING_METHOD);
@@ -3622,6 +3911,7 @@ public String getSceneMode() {
          * @see #getSceneMode()
          */
         public void setSceneMode(String value) {
+            if(getSupportedSceneModes() == null) return;
             set(KEY_SCENE_MODE, value);
         }
 
@@ -3659,6 +3949,7 @@ public String getFlashMode() {
          * @see #getFlashMode()
          */
         public void setFlashMode(String value) {
+	    if(getSupportedFlashModes() == null) return;
             set(KEY_FLASH_MODE, value);
         }
 
@@ -4343,6 +4634,7 @@ private void splitInt(String str, int[] output) {
             splitter.setString(str);
             int index = 0;
             for (String s : splitter) {
+                s = s.replaceAll("\\s","");
                 output[index++] = Integer.parseInt(s);
             }
         }
@@ -4413,7 +4705,7 @@ private Size strToSize(String str) {
         // Example string: "(10000,26623),(10000,30000)". Return null if the
         // passing string is null or the size is 0.
         private ArrayList<int[]> splitRange(String str) {
-            if (str == null || str.charAt(0) != '('
+            if (str == null || str.isEmpty() || str.charAt(0) != '('
                     || str.charAt(str.length() - 1) != ')') {
                 Log.e(TAG, "Invalid range list string=" + str);
                 return null;
@@ -4439,7 +4731,7 @@ private ArrayList<int[]> splitRange(String str) {
         // the passing string is null or the size is 0 or (0,0,0,0,0).
         @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         private ArrayList<Area> splitArea(String str) {
-            if (str == null || str.charAt(0) != '('
+            if (str == null || str.isEmpty() || str.charAt(0) != '('
                     || str.charAt(str.length() - 1) != ')') {
                 Log.e(TAG, "Invalid area string=" + str);
                 return null;
@@ -4476,5 +4768,1231 @@ private boolean same(String s1, String s2) {
             if (s1 != null && s1.equals(s2)) return true;
             return false;
         }
+        /* ### QC ADD-ONS: START */
+
+        /* ### QC ADDED PARAMETER KEYS*/
+        private static final String KEY_QC_HFR_SIZE = "hfr-size";
+        private static final String KEY_QC_PREVIEW_FRAME_RATE_MODE = "preview-frame-rate-mode";
+        private static final String KEY_QC_PREVIEW_FRAME_RATE_AUTO_MODE = "frame-rate-auto";
+        private static final String KEY_QC_PREVIEW_FRAME_RATE_FIXED_MODE = "frame-rate-fixed";
+        private static final String KEY_QC_GPS_LATITUDE_REF = "gps-latitude-ref";
+        private static final String KEY_QC_GPS_LONGITUDE_REF = "gps-longitude-ref";
+        private static final String KEY_QC_GPS_ALTITUDE_REF = "gps-altitude-ref";
+        private static final String KEY_QC_GPS_STATUS = "gps-status";
+        private static final String KEY_QC_EXIF_DATETIME = "exif-datetime";
+        private static final String KEY_QC_TOUCH_AF_AEC = "touch-af-aec";
+        private static final String KEY_QC_TOUCH_INDEX_AEC = "touch-index-aec";
+        private static final String KEY_QC_TOUCH_INDEX_AF = "touch-index-af";
+        private static final String KEY_QC_MANUAL_FOCUS_POSITION = "manual-focus-position";
+        private static final String KEY_QC_MANUAL_FOCUS_POS_TYPE = "manual-focus-pos-type";
+        private static final String KEY_QC_SCENE_DETECT = "scene-detect";
+        private static final String KEY_QC_ISO_MODE = "iso";
+        private static final String KEY_QC_EXPOSURE_TIME = "exposure-time";
+        private static final String KEY_QC_MIN_EXPOSURE_TIME = "min-exposure-time";
+        private static final String KEY_QC_MAX_EXPOSURE_TIME = "max-exposure-time";
+        private static final String KEY_QC_LENSSHADE = "lensshade";
+        private static final String KEY_QC_HISTOGRAM = "histogram";
+        private static final String KEY_QC_SKIN_TONE_ENHANCEMENT = "skinToneEnhancement";
+        private static final String KEY_QC_AUTO_EXPOSURE = "auto-exposure";
+        private static final String KEY_QC_SHARPNESS = "sharpness";
+        private static final String KEY_QC_MAX_SHARPNESS = "max-sharpness";
+        private static final String KEY_QC_CONTRAST = "contrast";
+        private static final String KEY_QC_MAX_CONTRAST = "max-contrast";
+        private static final String KEY_QC_SATURATION = "saturation";
+        private static final String KEY_QC_MAX_SATURATION = "max-saturation";
+        private static final String KEY_QC_DENOISE = "denoise";
+        private static final String KEY_QC_CONTINUOUS_AF = "continuous-af";
+        private static final String KEY_QC_SELECTABLE_ZONE_AF = "selectable-zone-af";
+        private static final String KEY_QC_FACE_DETECTION = "face-detection";
+        private static final String KEY_QC_MEMORY_COLOR_ENHANCEMENT = "mce";
+        private static final String KEY_QC_REDEYE_REDUCTION = "redeye-reduction";
+        private static final String KEY_QC_ZSL = "zsl";
+        private static final String KEY_QC_CAMERA_MODE = "camera-mode";
+        private static final String KEY_QC_VIDEO_HIGH_FRAME_RATE = "video-hfr";
+        private static final String KEY_QC_VIDEO_HDR = "video-hdr";
+        private static final String KEY_QC_POWER_MODE = "power-mode";
+        private static final String KEY_QC_POWER_MODE_SUPPORTED = "power-mode-supported";
+        private static final String KEY_QC_WB_MANUAL_CCT = "wb-manual-cct";
+        private static final String KEY_QC_MIN_WB_CCT = "min-wb-cct";
+        private static final String KEY_QC_MAX_WB_CCT = "max-wb-cct";
+        private static final String KEY_QC_AUTO_HDR_ENABLE = "auto-hdr-enable";
+        private static final String KEY_QC_VIDEO_ROTATION = "video-rotation";
+
+        /** @hide
+        * KEY_QC_AE_BRACKET_HDR
+        **/
+        public static final String KEY_QC_AE_BRACKET_HDR = "ae-bracket-hdr";
+
+        /* ### QC ADDED PARAMETER VALUES*/
+
+        // Values for touch af/aec settings.
+        /** @hide
+        * TOUCH_AF_AEC_OFF
+        **/
+        public static final String TOUCH_AF_AEC_OFF = "touch-off";
+        /** @hide
+        * TOUCH_AF_AEC_ON
+        **/
+        public static final String TOUCH_AF_AEC_ON = "touch-on";
+
+        // Values for auto exposure settings.
+        /** @hide
+        * Auto exposure frame-avg
+        **/
+        public static final String AUTO_EXPOSURE_FRAME_AVG = "frame-average";
+        /** @hide
+        * Auto exposure center weighted
+        **/
+        public static final String AUTO_EXPOSURE_CENTER_WEIGHTED = "center-weighted";
+        /** @hide
+        * Auto exposure spot metering
+        **/
+        public static final String AUTO_EXPOSURE_SPOT_METERING = "spot-metering";
+
+        //Values for ISO settings
+        /** @hide
+        * ISO_AUTO
+        **/
+        public static final String ISO_AUTO = "auto";
+        /** @hide
+        * ISO_HJR
+        **/
+        public static final String ISO_HJR = "ISO_HJR";
+        /** @hide
+        * ISO_100
+        **/
+        public static final String ISO_100 = "ISO100";
+        /** @hide
+        * ISO_200
+        **/
+        public static final String ISO_200 = "ISO200";
+        /** @hide
+        * ISO_400
+        **/
+        public static final String ISO_400 = "ISO400";
+        /** @hide
+        * ISO_800
+        **/
+        public static final String ISO_800 = "ISO800";
+        /** @hide
+        * ISO_1600
+        **/
+        public static final String ISO_1600 = "ISO1600";
+
+        /** @hide
+        * ISO_3200
+        **/
+        public static final String ISO_3200 = "ISO3200";
+
+        //Values for Lens Shading
+        /** @hide
+        * LENSSHADE_ENABLE
+        **/
+        public static final String LENSSHADE_ENABLE = "enable";
+        /** @hide
+        * LENSSHADE_DISABLE
+        **/
+        public static final String LENSSHADE_DISABLE= "disable";
+
+        //Values for Histogram
+        /** @hide
+        * Histogram enable
+        **/
+        public static final String HISTOGRAM_ENABLE = "enable";
+        /** @hide
+        * Histogram disable
+        **/
+        public static final String HISTOGRAM_DISABLE= "disable";
+
+        //Values for Skin Tone Enhancement
+        /** @hide
+        * SKIN_TONE_ENHANCEMENT_ENABLE
+        **/
+        public static final String SKIN_TONE_ENHANCEMENT_ENABLE = "enable";
+        /** @hide
+        * SKIN_TONE_ENHANCEMENT_DISABLE
+        **/
+        public static final String SKIN_TONE_ENHANCEMENT_DISABLE= "disable";
+
+        // Values for MCE settings.
+        /** @hide
+        * MCE_ENaBLE
+        **/
+        public static final String MCE_ENABLE = "enable";
+        /** @hide
+        * MCE_DISABLE
+        **/
+        public static final String MCE_DISABLE = "disable";
+
+        // Values for ZSL settings.
+        /** @hide
+        * ZSL_ON
+        **/
+        public static final String ZSL_ON = "on";
+        /** @hide
+        * ZSL_OFF
+        **/
+        public static final String ZSL_OFF = "off";
+
+        // Values for HDR Bracketing settings.
+
+        /** @hide
+        * AEC bracketing off
+        **/
+        public static final String AE_BRACKET_HDR_OFF = "Off";
+        /** @hide
+        * AEC bracketing hdr
+        **/
+        public static final String AE_BRACKET_HDR = "HDR";
+        /** @hide
+        * AEC bracketing aec-bracket
+        **/
+        public static final String AE_BRACKET = "AE-Bracket";
+
+        // Values for Power mode.
+        /** @hide
+        * LOW_POWER
+        **/
+        public static final String LOW_POWER = "Low_Power";
+        /** @hide
+        * NORMAL_POWER
+        **/
+        public static final String NORMAL_POWER = "Normal_Power";
+
+        // Values for HFR settings.
+        /** @hide
+        * VIDEO_HFR_OFF
+        **/
+        public static final String VIDEO_HFR_OFF = "off";
+        /** @hide
+        * VIDEO_HFR_2X
+        **/
+        public static final String VIDEO_HFR_2X = "60";
+        /** @hide
+        * VIDEO_HFR_3X
+        **/
+        public static final String VIDEO_HFR_3X = "90";
+        /** @hide
+        * VIDEO_HFR_4X
+        **/
+        public static final String VIDEO_HFR_4X = "120";
+
+        // Values for auto scene detection settings.
+        /** @hide
+        * SCENE_DETECT_OFF
+        **/
+        public static final String SCENE_DETECT_OFF = "off";
+        /** @hide
+        * SCENE_DETECT_ON
+        **/
+        public static final String SCENE_DETECT_ON = "on";
+
+        //Values for Continuous AF
+
+        /** @hide
+        * CAF off
+        **/
+        public static final String CONTINUOUS_AF_OFF = "caf-off";
+        /** @hide
+        * CAF on
+        **/
+        public static final String CONTINUOUS_AF_ON = "caf-on";
+        /** @hide
+        * Denoise off
+        **/
+        public static final String DENOISE_OFF = "denoise-off";
+        /** @hide
+        * Denoise on
+        **/
+        public static final String DENOISE_ON = "denoise-on";
+
+        // Values for Redeye Reduction settings.
+        /** @hide
+        * REDEYE_REDUCTION_ENABLE
+        **/
+        public static final String REDEYE_REDUCTION_ENABLE = "enable";
+        /** @hide
+        * REDEYE_REDUCTION_DISABLE
+        **/
+        public static final String REDEYE_REDUCTION_DISABLE = "disable";
+
+        // Values for selectable zone af settings.
+        /** @hide
+        * SELECTABLE_ZONE_AF_AUTO
+        **/
+        public static final String SELECTABLE_ZONE_AF_AUTO = "auto";
+        /** @hide
+        * SELECTABLE_ZONE_AF_SPOTMETERING
+        **/
+        public static final String SELECTABLE_ZONE_AF_SPOTMETERING = "spot-metering";
+        /** @hide
+        * SELECTABLE_ZONE_AF_CENTER_WEIGHTED
+        **/
+        public static final String SELECTABLE_ZONE_AF_CENTER_WEIGHTED = "center-weighted";
+        /** @hide
+        * SELECTABLE_ZONE_AF_FRAME_AVERAGE
+        **/
+        public static final String SELECTABLE_ZONE_AF_FRAME_AVERAGE = "frame-average";
+
+        // Values for Face Detection settings.
+        /** @hide
+        * Face Detection off
+        **/
+        public static final String FACE_DETECTION_OFF = "off";
+        /** @hide
+        * Face Detction on
+        **/
+        public static final String FACE_DETECTION_ON = "on";
+
+        // Values for video rotation settings.
+
+        /** @hide
+        * VIDEO_ROTATION_0
+        **/
+        public static final String VIDEO_ROTATION_0 = "0";
+        /** @hide
+        * VIDEO_ROTATION_90
+        **/
+        public static final String VIDEO_ROTATION_90 = "90";
+        /** @hide
+        * VIDEO_ROTATION_180
+        **/
+        public static final String VIDEO_ROTATION_180 = "180";
+        /** @hide
+        * VIDEO_ROTATION_270
+        **/
+        public static final String VIDEO_ROTATION_270 = "270";
+
+        /* ### QC ADDED PARAMETER APIS*/
+         /** @hide
+         * Gets the supported preview sizes in high frame rate recording mode.
+         *
+         * @return a list of Size object. This method will always return a list
+         *         with at least one element.
+         */
+         public List<Size> getSupportedHfrSizes() {
+            String str = get(KEY_QC_HFR_SIZE + SUPPORTED_VALUES_SUFFIX);
+            return splitSize(str);
+         }
+
+         /** @hide
+         * Gets the supported Touch AF/AEC setting.
+         *
+         * @return a List of TOUCH_AF_AEC_XXX string constants. null if TOUCH AF/AEC
+         *         setting is not supported.
+         *
+         */
+         public List<String> getSupportedTouchAfAec() {
+            String str = get(KEY_QC_TOUCH_AF_AEC + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /**
+         * Gets the supported Touch AF/AEC setting.
+         *
+         * @return a List of TOUCH_AF_AEC_XXX string constants. null if TOUCH AF/AEC
+         *         setting is not supported.
+         *
+         */
+
+         /** @hide
+         * Gets the supported frame rate modes.
+         *
+         * @return a List of FRAME_RATE_XXX_MODE string constant. null if this
+         *         setting is not supported.
+         */
+         public List<String> getSupportedPreviewFrameRateModes() {
+            String str = get(KEY_QC_PREVIEW_FRAME_RATE_MODE + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported auto scene detection modes.
+         *
+         * @return a List of SCENE_DETECT_XXX string constant. null if scene detection
+         *         setting is not supported.
+         *
+         */
+         public List<String> getSupportedSceneDetectModes() {
+            String str = get(KEY_QC_SCENE_DETECT + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported ISO values.
+         *
+         * @return a List of FLASH_MODE_XXX string constants. null if flash mode
+         *         setting is not supported.
+         */
+         public List<String> getSupportedIsoValues() {
+            String str = get(KEY_QC_ISO_MODE + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported Lensshade modes.
+         *
+         * @return a List of LENS_MODE_XXX string constants. null if lens mode
+         *         setting is not supported.
+         */
+         public List<String> getSupportedLensShadeModes() {
+            String str = get(KEY_QC_LENSSHADE + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported Histogram modes.
+         *
+         * @return a List of HISTOGRAM_XXX string constants. null if histogram mode
+         *         setting is not supported.
+         */
+         public List<String> getSupportedHistogramModes() {
+            String str = get(KEY_QC_HISTOGRAM + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported Skin Tone Enhancement modes.
+         *
+         * @return a List of SKIN_TONE_ENHANCEMENT_XXX string constants. null if skin tone enhancement
+         *         setting is not supported.
+         */
+         public List<String> getSupportedSkinToneEnhancementModes() {
+            String str = get(KEY_QC_SKIN_TONE_ENHANCEMENT + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+          /** @hide
+          * Gets the supported auto exposure setting.
+          *
+          * @return a List of AUTO_EXPOSURE_XXX string constants. null if auto exposure
+          *         setting is not supported.
+          */
+          public List<String> getSupportedAutoexposure() {
+             String str = get(KEY_QC_AUTO_EXPOSURE + SUPPORTED_VALUES_SUFFIX);
+             return split(str);
+          }
+
+         /** @hide
+         * Gets the supported MCE modes.
+         *
+         * @return a List of MCE_ENABLE/DISABLE string constants. null if MCE mode
+         *         setting is not supported.
+         */
+         public List<String> getSupportedMemColorEnhanceModes() {
+            String str = get(KEY_QC_MEMORY_COLOR_ENHANCEMENT + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported ZSL modes.
+         *
+         * @return a List of ZSL_OFF/OFF string constants. null if ZSL mode
+         * setting is not supported.
+         */
+         public List<String> getSupportedZSLModes() {
+            String str = get(KEY_QC_ZSL + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported Video HDR modes.
+         *
+         * @return a List of Video HDR_OFF/OFF string constants. null if
+         * Video HDR mode setting is not supported.
+         */
+         public List<String> getSupportedVideoHDRModes() {
+            String str = get(KEY_QC_VIDEO_HDR + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported HFR modes.
+         *
+         * @return a List of VIDEO_HFR_XXX string constants. null if hfr mode
+         *         setting is not supported.
+         */
+         public List<String> getSupportedVideoHighFrameRateModes() {
+            String str = get(KEY_QC_VIDEO_HIGH_FRAME_RATE + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported Continuous AF modes.
+         *
+         * @return a List of CONTINUOUS_AF_XXX string constant. null if continuous AF
+         *         setting is not supported.
+         *
+         */
+         public List<String> getSupportedContinuousAfModes() {
+            String str = get(KEY_QC_CONTINUOUS_AF + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported DENOISE  modes.
+         *
+         * @return a List of DENOISE_XXX string constant. null if DENOISE
+         *         setting is not supported.
+         *
+         */
+         public List<String> getSupportedDenoiseModes() {
+             String str = get(KEY_QC_DENOISE + SUPPORTED_VALUES_SUFFIX);
+             return split(str);
+         }
+
+         /** @hide
+         * Gets the supported selectable zone af setting.
+         *
+         * @return a List of SELECTABLE_ZONE_AF_XXX string constants. null if selectable zone af
+         *         setting is not supported.
+         */
+         public List<String> getSupportedSelectableZoneAf() {
+            String str = get(KEY_QC_SELECTABLE_ZONE_AF + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         /** @hide
+         * Gets the supported face detection modes.
+         *
+         * @return a List of FACE_DETECTION_XXX string constant. null if face detection
+         *         setting is not supported.
+         *
+         */
+         public List<String> getSupportedFaceDetectionModes() {
+            String str = get(KEY_QC_FACE_DETECTION + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+        /** @hide
+         * Gets the supported redeye reduction modes.
+         *
+         * @return a List of REDEYE_REDUCTION_XXX string constant. null if redeye reduction
+         *         setting is not supported.
+         *
+         */
+        public List<String> getSupportedRedeyeReductionModes() {
+            String str = get(KEY_QC_REDEYE_REDUCTION + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+        }
+
+         /** @hide
+         * Sets GPS altitude reference. This will be stored in JPEG EXIF header.
+         * @param altRef reference GPS altitude in meters.
+         */
+         public void setGpsAltitudeRef(double altRef) {
+            set(KEY_QC_GPS_ALTITUDE_REF, Double.toString(altRef));
+         }
+
+         /** @hide
+         * Sets GPS Status. This will be stored in JPEG EXIF header.
+         *
+         * @param status GPS status (UTC in seconds since January 1,
+         *                  1970).
+         */
+         public void setGpsStatus(double status) {
+            set(KEY_QC_GPS_STATUS, Double.toString(status));
+         }
+
+         /** @hide
+         * Sets the touch co-ordinate for Touch AEC.
+         *
+         * @param x  the x co-ordinate of the touch event
+         * @param y the y co-ordinate of the touch event
+         *
+         */
+         public void setTouchIndexAec(int x, int y) {
+            String v = Integer.toString(x) + "x" + Integer.toString(y);
+            set(KEY_QC_TOUCH_INDEX_AEC, v);
+         }
+
+         /** @hide
+         * Returns the touch co-ordinates of the touch event.
+         *
+         * @return a Index object with the x and y co-ordinated
+         *          for the touch event
+         *
+         */
+         public Coordinate getTouchIndexAec() {
+            String pair = get(KEY_QC_TOUCH_INDEX_AEC);
+            return strToCoordinate(pair);
+         }
+
+         /** @hide
+         * Sets the touch co-ordinate for Touch AF.
+         *
+         * @param x  the x co-ordinate of the touch event
+         * @param y the y co-ordinate of the touch event
+         *
+         */
+         public void setTouchIndexAf(int x, int y) {
+            String v = Integer.toString(x) + "x" + Integer.toString(y);
+            set(KEY_QC_TOUCH_INDEX_AF, v);
+         }
+
+         /** @hide
+         * Returns the touch co-ordinates of the touch event.
+         *
+         * @return a Index object with the x and y co-ordinated
+         *          for the touch event
+         *
+         */
+         public Coordinate getTouchIndexAf() {
+            String pair = get(KEY_QC_TOUCH_INDEX_AF);
+            return strToCoordinate(pair);
+         }
+         /** @hide
+         * Set Sharpness Level
+         *
+         * @param sharpness level
+         */
+         public void setSharpness(int sharpness){
+            if((sharpness < 0) || (sharpness > getMaxSharpness()) )
+                throw new IllegalArgumentException(
+                        "Invalid Sharpness " + sharpness);
+
+            set(KEY_QC_SHARPNESS, String.valueOf(sharpness));
+         }
+
+         /** @hide
+         * Set Contrast Level
+         *
+         * @param contrast level
+         */
+         public void setContrast(int contrast){
+            if((contrast < 0 ) || (contrast > getMaxContrast()))
+                throw new IllegalArgumentException(
+                        "Invalid Contrast " + contrast);
+
+            set(KEY_QC_CONTRAST, String.valueOf(contrast));
+         }
+
+         /** @hide
+         * Set Saturation Level
+         *
+         * @param saturation level
+         */
+         public void setSaturation(int saturation){
+            if((saturation < 0 ) || (saturation > getMaxSaturation()))
+                throw new IllegalArgumentException(
+                        "Invalid Saturation " + saturation);
+
+            set(KEY_QC_SATURATION, String.valueOf(saturation));
+         }
+
+         /** @hide
+         * @return true if full size video snapshot is supported.
+         */
+         public boolean isPowerModeSupported() {
+            String str = get(KEY_QC_POWER_MODE_SUPPORTED);
+            return TRUE.equals(str);
+         }
+
+         /** @hide
+         * Get Sharpness level
+         *
+         * @return sharpness level
+         */
+         public int getSharpness(){
+            return getInt(KEY_QC_SHARPNESS);
+         }
+
+         /** @hide
+         * Get Max Sharpness Level
+         *
+         * @return max sharpness level
+         */
+         public int getMaxSharpness(){
+            return getInt(KEY_QC_MAX_SHARPNESS);
+         }
+
+         /** @hide
+         * Get Contrast level
+         *
+         * @return contrast level
+         */
+         public int getContrast(){
+            return getInt(KEY_QC_CONTRAST);
+         }
+
+         /** @hide
+         * Get Max Contrast Level
+         *
+         * @return max contrast level
+         */
+         public int getMaxContrast(){
+            return getInt(KEY_QC_MAX_CONTRAST);
+         }
+
+         /** @hide
+         * Get Saturation level
+         *
+         * @return saturation level
+         */
+         public int getSaturation(){
+            return getInt(KEY_QC_SATURATION);
+         }
+
+         /** @hide
+         * Get Max Saturation Level
+         *
+         * @return max contrast level
+         */
+         public int getMaxSaturation(){
+            return getInt(KEY_QC_MAX_SATURATION);
+         }
+
+         /** @hide
+         * Sets GPS latitude reference coordinate. This will be stored in JPEG EXIF
+         * header.
+         * @param latRef GPS latitude reference coordinate.
+         */
+         public void setGpsLatitudeRef(String latRef) {
+            set(KEY_QC_GPS_LATITUDE_REF, latRef);
+         }
+
+         /** @hide
+         * Sets GPS longitude reference coordinate. This will be stored in JPEG EXIF
+         * header.
+         * @param lonRef GPS longitude reference coordinate.
+         */
+         public void setGpsLongitudeRef(String lonRef) {
+            set(KEY_QC_GPS_LONGITUDE_REF, lonRef);
+         }
+
+         /** @hide
+         * Sets system timestamp. This will be stored in JPEG EXIF header.
+         *
+         * @param dateTime current timestamp (UTC in seconds since January 1,
+         *                  1970).
+         */
+         public void setExifDateTime(String dateTime) {
+            set(KEY_QC_EXIF_DATETIME, dateTime);
+         }
+
+         /** @hide
+         * Gets the current Touch AF/AEC setting.
+         *
+         * @return one of TOUCH_AF_AEC_XXX string constant. null if Touch AF/AEC
+         *         setting is not supported.
+         *
+         */
+         public String getTouchAfAec() {
+            return get(KEY_QC_TOUCH_AF_AEC);
+         }
+
+         /** @hide
+         * Sets the current TOUCH AF/AEC setting.
+         *
+         * @param value TOUCH_AF_AEC_XXX string constants.
+         *
+         */
+         public void setTouchAfAec(String value) {
+            set(KEY_QC_TOUCH_AF_AEC, value);
+         }
+
+         /** @hide
+         * Gets the current redeye reduction setting.
+         *
+         * @return one of REDEYE_REDUCTION_XXX string constant. null if redeye reduction
+         *         setting is not supported.
+         *
+         */
+         public String getRedeyeReductionMode() {
+            return get(KEY_QC_REDEYE_REDUCTION);
+         }
+
+         /** @hide
+         * Sets the redeye reduction. Other parameters may be changed after changing
+         * redeye reduction. After setting redeye reduction,
+         * applications should call getParameters to know if some parameters are
+         * changed.
+         *
+         * @param value REDEYE_REDUCTION_XXX string constants.
+         *
+         */
+         public void setRedeyeReductionMode(String value) {
+            set(KEY_QC_REDEYE_REDUCTION, value);
+         }
+
+         /** @hide
+         * Gets the frame rate mode setting.
+         *
+         * @return one of FRAME_RATE_XXX_MODE string constant. null if this
+         *         setting is not supported.
+         */
+         public String getPreviewFrameRateMode() {
+            return get(KEY_QC_PREVIEW_FRAME_RATE_MODE);
+         }
+
+         /** @hide
+         * Sets the frame rate mode.
+         *
+         * @param value FRAME_RATE_XXX_MODE string constants.
+         */
+         public void setPreviewFrameRateMode(String value) {
+            set(KEY_QC_PREVIEW_FRAME_RATE_MODE, value);
+         }
+
+         /** @hide
+         * Gets the current auto scene detection setting.
+         *
+         * @return one of SCENE_DETECT_XXX string constant. null if auto scene detection
+         *         setting is not supported.
+         *
+         */
+         public String getSceneDetectMode() {
+            return get(KEY_QC_SCENE_DETECT);
+         }
+
+         /** @hide
+         * Sets the auto scene detect. Other parameters may be changed after changing
+         * scene detect. After setting auto scene detection,
+         * applications should call getParameters to know if some parameters are
+         * changed.
+         *
+         * @param value SCENE_DETECT_XXX string constants.
+         *
+         */
+         public void setSceneDetectMode(String value) {
+            set(KEY_QC_SCENE_DETECT, value);
+         }
+
+         /** @hide
+         * Gets the current hdr bracketing mode setting.
+         *
+         * @return current hdr bracketing mode.
+         * @see #KEY_AE_BRACKET_OFF
+         * @see #KEY_AE_BRACKET_HDR
+         * @see #KEY_AE_BRACKET_BRACKATING
+         */
+         public String getAEBracket() {
+            return get(KEY_QC_AE_BRACKET_HDR);
+         }
+
+         /** @hide
+         * Sets the Power mode.
+         *
+         * @param value Power mode.
+         * @see #getPowerMode()
+         */
+         public void setPowerMode(String value) {
+            set(KEY_QC_POWER_MODE, value);
+         }
+
+         /** @hide
+         * Gets the current power mode setting.
+         *
+         * @return current power mode. null if power mode setting is not
+         *         supported.
+         * @see #POWER_MODE_LOW
+         * @see #POWER_MODE_NORMAL
+         */
+         public String getPowerMode() {
+            return get(KEY_QC_POWER_MODE);
+         }
+
+         /** @hide
+         * Set HDR-Bracketing Level
+         *
+         * @param value HDR-Bracketing
+         */
+         public void setAEBracket(String value){
+            set(KEY_QC_AE_BRACKET_HDR, value);
+         }
+
+         /** @hide
+         * Gets the current ISO setting.
+         *
+         * @return one of ISO_XXX string constant. null if ISO
+         *         setting is not supported.
+         */
+         public String getISOValue() {
+            return get(KEY_QC_ISO_MODE);
+         }
+
+         /** @hide
+         * Sets the ISO.
+         *
+         * @param iso ISO_XXX string constant.
+         */
+         public void setISOValue(String iso) {
+            set(KEY_QC_ISO_MODE, iso);
+         }
+
+         /** @hide
+         * Sets the exposure time.
+         *
+         * @param value exposure time.
+         */
+         public void setExposureTime(int value) {
+            set(KEY_QC_EXPOSURE_TIME, Integer.toString(value));
+         }
+
+         /** @hide
+         * Gets the current exposure time.
+         *
+         * @return exposure time.
+         */
+         public String getExposureTime() {
+            return get(KEY_QC_EXPOSURE_TIME);
+         }
+
+         /** @hide
+         * Gets the min supported exposure time.
+         *
+         * @return min supported exposure time.
+         */
+         public String getMinExposureTime() {
+            return get(KEY_QC_MIN_EXPOSURE_TIME);
+         }
+
+         /** @hide
+         * Gets the max supported exposure time.
+         *
+         * @return max supported exposure time.
+         */
+         public String getMaxExposureTime() {
+            return get(KEY_QC_MAX_EXPOSURE_TIME);
+         }
+
+         /** @hide
+         * Gets the current LensShade Mode.
+         *
+         * @return LensShade Mode
+         */
+         public String getLensShade() {
+            return get(KEY_QC_LENSSHADE);
+         }
+
+         /** @hide
+         * Sets the current LensShade Mode.
+         *
+         * @return LensShade Mode
+         */
+         public void setLensShade(String lensshade) {
+            set(KEY_QC_LENSSHADE, lensshade);
+         }
+
+         /** @hide
+         * Gets the current auto exposure setting.
+         *
+         * @return one of AUTO_EXPOSURE_XXX string constant. null if auto exposure
+         *         setting is not supported.
+         */
+         public String getAutoExposure() {
+            return get(KEY_QC_AUTO_EXPOSURE);
+         }
+
+         /** @hide
+         * Sets the current auto exposure setting.
+         *
+         * @param value AUTO_EXPOSURE_XXX string constants.
+         */
+         public void setAutoExposure(String value) {
+            set(KEY_QC_AUTO_EXPOSURE, value);
+         }
+
+         /** @hide
+         * Gets the current MCE Mode.
+         *
+         * @return MCE value
+         */
+         public String getMemColorEnhance() {
+            return get(KEY_QC_MEMORY_COLOR_ENHANCEMENT);
+         }
+
+         /** @hide
+         * Sets the current MCE Mode.
+         *
+         * @return MCE Mode
+         */
+         public void setMemColorEnhance(String mce) {
+            set(KEY_QC_MEMORY_COLOR_ENHANCEMENT, mce);
+         }
+
+         /** @hide
+         * Set white balance manual cct value.
+         *
+         * @param cct user CCT setting.
+         */
+         public void setWBManualCCT(int cct) {
+            set(KEY_QC_WB_MANUAL_CCT, Integer.toString(cct));
+         }
+
+         /** @hide
+         * Gets the WB min supported CCT.
+         *
+         * @return min cct value.
+         */
+         public String getWBMinCCT() {
+            return get(KEY_QC_MIN_WB_CCT);
+         }
+
+         /** @hide
+         * Gets the WB max supported CCT.
+         *
+         * @return max cct value.
+         */
+         public String getMaxWBCCT() {
+            return get(KEY_QC_MAX_WB_CCT);
+         }
+
+         /** @hide
+         * Gets the current WB CCT.
+         *
+         * @return CCT value
+         */
+         public String getWBCurrentCCT() {
+            return get(KEY_QC_WB_MANUAL_CCT);
+         }
+
+         /** @hide
+         * Gets the current ZSL Mode.
+         *
+         * @return ZSL mode value
+         */
+         public String getZSLMode() {
+            return get(KEY_QC_ZSL);
+         }
+
+         /** @hide
+         * Sets the current ZSL Mode. ZSL mode is set as a 0th bit in KEY_CAMERA_MODE.
+         *
+         * @return null
+         */
+         public void setZSLMode(String zsl) {
+            set(KEY_QC_ZSL, zsl);
+         }
+
+         /** @hide
+         * Sets the current Auto HDR Mode.
+         * @ auto_hdr auto hdr string for enable/disable
+         * @return null
+         */
+         public void setAutoHDRMode(String auto_hdr){
+             set(KEY_QC_AUTO_HDR_ENABLE,auto_hdr);
+         }
+
+         /** @hide
+         * Gets the current Camera Mode Flag. Camera mode includes a
+         * flag(byte) which indicates different camera modes.
+         * For now support for ZSL added at bit0
+         *
+         * @return Camera Mode.
+         */
+         public String getCameraMode() {
+           return get(KEY_QC_CAMERA_MODE);
+         }
+
+         /** @hide
+         * Sets the current Camera Mode.
+         *
+         * @return null
+         */
+         public void setCameraMode(int cameraMode) {
+           set(KEY_QC_CAMERA_MODE, cameraMode);
+         }
+
+         private static final int MANUAL_FOCUS_POS_TYPE_INDEX = 0;
+         private static final int MANUAL_FOCUS_POS_TYPE_DAC = 1;
+         /** @hide
+         * Set focus position.
+         *
+         * @param pos user setting of focus position.
+         */
+         public void setFocusPosition(int type, int pos) {
+           set(KEY_QC_MANUAL_FOCUS_POS_TYPE, Integer.toString(type));
+           set(KEY_QC_MANUAL_FOCUS_POSITION, Integer.toString(pos));
+         }
+
+         /** @hide
+         * Gets the current focus position.
+         *
+         * @return current focus position
+         */
+         public String getCurrentFocusPosition() {
+            return get(KEY_QC_MANUAL_FOCUS_POSITION);
+         }
+
+
+         /** @hide
+         * Gets the current HFR Mode.
+         *
+         * @return VIDEO_HFR_XXX string constants
+         */
+         public String getVideoHighFrameRate() {
+            return get(KEY_QC_VIDEO_HIGH_FRAME_RATE);
+         }
+
+         /** @hide
+         * Sets the current HFR Mode.
+         *
+         * @param hfr VIDEO_HFR_XXX string constants
+         */
+         public void setVideoHighFrameRate(String hfr) {
+            set(KEY_QC_VIDEO_HIGH_FRAME_RATE, hfr);
+         }
+
+         /** @hide
+         * Gets the current Video HDR Mode.
+         *
+         * @return Video HDR mode value
+         */
+         public String getVideoHDRMode() {
+            return get(KEY_QC_VIDEO_HDR);
+         }
+
+         /** @hide
+         * Sets the current Video HDR Mode.
+         *
+         * @return null
+         */
+         public void setVideoHDRMode(String videohdr) {
+            set(KEY_QC_VIDEO_HDR, videohdr);
+         }
+
+         /** @hide
+         * Gets the current DENOISE  setting.
+         *
+         * @return one of DENOISE_XXX string constant. null if Denoise
+         *         setting is not supported.
+         *
+         */
+         public String getDenoise() {
+             return get(KEY_QC_DENOISE);
+         }
+
+         /** @hide
+         * Gets the current Continuous AF setting.
+         *
+         * @return one of CONTINUOUS_AF_XXX string constant. null if continuous AF
+         *         setting is not supported.
+         *
+         */
+         public String getContinuousAf() {
+            return get(KEY_QC_CONTINUOUS_AF);
+         }
+
+         /** @hide
+         * Sets the current Denoise  mode.
+         * @param value DENOISE_XXX string constants.
+         *
+         */
+
+         public void setDenoise(String value) {
+             set(KEY_QC_DENOISE, value);
+         }
+
+         /** @hide
+         * Sets the current Continuous AF mode.
+         * @param value CONTINUOUS_AF_XXX string constants.
+         *
+         */
+         public void setContinuousAf(String value) {
+            set(KEY_QC_CONTINUOUS_AF, value);
+         }
+
+         /** @hide
+         * Gets the current selectable zone af setting.
+         *
+         * @return one of SELECTABLE_ZONE_AF_XXX string constant. null if selectable zone af
+         *         setting is not supported.
+         */
+         public String getSelectableZoneAf() {
+            return get(KEY_QC_SELECTABLE_ZONE_AF);
+         }
+
+         /** @hide
+         * Sets the current selectable zone af setting.
+         *
+         * @param value SELECTABLE_ZONE_AF_XXX string constants.
+         */
+         public void setSelectableZoneAf(String value) {
+            set(KEY_QC_SELECTABLE_ZONE_AF, value);
+         }
+
+         /** @hide
+         * Gets the current face detection setting.
+         *
+         * @return one of FACE_DETECTION_XXX string constant. null if face detection
+         *         setting is not supported.
+         *
+         */
+         public String getFaceDetectionMode() {
+            return get(KEY_QC_FACE_DETECTION);
+         }
+
+         /** @hide
+         * Sets the auto scene detect. Other settings like Touch AF/AEC might be
+         * changed after setting face detection.
+         *
+         * @param value FACE_DETECTION_XXX string constants.
+         *
+         */
+         public void setFaceDetectionMode(String value) {
+            set(KEY_QC_FACE_DETECTION, value);
+         }
+
+         /** @hide
+         * Gets the current video rotation setting.
+         *
+         * @return one of VIDEO_QC_ROTATION_XXX string constant. null if video rotation
+         *         setting is not supported.
+         */
+         public String getVideoRotation() {
+            return get(KEY_QC_VIDEO_ROTATION);
+         }
+
+         /** @hide
+         * Sets the current video rotation setting.
+         *
+         * @param value VIDEO_QC_ROTATION_XXX string constants.
+         */
+         public void setVideoRotation(String value) {
+            set(KEY_QC_VIDEO_ROTATION, value);
+         }
+         /** @hide
+         * Gets the supported video rotation  modes.
+         *
+         * @return a List of VIDEO_QC_ROTATION_XXX string constant. null if this
+         *         setting is not supported.
+         */
+         public List<String> getSupportedVideoRotationValues() {
+            String str = get(KEY_QC_VIDEO_ROTATION + SUPPORTED_VALUES_SUFFIX);
+            return split(str);
+         }
+
+         // Splits a comma delimited string to an ArrayList of Coordinate.
+         // Return null if the passing string is null or the Coordinate is 0.
+         private ArrayList<Coordinate> splitCoordinate(String str) {
+            if (str == null) return null;
+            TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
+            splitter.setString(str);
+            ArrayList<Coordinate> coordinateList = new ArrayList<Coordinate>();
+            for (String s : splitter) {
+                Coordinate coordinate = strToCoordinate(s);
+                if (coordinate != null) coordinateList.add(coordinate);
+            }
+            if (coordinateList.size() == 0) return null;
+            return coordinateList;
+         }
+
+         // Parses a string (ex: "500x500") to Coordinate object.
+         // Return null if the passing string is null.
+         private Coordinate strToCoordinate(String str) {
+            if (str == null) return null;
+
+            int pos = str.indexOf('x');
+            if (pos != -1) {
+                String x = str.substring(0, pos);
+                String y = str.substring(pos + 1);
+                return new Coordinate(Integer.parseInt(x),
+                                Integer.parseInt(y));
+            }
+            Log.e(TAG, "Invalid Coordinate parameter string=" + str);
+            return null;
+         }
+         /* ### QC ADD-ONS: END */
     };
 }
diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index 8f6a23dc389a7..1c14f12dbab67 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -29,15 +29,20 @@
 import android.compat.annotation.EnabledAfter;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.MemoryFile;
 import android.os.MessageQueue;
+import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
@@ -56,6 +61,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Sensor manager implementation that communicates with the built-in
@@ -145,6 +152,10 @@ private static native int nativeSetOperationParameter(
 
     private Optional<Boolean> mHasHighSamplingRateSensorsPermission = Optional.empty();
 
+    private String mBlockedPackageList;
+    private final Set<String> mBlockedApps =
+        Collections.newSetFromMap(new ConcurrentHashMap<>());
+
     /** @hide */
     public SystemSensorManager(Context context, Looper mainLooper) {
         synchronized (sLock) {
@@ -172,6 +183,12 @@ public SystemSensorManager(Context context, Looper mainLooper) {
                 mHandleToSensor.put(sensor.getHandle(), sensor);
             }
         }
+
+        parsePackageList();
+
+        SettingsObserver observer = new SettingsObserver(
+                new Handler(mMainLooper));
+        observer.observe();
     }
 
     /** @hide */
@@ -252,6 +269,76 @@ protected List<Sensor> getFullDynamicSensorList() {
         return mFullDynamicSensorsList;
     }
 
+    private void parsePackageList() {
+        String blockedApp = Settings.Global.getString(mContext.getContentResolver(),
+                    Settings.Global.SENSOR_BLOCKED_APP);
+        if (blockedApp == null) {
+            blockedApp = TextUtils.join("|", mContext.getResources().getStringArray(
+                    com.android.internal.R.array.config_blockPackagesSensorDrain));
+        }
+        splitAndAddToArrayList(blockedApp, "\\|");
+    }
+
+    private void savePackageList(ArrayList<String> arrayList) {
+        String setting = Settings.Global.SENSOR_BLOCKED_APP;
+
+        List<String> settings = new ArrayList<String>();
+        for (String app : arrayList) {
+            settings.add(app.toString());
+        }
+        final String value = TextUtils.join("|", settings);
+        if (TextUtils.equals(setting, Settings.Global.SENSOR_BLOCKED_APP)) {
+            mBlockedPackageList = value;
+        }
+        Settings.Global.putString(mContext.getContentResolver(),
+                setting, value);
+    }
+
+    private void addBlockedApp(String packageName) {
+        if (mBlockedApps.add(packageName)) {
+            savePackageList(new ArrayList<>(mBlockedApps));
+        }
+    }
+
+    private boolean isBlockedApp(String packageName) {
+        return mBlockedApps.contains(packageName);
+    }
+
+    public void notePackageUninstalled(String pkgName) {
+        if (mBlockedApps.remove(pkgName)) {
+            savePackageList(new ArrayList<>(mBlockedApps));
+        }
+    }
+
+    private void splitAndAddToArrayList(String baseString, String separator) {
+        mBlockedApps.clear();
+        if (baseString != null) {
+            for (String s : TextUtils.split(baseString, separator)) {
+                final String v = s.trim();
+                if (!v.isEmpty()) mBlockedApps.add(v);
+            }
+        }
+    }
+
+    class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.Global.getUriFor(
+                    Settings.Global.SENSOR_BLOCKED_APP), false, this);
+            resolver.registerContentObserver(Settings.Global.getUriFor(
+                    Settings.Global.SENSOR_BLOCK), false, this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            parsePackageList();
+        }
+    }
+
     /** @hide */
     @Override
     protected boolean registerListenerImpl(SensorEventListener listener, Sensor sensor,
@@ -269,6 +356,21 @@ protected boolean registerListenerImpl(SensorEventListener listener, Sensor sens
             Log.e(TAG, "maxBatchReportLatencyUs and delayUs should be non-negative");
             return false;
         }
+
+        if (Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SENSOR_BLOCK, 0) == 1) {
+            int sensortype = sensor.getType();
+            if (sensortype == Sensor.TYPE_SIGNIFICANT_MOTION ||
+                    sensortype == Sensor.TYPE_ACCELEROMETER ||
+                    sensortype == Sensor.TYPE_LINEAR_ACCELERATION) {
+                String pkgName = mContext.getPackageName();
+                if (isBlockedApp(pkgName)) {
+                    Log.w(TAG, "Preventing " + pkgName + " from using " + sensor.getStringType());
+                    return false;
+                }
+            }
+        }
+
         if (mSensorListeners.size() >= MAX_LISTENER_COUNT) {
             Log.e(TAG, "Too many sensor listeners! Dump:");
             Map<String, Integer> listenerCounts = new HashMap<>();
@@ -350,6 +452,20 @@ protected boolean requestTriggerSensorImpl(TriggerEventListener listener, Sensor
 
         if (sensor.getReportingMode() != Sensor.REPORTING_MODE_ONE_SHOT) return false;
 
+        if (Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SENSOR_BLOCK, 0) == 1) {
+            final int sensortype = sensor.getType();
+            if (sensortype == Sensor.TYPE_SIGNIFICANT_MOTION ||
+                    sensortype == Sensor.TYPE_ACCELEROMETER ||
+                    sensortype == Sensor.TYPE_LINEAR_ACCELERATION) {
+                final String pkgName = mContext.getPackageName();
+                if (isBlockedApp(pkgName)) {
+                    Log.w(TAG, "Preventing " + pkgName + " from using " + sensor.getStringType());
+                    return false;
+                }
+            }
+        }
+
         if (mTriggerListeners.size() >= MAX_LISTENER_COUNT) {
             throw new IllegalStateException("request failed, "
                     + "the trigger listeners size has exceeded the maximum limit "
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java
index affc5004403c0..08c39961aa3ba 100644
--- a/core/java/android/hardware/camera2/CameraDevice.java
+++ b/core/java/android/hardware/camera2/CameraDevice.java
@@ -1404,6 +1404,10 @@ public abstract CaptureRequest.Builder createReprocessCaptureRequest(
     @Override
     public abstract void close();
 
+    /** @hide */
+    public abstract void setVendorStreamConfigMode(int index)
+            throws CameraAccessException;
+
     /**
      * Checks whether a particular {@link SessionConfiguration} is supported by the camera device.
      *
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 5cd5ecd7beda7..204413bedc028 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -2487,8 +2487,11 @@ private String[] extractCameraIdListLocked(int deviceId, int devicePolicy) {
             try {
                 List<String> cameraIds = new ArrayList<>();
                 boolean exposeAuxCamera = Camera.shouldExposeAuxCamera();
-                for (int i = 0; i < mDeviceStatus.size(); i++) {
-                    if (!exposeAuxCamera && i == 2) break;
+                int size = exposeAuxCamera ? mDeviceStatus.size() : 2;
+                if (mDeviceStatus.size() < size) {
+                    size = mDeviceStatus.size();
+                }
+                for (int i = 0; i < size; i++) {
                     int status = mDeviceStatus.valueAt(i);
                     DeviceCameraInfo info = mDeviceStatus.keyAt(i);
                     if (status == ICameraServiceListener.STATUS_NOT_PRESENT
@@ -2538,6 +2541,12 @@ private Set<Set<String>> extractConcurrentCameraIdListLocked(int deviceId,
         }
 
         private static void sortCameraIds(String[] cameraIds) {
+            // Check if the cameraIds array is null to avoid NullPointerException
+            if (cameraIds == null) {
+                Log.e("CameraManagerGlobal", "Camera ID array is null");
+                return;
+            }
+
             // The sort logic must match the logic in
             // libcameraservice/common/CameraProviderManager.cpp::getAPI1CompatibleCameraDeviceIds
             Arrays.sort(cameraIds, new Comparator<String>() {
@@ -2875,6 +2884,14 @@ public int getTorchStrengthLevel(
                     throw new IllegalArgumentException("cameraId was null");
                 }
 
+                /* Force to expose only two cameras
+                 * if the package name does not falls in this bucket
+                 */
+                boolean exposeAuxCamera = Camera.shouldExposeAuxCamera();
+                if (exposeAuxCamera == false && (Integer.parseInt(cameraId) >= 2)) {
+                    throw new IllegalArgumentException("invalid cameraId");
+                }
+
                 ICameraService cameraService = getCameraService();
                 if (cameraService == null) {
                     throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED,
@@ -3238,6 +3255,15 @@ private void onTorchStatusChangedLocked(int status, DeviceCameraInfo info) {
                         info.mCameraId, status, info.mDeviceId));
             }
 
+            /* Force to ignore the aux or composite camera torch status update
+             * if the package name does not falls in this bucket
+             */
+            boolean exposeAuxCamera = Camera.shouldExposeAuxCamera();
+            if (exposeAuxCamera == false && Integer.parseInt(info.mCameraId) >= 2) {
+                Log.w(TAG, "ignore the torch status update of camera: " + info.mCameraId);
+                return;
+            }
+
             if (!validTorchStatus(status)) {
                 Log.e(TAG, String.format(
                         "Ignoring invalid camera %s torch status 0x%x for device %d",
diff --git a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
index 618044123d7c0..f4fd2f0839fae 100644
--- a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
@@ -15,6 +15,7 @@
  */
 package android.hardware.camera2.impl;
 
+import android.app.ActivityThread;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraDevice;
@@ -28,6 +29,7 @@
 import android.os.Binder;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.util.Log;
 import android.view.Surface;
 
@@ -131,6 +133,18 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession
             Log.e(TAG, mIdString + "Failed to create capture session; configuration failed");
             mConfigureSuccess = false;
         }
+
+        setSkipUnconfigure();
+    }
+
+    private void setSkipUnconfigure() {
+        String packageName = ActivityThread.currentOpPackageName();
+        List<String> packageList = Arrays.asList(SystemProperties.get(
+                "vendor.camera.skip_unconfigure.packagelist", packageName).split(","));
+
+        if (packageList.contains(packageName)) {
+            mSkipUnconfigure = true;
+        }
     }
 
     @Override
diff --git a/core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java
index 87553d8c42ab2..bbac7e3796153 100644
--- a/core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java
@@ -26,11 +26,13 @@
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
+import android.hardware.camera2.params.HighSpeedVideoConfiguration;
 import android.hardware.camera2.utils.SurfaceUtils;
 import android.os.Handler;
 import android.os.ConditionVariable;
 import android.util.Range;
 import android.util.Log;
+import android.util.Size;
 import android.view.Surface;
 
 import java.util.ArrayList;
@@ -118,7 +120,7 @@ public List<CaptureRequest> createHighSpeedRequestList(CaptureRequest request)
         }
         Log.v(TAG, "previewFps: " + previewFps);
 
-        int requestListSize = fpsRange.getUpper() / previewFps;
+        int requestListSize = getHighSpeedRequestListSize(fpsRange, outputSurfaces);
         // If it's a preview, keep requestList size fixed = 1.
         if (fpsRange.getUpper() > fpsRange.getLower()) {
             requestListSize = 1;
@@ -203,6 +205,34 @@ private boolean isConstrainedHighSpeedRequestList(List<CaptureRequest> requestLi
         return true;
     }
 
+    private int getHighSpeedRequestListSize(Range<Integer> fpsRange, Collection<Surface> surfaces) {
+        int requestListSize = 0;
+
+        for (Surface surface : surfaces) {
+
+            if (SurfaceUtils.isSurfaceForHwVideoEncoder(surface)) {
+                Size surfaceSize = SurfaceUtils.getSurfaceSize(surface);
+                HighSpeedVideoConfiguration[] highSpeedVideoConfigurations =
+                    mCharacteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS);
+
+                // Get the batchsize for matching FPS & video size
+                for (HighSpeedVideoConfiguration config : highSpeedVideoConfigurations) {
+                    if (config.getSize().equals(surfaceSize) && config.getFpsRange().equals(fpsRange)) {
+                        requestListSize = config.getBatchSizeMax();
+                        break;
+                     }
+                }
+                break;
+            }
+        }
+
+        if (requestListSize == 0) {
+            // If cant' find the matching batch size,  limit the preview to 30fps.
+            requestListSize = fpsRange.getUpper() / 30;
+        }
+        return requestListSize;
+    }
+
     @Override
     public CameraDevice getDevice() {
         return mSessionImpl.getDevice();
diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
index 545be8f104e40..9de7bcad41fa7 100644
--- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
@@ -114,6 +114,8 @@ public Thread newThread(Runnable r) {
 
     private static final int REQUEST_ID_NONE = -1;
 
+    private int customOpMode = 0;
+
     /**
      * Starting {@link Build.VERSION_CODES#VANILLA_ICE_CREAM},
      * {@link #isSessionConfigurationSupported} also checks for compatibility of session parameters
@@ -581,6 +583,10 @@ public void run() {
         }
     }
 
+    public void setVendorStreamConfigMode(int fpsrange) {
+        customOpMode = fpsrange;
+    }
+
     @Override
     public String getId() {
         return mCameraId;
@@ -637,7 +643,11 @@ public boolean configureStreamsChecked(InputConfiguration inputConfig,
         if (!checkSurfaceSizesCompatible(outputs)) {
             return false;
         }
-        checkInputConfiguration(inputConfig);
+        try {
+            checkInputConfiguration(inputConfig);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, "Check input configuration failed due to: " + e.getMessage());
+        }
 
         boolean success = false;
 
@@ -706,6 +716,7 @@ public boolean configureStreamsChecked(InputConfiguration inputConfig,
                         mConfiguredOutputs.put(streamId, outConfig);
                     }
                 }
+                operatingMode = (operatingMode | (customOpMode << 16));
 
                 int offlineStreamIds[];
                 if (sessionParams != null) {
diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
index d7b6f116e4525..2570afaf1d6d4 100644
--- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
+++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java
@@ -605,36 +605,40 @@ private <T> T getBase(CaptureRequest.Key<T> key) {
     }
 
     private <T> T getBase(Key<T> key) {
-        int tag, nativeType;
-        byte[] values = null;
-        synchronized (this) {
-            if (key.hasTag()) {
-                tag = key.getTag();
-            } else {
-                tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.getName());
-                key.cacheTag(tag);
-            }
-            values = readValues(tag);
-            if (values == null) {
-                // If the key returns null, use the fallback key if exists.
-                // This is to support old key names for the newly published keys.
-                if (key.mFallbackName == null) {
-                    return null;
+        try {
+            int tag, nativeType;
+            byte[] values = null;
+            synchronized (this) {
+                if (key.hasTag()) {
+                    tag = key.getTag();
+                } else {
+                    tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.getName());
+                    key.cacheTag(tag);
                 }
-                tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.mFallbackName);
                 values = readValues(tag);
                 if (values == null) {
-                    return null;
+                    // If the key returns null, use the fallback key if exists.
+                    // This is to support old key names for the newly published keys.
+                    if (key.mFallbackName == null) {
+                        return null;
+                    }
+                    tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.mFallbackName);
+                    values = readValues(tag);
+                    if (values == null) {
+                        return null;
+                    }
                 }
-            }
 
-            nativeType = nativeGetTypeFromTagLocal(mMetadataPtr, tag);
+                nativeType = nativeGetTypeFromTagLocal(mMetadataPtr, tag);
+            }
+            // This block of code doesn't need to be synchronized since we aren't writing or reading
+            // from the metadata buffer for this instance of CameraMetadataNative.
+            Marshaler<T> marshaler = getMarshalerForKey(key, nativeType);
+            ByteBuffer buffer = ByteBuffer.wrap(values).order(ByteOrder.nativeOrder());
+            return marshaler.unmarshal(buffer);
+        } catch (Exception e) {
+                return null;
         }
-        // This block of code doesn't need to be synchronized since we aren't writing or reading
-        // from the metadata buffer for this instance of CameraMetadataNative.
-        Marshaler<T> marshaler = getMarshalerForKey(key, nativeType);
-        ByteBuffer buffer = ByteBuffer.wrap(values).order(ByteOrder.nativeOrder());
-        return marshaler.unmarshal(buffer);
     }
 
     // Use Command pattern here to avoid lots of expensive if/equals checks in get for overridden
@@ -1993,30 +1997,34 @@ private <T> void setBase(CaptureRequest.Key<T> key, T value) {
     // we expect the metadata's properties such as vendor id etc to
     // stay the same and as a result the whole method should be synchronized for safety.
     private synchronized <T> void setBase(Key<T> key, T value) {
-        int tag, nativeType;
-        if (key.hasTag()) {
-            tag = key.getTag();
-        } else {
-            tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.getName());
-            key.cacheTag(tag);
-        }
-        if (value == null) {
-            // Erase the entry
-            writeValues(tag, /*src*/null);
-            return;
-        } // else update the entry to a new value
+        try {
+            int tag, nativeType;
+            if (key.hasTag()) {
+                tag = key.getTag();
+            } else {
+                tag = nativeGetTagFromKeyLocal(mMetadataPtr, key.getName());
+                key.cacheTag(tag);
+            }
+            if (value == null) {
+                // Erase the entry
+                writeValues(tag, /*src*/null);
+                return;
+            } // else update the entry to a new value
 
-        nativeType = nativeGetTypeFromTagLocal(mMetadataPtr, tag);
-        Marshaler<T> marshaler = getMarshalerForKey(key, nativeType);
-        int size = marshaler.calculateMarshalSize(value);
+            nativeType = nativeGetTypeFromTagLocal(mMetadataPtr, tag);
+            Marshaler<T> marshaler = getMarshalerForKey(key, nativeType);
+            int size = marshaler.calculateMarshalSize(value);
 
-        // TODO: Optimization. Cache the byte[] and reuse if the size is big enough.
-        byte[] values = new byte[size];
+            // TODO: Optimization. Cache the byte[] and reuse if the size is big enough.
+            byte[] values = new byte[size];
 
-        ByteBuffer buffer = ByteBuffer.wrap(values).order(ByteOrder.nativeOrder());
-        marshaler.marshal(value, buffer);
+            ByteBuffer buffer = ByteBuffer.wrap(values).order(ByteOrder.nativeOrder());
+            marshaler.marshal(value, buffer);
 
-        writeValues(tag, values);
+            writeValues(tag, values);
+        } catch (Exception e) {
+                // Do nothing
+        }
     }
 
     // Use Command pattern here to avoid lots of expensive if/equals checks in get for overridden
diff --git a/core/java/android/hardware/camera2/impl/CaptureResultExtras.java b/core/java/android/hardware/camera2/impl/CaptureResultExtras.java
index 8bf94986a4905..0257ab979cb1f 100644
--- a/core/java/android/hardware/camera2/impl/CaptureResultExtras.java
+++ b/core/java/android/hardware/camera2/impl/CaptureResultExtras.java
@@ -75,6 +75,20 @@ public CaptureResultExtras(int requestId, int subsequenceId, int afTriggerId,
         this.readoutTimestamp = readoutTimestamp;
     }
 
+    // Backwards-compatible constructor
+    public CaptureResultExtras(int requestId, int subsequenceId, int afTriggerId,
+                               int precaptureTriggerId, long frameNumber,
+                               int partialResultCount, int errorStreamId,
+                               String errorPhysicalCameraId, long lastCompletedRegularFrameNumber,
+                               long lastCompletedReprocessFrameNumber,
+                               long lastCompletedZslFrameNumber) {
+        this(requestId, subsequenceId, afTriggerId, precaptureTriggerId, frameNumber,
+                partialResultCount, errorStreamId, errorPhysicalCameraId,
+                lastCompletedRegularFrameNumber, lastCompletedReprocessFrameNumber,
+                lastCompletedZslFrameNumber,
+                false /*hasReadOutTimestamp*/, 0 /*readoutTimestamp*/);
+    }
+
     @Override
     public int describeContents() {
         return 0;
diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 323459d553acf..e7a8dd41da202 100644
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -151,6 +151,136 @@ public StreamConfigurationMap(
                     listHighResolution, /*enforceImplementationDefined*/ true);
     }
 
+    /**
+     * Create a new {@link StreamConfigurationMap}.
+     *
+     * <p>The array parameters ownership is passed to this object after creation; do not
+     * write to them after this constructor is invoked.</p>
+     *
+     * @param configurations a non-{@code null} array of {@link StreamConfiguration}
+     * @param minFrameDurations a non-{@code null} array of {@link StreamConfigurationDuration}
+     * @param stallDurations a non-{@code null} array of {@link StreamConfigurationDuration}
+     * @param depthConfigurations a non-{@code null} array of depth {@link StreamConfiguration}
+     * @param depthMinFrameDurations a non-{@code null} array of depth
+     *        {@link StreamConfigurationDuration}
+     * @param depthStallDurations a non-{@code null} array of depth
+     *        {@link StreamConfigurationDuration}
+     * @param dynamicDepthConfigurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfiguration}
+     * @param dynamicDepthMinFrameDurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfigurationDuration}
+     * @param dynamicDepthStallDurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfigurationDuration}
+     * @param heicConfigurations a non-{@code null} array of heic {@link StreamConfiguration}
+     * @param heicMinFrameDurations a non-{@code null} array of heic
+     *        {@link StreamConfigurationDuration}
+     * @param heicStallDurations a non-{@code null} array of heic
+     *        {@link StreamConfigurationDuration}
+     * @param highSpeedVideoConfigurations an array of {@link HighSpeedVideoConfiguration}, null if
+     *        camera device does not support high speed video recording
+     * @param listHighResolution a flag indicating whether the device supports BURST_CAPTURE
+     *        and thus needs a separate list of slow high-resolution output sizes
+     * @throws NullPointerException if any of the arguments except highSpeedVideoConfigurations
+     *         were {@code null} or any subelements were {@code null}
+     *
+     * @hide
+     */
+    public StreamConfigurationMap(
+            StreamConfiguration[] configurations,
+            StreamConfigurationDuration[] minFrameDurations,
+            StreamConfigurationDuration[] stallDurations,
+            StreamConfiguration[] depthConfigurations,
+            StreamConfigurationDuration[] depthMinFrameDurations,
+            StreamConfigurationDuration[] depthStallDurations,
+            StreamConfiguration[] dynamicDepthConfigurations,
+            StreamConfigurationDuration[] dynamicDepthMinFrameDurations,
+            StreamConfigurationDuration[] dynamicDepthStallDurations,
+            StreamConfiguration[] heicConfigurations,
+            StreamConfigurationDuration[] heicMinFrameDurations,
+            StreamConfigurationDuration[] heicStallDurations,
+            HighSpeedVideoConfiguration[] highSpeedVideoConfigurations,
+            ReprocessFormatsMap inputOutputFormatsMap,
+            boolean listHighResolution) {
+        this(configurations, minFrameDurations, stallDurations,
+                    depthConfigurations, depthMinFrameDurations, depthStallDurations,
+                    dynamicDepthConfigurations, dynamicDepthMinFrameDurations,
+                    dynamicDepthStallDurations,
+                    heicConfigurations, heicMinFrameDurations, heicStallDurations,
+                    null /*jpegRConfigurations*/, null /*jpegRMinFrameDurations*/, null /*jpegRStallDurations*/,
+                    null /*heicUltraHDRConfigurations*/, null /*heicUltraHDRMinFrameDurations*/,
+                    null /*heicUltraHDRStallDurations*/, highSpeedVideoConfigurations, inputOutputFormatsMap,
+                    listHighResolution, /*enforceImplementationDefined*/ true);
+    }
+
+    /**
+     * Create a new {@link StreamConfigurationMap}.
+     *
+     * <p>The array parameters ownership is passed to this object after creation; do not
+     * write to them after this constructor is invoked.</p>
+     *
+     * @param configurations a non-{@code null} array of {@link StreamConfiguration}
+     * @param minFrameDurations a non-{@code null} array of {@link StreamConfigurationDuration}
+     * @param stallDurations a non-{@code null} array of {@link StreamConfigurationDuration}
+     * @param depthConfigurations a non-{@code null} array of depth {@link StreamConfiguration}
+     * @param depthMinFrameDurations a non-{@code null} array of depth
+     *        {@link StreamConfigurationDuration}
+     * @param depthStallDurations a non-{@code null} array of depth
+     *        {@link StreamConfigurationDuration}
+     * @param dynamicDepthConfigurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfiguration}
+     * @param dynamicDepthMinFrameDurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfigurationDuration}
+     * @param dynamicDepthStallDurations a non-{@code null} array of dynamic depth
+     *        {@link StreamConfigurationDuration}
+     * @param heicConfigurations a non-{@code null} array of heic {@link StreamConfiguration}
+     * @param heicMinFrameDurations a non-{@code null} array of heic
+     *        {@link StreamConfigurationDuration}
+     * @param heicStallDurations a non-{@code null} array of heic
+     *        {@link StreamConfigurationDuration}
+     * @param jpegRConfigurations a non-{@code null} array of Jpeg/R {@link StreamConfiguration}
+     * @param jpegRMinFrameDurations a non-{@code null} array of Jpeg/R
+     *        {@link StreamConfigurationDuration}
+     * @param jpegRStallDurations a non-{@code null} array of Jpeg/R
+     *        {@link StreamConfigurationDuration}
+     * @param highSpeedVideoConfigurations an array of {@link HighSpeedVideoConfiguration}, null if
+     *        camera device does not support high speed video recording
+     * @param listHighResolution a flag indicating whether the device supports BURST_CAPTURE
+     *        and thus needs a separate list of slow high-resolution output sizes
+     * @throws NullPointerException if any of the arguments except highSpeedVideoConfigurations
+     *         were {@code null} or any subelements were {@code null}
+     *
+     * @hide
+     */
+    public StreamConfigurationMap(
+            StreamConfiguration[] configurations,
+            StreamConfigurationDuration[] minFrameDurations,
+            StreamConfigurationDuration[] stallDurations,
+            StreamConfiguration[] depthConfigurations,
+            StreamConfigurationDuration[] depthMinFrameDurations,
+            StreamConfigurationDuration[] depthStallDurations,
+            StreamConfiguration[] dynamicDepthConfigurations,
+            StreamConfigurationDuration[] dynamicDepthMinFrameDurations,
+            StreamConfigurationDuration[] dynamicDepthStallDurations,
+            StreamConfiguration[] heicConfigurations,
+            StreamConfigurationDuration[] heicMinFrameDurations,
+            StreamConfigurationDuration[] heicStallDurations,
+            StreamConfiguration[] jpegRConfigurations,
+            StreamConfigurationDuration[] jpegRMinFrameDurations,
+            StreamConfigurationDuration[] jpegRStallDurations,
+            HighSpeedVideoConfiguration[] highSpeedVideoConfigurations,
+            ReprocessFormatsMap inputOutputFormatsMap,
+            boolean listHighResolution) {
+        this(configurations, minFrameDurations, stallDurations,
+                    depthConfigurations, depthMinFrameDurations, depthStallDurations,
+                    dynamicDepthConfigurations, dynamicDepthMinFrameDurations,
+                    dynamicDepthStallDurations,
+                    heicConfigurations, heicMinFrameDurations, heicStallDurations,
+                    jpegRConfigurations, jpegRMinFrameDurations, jpegRStallDurations,
+                    null /*heicUltraHDRConfigurations*/, null /*heicUltraHDRMinFrameDurations*/,
+                    null /*heicUltraHDRStallDurations*/, highSpeedVideoConfigurations, inputOutputFormatsMap,
+                    listHighResolution, /*enforceImplementationDefined*/ true);
+    }
+
     /**
      * Create a new {@link StreamConfigurationMap}.
      *
diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
index d341805b1588f..43592a9df94c2 100644
--- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -20,7 +20,10 @@
 
 import android.annotation.TestApi;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.hardware.biometrics.Flags;
+import android.os.BatteryManager;
 import android.os.Build;
 import android.os.SystemProperties;
 import android.provider.Settings;
@@ -40,7 +43,10 @@
  */
 @TestApi
 public class AmbientDisplayConfiguration {
-    private static final String TAG = "AmbientDisplayConfig";
+    private static final int DEFAULT_DOZE_PEEK_DURATION_SECONDS = 5;
+    private static final IntentFilter sIntentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+    private static final long BATTERY_STATUS_CACHE_TTL_MS = 5000; // 5 seconds cache
+
     private final Context mContext;
     private final boolean mAlwaysOnByDefault;
     private final boolean mPickupGestureEnabledByDefault;
@@ -48,17 +54,24 @@ public class AmbientDisplayConfiguration {
     private final boolean mDozeEnabledByDefault;
     private final boolean mTapGestureEnabledByDefault;
     private final boolean mDoubleTapGestureEnabledByDefault;
+    
+    // Battery status cache
+    private boolean mCachedChargingStatus = false;
+    private long mBatteryStatusCacheTime = 0;
 
     /** Copied from android.provider.Settings.Secure since these keys are hidden. */
     private static final String[] DOZE_SETTINGS = {
             Settings.Secure.DOZE_ENABLED,
             Settings.Secure.DOZE_ALWAYS_ON,
+            Settings.Secure.DOZE_PEEK,
+            Settings.Secure.DOZE_PEEK_DURATION,
             Settings.Secure.DOZE_PICK_UP_GESTURE,
             Settings.Secure.DOZE_PULSE_ON_LONG_PRESS,
             Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,
             Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
             Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
-            Settings.Secure.DOZE_TAP_SCREEN_GESTURE
+            Settings.Secure.DOZE_TAP_SCREEN_GESTURE,
+            Settings.Secure.DOZE_ON_CHARGE
     };
 
     /** Non-user configurable doze settings */
@@ -93,10 +106,16 @@ public AmbientDisplayConfiguration(Context context) {
     public boolean enabled(int user) {
         return pulseOnNotificationEnabled(user)
                 || pulseOnLongPressEnabled(user)
-                || alwaysOnEnabled(user)
+                || pulseOnCustomDozeEventEnabled(user)
+                || screenOffAodEnabled(user)
+                || edgeLightEnabled(user)
+                || isAmbientTickerEnabled(user)
                 || wakeLockScreenGestureEnabled(user)
                 || wakeDisplayGestureEnabled(user)
                 || pickupGestureEnabled(user)
+                || tiltGestureEnabled(user)
+                || handwaveGestureEnabled(user)
+                || pocketGestureEnabled(user)
                 || tapGestureEnabled(user)
                 || doubleTapGestureEnabled(user)
                 || quickPickupSensorEnabled(user)
@@ -116,6 +135,17 @@ public boolean pulseOnNotificationAvailable() {
                 && ambientDisplayAvailable();
     }
 
+    /** {@hide} */
+    private boolean pulseOnCustomDozeEventEnabled(int user) {
+        return (Settings.System.getIntForUser(mContext.getContentResolver(), "doze_trigger_doubletap", 0, user) != 0)
+                && pulseOnNotificationAvailable();
+    }
+
+    /** @hide */
+    public boolean isAmbientTickerEnabled(int user) {
+        return boolSettingDefaultOff(Settings.Secure.PULSE_ON_NEW_TRACKS, user);
+    }
+
     /** @hide */
     public boolean pickupGestureEnabled(int user) {
         return boolSetting(Settings.Secure.DOZE_PICK_UP_GESTURE, user,
@@ -123,11 +153,57 @@ public boolean pickupGestureEnabled(int user) {
                 && dozePickupSensorAvailable();
     }
 
+    /** @hide */
+    public boolean pickupGestureAmbient(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_PICK_UP_GESTURE_AMBIENT, user)
+                && pickupGestureEnabled(user) && pulseOnNotificationEnabled(user);
+    }
+
+    /** @hide */
+    public boolean pickupGestureVibrate(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_PICK_UP_GESTURE_VIBRATE, user)
+                && pickupGestureEnabled(user);
+    }
+
     /** @hide */
     public boolean dozePickupSensorAvailable() {
         return mContext.getResources().getBoolean(R.bool.config_dozePulsePickup);
     }
 
+    /** {@hide} */
+    public boolean tiltGestureEnabled(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_TILT_GESTURE, user)
+                && dozeTiltSensorAvailable();
+    }
+
+    /** {@hide} */
+    public boolean dozeTiltSensorAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_dozePulseTilt);
+    }
+
+    /** {@hide} */
+    public boolean handwaveGestureEnabled(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_HANDWAVE_GESTURE, user)
+                && dozeProximitySensorAvailable();
+    }
+
+    /** {@hide} */
+    public boolean pocketGestureEnabled(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_POCKET_GESTURE, user)
+                && dozeProximitySensorAvailable();
+    }
+
+    /** {@hide} */
+    public boolean dozeProximitySensorAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_dozePulseProximity);
+    }
+
+    /** @hide */
+    public boolean edgeLightEnabled(int user) {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.EDGE_LIGHT_ENABLED, 0, user) != 0;
+    }
+
     /** @hide */
     public boolean tapGestureEnabled(int user) {
         return boolSetting(Settings.Secure.DOZE_TAP_SCREEN_GESTURE, user,
@@ -135,6 +211,12 @@ public boolean tapGestureEnabled(int user) {
                 && tapSensorAvailable();
     }
 
+    /** @hide */
+    public boolean tapGestureVibrate(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_TAP_GESTURE_VIBRATE, user)
+                && tapGestureEnabled(user);
+    }
+
     /** @hide */
     public boolean tapSensorAvailable() {
         for (String tapType : tapSensorTypeMapping()) {
@@ -157,6 +239,18 @@ public boolean doubleTapSensorAvailable() {
         return !TextUtils.isEmpty(doubleTapSensorType());
     }
 
+    /** @hide */
+    public boolean tapGestureAmbient(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_TAP_GESTURE_AMBIENT, user)
+                && tapGestureEnabled(user) && pulseOnNotificationEnabled(user);
+    }
+
+    /** @hide */
+    public boolean doubleTapGestureVibrate(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_DOUBLE_TAP_GESTURE_VIBRATE, user)
+                && doubleTapGestureEnabled(user);
+    }
+
     /** @hide */
     public boolean quickPickupSensorEnabled(int user) {
         return boolSettingDefaultOn(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user)
@@ -167,11 +261,10 @@ && pickupGestureEnabled(user)
 
     /** @hide */
     public boolean screenOffUdfpsEnabled(int user) {
-        return !TextUtils.isEmpty(udfpsLongPressSensorType())
-                && ((mScreenOffUdfpsAvailable && Flags.screenOffUnlockUdfps())
-                && mContext.getResources().getBoolean(R.bool.config_screen_off_udfps_default_on)
+        if (!mScreenOffUdfpsAvailable) return false;
+        return mContext.getResources().getBoolean(R.bool.config_screen_off_udfps_default_on)
                 ? boolSettingDefaultOn(SCREEN_OFF_UNLOCK_UDFPS_ENABLED, user)
-                : boolSettingDefaultOff(SCREEN_OFF_UNLOCK_UDFPS_ENABLED, user));
+                : boolSettingDefaultOff(SCREEN_OFF_UNLOCK_UDFPS_ENABLED, user);
     }
 
     /** @hide */
@@ -248,8 +341,108 @@ private boolean pulseOnLongPressAvailable() {
      */
     @TestApi
     public boolean alwaysOnEnabled(int user) {
-        return boolSetting(Settings.Secure.DOZE_ALWAYS_ON, user, mAlwaysOnByDefault ? 1 : 0)
-                && alwaysOnAvailable() && !accessibilityInversionEnabled(user);
+        return alwaysOnEnabledSetting(user) || alwaysOnChargingEnabled(user);
+    }
+
+    /**
+     * Returns if any screen-off AOD experience should start for the current screen-off session.
+     *
+     * <p>This includes full AOD as well as a short-lived AOD peek.
+     *
+     * @hide
+     */
+    public boolean screenOffAodEnabled(int user) {
+        return alwaysOnEnabled(user) || screenOffPeekEnabled(user);
+    }
+
+    /**
+     * Returns if a short-lived screen-off AOD peek should be shown for the current user.
+     *
+     * @hide
+     */
+    public boolean screenOffPeekEnabled(int user) {
+        return boolSettingDefaultOff(Settings.Secure.DOZE_PEEK, user)
+                && ambientDisplayAvailable()
+                && !alwaysOnEnabled(user)
+                && !accessibilityInversionEnabled(user);
+    }
+
+    /**
+     * Returns the configured screen-off AOD peek duration in milliseconds.
+     *
+     * @hide
+     */
+    public long getScreenOffPeekDurationMillis(int user) {
+        return getScreenOffPeekDurationSeconds(user) * 1000L;
+    }
+
+    private int getScreenOffPeekDurationSeconds(int user) {
+        final int configuredDuration = Settings.Secure.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.DOZE_PEEK_DURATION,
+                DEFAULT_DOZE_PEEK_DURATION_SECONDS,
+                user);
+        switch (configuredDuration) {
+            case 7:
+            case 10:
+                return configuredDuration;
+            case DEFAULT_DOZE_PEEK_DURATION_SECONDS:
+            default:
+                return DEFAULT_DOZE_PEEK_DURATION_SECONDS;
+        }
+    }
+
+    /** @hide */
+    public boolean alwaysOnEnabledSetting(int user) {
+        final boolean alwaysOnEnabled = Settings.Secure.getIntForUser(
+                mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON,
+                mAlwaysOnByDefault ? 1 : 0, user) == 1;
+        return alwaysOnEnabled && alwaysOnAvailable() && !accessibilityInversionEnabled(user);
+    }
+
+    /** @hide */
+    public boolean alwaysOnChargingEnabledSetting(int user) {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            Settings.Secure.DOZE_ON_CHARGE, 0, user) == 1;
+    }
+
+    private boolean alwaysOnChargingEnabled(int user) {
+        if (alwaysOnChargingEnabledSetting(user)) {
+            long currentTime = System.currentTimeMillis();
+            
+            // Use cached value if it's still valid
+            if (currentTime - mBatteryStatusCacheTime < BATTERY_STATUS_CACHE_TTL_MS) {
+                return mCachedChargingStatus;
+            }
+            
+            // Update cache with fresh battery status
+            final Intent intent = mContext.registerReceiver(null, sIntentFilter, Context.RECEIVER_NOT_EXPORTED);
+            if (intent != null) {
+                int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+                
+                boolean chargingStatus;
+                
+                // Check if we have valid battery status and plugged values
+                if (status == -1 || plugged == -1) {
+                    // Fallback to original logic if new values are invalid
+                    chargingStatus = plugged != 0;
+                } else {
+                    boolean isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING ||
+                                status == BatteryManager.BATTERY_STATUS_FULL;
+                    boolean isPlugged = plugged == BatteryManager.BATTERY_PLUGGED_AC || 
+                                plugged == BatteryManager.BATTERY_PLUGGED_USB ||
+                                plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
+                    chargingStatus = isPlugged && isCharging;
+                }
+                
+                // Update cache
+                mCachedChargingStatus = chargingStatus;
+                mBatteryStatusCacheTime = currentTime;
+                return chargingStatus;
+            }
+        }
+        return false;
     }
 
     /**
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java
index 2174513c83e56..b149d03f351ad 100644
--- a/core/java/android/hardware/display/DisplayManagerInternal.java
+++ b/core/java/android/hardware/display/DisplayManagerInternal.java
@@ -24,17 +24,21 @@
 import android.hardware.SensorManager;
 import android.hardware.input.HostUsiVersion;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.IntArray;
 import android.util.SparseArray;
 import android.view.Display;
 import android.view.DisplayInfo;
+import android.view.Surface;
 import android.view.SurfaceControl;
 import android.view.SurfaceControl.RefreshRateRange;
 import android.view.SurfaceControl.Transaction;
 import android.window.DisplayWindowPolicyController;
 import android.window.ScreenCaptureInternal;
 
+import com.libremobileos.freeform.ILMOFreeformDisplayCallback;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
@@ -501,6 +505,17 @@ public abstract RefreshRateRange getRefreshRateForDisplayAndSensor(
      */
     public abstract IntArray getDisplayIds();
 
+    // LMOFreeform
+    public abstract void createFreeformLocked(String name, ILMOFreeformDisplayCallback callback,
+            int width, int height, int densityDpi, boolean secure, boolean ownContentOnly,
+            boolean shouldShowSystemDecorations, Surface surface, float refreshRate,
+            long presentationDeadlineNanos);
+
+    public abstract void resizeFreeform(IBinder appToken, int width, int height,
+            int densityDpi);
+
+    public abstract void releaseFreeform(IBinder appToken);
+
     /**
      * Get group id for given display id
      */
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index d470594a140ab..d8a467c451bc7 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -431,6 +431,10 @@ public void createSession(InputChannel channel, IInputMethodSessionCallback call
     @BinderThread
     @Override
     public void setSessionEnabled(IInputMethodSession session, boolean enabled) {
+        if (session == null) {
+            Log.w(TAG, "Incoming session is null");
+            return;
+        }
         try {
             InputMethodSession ls = ((IInputMethodSessionWrapper)
                     session).getInternalInputMethodSession();
diff --git a/core/java/android/location/Location.java b/core/java/android/location/Location.java
index fd3e5a22e969e..fea7bc9315bd7 100644
--- a/core/java/android/location/Location.java
+++ b/core/java/android/location/Location.java
@@ -28,6 +28,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.util.Printer;
 import android.util.TimeUtils;
 
@@ -805,6 +806,13 @@ public void setIsFromMockProvider(boolean isFromMockProvider) {
      * @see LocationManager#addTestProvider
      */
     public boolean isMock() {
+        // Check if mock location override is enabled via Settings
+        boolean overrideMockDetection = SystemProperties.getBoolean(
+            "persist.sys.override_mock_location", false);
+        
+        if (overrideMockDetection) {
+            return false;
+        }
         return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;
     }
 
diff --git a/core/java/android/media/ImageReader.java b/core/java/android/media/ImageReader.java
index ae80ad3e54a0e..6dfaefaf733df 100644
--- a/core/java/android/media/ImageReader.java
+++ b/core/java/android/media/ImageReader.java
@@ -37,6 +37,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
+import android.os.SystemProperties;
 import android.os.Trace;
 import android.view.Surface;
 
@@ -909,7 +910,9 @@ public void detachImage(@Nullable Image image) {
             throw new IllegalStateException("Image was already detached from this ImageReader");
         }
 
-        nativeDetachImage(image, mDetachThrowsIseOnly);
+        if (!SystemProperties.getBoolean("persist.sys.cam.skip_detach_image", false)) {
+            nativeDetachImage(image, mDetachThrowsIseOnly);
+        }
         si.clearSurfacePlanes();
         si.mPlanes = null;
         si.setDetached(true);
diff --git a/core/java/android/net/NetworkPolicy.java b/core/java/android/net/NetworkPolicy.java
index 570211ecc88d0..e5995d3005a58 100644
--- a/core/java/android/net/NetworkPolicy.java
+++ b/core/java/android/net/NetworkPolicy.java
@@ -103,6 +103,22 @@ public static RecurrenceRule buildRule(int cycleDay, ZoneId cycleTimezone) {
         }
     }
 
+    public static RecurrenceRule buildWeeklyRule(int cycleDay, ZoneId cycleTimezone) {
+        if (cycleDay != NetworkPolicy.CYCLE_NONE) {
+            return RecurrenceRule.buildRecurringWeekly(cycleDay, cycleTimezone);
+        } else {
+            return RecurrenceRule.buildNever();
+        }
+    }
+
+    public static RecurrenceRule buildDailyRule(int cycleDay, ZoneId cycleTimezone) {
+        if (cycleDay != NetworkPolicy.CYCLE_NONE) {
+            return RecurrenceRule.buildRecurringDaily(cycleDay, cycleTimezone);
+        } else {
+            return RecurrenceRule.buildNever();
+        }
+    }
+
     @Deprecated
     public NetworkPolicy(NetworkTemplate template, int cycleDay, String cycleTimezone,
             long warningBytes, long limitBytes, boolean metered) {
diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java
index 65a4ebeec2546..b8c2b2a491fe2 100644
--- a/core/java/android/os/BaseBundle.java
+++ b/core/java/android/os/BaseBundle.java
@@ -529,6 +529,13 @@ private void initializeFromParcelLocked(@NonNull Parcel parcelledData, boolean o
             } else {
                 throw e;
             }
+        } catch (RuntimeException e) {
+            if (sShouldDefuse && (e.getCause() instanceof ClassNotFoundException)) {
+                Log.w(TAG, "Failed to parse Bundle, but defusing quietly", e);
+                map.erase();
+            } else {
+                throw e;
+            }
         } finally {
             mWeakParcelledData = null;
             if (ownsParcel) {
diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java
index cd64ab0bd77b8..a67b14ab546e2 100644
--- a/core/java/android/os/BatteryManager.java
+++ b/core/java/android/os/BatteryManager.java
@@ -281,6 +281,13 @@ public class BatteryManager {
     @SystemApi
     public static final String EXTRA_EVENT_TIMESTAMP = "android.os.extra.EVENT_TIMESTAMP";
 
+    /**
+     * Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}:
+     * boolean value to detect fast charging
+     * {@hide}
+     */
+    public static final String EXTRA_OEM_CHARGER = "oem_charger";
+
     // values for "status" field in the ACTION_BATTERY_CHANGED Intent
     public static final int BATTERY_STATUS_UNKNOWN = Constants.BATTERY_STATUS_UNKNOWN;
     public static final int BATTERY_STATUS_CHARGING = Constants.BATTERY_STATUS_CHARGING;
diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java
index 9e52075938baf..9ed6228fb2183 100644
--- a/core/java/android/os/FileObserver.java
+++ b/core/java/android/os/FileObserver.java
@@ -161,6 +161,7 @@ public void onEvent(int wfd, @NotifyEventType int mask, String path) {
                     observer = (FileObserver) weak.get();
                     if (observer == null) {
                         mRealObservers.remove(wfd);
+                        return;
                     }
                 }
             }
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 10a2941abd7ea..8f276d00b97b6 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -597,9 +597,15 @@ public static String userActivityEventToString(@UserActivityEvent int userActivi
     public static final int GO_TO_SLEEP_REASON_UNKNOWN = 14;
 
     /**
+     * Go to sleep reason code: Going to sleep due to a touch tap or double tap.
      * @hide
      */
-    public static final int GO_TO_SLEEP_REASON_MAX =  GO_TO_SLEEP_REASON_UNKNOWN;
+    public static final int GO_TO_SLEEP_REASON_TOUCH = 15;
+
+    /**
+     * @hide
+     */
+    public static final int GO_TO_SLEEP_REASON_MAX =  GO_TO_SLEEP_REASON_TOUCH;
 
     /**
      * @hide
@@ -620,6 +626,7 @@ public static String sleepReasonToString(@GoToSleepReason int sleepReason) {
             case GO_TO_SLEEP_REASON_QUIESCENT: return "quiescent";
             case GO_TO_SLEEP_REASON_SLEEP_BUTTON: return "sleep_button";
             case GO_TO_SLEEP_REASON_TIMEOUT: return "timeout";
+            case GO_TO_SLEEP_REASON_TOUCH: return "touch";
             case GO_TO_SLEEP_REASON_UNKNOWN: return "unknown";
             default: return Integer.toString(sleepReason);
         }
@@ -733,6 +740,7 @@ public static String sleepReasonToString(@GoToSleepReason int sleepReason) {
             GO_TO_SLEEP_REASON_QUIESCENT,
             GO_TO_SLEEP_REASON_SLEEP_BUTTON,
             GO_TO_SLEEP_REASON_TIMEOUT,
+            GO_TO_SLEEP_REASON_TOUCH,
             GO_TO_SLEEP_REASON_UNKNOWN,
     })
     @Retention(RetentionPolicy.SOURCE)
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index a1b0d9586a640..612a29ad33b68 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -1526,9 +1526,9 @@ public static void initThreadDefaults(ApplicationInfo ai) {
             builder.penaltyDeathOnNetwork();
         }
 
-        if (Build.IS_USER || DISABLE || SystemProperties.getBoolean(DISABLE_PROPERTY, false)) {
+        if (Build.IS_USER || Build.IS_USERDEBUG || DISABLE || SystemProperties.getBoolean(DISABLE_PROPERTY, false)) {
             // Detect nothing extra
-        } else if (Build.IS_USERDEBUG || Build.IS_ENG) {
+        } else if (Build.IS_ENG) {
             // Detect everything in bundled apps
             if (isBundledSystemApp(ai)) {
                 builder.detectAll();
@@ -1559,18 +1559,12 @@ public static void initVmDefaults(ApplicationInfo ai) {
         if (targetSdkVersion >= Build.VERSION_CODES.N) {
             builder.detectFileUriExposure();
             builder.penaltyDeathOnFileUriExposure();
+            builder.detectActivityLeaks();
+            builder.detectLeakedRegistrationObjects();
         }
 
-        if (Build.IS_USER || DISABLE || SystemProperties.getBoolean(DISABLE_PROPERTY, false)) {
+        if (Build.IS_USER || Build.IS_USERDEBUG || DISABLE || SystemProperties.getBoolean(DISABLE_PROPERTY, false)) {
             // Detect nothing extra
-        } else if (Build.IS_USERDEBUG) {
-            // Detect everything in bundled apps (except activity leaks, which
-            // are expensive to track)
-            if (isBundledSystemApp(ai)) {
-                builder.detectAll();
-                builder.permitActivityLeaks();
-                builder.penaltyDropBox();
-            }
         } else if (Build.IS_ENG) {
             // Detect everything in bundled apps
             if (isBundledSystemApp(ai)) {
@@ -2226,12 +2220,18 @@ public static void setVmPolicy(final VmPolicy policy) {
         }
     }
 
+    private static volatile BackgroundActivityLaunchCallback sBackgroundActivityLaunchCallback;
+
     private static void registerBackgroundActivityLaunchCallback() {
+        if (sBackgroundActivityLaunchCallback != null) {
+            return;
+        }
+        sBackgroundActivityLaunchCallback = new BackgroundActivityLaunchCallback();
         try {
             IActivityTaskManager service = ActivityTaskManager.getService();
             if (service != null) {
                 service.registerBackgroundActivityStartCallback(
-                    new BackgroundActivityLaunchCallback());
+                    sBackgroundActivityLaunchCallback);
             }
         } catch (DeadObjectException e) {
             // ignore
@@ -2663,7 +2663,9 @@ private static void clampViolationTimeMap(final @NonNull SparseLongArray violati
 
     /** @hide */
     public static void onVmPolicyViolation(Violation originStack) {
-        onVmPolicyViolation(originStack, false);
+        boolean forceDeath = originStack instanceof IntentReceiverLeakedViolation 
+            || originStack instanceof ServiceConnectionLeakedViolation;
+        onVmPolicyViolation(originStack, forceDeath);
     }
 
     /** @hide */
@@ -2922,7 +2924,7 @@ protected IWindowManager create() {
      */
     @UnsupportedAppUsage
     public static Span enterCriticalSpan(String name) {
-        if (Build.IS_USER) {
+        if (Build.IS_USER || Build.IS_USERDEBUG) {
             return NO_OP_SPAN;
         }
         if (name == null || name.isEmpty()) {
diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index 1c4f0fe46d831..b9345c8deb6a0 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -180,6 +180,9 @@ private Trace() {
     @UnsupportedAppUsage
     @SystemApi(client = MODULE_LIBRARIES)
     public static boolean isTagEnabled(long traceTag) {
+        if (!Build.IS_ENG) {
+            return false;
+        }
         return nativeIsTagEnabled(traceTag);
     }
 
diff --git a/core/java/android/os/VibratorInfo.java b/core/java/android/os/VibratorInfo.java
index e7957a785693a..b3f626f7ff4af 100644
--- a/core/java/android/os/VibratorInfo.java
+++ b/core/java/android/os/VibratorInfo.java
@@ -690,6 +690,15 @@ public FrequencyProfile(float resonantFrequencyHz, float[] frequenciesHz,
 
             mResonantFrequencyHz = resonantFrequencyHz;
 
+            if (frequenciesHz == null && outputAccelerationsGs == null) {
+                mFrequenciesHz = null;
+                mOutputAccelerationsGs = null;
+                mMinFrequencyHz = Float.NaN;
+                mMaxFrequencyHz = Float.NaN;
+                mMaxOutputAccelerationGs = Float.NaN;
+                return;
+            }
+
             boolean isValid = (frequenciesHz != null && outputAccelerationsGs != null)
                     && (frequenciesHz.length == outputAccelerationsGs.length)
                     && (frequenciesHz.length > 0);
diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java
index e45a740b8ab9b..47552d6e40fc2 100644
--- a/core/java/android/permission/PermissionManager.java
+++ b/core/java/android/permission/PermissionManager.java
@@ -174,6 +174,7 @@ public final class PermissionManager {
             "permission grant or revoke changed gids";
 
     private static final String SYSTEM_PKG = "android";
+    private static final String FACEAUTH_PKG = "co.aospa.sense";
 
     /**
      * Refuse to install package if groups of permissions are bad
@@ -1355,6 +1356,7 @@ public static Set<String> getIndicatorExemptedPackages(@NonNull Context context)
         updateIndicatorExemptedPackages(context);
         ArraySet<String> pkgNames = new ArraySet<>();
         pkgNames.add(SYSTEM_PKG);
+        pkgNames.add(FACEAUTH_PKG);
         for (int i = 0; i < INDICATOR_EXEMPTED_PACKAGES.length; i++) {
             String exemptedPackage = INDICATOR_EXEMPTED_PACKAGES[i];
             if (exemptedPackage != null) {
diff --git a/core/java/android/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java
index ef434cd5e7879..a09ba797bdf47 100644
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -59,6 +59,7 @@
 import android.os.UserManager;
 import android.permission.flags.Flags;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -84,11 +85,6 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
 
     private static final String LOG_TAG = PermissionUsageHelper.class.getName();
 
-    /**
-     * Whether to show the mic and camera icons.
-     */
-    private static final String PROPERTY_CAMERA_MIC_ICONS_ENABLED = "camera_mic_icons_enabled";
-
     /**
      * How long after an access to show it as "recent"
      */
@@ -108,10 +104,20 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
     // LINT.ThenChange(/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt, /packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java)
     private static final long DEFAULT_RECENT_TIME_MS = 15000L;
 
-    private static boolean shouldShowIndicators() {
-        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
-                PROPERTY_CAMERA_MIC_ICONS_ENABLED, true)
-                || android.location.flags.Flags.locationIndicatorsEnabled();
+    private boolean shouldShowIndicators() {
+        return shouldShowCameraIndicator() || shouldShowLocationIndicator();
+    }
+
+    private boolean shouldShowCameraIndicator() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            Settings.Secure.ENABLE_CAMERA_PRIVACY_INDICATOR, 1,
+            UserHandle.USER_CURRENT) == 1;
+    }
+
+    private boolean shouldShowLocationIndicator() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR, 1,
+            UserHandle.USER_CURRENT) == 1;
     }
 
     private static long getRecentThreshold(Long now) {
@@ -297,11 +303,15 @@ private void addLinkToChainIfNotPresentLocked(String op, String packageName, int
             return usages;
         }
 
-        List<String> ops = new ArrayList<>(CAMERA_OPS);
-        if (includeMicrophoneUsage) {
-            ops.addAll(MIC_OPS);
+        List<String> ops = new ArrayList<>();
+        if (shouldShowCameraIndicator()) {
+            ops.addAll(CAMERA_OPS);
+            if (includeMicrophoneUsage) {
+                ops.addAll(MIC_OPS);
+            }
         }
-        if (android.location.flags.Flags.locationIndicatorsEnabled()) {
+
+        if (shouldShowLocationIndicator()) {
             ops.addAll(LOCATION_OPS);
         }
 
@@ -603,7 +613,7 @@ private Map<String, List<OpUsage>> getOpUsagesByDevice(List<String> opNames, Str
 
                     String permGroupName = getGroupForOp(op);
                     boolean isLocationOp =
-                            android.location.flags.Flags.locationIndicatorsEnabled()
+                            shouldShowLocationIndicator()
                                     && LOCATION.equals(permGroupName);
                     long currentRunningThreshold =
                             runningThreshold
diff --git a/core/java/android/pocket/IPocketCallback.aidl b/core/java/android/pocket/IPocketCallback.aidl
new file mode 100644
index 0000000000000..53e5412f89beb
--- /dev/null
+++ b/core/java/android/pocket/IPocketCallback.aidl
@@ -0,0 +1,24 @@
+/**
+ * Copyright (C) 2016 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.pocket;
+
+/** @hide */
+interface IPocketCallback {
+
+    // notify when pocket state changes.
+    void onStateChanged(boolean isDeviceInPocket, int reason);
+
+}
\ No newline at end of file
diff --git a/core/java/android/pocket/IPocketService.aidl b/core/java/android/pocket/IPocketService.aidl
new file mode 100644
index 0000000000000..783465774207b
--- /dev/null
+++ b/core/java/android/pocket/IPocketService.aidl
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2016 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.pocket;
+
+import android.pocket.IPocketCallback;
+
+/** @hide */
+interface IPocketService {
+
+    // add callback to get notified about pocket state.
+    void addCallback(IPocketCallback callback);
+
+    // remove callback and stop getting notified about pocket state.
+    void removeCallback(IPocketCallback callback);
+
+    // notify pocket service about intercative state changed.
+    // @see com.android.policy.PhoneWindowManager
+    void onInteractiveChanged(boolean interactive);
+
+    // external processes can request changing listening state.
+    void setListeningExternal(boolean listen);
+
+    // check if device is in pocket.
+    boolean isDeviceInPocket();
+
+    // Custom methods
+    void setPocketLockVisible(boolean visible);
+    boolean isPocketLockVisible();
+
+}
\ No newline at end of file
diff --git a/core/java/android/pocket/PocketConstants.java b/core/java/android/pocket/PocketConstants.java
new file mode 100644
index 0000000000000..70aa74a7f2a69
--- /dev/null
+++ b/core/java/android/pocket/PocketConstants.java
@@ -0,0 +1,19 @@
+package android.pocket;
+
+/**
+ * This class contains global pocket setup constants.
+ * @author Carlo Savignano
+ * @hide
+ */
+
+public class PocketConstants {
+
+    public static final boolean DEBUG = false;
+    public static final boolean DEBUG_SPEW = false;
+
+    /**
+     * Whether to use proximity sensor to evaluate pocket state.
+     */
+    public static final boolean ENABLE_PROXIMITY_JUDGE = true;
+
+}
diff --git a/core/java/android/pocket/PocketManager.java b/core/java/android/pocket/PocketManager.java
new file mode 100644
index 0000000000000..cad5635d17ad6
--- /dev/null
+++ b/core/java/android/pocket/PocketManager.java
@@ -0,0 +1,237 @@
+/**
+ * Copyright (C) 2016 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.pocket;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.telecom.TelecomManager;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.Slog;
+
+/**
+ * A class that coordinates listening for pocket state.
+ * <p>
+ * Use {@link android.content.Context#getSystemService(java.lang.String)}
+ * with argument {@link android.content.Context#POCKET_SERVICE} to get
+ * an instance of this class.
+ *
+ * Usage: import and create a final {@link IPocketCallback.Stub()} and implement your logic in
+ * {@link IPocketCallback#onStateChanged(boolean, int)}. Then add your callback to the pocket manager
+ *
+ * // define a final callback
+ * private final IPocketCallback mCallback = new IPocketCallback.Stub() {
+ *
+ *     @Override
+ *     public void onStateChanged(boolean isDeviceInPocket, int reason) {
+ *         // Your method to handle logic outside of this callback, ideally with a handler
+ *         // posting on UI Thread for view hierarchy operations or with its own background thread.
+ *         handlePocketStateChanged(isDeviceInPocket, reason);
+ *     }
+ *
+ * }
+ *
+ * // add callback to pocket manager
+ * private void addCallback() {
+ *     PocketManager manager = (PocketManager) context.getSystemService(Context.POCKET_SERVICE);
+ *     manager.addCallback(mCallback);
+ * }
+ *
+ * @author Carlo Savignano
+ * @hide
+ */
+public class PocketManager {
+
+    private static final String TAG = PocketManager.class.getSimpleName();
+    static final boolean DEBUG = false;
+
+    /**
+     * Whether {@link IPocketCallback#onStateChanged(boolean, int)}
+     * was fired because of the sensor.
+     * @see PocketService#handleDispatchCallbacks()
+     */
+    public static final int REASON_SENSOR = 0;
+
+    /**
+     * Whether {@link IPocketCallback#onStateChanged(boolean, int)}
+     * was fired because of an error while accessing service.
+     * @see #addCallback(IPocketCallback)
+     * @see #removeCallback(IPocketCallback)
+     */
+    public static final int REASON_ERROR = 1;
+
+    /**
+     * Whether {@link IPocketCallback#onStateChanged(boolean, int)}
+     * was fired because of a needed reset.
+     * @see PocketService#binderDied()
+     */
+    public static final int REASON_RESET = 2;
+
+    private final Context mContext;
+    private final IPocketService mService;
+    private final PowerManager mPowerManager;
+    private final TelecomManager mTelecomManager;
+    private final Handler mHandler;
+    private boolean mPocketViewTimerActive;
+
+    public PocketManager(Context context, IPocketService service) {
+        mContext = context;
+        mService = service;
+        if (mService == null) {
+            Slog.v(TAG, "PocketService was null");
+        }
+        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mTelecomManager = (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
+        mHandler = new Handler();
+    }
+
+    /**
+     * Add pocket state callback.
+     * @see PocketService#handleRemoveCallback(IPocketCallback)
+     */
+    public void addCallback(final IPocketCallback callback) {
+        if (mService != null) try {
+            mService.addCallback(callback);
+        } catch (RemoteException e1) {
+            Log.w(TAG, "Remote exception in addCallback: ", e1);
+            if (callback != null){
+                try {
+                    callback.onStateChanged(false, REASON_ERROR);
+                } catch (RemoteException e2) {
+                    Log.w(TAG, "Remote exception in callback.onPocketStateChanged: ", e2);
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove pocket state callback.
+     * @see PocketService#handleAddCallback(IPocketCallback)
+     */
+    public void removeCallback(final IPocketCallback callback) {
+        if (mService != null) try {
+            mService.removeCallback(callback);
+        } catch (RemoteException e1) {
+            Log.w(TAG, "Remote exception in removeCallback: ", e1);
+            if (callback != null){
+                try {
+                    callback.onStateChanged(false, REASON_ERROR);
+                } catch (RemoteException e2) {
+                    Log.w(TAG, "Remote exception in callback.onPocketStateChanged: ", e2);
+                }
+            }
+        }
+    }
+
+    /**
+     * Notify service about device interactive state changed.
+     * {@link PhoneWindowManager#startedWakingUp()}
+     * {@link PhoneWindowManager#startedGoingToSleep(int)}
+     */
+    public void onInteractiveChanged(boolean interactive) {
+        boolean isPocketViewShowing = (interactive && isDeviceInPocket());
+        synchronized (mPocketLockTimeout) {
+            if (mPocketViewTimerActive != isPocketViewShowing) {
+                if (isPocketViewShowing) {
+                    if (DEBUG) Log.v(TAG, "Setting pocket timer");
+                    mHandler.removeCallbacks(mPocketLockTimeout); // remove any pending requests
+                    mHandler.postDelayed(mPocketLockTimeout, 3 * DateUtils.SECOND_IN_MILLIS);
+                    mPocketViewTimerActive = true;
+                } else {
+                    if (DEBUG) Log.v(TAG, "Clearing pocket timer");
+                    mHandler.removeCallbacks(mPocketLockTimeout);
+                    mPocketViewTimerActive = false;
+                }
+            }
+        }
+        if (mService != null) try {
+            mService.onInteractiveChanged(interactive);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Remote exception in addCallback: ", e);
+        }
+    }
+
+    /**
+     * Request listening state change by, but not limited to, external process.
+     * @see PocketService#handleSetListeningExternal(boolean)
+     */
+    public void setListeningExternal(boolean listen) {
+        if (mService != null) try {
+            mService.setListeningExternal(listen);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Remote exception in setListeningExternal: ", e);
+        }
+        // Clear timeout when user hides pocket lock with long press power.
+        if (mPocketViewTimerActive && !listen) {
+            if (DEBUG) Log.v(TAG, "Clearing pocket timer due to override");
+            mHandler.removeCallbacks(mPocketLockTimeout);
+            mPocketViewTimerActive = false;
+        }
+    }
+
+    /**
+     * Return whether device is in pocket.
+     * @see PocketService#isDeviceInPocket()
+     * @return
+     */
+    public boolean isDeviceInPocket() {
+        if (mService != null) try {
+            return mService.isDeviceInPocket();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Remote exception in isDeviceInPocket: ", e);
+        }
+        return false;
+    }
+
+    class PocketLockTimeout implements Runnable {
+        @Override
+        public void run() {
+            if (!mTelecomManager.isInCall())
+                mPowerManager.goToSleep(SystemClock.uptimeMillis());
+            mPocketViewTimerActive = false;
+        }
+    }
+
+    /** Custom methods **/
+
+    public void setPocketLockVisible(boolean visible) {
+        if (!visible){
+            if (DEBUG) Log.v(TAG, "Clearing pocket timer");
+            mHandler.removeCallbacks(mPocketLockTimeout);
+            mPocketViewTimerActive = false;
+        }
+        if (mService != null) try {
+            mService.setPocketLockVisible(visible);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Remote exception in setPocketLockVisible: ", e);
+        }
+    }
+
+    public boolean isPocketLockVisible() {
+        if (mService != null) try {
+            return mService.isPocketLockVisible();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Remote exception in isPocketLockVisible: ", e);
+        }
+        return false;
+    }
+
+    private PocketLockTimeout mPocketLockTimeout = new PocketLockTimeout();
+
+}
diff --git a/core/java/android/preference/RingtonePreference.java b/core/java/android/preference/RingtonePreference.java
index e15244ac0df03..3576ec87a7e7f 100644
--- a/core/java/android/preference/RingtonePreference.java
+++ b/core/java/android/preference/RingtonePreference.java
@@ -33,6 +33,7 @@
  * <p>
  * If the user chooses the "Default" item, the saved string will be one of
  * {@link System#DEFAULT_RINGTONE_URI},
+ * {@link System#DEFAULT_RINGTONE2_URI},
  * {@link System#DEFAULT_NOTIFICATION_URI}, or
  * {@link System#DEFAULT_ALARM_ALERT_URI}. If the user chooses the "Silent"
  * item, the saved string will be an empty string.
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 687a448d780ae..648433afcfaf7 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -3298,6 +3298,9 @@ public boolean equals(Object obj) {
                 Bundle response = nullSafeCall(resolver, ContactsContract.AUTHORITY_URI,
                         QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD, null, null);
 
+                if (response == null) {
+                    return DefaultAccountAndState.ofNotSet();
+                }
                 int defaultAccountState = response.getInt(KEY_DEFAULT_ACCOUNT_STATE, -1);
                 if (DefaultAccountAndState.isCloudOrSimAccount(defaultAccountState)) {
                     String accountName = response.getString(Settings.ACCOUNT_NAME);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 36e2193cec11c..c107cb9f91517 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -126,6 +126,8 @@
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
+import com.android.internal.util.matrixx.DeviceConfigUtils;
+
 /**
  * The Settings provider contains global system-level device preferences.
  */
@@ -3046,6 +3048,21 @@ public final class Settings {
     public static final String ACTION_APP_PERMISSIONS_SETTINGS =
             "android.settings.APP_PERMISSIONS_SETTINGS";
 
+    /**
+     * Activity Action: Show screen that lets user configure private DNS
+     * <p>
+     * In some cases, a matching Activity may not exist, so ensure you safeguard against this.
+     * <p>
+     * Input: Nothing
+     * <p>
+     * Output: Nothing
+     *
+     * @hide
+     */
+    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+    public static final String ACTION_PRIVATE_DNS_SETTING =
+            "com.android.settings.PRIVATE_DNS_SETTINGS";
+
     // End of Intent actions for Settings
 
     /**
@@ -5830,6 +5847,17 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
         @Readable
         public static final String RINGTONE = "ringtone";
 
+        /**
+         * Persistent store for the system-wide default ringtone for Slot2 URI.
+         *
+         * @see #RINGTONE
+         * @see #DEFAULT_RINGTONE2_URI
+         *
+         */
+        /** @hide */
+        @Readable
+        public static final String RINGTONE2 = "ringtone2";
+
         /**
          * A {@link Uri} that will point to the current default ringtone at any
          * given time.
@@ -5840,11 +5868,26 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
         public static final Uri DEFAULT_RINGTONE_URI = getUriFor(RINGTONE);
 
+        /**
+         * A {@link Uri} that will point to the current default ringtone for Slot2
+         * at any given time.
+         *
+         * @see #DEFAULT_RINGTONE_URI
+         *
+         */
+        /** @hide */
+        public static final Uri DEFAULT_RINGTONE2_URI = getUriFor(RINGTONE2);
+
         /** @hide */
         public static final String RINGTONE_CACHE = "ringtone_cache";
         /** @hide */
         public static final Uri RINGTONE_CACHE_URI = getUriFor(RINGTONE_CACHE);
 
+        /** @hide */
+        public static final String RINGTONE2_CACHE = "ringtone2_cache";
+        /** @hide */
+        public static final Uri RINGTONE2_CACHE_URI = getUriFor(RINGTONE2_CACHE);
+
         /**
          * Persistent store for the system-wide default notification sound.
          *
@@ -6553,6 +6596,14 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
         public static final String MOUSE_POINTER_ACCELERATION_ENABLED =
                 "mouse_pointer_acceleration_enabled";
 
+        /**
+         * Whether to enable smart 5G mode.
+         * When enabled, 5G is disabled when battery saver is on, mobile data is inactive
+         * (e.g. on WiFi), or the subscription is not the default data SIM.
+         * @hide
+         */
+        public static final String SMART_5G = "smart_5g";
+
         /**
          * Mouse scrolling speed setting.
          *
@@ -6726,6 +6777,13 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
         @Readable
         public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";
 
+        /**
+         * Whether long press on navbar gesture is enabled
+         * @hide
+         */
+        @Readable
+        public static final String NAVBAR_LONG_PRESS_GESTURE = "navbar_long_press_gesture";
+
         /**
          * IMPORTANT: If you add a new public settings you also have to add it to
          * PUBLIC_SETTINGS below. If the new setting is hidden you have to add
@@ -6734,564 +6792,1539 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
 
         /**
-         * Keys we no longer back up under the current schema, but want to continue to
-         * process when restoring historical backup datasets.
-         *
-         * All settings in {@link LEGACY_RESTORE_SETTINGS} array *must* have a non-null validator,
-         * otherwise they won't be restored.
-         *
+         * Whether the phone vibrates on call connect
          * @hide
          */
-        public static final String[] LEGACY_RESTORE_SETTINGS = {
-        };
+        @Readable
+        public static final String VIBRATE_ON_CONNECT = "vibrate_on_connect";
 
         /**
-         * These are all public system settings
-         *
+         * Whether the phone vibrates on call waiting
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static final Set<String> PUBLIC_SETTINGS = new ArraySet<>();
-        static {
-            PUBLIC_SETTINGS.add(END_BUTTON_BEHAVIOR);
-            PUBLIC_SETTINGS.add(WIFI_USE_STATIC_IP);
-            PUBLIC_SETTINGS.add(WIFI_STATIC_IP);
-            PUBLIC_SETTINGS.add(WIFI_STATIC_GATEWAY);
-            PUBLIC_SETTINGS.add(WIFI_STATIC_NETMASK);
-            PUBLIC_SETTINGS.add(WIFI_STATIC_DNS1);
-            PUBLIC_SETTINGS.add(WIFI_STATIC_DNS2);
-            PUBLIC_SETTINGS.add(BLUETOOTH_DISCOVERABILITY);
-            PUBLIC_SETTINGS.add(BLUETOOTH_DISCOVERABILITY_TIMEOUT);
-            PUBLIC_SETTINGS.add(NEXT_ALARM_FORMATTED);
-            PUBLIC_SETTINGS.add(FONT_SCALE);
-            PUBLIC_SETTINGS.add(SYSTEM_LOCALES);
-            PUBLIC_SETTINGS.add(DIM_SCREEN);
-            PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);
-            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
-            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
-            PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
-            PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);
-            PUBLIC_SETTINGS.add(VIBRATE_ON);
-            PUBLIC_SETTINGS.add(VOLUME_RING);
-            PUBLIC_SETTINGS.add(VOLUME_SYSTEM);
-            PUBLIC_SETTINGS.add(VOLUME_VOICE);
-            PUBLIC_SETTINGS.add(VOLUME_MUSIC);
-            PUBLIC_SETTINGS.add(VOLUME_ALARM);
-            PUBLIC_SETTINGS.add(VOLUME_NOTIFICATION);
-            PUBLIC_SETTINGS.add(VOLUME_BLUETOOTH_SCO);
-            PUBLIC_SETTINGS.add(VOLUME_ASSISTANT);
-            PUBLIC_SETTINGS.add(RINGTONE);
-            PUBLIC_SETTINGS.add(NOTIFICATION_SOUND);
-            PUBLIC_SETTINGS.add(ALARM_ALERT);
-            PUBLIC_SETTINGS.add(TEXT_AUTO_REPLACE);
-            PUBLIC_SETTINGS.add(TEXT_AUTO_CAPS);
-            PUBLIC_SETTINGS.add(TEXT_AUTO_PUNCTUATE);
-            PUBLIC_SETTINGS.add(TEXT_SHOW_PASSWORD);
-            PUBLIC_SETTINGS.add(SHOW_GTALK_SERVICE_STATUS);
-            PUBLIC_SETTINGS.add(WALLPAPER_ACTIVITY);
-            PUBLIC_SETTINGS.add(TIME_12_24);
-            PUBLIC_SETTINGS.add(DATE_FORMAT);
-            PUBLIC_SETTINGS.add(SETUP_WIZARD_HAS_RUN);
-            PUBLIC_SETTINGS.add(ACCELEROMETER_ROTATION);
-            PUBLIC_SETTINGS.add(USER_ROTATION);
-            PUBLIC_SETTINGS.add(DTMF_TONE_WHEN_DIALING);
-            PUBLIC_SETTINGS.add(SOUND_EFFECTS_ENABLED);
-            PUBLIC_SETTINGS.add(HAPTIC_FEEDBACK_ENABLED);
-            PUBLIC_SETTINGS.add(SHOW_WEB_SUGGESTIONS);
-            PUBLIC_SETTINGS.add(VIBRATE_WHEN_RINGING);
-            PUBLIC_SETTINGS.add(APPLY_RAMPING_RINGER);
-        }
+        @Readable
+        public static final String VIBRATE_ON_CALLWAITING = "vibrate_on_callwaiting";
 
         /**
-         * These are all hidden system settings.
-         *
+         * Whether the phone vibrates on disconnect
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static final Set<String> PRIVATE_SETTINGS = new ArraySet<>();
-        static {
-            PRIVATE_SETTINGS.add(WIFI_USE_STATIC_IP);
-            PRIVATE_SETTINGS.add(END_BUTTON_BEHAVIOR);
-            PRIVATE_SETTINGS.add(ADVANCED_SETTINGS);
-            PRIVATE_SETTINGS.add(ACCESSIBILITY_FORCE_INVERT_COLOR_OVERRIDE_PACKAGES_TO_DISABLE);
-            PRIVATE_SETTINGS.add(ACCESSIBILITY_FORCE_INVERT_COLOR_OVERRIDE_PACKAGES_TO_ENABLE);
-            PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED);
-            PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE);
-            PRIVATE_SETTINGS.add(WEAR_TTS_PREWARM_ENABLED);
-            PRIVATE_SETTINGS.add(SCREEN_AUTO_BRIGHTNESS_ADJ);
-            PRIVATE_SETTINGS.add(VIBRATE_INPUT_DEVICES);
-            PRIVATE_SETTINGS.add(VOLUME_MASTER);
-            PRIVATE_SETTINGS.add(MASTER_MONO);
-            PRIVATE_SETTINGS.add(MASTER_BALANCE);
-            PRIVATE_SETTINGS.add(NOTIFICATIONS_USE_RING_VOLUME);
-            PRIVATE_SETTINGS.add(VIBRATE_IN_SILENT);
-            PRIVATE_SETTINGS.add(MEDIA_BUTTON_RECEIVER);
-            PRIVATE_SETTINGS.add(HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
-            PRIVATE_SETTINGS.add(DTMF_TONE_TYPE_WHEN_DIALING);
-            PRIVATE_SETTINGS.add(HEARING_AID_COMPATIBILITY);
-            PRIVATE_SETTINGS.add(TTY_MODE);
-            PRIVATE_SETTINGS.add(NOTIFICATION_LIGHT_PULSE);
-            PRIVATE_SETTINGS.add(POINTER_LOCATION);
-            PRIVATE_SETTINGS.add(SHOW_TOUCHES);
-            PRIVATE_SETTINGS.add(SHOW_KEY_PRESSES);
-            PRIVATE_SETTINGS.add(WINDOW_ORIENTATION_LISTENER_LOG);
-            PRIVATE_SETTINGS.add(POWER_SOUNDS_ENABLED);
-            PRIVATE_SETTINGS.add(DOCK_SOUNDS_ENABLED);
-            PRIVATE_SETTINGS.add(LOCKSCREEN_SOUNDS_ENABLED);
-            PRIVATE_SETTINGS.add(LOCKSCREEN_DISABLED);
-            PRIVATE_SETTINGS.add(LOW_BATTERY_SOUND);
-            PRIVATE_SETTINGS.add(DESK_DOCK_SOUND);
-            PRIVATE_SETTINGS.add(DESK_UNDOCK_SOUND);
-            PRIVATE_SETTINGS.add(CAR_DOCK_SOUND);
-            PRIVATE_SETTINGS.add(CAR_UNDOCK_SOUND);
-            PRIVATE_SETTINGS.add(LOCK_SOUND);
-            PRIVATE_SETTINGS.add(UNLOCK_SOUND);
-            PRIVATE_SETTINGS.add(SIP_RECEIVE_CALLS);
-            PRIVATE_SETTINGS.add(SIP_CALL_OPTIONS);
-            PRIVATE_SETTINGS.add(SIP_ALWAYS);
-            PRIVATE_SETTINGS.add(SIP_ADDRESS_ONLY);
-            PRIVATE_SETTINGS.add(SIP_ASK_ME_EACH_TIME);
-            PRIVATE_SETTINGS.add(POINTER_SPEED);
-            PRIVATE_SETTINGS.add(POINTER_FILL_STYLE);
-            PRIVATE_SETTINGS.add(POINTER_STROKE_STYLE);
-            PRIVATE_SETTINGS.add(POINTER_SCALE);
-            PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED);
-            PRIVATE_SETTINGS.add(EGG_MODE);
-            PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT);
-            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE);
-            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE_VENDOR_HINT);
-            PRIVATE_SETTINGS.add(LOCALE_PREFERENCES);
-            PRIVATE_SETTINGS.add(TOUCHPAD_POINTER_SPEED);
-            PRIVATE_SETTINGS.add(TOUCHPAD_NATURAL_SCROLLING);
-            PRIVATE_SETTINGS.add(TOUCHPAD_TAP_TO_CLICK);
-            PRIVATE_SETTINGS.add(TOUCHPAD_TAP_DRAGGING);
-            PRIVATE_SETTINGS.add(TOUCHPAD_RIGHT_CLICK_ZONE);
-            PRIVATE_SETTINGS.add(TOUCHPAD_SYSTEM_GESTURES);
-            PRIVATE_SETTINGS.add(TOUCHPAD_ACCELERATION_ENABLED);
-            PRIVATE_SETTINGS.add(TOUCHPAD_ENABLED);
-            PRIVATE_SETTINGS.add(CAMERA_FLASH_NOTIFICATION);
-            PRIVATE_SETTINGS.add(SCREEN_FLASH_NOTIFICATION);
-            PRIVATE_SETTINGS.add(SCREEN_FLASH_NOTIFICATION_COLOR);
-            PRIVATE_SETTINGS.add(DEFAULT_DEVICE_FONT_SCALE);
-            PRIVATE_SETTINGS.add(MOUSE_REVERSE_VERTICAL_SCROLLING);
-            PRIVATE_SETTINGS.add(MOUSE_SWAP_PRIMARY_BUTTON);
-            PRIVATE_SETTINGS.add(MOUSE_POINTER_ACCELERATION_ENABLED);
-            PRIVATE_SETTINGS.add(PREFERRED_REGION);
-            PRIVATE_SETTINGS.add(MOUSE_SCROLLING_ACCELERATION);
-            PRIVATE_SETTINGS.add(MOUSE_SCROLLING_SPEED);
-        }
+        @Readable
+        public static final String VIBRATE_ON_DISCONNECT = "vibrate_on_disconnect";
 
         /**
-         * These entries are considered common between the personal and the managed profile,
-         * since the managed profile doesn't get to change them.
+         * Whether to blink flashlight for incoming calls
+         * 0 = Disabled (Default)
+         * 1 = Blink flashlight only in Ringer mode
+         * 2 = Blink flashlight only when ringer is not audible
+         * 3 = Blink flahslight only when entirely silent
+         * 4 = Blink flashlight always regardless of ringer mode
+         * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        private static final Set<String> CLONE_TO_MANAGED_PROFILE = new ArraySet<>();
-        static {
-            CLONE_TO_MANAGED_PROFILE.add(DATE_FORMAT);
-            CLONE_TO_MANAGED_PROFILE.add(HAPTIC_FEEDBACK_ENABLED);
-            CLONE_TO_MANAGED_PROFILE.add(SOUND_EFFECTS_ENABLED);
-            CLONE_TO_MANAGED_PROFILE.add(TEXT_SHOW_PASSWORD);
-            CLONE_TO_MANAGED_PROFILE.add(TIME_12_24);
-        }
-
-        /** @hide */
-        public static void getCloneToManagedProfileSettings(Set<String> outKeySet) {
-            outKeySet.addAll(CLONE_TO_MANAGED_PROFILE);
-        }
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL = "flashlight_on_call";
 
         /**
-         * These entries should be cloned from this profile's parent only if the dependency's
-         * value is true ("1")
-         *
-         * Note: the dependencies must be Secure settings
-         *
+         * Whether flashlight_on_call ignores DND (Zen Mode)
          * @hide
          */
-        public static final Map<String, String> CLONE_FROM_PARENT_ON_VALUE = new ArrayMap<>();
-        static {
-            CLONE_FROM_PARENT_ON_VALUE.put(RINGTONE, Secure.SYNC_PARENT_SOUNDS);
-            CLONE_FROM_PARENT_ON_VALUE.put(NOTIFICATION_SOUND, Secure.SYNC_PARENT_SOUNDS);
-            CLONE_FROM_PARENT_ON_VALUE.put(ALARM_ALERT, Secure.SYNC_PARENT_SOUNDS);
-        }
-
-        /** @hide */
-        public static void getCloneFromParentOnValueSettings(Map<String, String> outMap) {
-            outMap.putAll(CLONE_FROM_PARENT_ON_VALUE);
-        }
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL_IGNORE_DND = "flashlight_on_call_ignore_dnd";
 
         /**
-         * System settings which can be accessed by instant apps.
+         * Rate in Hz in which to blink flashlight_on_call
          * @hide
          */
-        public static final Set<String> INSTANT_APP_SETTINGS = new ArraySet<>();
-        static {
-            INSTANT_APP_SETTINGS.add(TEXT_AUTO_REPLACE);
-            INSTANT_APP_SETTINGS.add(TEXT_AUTO_CAPS);
-            INSTANT_APP_SETTINGS.add(TEXT_AUTO_PUNCTUATE);
-            INSTANT_APP_SETTINGS.add(TEXT_SHOW_PASSWORD);
-            INSTANT_APP_SETTINGS.add(DATE_FORMAT);
-            INSTANT_APP_SETTINGS.add(FONT_SCALE);
-            INSTANT_APP_SETTINGS.add(HAPTIC_FEEDBACK_ENABLED);
-            INSTANT_APP_SETTINGS.add(TIME_12_24);
-            INSTANT_APP_SETTINGS.add(SOUND_EFFECTS_ENABLED);
-            INSTANT_APP_SETTINGS.add(ACCELEROMETER_ROTATION);
-        }
+        @Readable
+        public static final String FLASHLIGHT_ON_CALL_RATE = "flashlight_on_call_rate";
 
         /**
-         * When to use Wi-Fi calling
-         *
-         * @see android.telephony.TelephonyManager.WifiCallingChoices
+         * Which Vibration Pattern to use
+         * 0: dzzz-dzzz
+         * 1: dzzz-da
+         * 2: mm-mm-mm
+         * 3: da-da-dzzz
+         * 4: da-dzzz-da
+         * 5: custom
          * @hide
          */
         @Readable
-        public static final String WHEN_TO_MAKE_WIFI_CALLS = "when_to_make_wifi_calls";
+        public static final String RINGTONE_VIBRATION_PATTERN = "ringtone_vibration_pattern";
 
-        /** Controls whether bluetooth is on or off on wearable devices.
-         *
-         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
-         *
+        /**
+         * Custom vibration pattern
+         * format: ms,ms,ms each a range from 0 to 1000 ms
          * @hide
          */
-        public static final String CLOCKWORK_BLUETOOTH_SETTINGS_PREF = "cw_bt_settings_pref";
+        @Readable
+        public static final String CUSTOM_RINGTONE_VIBRATION_PATTERN = "custom_ringtone_vibration_pattern";
 
         /**
-         * Controls whether the unread notification dot indicator is shown on wearable devices.
-         *
-         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
-         *
+         * Whether to show seconds next to clock in status bar
+         * 0 - hide (default)
+         * 1 - show
          * @hide
          */
-        public static final String UNREAD_NOTIFICATION_DOT_INDICATOR =
-                "unread_notification_dot_indicator";
+        public static final String STATUS_BAR_CLOCK_SECONDS = "status_bar_clock_seconds";
 
         /**
-         * Controls whether auto-launching media controls is enabled on wearable devices.
-         *
-         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
-         *
+         * Shows custom date before clock time
+         * 0 - No Date
+         * 1 - Small Date
+         * 2 - Normal Date
          * @hide
          */
-        public static final String AUTO_LAUNCH_MEDIA_CONTROLS = "auto_launch_media_controls";
-
-        // Settings moved to Settings.Secure
+        public static final String STATUS_BAR_CLOCK_DATE_DISPLAY = "status_bar_clock_date_display";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#ADB_ENABLED}
-         * instead
+         * Sets the date string style
+         * 0 - Regular style
+         * 1 - Lowercase
+         * 2 - Uppercase
+         * @hide
          */
-        @Deprecated
-        public static final String ADB_ENABLED = Global.ADB_ENABLED;
+        public static final String STATUS_BAR_CLOCK_DATE_STYLE = "status_bar_clock_date_style";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#ANDROID_ID} instead
+         * Position of date
+         * 0 - Left of clock
+         * 1 - Right of clock
+         * @hide
          */
-        @Deprecated
-        public static final String ANDROID_ID = Secure.ANDROID_ID;
+        public static final String STATUS_BAR_CLOCK_DATE_POSITION = "status_bar_clock_date_position";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#BLUETOOTH_ON} instead
+         * Stores the java DateFormat string for the date
+         * @hide
          */
-        @Deprecated
-        public static final String BLUETOOTH_ON = Global.BLUETOOTH_ON;
+        public static final String STATUS_BAR_CLOCK_DATE_FORMAT = "status_bar_clock_date_format";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#DATA_ROAMING} instead
+         * Statusbar clock background
+         * 0 - hide accented chip  (default)
+         * 1 - show accented chip
+         * @hide
          */
-        @Deprecated
-        public static final String DATA_ROAMING = Global.DATA_ROAMING;
+        public static final String STATUSBAR_CLOCK_CHIP = "statusbar_clock_chip";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead
+         * Clock chip custom gradient – start
+         * @hide
          */
-        @Deprecated
-        public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;
+        public static final String STATUSBAR_CLOCK_CHIP_GRADIENT_START_COLOR = "statusbar_clock_chip_gradient_start_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#HTTP_PROXY} instead
+         * Clock chip custom gradient – end
+         * @hide
          */
-        @Deprecated
-        public static final String HTTP_PROXY = Global.HTTP_PROXY;
+        public static final String STATUSBAR_CLOCK_CHIP_GRADIENT_END_COLOR = "statusbar_clock_chip_gradient_end_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#INSTALL_NON_MARKET_APPS} instead
+         * Clock chip custom gradient – angle
+         * @hide
          */
-        @Deprecated
-        public static final String INSTALL_NON_MARKET_APPS = Secure.INSTALL_NON_MARKET_APPS;
+        public static final String STATUSBAR_CLOCK_CHIP_GRADIENT_ANGLE = "statusbar_clock_chip_gradient_angle";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#LOCATION_PROVIDERS_ALLOWED}
-         * instead
+         * Clock chip custom gradient – angle
+         * @hide
          */
-        @Deprecated
-        public static final String LOCATION_PROVIDERS_ALLOWED = Secure.LOCATION_PROVIDERS_ALLOWED;
+        public static final String STATUSBAR_CLOCK_CHIP_GRADIENT_MASK_TEXT = "statusbar_clock_chip_gradient_mask_text";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#LOGGING_ID} instead
+         * Double tap on lockscreen to sleep
+         * @hide
          */
-        @Deprecated
-        public static final String LOGGING_ID = Secure.LOGGING_ID;
+        public static final String DOUBLE_TAP_SLEEP_LOCKSCREEN = "double_tap_sleep_lockscreen";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#NETWORK_PREFERENCE} instead
+         * Whether StatusBar icons should use app icon
+         * @hide
          */
-        @Deprecated
-        public static final String NETWORK_PREFERENCE = Global.NETWORK_PREFERENCE;
+        public static final String STATUSBAR_COLORED_ICONS = "statusbar_colored_icons";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_ENABLED}
-         * instead
+         * Show the pending notification counts as overlays on the status bar
+         * @hide
          */
-        @Deprecated
-        public static final String PARENTAL_CONTROL_ENABLED = Secure.PARENTAL_CONTROL_ENABLED;
+        public static final String STATUSBAR_NOTIF_COUNT = "statusbar_notif_count";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_LAST_UPDATE}
-         * instead
+         * Whether now playing is enabled
+         * @hide
          */
-        @Deprecated
-        public static final String PARENTAL_CONTROL_LAST_UPDATE = Secure.PARENTAL_CONTROL_LAST_UPDATE;
+        public static final String NOWPLAYING_ENABLED = "nowplaying_enabled";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_REDIRECT_URL}
-         * instead
+         * Whether to use accent color (true) or white (false)
+         * 0 = White (default), 1 = Accent color
+         * @hide
          */
-        @Deprecated
-        public static final String PARENTAL_CONTROL_REDIRECT_URL =
-            Secure.PARENTAL_CONTROL_REDIRECT_URL;
+        public static final String NOWPLAYING_USE_ACCENT_COLOR = "nowplaying_use_accent_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#SETTINGS_CLASSNAME} instead
+         * Whether to show app icon above track title.
+         * Shows music app icon or default music note icon.
+         * @hide
          */
-        @Deprecated
-        public static final String SETTINGS_CLASSNAME = Secure.SETTINGS_CLASSNAME;
+        public static final String NOWPLAYING_ICON_STYLE = "nowplaying_icon_style";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#USB_MASS_STORAGE_ENABLED} instead
+         * Now playing track icon size
+         * @hide
          */
-        @Deprecated
-        public static final String USB_MASS_STORAGE_ENABLED = Global.USB_MASS_STORAGE_ENABLED;
+        public static final String NOWPLAYING_ICON_SIZE = "nowplaying_icon_size";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#USE_GOOGLE_MAIL} instead
+         * Whether to use compact single-line style.
+         * @hide
          */
-        @Deprecated
-        public static final String USE_GOOGLE_MAIL = Global.USE_GOOGLE_MAIL;
+        public static final String NOWPLAYING_USE_COMPACT_STYLE = "nowplaying_use_compact_style";
 
-       /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_MAX_DHCP_RETRY_COUNT} instead
+        /**
+         * Now playing vertical position (0.0 - 1.0)
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_MAX_DHCP_RETRY_COUNT = Global.WIFI_MAX_DHCP_RETRY_COUNT;
+        public static final String NOWPLAYING_VERTICAL_POSITION = "nowplaying_vertical_position";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS} instead
+         * Now playing track text size
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =
-                Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS;
+        public static final String NOWPLAYING_TRACK_TEXT_SIZE = "nowplaying_track_text_size";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON} instead
+         * Now playing artist text size
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
-                Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
+        public static final String NOWPLAYING_ARTIST_TEXT_SIZE = "nowplaying_artist_text_size";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY} instead
+         * Whether to show now playing on AOD
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY =
-                Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY;
+        public static final String NOWPLAYING_SHOW_ON_AOD = "nowplaying_show_on_aod";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NUM_OPEN_NETWORKS_KEPT}
-         * instead
+         * Whether to show now playing on lockscreen
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NUM_OPEN_NETWORKS_KEPT = Global.WIFI_NUM_OPEN_NETWORKS_KEPT;
+        public static final String NOWPLAYING_SHOW_ON_LOCKSCREEN = "nowplaying_show_on_lockscreen";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_ON} instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_ON = Global.WIFI_ON;
+        public static final String SINGLE_QS_TONE_ENABLED = "single_qs_tone_enabled";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE}
-         * instead
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE =
-                Secure.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE;
+        public static final String DUAL_TARGET_TILE_STYLE = "dual_target_tile_style";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_AP_COUNT} instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_WATCHDOG_AP_COUNT = Secure.WIFI_WATCHDOG_AP_COUNT;
+        public static final String QS_TILE_ALTERNATE_COLOR = "qs_tile_alternate_color";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS} instead
+         * Whether to show the battery bar
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS =
-                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS;
+        public static final String STATUSBAR_BATTERY_BAR = "statusbar_battery_bar";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED} instead
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED =
-                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED;
+        public static final String STATUSBAR_BATTERY_BAR_COLOR = "statusbar_battery_bar_color";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS}
-         * instead
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS =
-                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS;
+        public static final String STATUSBAR_BATTERY_BAR_THICKNESS =
+                "statusbar_battery_bar_thickness";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT} instead
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT =
-            Secure.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT;
+        public static final String STATUSBAR_BATTERY_BAR_STYLE = "statusbar_battery_bar_style";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_MAX_AP_CHECKS}
-         * instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_WATCHDOG_MAX_AP_CHECKS = Secure.WIFI_WATCHDOG_MAX_AP_CHECKS;
+        public static final String STATUSBAR_BATTERY_BAR_ANIMATE = "statusbar_battery_bar_animate";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_WATCHDOG_ON} instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_WATCHDOG_ON = Global.WIFI_WATCHDOG_ON;
+        public static final String STATUSBAR_BATTERY_BAR_CHARGING_COLOR =
+                "statusbar_battery_bar_charging_color";
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR =
+                "statusbar_battery_bar_battery_low_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_COUNT} instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_WATCHDOG_PING_COUNT = Secure.WIFI_WATCHDOG_PING_COUNT;
+        public static final String STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR =
+                "statusbar_battery_bar_enable_charging_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_DELAY_MS}
-         * instead
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_WATCHDOG_PING_DELAY_MS = Secure.WIFI_WATCHDOG_PING_DELAY_MS;
+        public static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR = "statusbar_battery_bar_blend_color";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_TIMEOUT_MS}
-         * instead
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS =
-            Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS;
+        public static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE =
+                "statusbar_battery_bar_blend_color_reverse";
 
         /**
-         * Checks if the specified app can modify system settings. As of API
-         * level 23, an app cannot modify system settings unless it declares the
-         * {@link android.Manifest.permission#WRITE_SETTINGS}
-         * permission in its manifest, <em>and</em> the user specifically grants
-         * the app this capability. To prompt the user to grant this approval,
-         * the app must send an intent with the action {@link
-         * android.provider.Settings#ACTION_MANAGE_WRITE_SETTINGS}, which causes
-         * the system to display a permission management screen.
-         *
-         * @param context App context.
-         * @return true if the calling app can write to system settings, false otherwise
+         * Enable/disable Bluetooth Battery bar
+         * @hide
          */
-        public static boolean canWrite(Context context) {
-            return isCallingPackageAllowedToWriteSettings(context, Process.myUid(),
-                    context.getOpPackageName(), false);
-        }
-    }
+        public static final String BLUETOOTH_SHOW_BATTERY = "bluetooth_show_battery";
 
-    /**
-     * Secure system settings, containing system preferences that applications
-     * can read but are not allowed to write.  These are for preferences that
-     * the user must explicitly modify through the UI of a system app. Normal
-     * applications cannot modify the secure settings database, either directly
-     * or by calling the "put" methods that this class contains.
-     */
-    public static final class Secure extends NameValueTable {
-        // NOTE: If you add new settings here, be sure to add them to
-        // com.android.providers.settings.SettingsProtoDumpUtil#dumpProtoSecureSettingsLocked.
+        /**
+         * Statusbar logo
+         * @hide
+         */
+        public static final String STATUS_BAR_LOGO = "status_bar_logo";
 
         /**
-         * The content:// style URL for this table
+         * Position of Status bar logo
+         * 0 - Left (default)
+         * 1 - Right
+         * @hide
          */
-        public static final Uri CONTENT_URI =
-            Uri.parse("content://" + AUTHORITY + "/secure");
+        public static final String STATUS_BAR_LOGO_POSITION = "status_bar_logo_position";
 
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        private static final ContentProviderHolder sProviderHolder =
-                new ContentProviderHolder(CONTENT_URI);
+        /**
+         * Statusbar logo custom style
+         * @hide
+         */
+        public static final String STATUS_BAR_LOGO_STYLE = "status_bar_logo_style";
 
-        // Populated lazily, guarded by class object:
-        @UnsupportedAppUsage
-        private static final NameValueCache sNameValueCache = new NameValueCache(
-                CONTENT_URI,
-                CALL_METHOD_GET_SECURE,
-                CALL_METHOD_PUT_SECURE,
-                CALL_METHOD_DELETE_SECURE,
-                sProviderHolder,
-                Secure.class);
+        /**
+         * Whether to display cross sign for a data disabled connection
+         * @hide
+         */
+        public static final String DATA_DISABLED_ICON = "data_disabled_icon";
 
-        @UnsupportedAppUsage
-        private static final HashSet<String> MOVED_TO_LOCK_SETTINGS;
-        @UnsupportedAppUsage
-        private static final HashSet<String> MOVED_TO_GLOBAL;
-        static {
-            MOVED_TO_LOCK_SETTINGS = new HashSet<>(6);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_ENABLED);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_VISIBLE);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_SIZE);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_DOTS_VISIBLE);
-            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_SHOW_ERROR_PATH);
+        /**
+         * Whether to display 4G icon instead LTE
+         * @hide
+         */
+        public static final String SHOW_FOURG_ICON = "show_fourg_icon";
 
-            MOVED_TO_GLOBAL = new HashSet<>();
-            MOVED_TO_GLOBAL.add(Settings.Global.ADB_ENABLED);
-            MOVED_TO_GLOBAL.add(Settings.Global.ASSISTED_GPS_ENABLED);
-            MOVED_TO_GLOBAL.add(Settings.Global.BLUETOOTH_ON);
-            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_CELL_BROADCAST_SMS);
-            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_ROAMING_MODE);
-            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_SUBSCRIPTION_MODE);
-            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE);
-            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI);
-            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ROAMING);
-            MOVED_TO_GLOBAL.add(Settings.Global.DEVELOPMENT_SETTINGS_ENABLED);
-            MOVED_TO_GLOBAL.add(Settings.Global.DEVICE_PROVISIONED);
-            MOVED_TO_GLOBAL.add(Settings.Global.DISPLAY_SIZE_FORCED);
-            MOVED_TO_GLOBAL.add(Settings.Global.DOWNLOAD_MAX_BYTES_OVER_MOBILE);
-            MOVED_TO_GLOBAL.add(Settings.Global.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE);
-            MOVED_TO_GLOBAL.add(Settings.Global.MOBILE_DATA);
-            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_BUCKET_DURATION);
-            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_DELETE_AGE);
-            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_PERSIST_BYTES);
+        /**
+         * @hide
+         */
+        public static final String DISABLE_STACKED_MOBILE_ICONS = "disable_stacked_mobile_icons";
+
+        /**
+         * @hide
+         */
+        public static final String WIFI_STANDARD_ICON = "wifi_standard_icon";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_EXTRA_PADDING_START = "statusbar_extra_padding_start";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_EXTRA_PADDING_TOP = "statusbar_extra_padding_top";
+
+        /**
+         * @hide
+         */
+        public static final String STATUSBAR_EXTRA_PADDING_END = "statusbar_extra_padding_end";
+
+        /**
+         * Whether to use the custom status bar header or not
+         * @hide
+         */
+        public static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
+
+        /**
+         * Whether to apply a shadow on top of the header image
+         * value is the alpha value of the shadow image is 0 -> no shadow -> 255 black
+         * @hide
+         */
+        public static final String STATUS_BAR_CUSTOM_HEADER_SHADOW = "status_bar_custom_header_shadow";
+
+        /**
+         * header image package to use for daylight header - package name - null if default
+         * @hide
+         */
+        public static final String STATUS_BAR_DAYLIGHT_HEADER_PACK = "status_bar_daylight_header_pack";
+
+        /**
+         * Current active provider - available currently "static" "daylight"
+         * @hide
+         */
+        public static final String STATUS_BAR_CUSTOM_HEADER_PROVIDER = "status_bar_custom_header_provider";
+
+        /**
+         * Manual override picture to use
+         * @hide
+         */
+        public static final String STATUS_BAR_CUSTOM_HEADER_IMAGE = "status_bar_custom_header_image";
+
+        /**
+         * @hide
+         */
+        public static final String STATUS_BAR_FILE_HEADER_IMAGE = "status_bar_file_header_image";
+
+        /**
+         * Header height
+         * @hide
+         */
+        public static final String STATUS_BAR_CUSTOM_HEADER_HEIGHT = "status_bar_custom_header_height";
+
+        /**
+         * Disable hw buttons
+         * @hide
+         */
+        public static final String HARDWARE_KEYS_DISABLE = "hardware_keys_disable";
+
+        /**
+         * @hide
+         */
+        public static final String LOCKSCREEN_WEATHER_ENABLED = "lockscreen_weather_enabled";
+
+        /**
+         * @hide
+         */
+        public static final String LOCKSCREEN_WEATHER_LOCATION = "lockscreen_weather_location";
+
+        /**
+         * @hide
+         */
+        public static final String LOCKSCREEN_WEATHER_TEXT = "lockscreen_weather_text";
+
+        /**
+         * @hide
+         */
+        public static final String LOCKSCREEN_WEATHER_WIND_INFO = "lockscreen_weather_wind_info";
+
+        /**
+         * @hide
+         */
+        public static final String LOCKSCREEN_WEATHER_HUMIDITY_INFO = "lockscreen_weather_humidity_info";
+
+        /**
+         * Whether to show the battery info on the lockscreen while charging
+         * @hide
+         */
+        public static final String LOCKSCREEN_BATTERY_INFO = "lockscreen_battery_info";
+
+        /**
+         * Whether to enable the ripple animation on fingerprint unlock
+         * @hide
+         */
+        public static final String ENABLE_RIPPLE_EFFECT = "enable_ripple_effect";
+
+        /**
+         * Whether to show power menu on LockScreen
+         * @hide
+         */
+        public static final String LOCKSCREEN_ENABLE_POWER_MENU = "lockscreen_enable_power_menu";
+
+        /**
+         * @hide
+         */
+        public static final String UDFPS_ANIM_STYLE = "udfps_anim_style";
+
+        /**
+         * UDFPS animation size (scale 0-100, where 50 = 100% default size)
+         * @hide
+         */
+        public static final String UDFPS_ANIM_SIZE = "udfps_anim_size";
+
+        /**
+         * UDFPS animation vertical offset (-50 to +50 dp from default position)
+         * @hide
+         */
+        public static final String UDFPS_ANIM_OFFSET = "udfps_anim_offset";
+        
+        /**
+         * @hide
+         */
+        public static final String UDFPS_ICON = "udfps_icon";
+
+        /**
+         * @hide
+         */
+        public static final String UDFPS_ICON_TYPE = "udfps_icon_type";
+
+	/**
+         * @hide
+         */
+        public static final String UDFPS_CUSTOM_FP_ICON_PATH = "udfps_custom_fp_icon_path";
+
+        /**
+         * @hide
+         */
+        public static final String UDFPS_ICON_AOD = "udfps_icon_aod";
+
+        /**
+         * Whether to vibrate on succesful fingerprint authentication
+         * @hide
+         */
+        public static final String FP_SUCCESS_VIBRATE = "fp_success_vibrate";
+
+        /**
+         * Whether to vibrate on unsuccesful fingerprint authentication
+         * @hide
+         */
+        public static final String FP_ERROR_VIBRATE = "fp_error_vibrate";
+
+        /**
+         * @hide
+         */
+        public static final String RECENTS_LOCKED_TASKS = "recents_locked_tasks";
+
+        /**
+         * Whether to show the carrier name on the lockscreen
+         * @hide
+         */
+        public static final String LOCKSCREEN_SHOW_CARRIER = "lockscreen_show_carrier";
+
+        /**
+         * Swap capacitive keys
+         * @hide
+         */
+        public static final String SWAP_CAPACITIVE_KEYS = "swap_capacitive_keys";
+
+        /**
+         * Indicates whether ANBI (Accidental navigation button interaction) is enabled.
+         * @hide
+         */
+        public static final String ANBI_ENABLED = "anbi_enabled";
+
+        /**
+         * Whether three fingers swipe is active
+         * 0 = Inactive, 1 = Active
+         * @hide
+         */
+        @Readable
+        public static final String THREE_FINGER_GESTURE_ACTIVE = "three_fingers_swipe_active";
+
+        /**
+         * If On-The-Go should be displayed at the power menu.
+         * @hide
+         */
+        public static final String GLOBAL_ACTIONS_ONTHEGO = "global_actions_onthego";
+
+        /**
+         * The alpha value of the On-The-Go overlay.
+         * @hide
+         */
+        public static final String ON_THE_GO_ALPHA = "on_the_go_alpha";
+
+        /**
+         * Whether the service should restart itself or not.
+         * @hide
+         */
+        public static final String ON_THE_GO_SERVICE_RESTART = "on_the_go_service_restart";
+
+        /**
+         * The camera instance to use.
+         * 0 = Rear Camera
+         * 1 = Front Camera
+         * @hide
+         */
+        public static final String ON_THE_GO_CAMERA = "on_the_go_camera";
+
+        /**
+         * Whether to show or hide alert slider notifications on supported devices
+         * @hide
+         */
+        public static final String ALERT_SLIDER_NOTIFICATIONS = "alert_slider_notifications";
+
+        /**
+         * Whether to show daily/weekly data usage in the QS footer.
+         * @hide
+         */
+        public static final String QS_SHOW_DATA_USAGE = "qs_show_data_usage";
+
+        /**
+         * Persist setting for showing either daily or weekly data usage in the QS footer.
+         * @hide
+         */
+        public static final String QS_SHOW_DATA_USAGE_WINDOW = "qs_show_data_usage_window";
+
+        /**
+         * Haptic feedback on brightness slider
+         * @hide
+         */
+        public static final String QS_BRIGHTNESS_SLIDER_HAPTIC = "qs_brightness_slider_haptic";
+
+        /**
+         * Customize QS tile shape.
+         * @hide
+         */
+        public static final String QS_TILE_SHAPE = "qs_tile_shape";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILE_STYLE_MINIMAL = "qs_tile_style_minimal";
+
+        /**
+         * @hide
+         */
+        public static final String QS_USE_MODIFIED_TILE_SPACING = "qs_use_modified_tile_spacing";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILE_STYLE_MINIMAL_INVERT = "qs_tile_style_minimal_invert";
+
+        /**
+         * Customize Brightness slider shape.
+         * @hide
+         */
+        public static final String QS_BRIGHTNESS_SLIDER_SHAPE = "qs_brightness_slider_shape";
+
+        /**
+         * @hide
+         */
+        public static final String QS_BRIGHTNESS_SLIDER_STYLE = "qs_brightness_slider_style";
+
+        /**
+         * Haptic feedback on QS tiles
+         * @hide
+         */
+        public static final String QS_TILE_HAPTIC = "qs_tile_haptic";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILES_COLUMNS_LANDSCAPE = "qs_tiles_columns_landscape";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILES_COLUMNS = "qs_tiles_columns";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILES_ROWS_LANDSCAPE = "qs_tiles_rows_landscape";
+
+        /**
+         * @hide
+         */
+        public static final String QS_TILES_ROWS = "qs_tiles_rows";
+
+        /**
+         * @hide
+         */
+        public static final String QQS_TILES_ROWS_LANDSCAPE = "qqs_tiles_rows_landscape";
+
+        /**
+         * @hide
+         */
+        public static final String QQS_TILES_ROWS = "qqs_tiles_rows";
+
+        /**
+         * Lockscreen Media Art
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_ENABLED = "ls_media_art_enabled";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_FILTER = "ls_media_art_filter";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_FADE_LEVEL = "ls_media_art_fade_level";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_BLUR_LEVEL = "ls_media_art_blur_level";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_PIXEL_SIZE = "ls_media_art_pixel_size";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_AOD_ENABLED = "ls_media_art_aod_enabled";
+
+        /**
+         * @hide
+         */
+        public static final String LS_MEDIA_ART_AOD_DIM_LEVEL = "ls_media_art_aod_dim_level";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_CHANGE_ON = "lock_glymps_change_on";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_TIMER_INTERVAL = "lock_glymps_timer_interval";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_WALLPAPER_TARGET = "lock_glymps_wallpaper_target";
+
+        /**
+         * Whether edge light is enabled
+         * @hide
+         */
+        public static final String EDGE_LIGHT_ENABLED = "edge_light_enabled";
+
+        /**
+         * Color mode of edge light
+         * @hide
+         */
+        public static final String EDGE_LIGHT_COLOR_MODE = "edge_light_color_mode";
+
+        /**
+         * Custom color (hex value) for edge light
+         * @hide
+         */
+        public static final String EDGE_LIGHT_CUSTOM_COLOR = "edge_light_custom_color";
+
+        /**
+         * Pulse count for edge light
+         * @hide
+         */
+        public static final String EDGE_LIGHT_PULSE_COUNT = "edge_light_pulse_count";
+
+        /**
+         * Stroke width for edge light
+         * @hide
+         */
+        public static final String EDGE_LIGHT_STROKE_WIDTH = "edge_light_stroke_width";
+
+        /**
+         * Edge light style
+         * @hide
+         */
+        public static final String EDGE_LIGHT_STYLE = "edge_light_style";
+
+        /**
+         * Edge light animation effect type
+         * @hide
+         */
+        public static final String EDGE_LIGHT_ANIMATION_EFFECT = "edge_light_animation_effect";
+
+        /**
+        * Lock Glymps - Dynamic lock screen wallpaper feature
+        * @hide
+        */
+        public static final String LOCK_GLYMPS_ENABLED = "lock_glymps_enabled";
+      
+        /**
+         * Lock Glymps wallpaper source (0=Random, 1=Custom URLs)
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_SOURCE = "lock_glymps_source";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_WIFI_ONLY = "lock_glymps_wifi_only";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_CACHE_SIZE = "lock_glymps_cache_size";
+
+        /**
+         * @hide
+         */
+        public static final String LOCK_GLYMPS_CUSTOM_URLS = "lock_glymps_custom_urls";
+
+        /**
+         * Gesture navbar length mode.
+         * Supported modes: 0 for short length, 1 for normal and 2 for long.
+         * @hide
+         */
+        public static final String GESTURE_NAVBAR_LENGTH_MODE = "gesture_navbar_length_mode";
+
+        /** @hide */
+        public static final String BACK_GESTURE_HEIGHT = "back_gesture_height";
+
+        /**
+         * @hide
+         */
+        public static final String GESTURE_NAVBAR_HEIGHT_MODE = "gesture_navbar_height_mode";
+
+        /**
+         * Whether allowing pocket service to register sensors and dispatch informations.
+         *   0 = disabled
+         *   1 = enabled
+         * @hide
+         */
+        public static final String POCKET_JUDGE = "pocket_judge";
+
+        /**
+         * Whether to show heads up only for dialer and sms apps
+         * @hide
+         */
+        public static final String LESS_BORING_HEADS_UP = "less_boring_heads_up";
+
+        /**
+         * Whether to play notification sound and vibration if screen is ON
+         * 0 - never
+         * 1 - always
+         * @hide
+         */
+        public static final String NOTIFICATION_SOUND_VIB_SCREEN_ON = "notification_sound_vib_screen_on";
+
+        /**
+         * Tint statusbar icons with system accent color
+         * @hide
+         */
+        public static final String TINT_STATUSBAR_ICONS_WITH_ACCENT = "tint_statusbar_icons_with_accent";
+
+        /**
+         * Heads up timeout configuration
+         * @hide
+         */
+        public static final String HEADS_UP_TIMEOUT = "heads_up_timeout";
+
+        /**
+         * Whether to show the kill app button in notification guts
+         * @hide
+         */
+        public static final String NOTIFICATION_GUTS_KILL_APP_BUTTON =
+                "notification_guts_kill_app_button";
+
+        /**
+         * Show app volume rows in volume panel
+         * @hide
+         */
+        public static final String SHOW_APP_VOLUME = "show_app_volume";
+
+        /**
+         * Per-app refresh rate config
+         * @hide
+         */
+        public static final String REFRESH_RATE_CONFIG_CUSTOM = "refresh_rate_config_custom";
+
+        /**
+         * Force highest refresh rate in all apps
+         * @hide
+         */
+        public static final String EXTREME_REFRESH_RATE = "extreme_refresh_rate";
+
+        /**
+         * Whether to show volume percentage in volume panel
+         * @hide
+         */
+        public static final String SHOW_VOLUME_PERCENTAGE = "show_volume_percentage";
+
+        /**
+         * Whether to show charging animation
+         * @hide
+         */
+        public static final String CHARGING_ANIMATION = "charging_animation";
+
+        /**
+         * Force full screen for devices with cutout
+         * @hide
+         */
+        public static final String FORCE_FULLSCREEN_CUTOUT_APPS = "force_full_screen_cutout_apps";
+
+        /**
+         * Defines the screen-off animation to display
+         * @hide
+         */
+        public static final String SCREEN_OFF_ANIMATION = "screen_off_animation";
+
+        /**
+         * @hide
+         */
+        public static final String MEDIA_WAVEFORM_SEEKBAR = "media_waveform_seekbar";
+
+        /**
+         * Whether to show rotation suggestion
+         * @hide
+         */
+        @Readable
+        public static final String ENABLE_ROTATION_BUTTON = "enable_rotation_button";
+
+        /**
+         * @hide
+         */
+        public static final String SCREENSHOT_SHUTTER_SOUND = "screenshot_shutter_sound";
+
+        /**
+         * Use dynamic color based on battery level
+         * @hide
+         */
+        public static final String WIRELESS_CHARGING_DYNAMIC_COLOR = "wireless_charging_dynamic_color";
+
+        /**
+         * Charging ripple shape
+         * @hide
+         */
+        public static final String WIRELESS_CHARGING_RIPPLE_SHAPE = "wireless_charging_ripple_shape";
+
+        /**
+         * @hide
+         */
+        @Readable
+        public static final String EDGE_SCROLLING_HAPTICS_INTENSITY = "edge_scrolling_haptics_intensity";
+
+        /**
+         * What to show at the bottom of the Ambient display
+         * 0: Nothing.
+         * 1: Battery Percentage.
+         * 2: Battery Temperature.
+         * 3: Battery Percentage & Temperature Together.
+         * @hide
+         */
+        public static final String AMBIENT_SHOW_SETTINGS = "ambient_show_settings";
+
+        /**
+         * Ambient settings show icons
+         * @hide
+         */
+        public static final String AMBIENT_SHOW_SETTINGS_ICONS = "ambient_show_settings_icons";
+
+        /**
+         * Whether to unlimit screenrecord filesize
+         * Not for backup - dev option
+         * @hide
+         */
+        @Readable
+        public static final String UNLIMIT_SCREENRECORD = "unlimit_screenrecord";
+
+        /**
+         * Gradient on QS tiles
+         * @hide
+         */
+        public static final String QS_TILE_GRADIENT = "qs_tile_gradient";
+
+        /**
+         * Gradient on QS brightness slider
+         * @hide
+         */
+        public static final String QS_BRIGHTNESS_SLIDER_GRADIENT = "qs_brightness_slider_gradient";
+
+        /**
+         * Gradient on Volume slider
+         * @hide
+         */
+        public static final String VOLUME_SLIDER_GRADIENT = "volume_slider_gradient";
+
+        /**
+         * Gradient color mode
+         * @hide
+         */
+        public static final String CUSTOM_GRADIENT_COLOR_MODE = "custom_gradient_color_mode";
+
+        /**
+         * Gradient start color
+         * @hide
+         */
+        public static final String CUSTOM_GRADIENT_START_COLOR = "custom_gradient_start_color";
+
+        /**
+         * Gradient end color
+         * @hide
+         */
+        public static final String CUSTOM_GRADIENT_END_COLOR = "custom_gradient_end_color";
+
+        /**
+         * Whether to use classic QS panel style for tiles
+         * @hide
+         */
+        public static final String QS_PANEL_STYLE = "qs_panel_style";
+
+        /**
+         * Whether to hide label under tiles in classic QS panel style
+         * @hide
+         */
+        public static final String QS_TILE_LABEL_HIDE = "qs_tile_label_hide";
+
+        /**
+         * Select tile shape for classic QS panel style
+         * @hide
+         */
+        public static final String QS_TILE_ICON_SHAPE = "qs_tile_icon_shape";
+
+        /**
+         * Keys we no longer back up under the current schema, but want to continue to
+         * process when restoring historical backup datasets.
+         *
+         * All settings in {@link LEGACY_RESTORE_SETTINGS} array *must* have a non-null validator,
+         * otherwise they won't be restored.
+         *
+         * @hide
+         */
+        public static final String[] LEGACY_RESTORE_SETTINGS = {
+        };
+
+        /**
+         * These are all public system settings
+         *
+         * @hide
+         */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static final Set<String> PUBLIC_SETTINGS = new ArraySet<>();
+        static {
+            PUBLIC_SETTINGS.add(END_BUTTON_BEHAVIOR);
+            PUBLIC_SETTINGS.add(WIFI_USE_STATIC_IP);
+            PUBLIC_SETTINGS.add(WIFI_STATIC_IP);
+            PUBLIC_SETTINGS.add(WIFI_STATIC_GATEWAY);
+            PUBLIC_SETTINGS.add(WIFI_STATIC_NETMASK);
+            PUBLIC_SETTINGS.add(WIFI_STATIC_DNS1);
+            PUBLIC_SETTINGS.add(WIFI_STATIC_DNS2);
+            PUBLIC_SETTINGS.add(BLUETOOTH_DISCOVERABILITY);
+            PUBLIC_SETTINGS.add(BLUETOOTH_DISCOVERABILITY_TIMEOUT);
+            PUBLIC_SETTINGS.add(NEXT_ALARM_FORMATTED);
+            PUBLIC_SETTINGS.add(FONT_SCALE);
+            PUBLIC_SETTINGS.add(SYSTEM_LOCALES);
+            PUBLIC_SETTINGS.add(DIM_SCREEN);
+            PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);
+            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
+            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
+            PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
+            PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);
+            PUBLIC_SETTINGS.add(VIBRATE_ON);
+            PUBLIC_SETTINGS.add(VOLUME_RING);
+            PUBLIC_SETTINGS.add(VOLUME_SYSTEM);
+            PUBLIC_SETTINGS.add(VOLUME_VOICE);
+            PUBLIC_SETTINGS.add(VOLUME_MUSIC);
+            PUBLIC_SETTINGS.add(VOLUME_ALARM);
+            PUBLIC_SETTINGS.add(VOLUME_NOTIFICATION);
+            PUBLIC_SETTINGS.add(VOLUME_BLUETOOTH_SCO);
+            PUBLIC_SETTINGS.add(VOLUME_ASSISTANT);
+            PUBLIC_SETTINGS.add(RINGTONE);
+            PUBLIC_SETTINGS.add(RINGTONE2);
+            PUBLIC_SETTINGS.add(NOTIFICATION_SOUND);
+            PUBLIC_SETTINGS.add(ALARM_ALERT);
+            PUBLIC_SETTINGS.add(TEXT_AUTO_REPLACE);
+            PUBLIC_SETTINGS.add(TEXT_AUTO_CAPS);
+            PUBLIC_SETTINGS.add(TEXT_AUTO_PUNCTUATE);
+            PUBLIC_SETTINGS.add(TEXT_SHOW_PASSWORD);
+            PUBLIC_SETTINGS.add(SHOW_GTALK_SERVICE_STATUS);
+            PUBLIC_SETTINGS.add(WALLPAPER_ACTIVITY);
+            PUBLIC_SETTINGS.add(TIME_12_24);
+            PUBLIC_SETTINGS.add(DATE_FORMAT);
+            PUBLIC_SETTINGS.add(SETUP_WIZARD_HAS_RUN);
+            PUBLIC_SETTINGS.add(ACCELEROMETER_ROTATION);
+            PUBLIC_SETTINGS.add(USER_ROTATION);
+            PUBLIC_SETTINGS.add(DTMF_TONE_WHEN_DIALING);
+            PUBLIC_SETTINGS.add(SOUND_EFFECTS_ENABLED);
+            PUBLIC_SETTINGS.add(HAPTIC_FEEDBACK_ENABLED);
+            PUBLIC_SETTINGS.add(SHOW_WEB_SUGGESTIONS);
+            PUBLIC_SETTINGS.add(VIBRATE_WHEN_RINGING);
+            PUBLIC_SETTINGS.add(APPLY_RAMPING_RINGER);
+        }
+
+        /**
+         * These are all hidden system settings.
+         *
+         * @hide
+         */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static final Set<String> PRIVATE_SETTINGS = new ArraySet<>();
+        static {
+            PRIVATE_SETTINGS.add(WIFI_USE_STATIC_IP);
+            PRIVATE_SETTINGS.add(END_BUTTON_BEHAVIOR);
+            PRIVATE_SETTINGS.add(ADVANCED_SETTINGS);
+            PRIVATE_SETTINGS.add(ACCESSIBILITY_FORCE_INVERT_COLOR_OVERRIDE_PACKAGES_TO_DISABLE);
+            PRIVATE_SETTINGS.add(ACCESSIBILITY_FORCE_INVERT_COLOR_OVERRIDE_PACKAGES_TO_ENABLE);
+            PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED);
+            PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE);
+            PRIVATE_SETTINGS.add(WEAR_TTS_PREWARM_ENABLED);
+            PRIVATE_SETTINGS.add(SCREEN_AUTO_BRIGHTNESS_ADJ);
+            PRIVATE_SETTINGS.add(VIBRATE_INPUT_DEVICES);
+            PRIVATE_SETTINGS.add(VOLUME_MASTER);
+            PRIVATE_SETTINGS.add(MASTER_MONO);
+            PRIVATE_SETTINGS.add(MASTER_BALANCE);
+            PRIVATE_SETTINGS.add(NOTIFICATIONS_USE_RING_VOLUME);
+            PRIVATE_SETTINGS.add(VIBRATE_IN_SILENT);
+            PRIVATE_SETTINGS.add(MEDIA_BUTTON_RECEIVER);
+            PRIVATE_SETTINGS.add(HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
+            PRIVATE_SETTINGS.add(DTMF_TONE_TYPE_WHEN_DIALING);
+            PRIVATE_SETTINGS.add(HEARING_AID_COMPATIBILITY);
+            PRIVATE_SETTINGS.add(TTY_MODE);
+            PRIVATE_SETTINGS.add(NOTIFICATION_LIGHT_PULSE);
+            PRIVATE_SETTINGS.add(POINTER_LOCATION);
+            PRIVATE_SETTINGS.add(SHOW_TOUCHES);
+            PRIVATE_SETTINGS.add(SHOW_KEY_PRESSES);
+            PRIVATE_SETTINGS.add(WINDOW_ORIENTATION_LISTENER_LOG);
+            PRIVATE_SETTINGS.add(POWER_SOUNDS_ENABLED);
+            PRIVATE_SETTINGS.add(DOCK_SOUNDS_ENABLED);
+            PRIVATE_SETTINGS.add(LOCKSCREEN_SOUNDS_ENABLED);
+            PRIVATE_SETTINGS.add(LOCKSCREEN_DISABLED);
+            PRIVATE_SETTINGS.add(LOW_BATTERY_SOUND);
+            PRIVATE_SETTINGS.add(DESK_DOCK_SOUND);
+            PRIVATE_SETTINGS.add(DESK_UNDOCK_SOUND);
+            PRIVATE_SETTINGS.add(CAR_DOCK_SOUND);
+            PRIVATE_SETTINGS.add(CAR_UNDOCK_SOUND);
+            PRIVATE_SETTINGS.add(LOCK_SOUND);
+            PRIVATE_SETTINGS.add(UNLOCK_SOUND);
+            PRIVATE_SETTINGS.add(SIP_RECEIVE_CALLS);
+            PRIVATE_SETTINGS.add(SIP_CALL_OPTIONS);
+            PRIVATE_SETTINGS.add(SIP_ALWAYS);
+            PRIVATE_SETTINGS.add(SIP_ADDRESS_ONLY);
+            PRIVATE_SETTINGS.add(SIP_ASK_ME_EACH_TIME);
+            PRIVATE_SETTINGS.add(POINTER_SPEED);
+            PRIVATE_SETTINGS.add(POINTER_FILL_STYLE);
+            PRIVATE_SETTINGS.add(POINTER_STROKE_STYLE);
+            PRIVATE_SETTINGS.add(POINTER_SCALE);
+            PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED);
+            PRIVATE_SETTINGS.add(EGG_MODE);
+            PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT);
+            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE);
+            PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE_VENDOR_HINT);
+            PRIVATE_SETTINGS.add(LOCALE_PREFERENCES);
+            PRIVATE_SETTINGS.add(TOUCHPAD_POINTER_SPEED);
+            PRIVATE_SETTINGS.add(TOUCHPAD_NATURAL_SCROLLING);
+            PRIVATE_SETTINGS.add(TOUCHPAD_TAP_TO_CLICK);
+            PRIVATE_SETTINGS.add(TOUCHPAD_TAP_DRAGGING);
+            PRIVATE_SETTINGS.add(TOUCHPAD_RIGHT_CLICK_ZONE);
+            PRIVATE_SETTINGS.add(TOUCHPAD_SYSTEM_GESTURES);
+            PRIVATE_SETTINGS.add(TOUCHPAD_ACCELERATION_ENABLED);
+            PRIVATE_SETTINGS.add(TOUCHPAD_ENABLED);
+            PRIVATE_SETTINGS.add(CAMERA_FLASH_NOTIFICATION);
+            PRIVATE_SETTINGS.add(SCREEN_FLASH_NOTIFICATION);
+            PRIVATE_SETTINGS.add(SCREEN_FLASH_NOTIFICATION_COLOR);
+            PRIVATE_SETTINGS.add(DEFAULT_DEVICE_FONT_SCALE);
+            PRIVATE_SETTINGS.add(MOUSE_REVERSE_VERTICAL_SCROLLING);
+            PRIVATE_SETTINGS.add(MOUSE_SWAP_PRIMARY_BUTTON);
+            PRIVATE_SETTINGS.add(MOUSE_POINTER_ACCELERATION_ENABLED);
+            PRIVATE_SETTINGS.add(PREFERRED_REGION);
+            PRIVATE_SETTINGS.add(MOUSE_SCROLLING_ACCELERATION);
+            PRIVATE_SETTINGS.add(MOUSE_SCROLLING_SPEED);
+        }
+
+        /**
+         * These entries are considered common between the personal and the managed profile,
+         * since the managed profile doesn't get to change them.
+         */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        private static final Set<String> CLONE_TO_MANAGED_PROFILE = new ArraySet<>();
+        static {
+            CLONE_TO_MANAGED_PROFILE.add(DATE_FORMAT);
+            CLONE_TO_MANAGED_PROFILE.add(HAPTIC_FEEDBACK_ENABLED);
+            CLONE_TO_MANAGED_PROFILE.add(SOUND_EFFECTS_ENABLED);
+            CLONE_TO_MANAGED_PROFILE.add(TEXT_SHOW_PASSWORD);
+            CLONE_TO_MANAGED_PROFILE.add(TIME_12_24);
+        }
+
+        /** @hide */
+        public static void getCloneToManagedProfileSettings(Set<String> outKeySet) {
+            outKeySet.addAll(CLONE_TO_MANAGED_PROFILE);
+        }
+
+        /**
+         * These entries should be cloned from this profile's parent only if the dependency's
+         * value is true ("1")
+         *
+         * Note: the dependencies must be Secure settings
+         *
+         * @hide
+         */
+        public static final Map<String, String> CLONE_FROM_PARENT_ON_VALUE = new ArrayMap<>();
+        static {
+            CLONE_FROM_PARENT_ON_VALUE.put(RINGTONE, Secure.SYNC_PARENT_SOUNDS);
+            CLONE_FROM_PARENT_ON_VALUE.put(RINGTONE2, Secure.SYNC_PARENT_SOUNDS);
+            CLONE_FROM_PARENT_ON_VALUE.put(NOTIFICATION_SOUND, Secure.SYNC_PARENT_SOUNDS);
+            CLONE_FROM_PARENT_ON_VALUE.put(ALARM_ALERT, Secure.SYNC_PARENT_SOUNDS);
+        }
+
+        /** @hide */
+        public static void getCloneFromParentOnValueSettings(Map<String, String> outMap) {
+            outMap.putAll(CLONE_FROM_PARENT_ON_VALUE);
+        }
+
+        /**
+         * System settings which can be accessed by instant apps.
+         * @hide
+         */
+        public static final Set<String> INSTANT_APP_SETTINGS = new ArraySet<>();
+        static {
+            INSTANT_APP_SETTINGS.add(TEXT_AUTO_REPLACE);
+            INSTANT_APP_SETTINGS.add(TEXT_AUTO_CAPS);
+            INSTANT_APP_SETTINGS.add(TEXT_AUTO_PUNCTUATE);
+            INSTANT_APP_SETTINGS.add(TEXT_SHOW_PASSWORD);
+            INSTANT_APP_SETTINGS.add(DATE_FORMAT);
+            INSTANT_APP_SETTINGS.add(FONT_SCALE);
+            INSTANT_APP_SETTINGS.add(HAPTIC_FEEDBACK_ENABLED);
+            INSTANT_APP_SETTINGS.add(TIME_12_24);
+            INSTANT_APP_SETTINGS.add(SOUND_EFFECTS_ENABLED);
+            INSTANT_APP_SETTINGS.add(ACCELEROMETER_ROTATION);
+        }
+
+        /**
+         * When to use Wi-Fi calling
+         *
+         * @see android.telephony.TelephonyManager.WifiCallingChoices
+         * @hide
+         */
+        @Readable
+        public static final String WHEN_TO_MAKE_WIFI_CALLS = "when_to_make_wifi_calls";
+
+        /** Controls whether bluetooth is on or off on wearable devices.
+         *
+         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
+         *
+         * @hide
+         */
+        public static final String CLOCKWORK_BLUETOOTH_SETTINGS_PREF = "cw_bt_settings_pref";
+
+        /**
+         * Controls whether the unread notification dot indicator is shown on wearable devices.
+         *
+         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
+         *
+         * @hide
+         */
+        public static final String UNREAD_NOTIFICATION_DOT_INDICATOR =
+                "unread_notification_dot_indicator";
+
+        /**
+         * Controls whether auto-launching media controls is enabled on wearable devices.
+         *
+         * <p>The valid values for this key are: 0 (disabled) or 1 (enabled).
+         *
+         * @hide
+         */
+        public static final String AUTO_LAUNCH_MEDIA_CONTROLS = "auto_launch_media_controls";
+
+        // Settings moved to Settings.Secure
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#ADB_ENABLED}
+         * instead
+         */
+        @Deprecated
+        public static final String ADB_ENABLED = Global.ADB_ENABLED;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#ANDROID_ID} instead
+         */
+        @Deprecated
+        public static final String ANDROID_ID = Secure.ANDROID_ID;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#BLUETOOTH_ON} instead
+         */
+        @Deprecated
+        public static final String BLUETOOTH_ON = Global.BLUETOOTH_ON;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#DATA_ROAMING} instead
+         */
+        @Deprecated
+        public static final String DATA_ROAMING = Global.DATA_ROAMING;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead
+         */
+        @Deprecated
+        public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#HTTP_PROXY} instead
+         */
+        @Deprecated
+        public static final String HTTP_PROXY = Global.HTTP_PROXY;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#INSTALL_NON_MARKET_APPS} instead
+         */
+        @Deprecated
+        public static final String INSTALL_NON_MARKET_APPS = Secure.INSTALL_NON_MARKET_APPS;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#LOCATION_PROVIDERS_ALLOWED}
+         * instead
+         */
+        @Deprecated
+        public static final String LOCATION_PROVIDERS_ALLOWED = Secure.LOCATION_PROVIDERS_ALLOWED;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#LOGGING_ID} instead
+         */
+        @Deprecated
+        public static final String LOGGING_ID = Secure.LOGGING_ID;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#NETWORK_PREFERENCE} instead
+         */
+        @Deprecated
+        public static final String NETWORK_PREFERENCE = Global.NETWORK_PREFERENCE;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_ENABLED}
+         * instead
+         */
+        @Deprecated
+        public static final String PARENTAL_CONTROL_ENABLED = Secure.PARENTAL_CONTROL_ENABLED;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_LAST_UPDATE}
+         * instead
+         */
+        @Deprecated
+        public static final String PARENTAL_CONTROL_LAST_UPDATE = Secure.PARENTAL_CONTROL_LAST_UPDATE;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#PARENTAL_CONTROL_REDIRECT_URL}
+         * instead
+         */
+        @Deprecated
+        public static final String PARENTAL_CONTROL_REDIRECT_URL =
+            Secure.PARENTAL_CONTROL_REDIRECT_URL;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#SETTINGS_CLASSNAME} instead
+         */
+        @Deprecated
+        public static final String SETTINGS_CLASSNAME = Secure.SETTINGS_CLASSNAME;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#USB_MASS_STORAGE_ENABLED} instead
+         */
+        @Deprecated
+        public static final String USB_MASS_STORAGE_ENABLED = Global.USB_MASS_STORAGE_ENABLED;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#USE_GOOGLE_MAIL} instead
+         */
+        @Deprecated
+        public static final String USE_GOOGLE_MAIL = Global.USE_GOOGLE_MAIL;
+
+       /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_MAX_DHCP_RETRY_COUNT} instead
+         */
+        @Deprecated
+        public static final String WIFI_MAX_DHCP_RETRY_COUNT = Global.WIFI_MAX_DHCP_RETRY_COUNT;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS} instead
+         */
+        @Deprecated
+        public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =
+                Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON} instead
+         */
+        @Deprecated
+        public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
+                Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY} instead
+         */
+        @Deprecated
+        public static final String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY =
+                Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NUM_OPEN_NETWORKS_KEPT}
+         * instead
+         */
+        @Deprecated
+        public static final String WIFI_NUM_OPEN_NETWORKS_KEPT = Global.WIFI_NUM_OPEN_NETWORKS_KEPT;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_ON} instead
+         */
+        @Deprecated
+        public static final String WIFI_ON = Global.WIFI_ON;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE}
+         * instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE =
+                Secure.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_AP_COUNT} instead
+         */
+        @Deprecated
+        public static final String WIFI_WATCHDOG_AP_COUNT = Secure.WIFI_WATCHDOG_AP_COUNT;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS} instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS =
+                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED} instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED =
+                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS}
+         * instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS =
+                Secure.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Secure#WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT} instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT =
+            Secure.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_MAX_AP_CHECKS}
+         * instead
+         */
+        @Deprecated
+        public static final String WIFI_WATCHDOG_MAX_AP_CHECKS = Secure.WIFI_WATCHDOG_MAX_AP_CHECKS;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_WATCHDOG_ON} instead
+         */
+        @Deprecated
+        public static final String WIFI_WATCHDOG_ON = Global.WIFI_WATCHDOG_ON;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_COUNT} instead
+         */
+        @Deprecated
+        public static final String WIFI_WATCHDOG_PING_COUNT = Secure.WIFI_WATCHDOG_PING_COUNT;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_DELAY_MS}
+         * instead
+         */
+        @Deprecated
+        public static final String WIFI_WATCHDOG_PING_DELAY_MS = Secure.WIFI_WATCHDOG_PING_DELAY_MS;
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Secure#WIFI_WATCHDOG_PING_TIMEOUT_MS}
+         * instead
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS =
+            Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS;
+
+        /**
+         * Checks if the specified app can modify system settings. As of API
+         * level 23, an app cannot modify system settings unless it declares the
+         * {@link android.Manifest.permission#WRITE_SETTINGS}
+         * permission in its manifest, <em>and</em> the user specifically grants
+         * the app this capability. To prompt the user to grant this approval,
+         * the app must send an intent with the action {@link
+         * android.provider.Settings#ACTION_MANAGE_WRITE_SETTINGS}, which causes
+         * the system to display a permission management screen.
+         *
+         * @param context App context.
+         * @return true if the calling app can write to system settings, false otherwise
+         */
+        public static boolean canWrite(Context context) {
+            return isCallingPackageAllowedToWriteSettings(context, Process.myUid(),
+                    context.getOpPackageName(), false);
+        }
+    }
+
+    /**
+     * Secure system settings, containing system preferences that applications
+     * can read but are not allowed to write.  These are for preferences that
+     * the user must explicitly modify through the UI of a system app. Normal
+     * applications cannot modify the secure settings database, either directly
+     * or by calling the "put" methods that this class contains.
+     */
+    public static final class Secure extends NameValueTable {
+        // NOTE: If you add new settings here, be sure to add them to
+        // com.android.providers.settings.SettingsProtoDumpUtil#dumpProtoSecureSettingsLocked.
+
+        /**
+         * The content:// style URL for this table
+         */
+        public static final Uri CONTENT_URI =
+            Uri.parse("content://" + AUTHORITY + "/secure");
+
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        private static final ContentProviderHolder sProviderHolder =
+                new ContentProviderHolder(CONTENT_URI);
+
+        // Populated lazily, guarded by class object:
+        @UnsupportedAppUsage
+        private static final NameValueCache sNameValueCache = new NameValueCache(
+                CONTENT_URI,
+                CALL_METHOD_GET_SECURE,
+                CALL_METHOD_PUT_SECURE,
+                CALL_METHOD_DELETE_SECURE,
+                sProviderHolder,
+                Secure.class);
+
+        @UnsupportedAppUsage
+        private static final HashSet<String> MOVED_TO_LOCK_SETTINGS;
+        @UnsupportedAppUsage
+        private static final HashSet<String> MOVED_TO_GLOBAL;
+        static {
+            MOVED_TO_LOCK_SETTINGS = new HashSet<>(6);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_ENABLED);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_VISIBLE);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_SIZE);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_DOTS_VISIBLE);
+            MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_SHOW_ERROR_PATH);
+
+            MOVED_TO_GLOBAL = new HashSet<>();
+            MOVED_TO_GLOBAL.add(Settings.Global.ADB_ENABLED);
+            MOVED_TO_GLOBAL.add(Settings.Global.ASSISTED_GPS_ENABLED);
+            MOVED_TO_GLOBAL.add(Settings.Global.BLUETOOTH_ON);
+            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_CELL_BROADCAST_SMS);
+            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_ROAMING_MODE);
+            MOVED_TO_GLOBAL.add(Settings.Global.CDMA_SUBSCRIPTION_MODE);
+            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE);
+            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI);
+            MOVED_TO_GLOBAL.add(Settings.Global.DATA_ROAMING);
+            MOVED_TO_GLOBAL.add(Settings.Global.DEVELOPMENT_SETTINGS_ENABLED);
+            MOVED_TO_GLOBAL.add(Settings.Global.DEVICE_PROVISIONED);
+            MOVED_TO_GLOBAL.add(Settings.Global.DISPLAY_SIZE_FORCED);
+            MOVED_TO_GLOBAL.add(Settings.Global.DOWNLOAD_MAX_BYTES_OVER_MOBILE);
+            MOVED_TO_GLOBAL.add(Settings.Global.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE);
+            MOVED_TO_GLOBAL.add(Settings.Global.MOBILE_DATA);
+            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_BUCKET_DURATION);
+            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_DELETE_AGE);
+            MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_PERSIST_BYTES);
             MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_DEV_ROTATE_AGE);
             MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_ENABLED);
             MOVED_TO_GLOBAL.add(Settings.Global.NETSTATS_GLOBAL_ALERT_BYTES);
@@ -7384,5955 +8417,6405 @@ public static final class Secure extends NameValueTable {
             MOVED_TO_GLOBAL.add(Settings.Global.SECURE_FRP_MODE);
         }
 
-        /** @hide */
-        public static void getMovedToGlobalSettings(Set<String> outKeySet) {
-            outKeySet.addAll(MOVED_TO_GLOBAL);
+        /** @hide */
+        public static void getMovedToGlobalSettings(Set<String> outKeySet) {
+            outKeySet.addAll(MOVED_TO_GLOBAL);
+        }
+
+        /** @hide */
+        public static void getMovedToSystemSettings(Set<String> outKeySet) {
+        }
+
+        /** @hide */
+        public static void clearProviderForTest() {
+            sProviderHolder.clearProviderForTest();
+            sNameValueCache.clearGenerationTrackerForTest();
+        }
+
+        /** @hide */
+        public static void getPublicSettings(Set<String> allKeys, Set<String> readableKeys,
+                ArrayMap<String, Integer> readableKeysWithMaxTargetSdk) {
+            getPublicSettingsForClass(Secure.class, allKeys, readableKeys,
+                    readableKeysWithMaxTargetSdk);
+        }
+
+        /**
+         * Look up a name in the database.
+         * @param resolver to access the database with
+         * @param name to look up in the table
+         * @return the corresponding value, or null if not present
+         */
+        public static String getString(ContentResolver resolver, String name) {
+            return getStringForUser(resolver, name, resolver.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage
+        public static String getStringForUser(ContentResolver resolver, String name,
+                @CanBeCURRENT @UserIdInt int userId) {
+            if (MOVED_TO_GLOBAL.contains(name)) {
+                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
+                        + " to android.provider.Settings.Global.");
+                return Global.getStringForUser(resolver, name, userId);
+            }
+
+            if (MOVED_TO_LOCK_SETTINGS.contains(name) && Process.myUid() != Process.SYSTEM_UID) {
+                // No context; use the ActivityThread's context as an approximation for
+                // determining the target API level.
+                Application application = ActivityThread.currentApplication();
+
+                boolean isPreMnc = application != null
+                    && application.getApplicationInfo() != null
+                    && application.getApplicationInfo().targetSdkVersion
+                    <= VERSION_CODES.LOLLIPOP_MR1;
+                if (isPreMnc) {
+                    // Old apps used to get the three deprecated LOCK_PATTERN_* settings from
+                    // ILockSettings.getString().  For security reasons, we now just return a
+                    // stubbed-out value.  Note: the only one of these three settings actually known
+                    // to have been used was LOCK_PATTERN_ENABLED, and ILockSettings.getString()
+                    // already always returned "0" for that starting in Android 11.
+                    return "0";
+                }
+                throw new SecurityException("Settings.Secure." + name + " is deprecated and no" +
+                        " longer accessible. See API documentation for potential replacements.");
+            }
+
+            return sNameValueCache.getStringForUser(resolver, name, userId);
+        }
+
+        /**
+         * Store a name/value pair into the database. Values written by this method will be
+         * overridden if a restore happens in the future.
+         *
+         * @param resolver to access the database with
+         * @param name to store
+         * @param value to associate with the name
+         * @return true if the value was set, false on database errors
+         *
+         * @hide
+         */
+        @RequiresPermission(Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE)
+        public static boolean putString(ContentResolver resolver, String name,
+                String value, boolean overrideableByRestore) {
+            return putStringForUser(resolver, name, value, /* tag */ null, /* makeDefault */ false,
+                    resolver.getUserId(), overrideableByRestore);
+        }
+
+        /**
+         * Store a name/value pair into the database.
+         * @param resolver to access the database with
+         * @param name to store
+         * @param value to associate with the name
+         * @return true if the value was set, false on database errors
+         */
+        public static boolean putString(ContentResolver resolver, String name, String value) {
+            return putStringForUser(resolver, name, value, resolver.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage
+        public static boolean putStringForUser(ContentResolver resolver, String name, String value,
+                @CanBeCURRENT @UserIdInt int userId) {
+            return putStringForUser(resolver, name, value, null, false, userId,
+                    DEFAULT_OVERRIDEABLE_BY_RESTORE);
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static boolean putStringForUser(@NonNull ContentResolver resolver,
+                @NonNull String name, @Nullable String value, @Nullable String tag,
+                boolean makeDefault, @CanBeCURRENT @UserIdInt int userId,
+                boolean overrideableByRestore) {
+            if (LOCAL_LOGV) {
+                Log.v(TAG, "Secure.putString(name=" + name + ", value=" + value + ") for "
+                        + userId);
+            }
+            if (MOVED_TO_GLOBAL.contains(name)) {
+                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
+                        + " to android.provider.Settings.Global");
+                return Global.putStringForUser(resolver, name, value,
+                        tag, makeDefault, userId, DEFAULT_OVERRIDEABLE_BY_RESTORE);
+            }
+            return sNameValueCache.putStringForUser(resolver, name, value, tag,
+                    makeDefault, userId, overrideableByRestore);
+        }
+
+        /**
+         * Store a name/value pair into the database.
+         * <p>
+         * The method takes an optional tag to associate with the setting
+         * which can be used to clear only settings made by your package and
+         * associated with this tag by passing the tag to {@link
+         * #resetToDefaults(ContentResolver, String)}. Anyone can override
+         * the current tag. Also if another package changes the setting
+         * then the tag will be set to the one specified in the set call
+         * which can be null. Also any of the settings setters that do not
+         * take a tag as an argument effectively clears the tag.
+         * </p><p>
+         * For example, if you set settings A and B with tags T1 and T2 and
+         * another app changes setting A (potentially to the same value), it
+         * can assign to it a tag T3 (note that now the package that changed
+         * the setting is not yours). Now if you reset your changes for T1 and
+         * T2 only setting B will be reset and A not (as it was changed by
+         * another package) but since A did not change you are in the desired
+         * initial state. Now if the other app changes the value of A (assuming
+         * you registered an observer in the beginning) you would detect that
+         * the setting was changed by another app and handle this appropriately
+         * (ignore, set back to some value, etc).
+         * </p><p>
+         * Also the method takes an argument whether to make the value the
+         * default for this setting. If the system already specified a default
+         * value, then the one passed in here will <strong>not</strong>
+         * be set as the default.
+         * </p>
+         *
+         * @param resolver to access the database with.
+         * @param name to store.
+         * @param value to associate with the name.
+         * @param tag to associate with the setting.
+         * @param makeDefault whether to make the value the default one.
+         * @return true if the value was set, false on database errors.
+         *
+         * @see #resetToDefaults(ContentResolver, String)
+         *
+         * @hide
+         */
+        @SystemApi
+        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
+        public static boolean putString(@NonNull ContentResolver resolver,
+                @NonNull String name, @Nullable String value, @Nullable String tag,
+                boolean makeDefault) {
+            return putStringForUser(resolver, name, value, tag, makeDefault,
+                    resolver.getUserId(), DEFAULT_OVERRIDEABLE_BY_RESTORE);
+        }
+
+        /**
+         * Reset the settings to their defaults. This would reset <strong>only</strong>
+         * settings set by the caller's package. Think of it of a way to undo your own
+         * changes to the global settings. Passing in the optional tag will reset only
+         * settings changed by your package and associated with this tag.
+         *
+         * @param resolver Handle to the content resolver.
+         * @param tag Optional tag which should be associated with the settings to reset.
+         *
+         * @see #putString(ContentResolver, String, String, String, boolean)
+         *
+         * @hide
+         */
+        @SystemApi
+        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
+        public static void resetToDefaults(@NonNull ContentResolver resolver,
+                @Nullable String tag) {
+            resetToDefaultsAsUser(resolver, tag, RESET_MODE_PACKAGE_DEFAULTS,
+                    resolver.getUserId());
+        }
+
+        /**
+         *
+         * Reset the settings to their defaults for a given user with a specific mode. The
+         * optional tag argument is valid only for {@link #RESET_MODE_PACKAGE_DEFAULTS}
+         * allowing resetting the settings made by a package and associated with the tag.
+         *
+         * @param resolver Handle to the content resolver.
+         * @param tag Optional tag which should be associated with the settings to reset.
+         * @param mode The reset mode.
+         * @param userId The user for which to reset to defaults.
+         *
+         * @see #RESET_MODE_PACKAGE_DEFAULTS
+         * @see #RESET_MODE_UNTRUSTED_DEFAULTS
+         * @see #RESET_MODE_UNTRUSTED_CHANGES
+         * @see #RESET_MODE_TRUSTED_DEFAULTS
+         *
+         * @hide
+         */
+        public static void resetToDefaultsAsUser(@NonNull ContentResolver resolver,
+                @Nullable String tag, @ResetMode int mode,
+                @IntRange(from = 0) @CannotBeSpecialUser @UserIdInt int userId) {
+            try {
+                Bundle arg = new Bundle();
+                arg.putInt(CALL_METHOD_USER_KEY, userId);
+                if (tag != null) {
+                    arg.putString(CALL_METHOD_TAG_KEY, tag);
+                }
+                arg.putInt(CALL_METHOD_RESET_MODE_KEY, mode);
+                IContentProvider cp = sProviderHolder.getProvider(resolver);
+                if (cp == null) {
+                    Log.w(TAG, "Can't reset to defaults for " + CONTENT_URI
+                        + " because cp is null");
+                    return;
+                }
+                cp.call(resolver.getAttributionSource(),
+                        sProviderHolder.mUri.getAuthority(), CALL_METHOD_RESET_SECURE, null, arg);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Can't reset do defaults for " + CONTENT_URI, e);
+            }
+        }
+
+        /**
+         * Construct the content URI for a particular name/value pair,
+         * useful for monitoring changes with a ContentObserver.
+         * @param name to look up in the table
+         * @return the corresponding content URI, or null if not present
+         */
+        public static Uri getUriFor(String name) {
+            if (MOVED_TO_GLOBAL.contains(name)) {
+                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
+                        + " to android.provider.Settings.Global, returning global URI.");
+                return Global.getUriFor(Global.CONTENT_URI, name);
+            }
+            return getUriFor(CONTENT_URI, name);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as an integer.  Note that internally setting values are always
+         * stored as strings; this function converts the string to an integer
+         * for you.  The default value will be returned if the setting is
+         * not defined or not an integer.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         * @param def Value to return if the setting is not defined.
+         *
+         * @return The setting's current value, or 'def' if it is not defined
+         * or not a valid integer.
+         */
+        public static int getInt(ContentResolver cr, String name, int def) {
+            return getIntForUser(cr, name, def, cr.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage
+        public static int getIntForUser(ContentResolver cr, String name, int def,
+                @CanBeCURRENT @UserIdInt int userId) {
+            String v = getStringForUser(cr, name, userId);
+            return parseIntSettingWithDefault(v, def);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as an integer.  Note that internally setting values are always
+         * stored as strings; this function converts the string to an integer
+         * for you.
+         * <p>
+         * This version does not take a default value.  If the setting has not
+         * been set, or the string value is not a number,
+         * it throws {@link SettingNotFoundException}.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         *
+         * @throws SettingNotFoundException Thrown if a setting by the given
+         * name can't be found or the setting value is not an integer.
+         *
+         * @return The setting's current value.
+         */
+        public static int getInt(ContentResolver cr, String name)
+                throws SettingNotFoundException {
+            return getIntForUser(cr, name, cr.getUserId());
+        }
+
+        /** @hide */
+        public static int getIntForUser(ContentResolver cr, String name,
+                @CanBeCURRENT @UserIdInt int userId)
+                throws SettingNotFoundException {
+            String v = getStringForUser(cr, name, userId);
+            return parseIntSetting(v, name);
+        }
+
+        /**
+         * Convenience function for updating a single settings value as an
+         * integer. This will either create a new entry in the table if the
+         * given name does not exist, or modify the value of the existing row
+         * with that name.  Note that internally setting values are always
+         * stored as strings, so this function converts the given value to a
+         * string before storing it.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to modify.
+         * @param value The new value for the setting.
+         * @return true if the value was set, false on database errors
+         */
+        public static boolean putInt(ContentResolver cr, String name, int value) {
+            return putIntForUser(cr, name, value, cr.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage
+        public static boolean putIntForUser(ContentResolver cr, String name, int value,
+                @CanBeCURRENT @UserIdInt int userId) {
+            return putStringForUser(cr, name, Integer.toString(value), userId);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as a {@code long}.  Note that internally setting values are always
+         * stored as strings; this function converts the string to a {@code long}
+         * for you.  The default value will be returned if the setting is
+         * not defined or not a {@code long}.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         * @param def Value to return if the setting is not defined.
+         *
+         * @return The setting's current value, or 'def' if it is not defined
+         * or not a valid {@code long}.
+         */
+        public static long getLong(ContentResolver cr, String name, long def) {
+            return getLongForUser(cr, name, def, cr.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static long getLongForUser(ContentResolver cr, String name, long def,
+                @CanBeCURRENT @UserIdInt int userId) {
+            String v = getStringForUser(cr, name, userId);
+            return parseLongSettingWithDefault(v, def);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as a {@code long}.  Note that internally setting values are always
+         * stored as strings; this function converts the string to a {@code long}
+         * for you.
+         * <p>
+         * This version does not take a default value.  If the setting has not
+         * been set, or the string value is not a number,
+         * it throws {@link SettingNotFoundException}.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         *
+         * @return The setting's current value.
+         * @throws SettingNotFoundException Thrown if a setting by the given
+         * name can't be found or the setting value is not an integer.
+         */
+        public static long getLong(ContentResolver cr, String name)
+                throws SettingNotFoundException {
+            return getLongForUser(cr, name, cr.getUserId());
+        }
+
+        /** @hide */
+        public static long getLongForUser(ContentResolver cr, String name,
+                @CanBeCURRENT @UserIdInt int userId)
+                throws SettingNotFoundException {
+            String v = getStringForUser(cr, name, userId);
+            return parseLongSetting(v, name);
+        }
+
+        /**
+         * Convenience function for updating a secure settings value as a long
+         * integer. This will either create a new entry in the table if the
+         * given name does not exist, or modify the value of the existing row
+         * with that name.  Note that internally setting values are always
+         * stored as strings, so this function converts the given value to a
+         * string before storing it.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to modify.
+         * @param value The new value for the setting.
+         * @return true if the value was set, false on database errors
+         */
+        public static boolean putLong(ContentResolver cr, String name, long value) {
+            return putLongForUser(cr, name, value, cr.getUserId());
+        }
+
+        /** @hide */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static boolean putLongForUser(ContentResolver cr, String name, long value,
+                @CanBeCURRENT @UserIdInt int userId) {
+            return putStringForUser(cr, name, Long.toString(value), userId);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as a floating point number.  Note that internally setting values are
+         * always stored as strings; this function converts the string to an
+         * float for you. The default value will be returned if the setting
+         * is not defined or not a valid float.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         * @param def Value to return if the setting is not defined.
+         *
+         * @return The setting's current value, or 'def' if it is not defined
+         * or not a valid float.
+         */
+        public static float getFloat(ContentResolver cr, String name, float def) {
+            return getFloatForUser(cr, name, def, cr.getUserId());
+        }
+
+        /** @hide */
+        public static float getFloatForUser(ContentResolver cr, String name, float def,
+                @CanBeCURRENT @UserIdInt int userId) {
+            String v = getStringForUser(cr, name, userId);
+            return parseFloatSettingWithDefault(v, def);
+        }
+
+        /**
+         * Convenience function for retrieving a single secure settings value
+         * as a float.  Note that internally setting values are always
+         * stored as strings; this function converts the string to a float
+         * for you.
+         * <p>
+         * This version does not take a default value.  If the setting has not
+         * been set, or the string value is not a number,
+         * it throws {@link SettingNotFoundException}.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to retrieve.
+         *
+         * @throws SettingNotFoundException Thrown if a setting by the given
+         * name can't be found or the setting value is not a float.
+         *
+         * @return The setting's current value.
+         */
+        public static float getFloat(ContentResolver cr, String name)
+                throws SettingNotFoundException {
+            return getFloatForUser(cr, name, cr.getUserId());
         }
 
         /** @hide */
-        public static void getMovedToSystemSettings(Set<String> outKeySet) {
+        public static float getFloatForUser(ContentResolver cr, String name,
+                @CanBeCURRENT @UserIdInt int userId)
+                throws SettingNotFoundException {
+            String v = getStringForUser(cr, name, userId);
+            return parseFloatSetting(v, name);
         }
 
-        /** @hide */
-        public static void clearProviderForTest() {
-            sProviderHolder.clearProviderForTest();
-            sNameValueCache.clearGenerationTrackerForTest();
+        /**
+         * Convenience function for updating a single settings value as a
+         * floating point number. This will either create a new entry in the
+         * table if the given name does not exist, or modify the value of the
+         * existing row with that name.  Note that internally setting values
+         * are always stored as strings, so this function converts the given
+         * value to a string before storing it.
+         *
+         * @param cr The ContentResolver to access.
+         * @param name The name of the setting to modify.
+         * @param value The new value for the setting.
+         * @return true if the value was set, false on database errors
+         */
+        public static boolean putFloat(ContentResolver cr, String name, float value) {
+            return putFloatForUser(cr, name, value, cr.getUserId());
         }
 
         /** @hide */
-        public static void getPublicSettings(Set<String> allKeys, Set<String> readableKeys,
-                ArrayMap<String, Integer> readableKeysWithMaxTargetSdk) {
-            getPublicSettingsForClass(Secure.class, allKeys, readableKeys,
-                    readableKeysWithMaxTargetSdk);
+        public static boolean putFloatForUser(ContentResolver cr, String name, float value,
+                @CanBeCURRENT @UserIdInt int userId) {
+            return putStringForUser(cr, name, Float.toString(value), userId);
         }
 
         /**
-         * Look up a name in the database.
-         * @param resolver to access the database with
-         * @param name to look up in the table
-         * @return the corresponding value, or null if not present
+         * A comma-separated list of package names that should disable hardware overlays while
+         * they are in the foreground.
+         * @hide
+         */
+        public static final String DISABLE_HW_OVERLAYS_APPS = "disable_hw_overlays_apps";
+
+        /**
+         * Control whether to enable adaptive sleep mode.
+         * @hide
+         */
+        @Readable
+        public static final String ADAPTIVE_SLEEP = "adaptive_sleep";
+
+        /**
+         * Setting key to indicate whether camera-based autorotate is enabled.
+         *
+         * @hide
+         */
+        public static final String CAMERA_AUTOROTATE = "camera_autorotate";
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#DEVELOPMENT_SETTINGS_ENABLED}
+         * instead
+         */
+        @Deprecated
+        public static final String DEVELOPMENT_SETTINGS_ENABLED =
+                Global.DEVELOPMENT_SETTINGS_ENABLED;
+
+        /**
+         * When the user has enable the option to have a "bug report" command
+         * in the power menu.
+         * @hide
+         */
+        @Readable
+        public static final String BUGREPORT_IN_POWER_MENU = "bugreport_in_power_menu";
+
+        /**
+         * The package name for the custom bugreport handler app. This app must be bugreport
+         * allow-listed. This is currently used only by Power Menu short press.
+         * @hide
+         */
+        public static final String CUSTOM_BUGREPORT_HANDLER_APP = "custom_bugreport_handler_app";
+
+        /**
+         * The user id for the custom bugreport handler app. This is currently used only by Power
+         * Menu short press.
+         * @hide
+         */
+        public static final String CUSTOM_BUGREPORT_HANDLER_USER = "custom_bugreport_handler_user";
+
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#ADB_ENABLED} instead
+         */
+        @Deprecated
+        public static final String ADB_ENABLED = Global.ADB_ENABLED;
+
+        /**
+         * Setting to allow mock locations and location provider status to be injected into the
+         * LocationManager service for testing purposes during application development.  These
+         * locations and status values  override actual location and status information generated
+         * by network, gps, or other location providers.
+         *
+         * @deprecated This settings is not used anymore.
+         */
+        @Deprecated
+        @Readable
+        public static final String ALLOW_MOCK_LOCATION = "mock_location";
+
+        /**
+         * This is used by Bluetooth Manager to store adapter name
+         * @hide
+         */
+        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+        @SuppressLint("NoSettingsProvider")
+        public static final String BLUETOOTH_NAME = "bluetooth_name";
+
+        /**
+         * This is used by Bluetooth Manager to store adapter address
+         * @hide
+         */
+        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+        @SuppressLint("NoSettingsProvider")
+        public static final String BLUETOOTH_ADDRESS = "bluetooth_address";
+
+        /**
+         * This is used by Bluetooth Manager to store whether adapter address is valid
+         * @hide
+         */
+        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+        @SuppressLint("NoSettingsProvider")
+        public static final String BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to store the broadcast program info.
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_PROGRAM_INFO =
+                "bluetooth_le_broadcast_program_info";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to store the broadcast name.
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_NAME = "bluetooth_le_broadcast_name";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to store the broadcast code.
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_CODE = "bluetooth_le_broadcast_code";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to store the app source name.
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME =
+                "bluetooth_le_broadcast_app_source_name";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to downgrade the broadcast quality to improve
+         * compatibility.
+         *
+         * <ul>
+         *   <li>0 = false
+         *   <li>1 = true
+         * </ul>
+         *
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_IMPROVE_COMPATIBILITY =
+                "bluetooth_le_broadcast_improve_compatibility";
+
+        /**
+         * This is used by LocalBluetoothLeBroadcast to store the fallback active device address.
+         *
+         * @hide
+         */
+        public static final String BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS =
+                "bluetooth_le_broadcast_fallback_active_device_address";
+
+        /**
+         * Ringtone routing value for hearing aid. It routes ringtone to hearing aid or device
+         * speaker.
+         * <ul>
+         *     <li> 0 = Default
+         *     <li> 1 = Route to hearing aid
+         *     <li> 2 = Route to device speaker
+         * </ul>
+         * @hide
+         */
+        public static final String HEARING_AID_RINGTONE_ROUTING =
+                "hearing_aid_ringtone_routing";
+
+        /**
+         * Phone call routing value for hearing aid. It routes phone call to hearing aid or
+         * device speaker.
+         * <ul>
+         *     <li> 0 = Default
+         *     <li> 1 = Route to hearing aid
+         *     <li> 2 = Route to device speaker
+         * </ul>
+         * @hide
+         */
+        public static final String HEARING_AID_CALL_ROUTING =
+                "hearing_aid_call_routing";
+
+        /**
+         * Media routing value for hearing aid. It routes media to hearing aid or device
+         * speaker.
+         * <ul>
+         *     <li> 0 = Default
+         *     <li> 1 = Route to hearing aid
+         *     <li> 2 = Route to device speaker
+         * </ul>
+         * @hide
+         */
+        public static final String HEARING_AID_MEDIA_ROUTING =
+                "hearing_aid_media_routing";
+
+        /**
+         * Notification routing value for hearing aid. It routes notification sounds to hearing aid
+         * or device speaker.
+         * <ul>
+         *     <li> 0 = Default
+         *     <li> 1 = Route to hearing aid
+         *     <li> 2 = Route to device speaker
+         * </ul>
+         * @hide
+         */
+        public static final String HEARING_AID_NOTIFICATION_ROUTING =
+                "hearing_aid_notification_routing";
+
+        /**
+         * Setting to indicate that on device captions are enabled.
+         *
+         * @hide
+         */
+        @SystemApi
+        @Readable
+        public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";
+
+
+        /**
+         * Setting to indicate live caption button show or hide in the volume
+         * rocker.
+         *
+         * @hide
          */
-        public static String getString(ContentResolver resolver, String name) {
-            return getStringForUser(resolver, name, resolver.getUserId());
-        }
+        public static final String ODI_CAPTIONS_VOLUME_UI_ENABLED =
+                "odi_captions_volume_ui_enabled";
 
-        /** @hide */
-        @UnsupportedAppUsage
-        public static String getStringForUser(ContentResolver resolver, String name,
-                @CanBeCURRENT @UserIdInt int userId) {
-            if (MOVED_TO_GLOBAL.contains(name)) {
-                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
-                        + " to android.provider.Settings.Global.");
-                return Global.getStringForUser(resolver, name, userId);
-            }
+        /**
+         * On Android 8.0 (API level 26) and higher versions of the platform,
+         * a 64-bit number (expressed as a hexadecimal string), unique to
+         * each combination of app-signing key, user, and device.
+         * Values of {@code ANDROID_ID} are scoped by signing key and user.
+         * The value may change if a factory reset is performed on the
+         * device or if an APK signing key changes.
+         *
+         * For more information about how the platform handles {@code ANDROID_ID}
+         * in Android 8.0 (API level 26) and higher, see <a
+         * href="{@docRoot}about/versions/oreo/android-8.0-changes.html#privacy-all">
+         * Android 8.0 Behavior Changes</a>.
+         *
+         * <p class="note"><strong>Note:</strong> For apps that were installed
+         * prior to updating the device to a version of Android 8.0
+         * (API level 26) or higher, the value of {@code ANDROID_ID} changes
+         * if the app is uninstalled and then reinstalled after the OTA.
+         * To preserve values across uninstalls after an OTA to Android 8.0
+         * or higher, developers can use
+         * <a href="{@docRoot}guide/topics/data/keyvaluebackup.html">
+         * Key/Value Backup</a>.</p>
+         *
+         * <p>In versions of the platform lower than Android 8.0 (API level 26),
+         * a 64-bit number (expressed as a hexadecimal string) that is randomly
+         * generated when the user first sets up the device and should remain
+         * constant for the lifetime of the user's device.
+         *
+         * On devices that have
+         * <a href="{@docRoot}about/versions/android-4.2.html#MultipleUsers">
+         * multiple users</a>, each user appears as a
+         * completely separate device, so the {@code ANDROID_ID} value is
+         * unique to each user.</p>
+         *
+         * <p class="note"><strong>Note:</strong> If the caller is an Instant App the ID is scoped
+         * to the Instant App, it is generated when the Instant App is first installed and reset if
+         * the user clears the Instant App.
+         */
+        @Readable
+        public static final String ANDROID_ID = "android_id";
 
-            if (MOVED_TO_LOCK_SETTINGS.contains(name) && Process.myUid() != Process.SYSTEM_UID) {
-                // No context; use the ActivityThread's context as an approximation for
-                // determining the target API level.
-                Application application = ActivityThread.currentApplication();
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#BLUETOOTH_ON} instead
+         */
+        @Deprecated
+        public static final String BLUETOOTH_ON = Global.BLUETOOTH_ON;
 
-                boolean isPreMnc = application != null
-                    && application.getApplicationInfo() != null
-                    && application.getApplicationInfo().targetSdkVersion
-                    <= VERSION_CODES.LOLLIPOP_MR1;
-                if (isPreMnc) {
-                    // Old apps used to get the three deprecated LOCK_PATTERN_* settings from
-                    // ILockSettings.getString().  For security reasons, we now just return a
-                    // stubbed-out value.  Note: the only one of these three settings actually known
-                    // to have been used was LOCK_PATTERN_ENABLED, and ILockSettings.getString()
-                    // already always returned "0" for that starting in Android 11.
-                    return "0";
-                }
-                throw new SecurityException("Settings.Secure." + name + " is deprecated and no" +
-                        " longer accessible. See API documentation for potential replacements.");
-            }
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#DATA_ROAMING} instead
+         */
+        @Deprecated
+        public static final String DATA_ROAMING = Global.DATA_ROAMING;
 
-            return sNameValueCache.getStringForUser(resolver, name, userId);
-        }
+        /**
+         * Stores {@link android.view.inputmethod.InputMethodInfo#getId()} of the input method
+         * service that is currently selected.
+         *
+         * <p>Although the name {@link #DEFAULT_INPUT_METHOD} implies that there is a concept of
+         * <i>default</i> input method, in reality this setting is no more or less than the
+         * <strong>currently selected</strong> input method. This setting can be updated at any
+         * time as a result of user-initiated and system-initiated input method switching.</p>
+         *
+         * <p>Use {@link ComponentName#unflattenFromString(String)} to parse the stored value.</p>
+         */
+        @Readable
+        public static final String DEFAULT_INPUT_METHOD = "default_input_method";
 
         /**
-         * Store a name/value pair into the database. Values written by this method will be
-         * overridden if a restore happens in the future.
+         * Used only by {@link com.android.server.inputmethod.InputMethodManagerService} as a
+         * temporary data store of {@link #DEFAULT_INPUT_METHOD} while a virtual-device-specific
+         * input method is set as default.</p>
          *
-         * @param resolver to access the database with
-         * @param name to store
-         * @param value to associate with the name
-         * @return true if the value was set, false on database errors
+         * <p>This should be considered to be an implementation detail of
+         * {@link com.android.server.inputmethod.InputMethodManagerService}.  Other system
+         * components should never rely on this value.</p>
          *
+         * @see #DEFAULT_INPUT_METHOD
          * @hide
          */
-        @RequiresPermission(Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE)
-        public static boolean putString(ContentResolver resolver, String name,
-                String value, boolean overrideableByRestore) {
-            return putStringForUser(resolver, name, value, /* tag */ null, /* makeDefault */ false,
-                    resolver.getUserId(), overrideableByRestore);
-        }
+        public static final String DEFAULT_DEVICE_INPUT_METHOD = "default_device_input_method";
 
         /**
-         * Store a name/value pair into the database.
-         * @param resolver to access the database with
-         * @param name to store
-         * @param value to associate with the name
-         * @return true if the value was set, false on database errors
+         * Setting to record the input method subtype used by default, holding the ID
+         * of the desired method.
          */
-        public static boolean putString(ContentResolver resolver, String name, String value) {
-            return putStringForUser(resolver, name, value, resolver.getUserId());
-        }
+        @Readable
+        public static final String SELECTED_INPUT_METHOD_SUBTYPE =
+                "selected_input_method_subtype";
 
-        /** @hide */
-        @UnsupportedAppUsage
-        public static boolean putStringForUser(ContentResolver resolver, String name, String value,
-                @CanBeCURRENT @UserIdInt int userId) {
-            return putStringForUser(resolver, name, value, null, false, userId,
-                    DEFAULT_OVERRIDEABLE_BY_RESTORE);
-        }
+        /**
+         * The {@link android.view.inputmethod.InputMethodInfo.InputMethodInfo#getId() ID} of the
+         * default voice input method.
+         * <p>
+         * This stores the last known default voice IME. If the related system config value changes,
+         * this is reset by InputMethodManagerService.
+         * <p>
+         * This IME is not necessarily in the enabled IME list. That state is still stored in
+         * {@link #ENABLED_INPUT_METHODS}.
+         *
+         * @hide
+         */
+        public static final String DEFAULT_VOICE_INPUT_METHOD = "default_voice_input_method";
 
-        /** @hide */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static boolean putStringForUser(@NonNull ContentResolver resolver,
-                @NonNull String name, @Nullable String value, @Nullable String tag,
-                boolean makeDefault, @CanBeCURRENT @UserIdInt int userId,
-                boolean overrideableByRestore) {
-            if (LOCAL_LOGV) {
-                Log.v(TAG, "Secure.putString(name=" + name + ", value=" + value + ") for "
-                        + userId);
-            }
-            if (MOVED_TO_GLOBAL.contains(name)) {
-                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
-                        + " to android.provider.Settings.Global");
-                return Global.putStringForUser(resolver, name, value,
-                        tag, makeDefault, userId, DEFAULT_OVERRIDEABLE_BY_RESTORE);
-            }
-            return sNameValueCache.putStringForUser(resolver, name, value, tag,
-                    makeDefault, userId, overrideableByRestore);
-        }
+        /**
+         * Setting to record the history of input method subtype, holding the pair of ID of IME
+         * and its last used subtype.
+         * @hide
+         */
+        @Readable
+        public static final String INPUT_METHODS_SUBTYPE_HISTORY =
+                "input_methods_subtype_history";
 
         /**
-         * Store a name/value pair into the database.
-         * <p>
-         * The method takes an optional tag to associate with the setting
-         * which can be used to clear only settings made by your package and
-         * associated with this tag by passing the tag to {@link
-         * #resetToDefaults(ContentResolver, String)}. Anyone can override
-         * the current tag. Also if another package changes the setting
-         * then the tag will be set to the one specified in the set call
-         * which can be null. Also any of the settings setters that do not
-         * take a tag as an argument effectively clears the tag.
-         * </p><p>
-         * For example, if you set settings A and B with tags T1 and T2 and
-         * another app changes setting A (potentially to the same value), it
-         * can assign to it a tag T3 (note that now the package that changed
-         * the setting is not yours). Now if you reset your changes for T1 and
-         * T2 only setting B will be reset and A not (as it was changed by
-         * another package) but since A did not change you are in the desired
-         * initial state. Now if the other app changes the value of A (assuming
-         * you registered an observer in the beginning) you would detect that
-         * the setting was changed by another app and handle this appropriately
-         * (ignore, set back to some value, etc).
-         * </p><p>
-         * Also the method takes an argument whether to make the value the
-         * default for this setting. If the system already specified a default
-         * value, then the one passed in here will <strong>not</strong>
-         * be set as the default.
-         * </p>
+         * Setting to record the visibility of input method selector
+         */
+        @Readable
+        public static final String INPUT_METHOD_SELECTOR_VISIBILITY =
+                "input_method_selector_visibility";
+
+        /**
+         * Toggle for enabling stylus handwriting. When enabled, current Input method receives
+         * stylus {@link MotionEvent}s if an {@link Editor} is focused.
          *
-         * @param resolver to access the database with.
-         * @param name to store.
-         * @param value to associate with the name.
-         * @param tag to associate with the setting.
-         * @param makeDefault whether to make the value the default one.
-         * @return true if the value was set, false on database errors.
+         * @see #STYLUS_HANDWRITING_DEFAULT_VALUE
+         * @hide
+         */
+        @TestApi
+        @Readable
+        @SuppressLint("NoSettingsProvider")
+        public static final String STYLUS_HANDWRITING_ENABLED = "stylus_handwriting_enabled";
+
+        /**
+         * Default value for {@link #STYLUS_HANDWRITING_ENABLED}.
          *
-         * @see #resetToDefaults(ContentResolver, String)
+         * @hide
+         */
+        @TestApi
+        @Readable
+        @SuppressLint("NoSettingsProvider")
+        public static final int STYLUS_HANDWRITING_DEFAULT_VALUE = 1;
+
+        /**
+         * The currently selected voice interaction service flattened ComponentName.
+         * @hide
+         */
+        @TestApi
+        @Readable
+        public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";
+
+
+        /**
+         * The currently selected credential service(s) flattened ComponentName.
          *
          * @hide
          */
-        @SystemApi
-        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
-        public static boolean putString(@NonNull ContentResolver resolver,
-                @NonNull String name, @Nullable String value, @Nullable String tag,
-                boolean makeDefault) {
-            return putStringForUser(resolver, name, value, tag, makeDefault,
-                    resolver.getUserId(), DEFAULT_OVERRIDEABLE_BY_RESTORE);
-        }
+        public static final String CREDENTIAL_SERVICE = "credential_service";
 
         /**
-         * Reset the settings to their defaults. This would reset <strong>only</strong>
-         * settings set by the caller's package. Think of it of a way to undo your own
-         * changes to the global settings. Passing in the optional tag will reset only
-         * settings changed by your package and associated with this tag.
+         * The currently selected primary credential service flattened ComponentName.
          *
-         * @param resolver Handle to the content resolver.
-         * @param tag Optional tag which should be associated with the settings to reset.
+         * @hide
+         */
+        public static final String CREDENTIAL_SERVICE_PRIMARY = "credential_service_primary";
+
+        /**
+         * The currently selected autofill service flattened ComponentName.
+         * @hide
+         */
+        @TestApi
+        @Readable
+        public static final String AUTOFILL_SERVICE = "autofill_service";
+
+        /**
+         * Boolean indicating if Autofill supports field classification.
          *
-         * @see #putString(ContentResolver, String, String, String, boolean)
+         * @see android.service.autofill.AutofillService
          *
          * @hide
          */
         @SystemApi
-        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
-        public static void resetToDefaults(@NonNull ContentResolver resolver,
-                @Nullable String tag) {
-            resetToDefaultsAsUser(resolver, tag, RESET_MODE_PACKAGE_DEFAULTS,
-                    resolver.getUserId());
-        }
+        @Readable
+        public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION =
+                "autofill_field_classification";
 
         /**
-         *
-         * Reset the settings to their defaults for a given user with a specific mode. The
-         * optional tag argument is valid only for {@link #RESET_MODE_PACKAGE_DEFAULTS}
-         * allowing resetting the settings made by a package and associated with the tag.
-         *
-         * @param resolver Handle to the content resolver.
-         * @param tag Optional tag which should be associated with the settings to reset.
-         * @param mode The reset mode.
-         * @param userId The user for which to reset to defaults.
-         *
-         * @see #RESET_MODE_PACKAGE_DEFAULTS
-         * @see #RESET_MODE_UNTRUSTED_DEFAULTS
-         * @see #RESET_MODE_UNTRUSTED_CHANGES
-         * @see #RESET_MODE_TRUSTED_DEFAULTS
+         * Boolean indicating if the dark mode dialog shown on first toggle has been seen.
          *
          * @hide
          */
-        public static void resetToDefaultsAsUser(@NonNull ContentResolver resolver,
-                @Nullable String tag, @ResetMode int mode,
-                @IntRange(from = 0) @CannotBeSpecialUser @UserIdInt int userId) {
-            try {
-                Bundle arg = new Bundle();
-                arg.putInt(CALL_METHOD_USER_KEY, userId);
-                if (tag != null) {
-                    arg.putString(CALL_METHOD_TAG_KEY, tag);
-                }
-                arg.putInt(CALL_METHOD_RESET_MODE_KEY, mode);
-                IContentProvider cp = sProviderHolder.getProvider(resolver);
-                if (cp == null) {
-                    Log.w(TAG, "Can't reset to defaults for " + CONTENT_URI
-                        + " because cp is null");
-                    return;
-                }
-                cp.call(resolver.getAttributionSource(),
-                        sProviderHolder.mUri.getAuthority(), CALL_METHOD_RESET_SECURE, null, arg);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Can't reset do defaults for " + CONTENT_URI, e);
-            }
-        }
+        @Readable
+        public static final String DARK_MODE_DIALOG_SEEN =
+                "dark_mode_dialog_seen";
 
         /**
-         * Construct the content URI for a particular name/value pair,
-         * useful for monitoring changes with a ContentObserver.
-         * @param name to look up in the table
-         * @return the corresponding content URI, or null if not present
+         * Custom time when Dark theme is scheduled to activate.
+         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
+         * @hide
          */
-        public static Uri getUriFor(String name) {
-            if (MOVED_TO_GLOBAL.contains(name)) {
-                Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
-                        + " to android.provider.Settings.Global, returning global URI.");
-                return Global.getUriFor(Global.CONTENT_URI, name);
-            }
-            return getUriFor(CONTENT_URI, name);
-        }
+        @Readable
+        public static final String DARK_THEME_CUSTOM_START_TIME =
+                "dark_theme_custom_start_time";
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as an integer.  Note that internally setting values are always
-         * stored as strings; this function converts the string to an integer
-         * for you.  The default value will be returned if the setting is
-         * not defined or not an integer.
-         *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
-         * @param def Value to return if the setting is not defined.
-         *
-         * @return The setting's current value, or 'def' if it is not defined
-         * or not a valid integer.
+         * Custom time when Dark theme is scheduled to deactivate.
+         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
+         * @hide
          */
-        public static int getInt(ContentResolver cr, String name, int def) {
-            return getIntForUser(cr, name, def, cr.getUserId());
-        }
+        @Readable
+        public static final String DARK_THEME_CUSTOM_END_TIME =
+                "dark_theme_custom_end_time";
 
-        /** @hide */
-        @UnsupportedAppUsage
-        public static int getIntForUser(ContentResolver cr, String name, int def,
-                @CanBeCURRENT @UserIdInt int userId) {
-            String v = getStringForUser(cr, name, userId);
-            return parseIntSettingWithDefault(v, def);
-        }
+        /**
+         * Defines value returned by {@link android.service.autofill.UserData#getMaxUserDataSize()}.
+         *
+         * @hide
+         */
+        @SystemApi
+        @Readable
+        public static final String AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE =
+                "autofill_user_data_max_user_data_size";
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as an integer.  Note that internally setting values are always
-         * stored as strings; this function converts the string to an integer
-         * for you.
-         * <p>
-         * This version does not take a default value.  If the setting has not
-         * been set, or the string value is not a number,
-         * it throws {@link SettingNotFoundException}.
+         * Defines value returned by
+         * {@link android.service.autofill.UserData#getMaxFieldClassificationIdsSize()}.
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
+         * @hide
+         */
+        @SystemApi
+        @Readable
+        public static final String AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE =
+                "autofill_user_data_max_field_classification_size";
+
+        /**
+         * Defines value returned by
+         * {@link android.service.autofill.UserData#getMaxCategoryCount()}.
          *
-         * @throws SettingNotFoundException Thrown if a setting by the given
-         * name can't be found or the setting value is not an integer.
+         * @hide
+         */
+        @SystemApi
+        @Readable
+        public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT =
+                "autofill_user_data_max_category_count";
+
+        /**
+         * Defines value returned by {@link android.service.autofill.UserData#getMaxValueLength()}.
          *
-         * @return The setting's current value.
+         * @hide
          */
-        public static int getInt(ContentResolver cr, String name)
-                throws SettingNotFoundException {
-            return getIntForUser(cr, name, cr.getUserId());
-        }
+        @SystemApi
+        @Readable
+        public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH =
+                "autofill_user_data_max_value_length";
 
-        /** @hide */
-        public static int getIntForUser(ContentResolver cr, String name,
-                @CanBeCURRENT @UserIdInt int userId)
-                throws SettingNotFoundException {
-            String v = getStringForUser(cr, name, userId);
-            return parseIntSetting(v, name);
-        }
+        /**
+         * Defines value returned by {@link android.service.autofill.UserData#getMinValueLength()}.
+         *
+         * @hide
+         */
+        @SystemApi
+        @Readable
+        public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH =
+                "autofill_user_data_min_value_length";
 
         /**
-         * Convenience function for updating a single settings value as an
-         * integer. This will either create a new entry in the table if the
-         * given name does not exist, or modify the value of the existing row
-         * with that name.  Note that internally setting values are always
-         * stored as strings, so this function converts the given value to a
-         * string before storing it.
+         * Defines whether Content Capture is enabled for the user.
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to modify.
-         * @param value The new value for the setting.
-         * @return true if the value was set, false on database errors
+         * <p>Type: {@code int} ({@code 0} for disabled, {@code 1} for enabled).
+         * <p>Default: enabled
+         *
+         * @hide
          */
-        public static boolean putInt(ContentResolver cr, String name, int value) {
-            return putIntForUser(cr, name, value, cr.getUserId());
-        }
+        @TestApi
+        @Readable
+        public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";
 
-        /** @hide */
-        @UnsupportedAppUsage
-        public static boolean putIntForUser(ContentResolver cr, String name, int value,
-                @CanBeCURRENT @UserIdInt int userId) {
-            return putStringForUser(cr, name, Integer.toString(value), userId);
-        }
+        /**
+         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead
+         */
+        @Deprecated
+        public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as a {@code long}.  Note that internally setting values are always
-         * stored as strings; this function converts the string to a {@code long}
-         * for you.  The default value will be returned if the setting is
-         * not defined or not a {@code long}.
+         * Indicates whether a DPC has been downloaded during provisioning.
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
-         * @param def Value to return if the setting is not defined.
+         * <p>Type: int (0 for false, 1 for true)
          *
-         * @return The setting's current value, or 'def' if it is not defined
-         * or not a valid {@code long}.
+         * <p>If this is true, then any attempts to begin setup again should result in factory reset
+         *
+         * @hide
          */
-        public static long getLong(ContentResolver cr, String name, long def) {
-            return getLongForUser(cr, name, def, cr.getUserId());
-        }
-
-        /** @hide */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static long getLongForUser(ContentResolver cr, String name, long def,
-                @CanBeCURRENT @UserIdInt int userId) {
-            String v = getStringForUser(cr, name, userId);
-            return parseLongSettingWithDefault(v, def);
-        }
+        @Readable
+        public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
+                "managed_provisioning_dpc_downloaded";
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as a {@code long}.  Note that internally setting values are always
-         * stored as strings; this function converts the string to a {@code long}
-         * for you.
+         * Indicates whether the device is under restricted secure FRP mode.
+         * Secure FRP mode is enabled when the device is under FRP. On solving of FRP challenge,
+         * device is removed from this mode.
          * <p>
-         * This version does not take a default value.  If the setting has not
-         * been set, or the string value is not a number,
-         * it throws {@link SettingNotFoundException}.
-         *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
+         * Type: int (0 for false, 1 for true)
          *
-         * @return The setting's current value.
-         * @throws SettingNotFoundException Thrown if a setting by the given
-         * name can't be found or the setting value is not an integer.
+         * @deprecated Use Global.SECURE_FRP_MODE
          */
-        public static long getLong(ContentResolver cr, String name)
-                throws SettingNotFoundException {
-            return getLongForUser(cr, name, cr.getUserId());
-        }
-
-        /** @hide */
-        public static long getLongForUser(ContentResolver cr, String name,
-                @CanBeCURRENT @UserIdInt int userId)
-                throws SettingNotFoundException {
-            String v = getStringForUser(cr, name, userId);
-            return parseLongSetting(v, name);
-        }
+        @Deprecated
+        @Readable
+        public static final String SECURE_FRP_MODE = "secure_frp_mode";
 
         /**
-         * Convenience function for updating a secure settings value as a long
-         * integer. This will either create a new entry in the table if the
-         * given name does not exist, or modify the value of the existing row
-         * with that name.  Note that internally setting values are always
-         * stored as strings, so this function converts the given value to a
-         * string before storing it.
+         * Indicates whether the current user has completed setup via the setup wizard.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to modify.
-         * @param value The new value for the setting.
-         * @return true if the value was set, false on database errors
+         * @hide
          */
-        public static boolean putLong(ContentResolver cr, String name, long value) {
-            return putLongForUser(cr, name, value, cr.getUserId());
-        }
-
-        /** @hide */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static boolean putLongForUser(ContentResolver cr, String name, long value,
-                @CanBeCURRENT @UserIdInt int userId) {
-            return putStringForUser(cr, name, Long.toString(value), userId);
-        }
+        @SystemApi
+        @Readable
+        public static final String USER_SETUP_COMPLETE = "user_setup_complete";
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as a floating point number.  Note that internally setting values are
-         * always stored as strings; this function converts the string to an
-         * float for you. The default value will be returned if the setting
-         * is not defined or not a valid float.
-         *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
-         * @param def Value to return if the setting is not defined.
+         * Indicates that the user has not started setup personalization.
+         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
          *
-         * @return The setting's current value, or 'def' if it is not defined
-         * or not a valid float.
+         * @hide
          */
-        public static float getFloat(ContentResolver cr, String name, float def) {
-            return getFloatForUser(cr, name, def, cr.getUserId());
-        }
-
-        /** @hide */
-        public static float getFloatForUser(ContentResolver cr, String name, float def,
-                @CanBeCURRENT @UserIdInt int userId) {
-            String v = getStringForUser(cr, name, userId);
-            return parseFloatSettingWithDefault(v, def);
-        }
+        @SystemApi
+        public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0;
 
         /**
-         * Convenience function for retrieving a single secure settings value
-         * as a float.  Note that internally setting values are always
-         * stored as strings; this function converts the string to a float
-         * for you.
-         * <p>
-         * This version does not take a default value.  If the setting has not
-         * been set, or the string value is not a number,
-         * it throws {@link SettingNotFoundException}.
+         * Indicates that the user has not yet completed setup personalization.
+         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to retrieve.
+         * @hide
+         */
+        @SystemApi
+        public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;
+
+        /**
+         * Indicates that the user has snoozed personalization and will complete it later.
+         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
          *
-         * @throws SettingNotFoundException Thrown if a setting by the given
-         * name can't be found or the setting value is not a float.
+         * @hide
+         */
+        @SystemApi
+        public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2;
+
+        /**
+         * Indicates that the user has completed setup personalization.
+         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
          *
-         * @return The setting's current value.
+         * @hide
          */
-        public static float getFloat(ContentResolver cr, String name)
-                throws SettingNotFoundException {
-            return getFloatForUser(cr, name, cr.getUserId());
-        }
+        @SystemApi
+        public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10;
 
         /** @hide */
-        public static float getFloatForUser(ContentResolver cr, String name,
-                @CanBeCURRENT @UserIdInt int userId)
-                throws SettingNotFoundException {
-            String v = getStringForUser(cr, name, userId);
-            return parseFloatSetting(v, name);
-        }
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({
+                USER_SETUP_PERSONALIZATION_NOT_STARTED,
+                USER_SETUP_PERSONALIZATION_STARTED,
+                USER_SETUP_PERSONALIZATION_PAUSED,
+                USER_SETUP_PERSONALIZATION_COMPLETE
+        })
+        public @interface UserSetupPersonalization {}
 
         /**
-         * Convenience function for updating a single settings value as a
-         * floating point number. This will either create a new entry in the
-         * table if the given name does not exist, or modify the value of the
-         * existing row with that name.  Note that internally setting values
-         * are always stored as strings, so this function converts the given
-         * value to a string before storing it.
+         * Defines the user's current state of device personalization.
+         * The possible states are defined in {@link UserSetupPersonalization}.
          *
-         * @param cr The ContentResolver to access.
-         * @param name The name of the setting to modify.
-         * @param value The new value for the setting.
-         * @return true if the value was set, false on database errors
+         * @hide
          */
-        public static boolean putFloat(ContentResolver cr, String name, float value) {
-            return putFloatForUser(cr, name, value, cr.getUserId());
-        }
+        @SystemApi
+        @Readable
+        public static final String USER_SETUP_PERSONALIZATION_STATE =
+                "user_setup_personalization_state";
 
-        /** @hide */
-        public static boolean putFloatForUser(ContentResolver cr, String name, float value,
-                @CanBeCURRENT @UserIdInt int userId) {
-            return putStringForUser(cr, name, Float.toString(value), userId);
-        }
+        /**
+         * Whether the current user has been set up via setup wizard (0 = false, 1 = true)
+         * This value differs from USER_SETUP_COMPLETE in that it can be reset back to 0
+         * in case SetupWizard has been re-enabled on TV devices.
+         *
+         * @hide
+         */
+        @Readable
+        public static final String TV_USER_SETUP_COMPLETE = "tv_user_setup_complete";
 
         /**
-         * Control whether to enable adaptive sleep mode.
+         * The prefix for a category name that indicates whether a suggested action from that
+         * category was marked as completed.
+         * <p>
+         * Type: int (0 for false, 1 for true)
+         *
          * @hide
          */
+        @SystemApi
         @Readable
-        public static final String ADAPTIVE_SLEEP = "adaptive_sleep";
+        public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
 
         /**
-         * Setting key to indicate whether camera-based autorotate is enabled.
+         * Whether or not compress blocks should be released on install.
+         * <p>The setting only determines if the platform will attempt to release
+         * compress blocks; it does not guarantee that the files will have their
+         * compress blocks released. Compression is currently only supported on
+         * some f2fs filesystems.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        public static final String CAMERA_AUTOROTATE = "camera_autorotate";
+        public static final String RELEASE_COMPRESS_BLOCKS_ON_INSTALL =
+                "release_compress_blocks_on_install";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#DEVELOPMENT_SETTINGS_ENABLED}
-         * instead
+         * List of input methods that are currently enabled.  This is a string
+         * containing the IDs of all enabled input methods, each ID separated
+         * by ':'.
+         *
+         * Format like "ime0;subtype0;subtype1;subtype2:ime1:ime2;subtype0"
+         * where imeId is ComponentName and subtype is int32.
+         *
+         * <p>Note: This setting is not readable to the app targeting API level 34 or higher. use
+         * {@link android.view.inputmethod.InputMethodManager#getEnabledInputMethodList()} instead.
          */
-        @Deprecated
-        public static final String DEVELOPMENT_SETTINGS_ENABLED =
-                Global.DEVELOPMENT_SETTINGS_ENABLED;
+        @Readable(maxTargetSdk = Build.VERSION_CODES.TIRAMISU)
+        public static final String ENABLED_INPUT_METHODS = "enabled_input_methods";
 
         /**
-         * When the user has enable the option to have a "bug report" command
-         * in the power menu.
+         * List of system input methods that are currently disabled.  This is a string
+         * containing the IDs of all disabled input methods, each ID separated
+         * by ':'.
          * @hide
          */
-        @Readable
-        public static final String BUGREPORT_IN_POWER_MENU = "bugreport_in_power_menu";
+        @Readable(maxTargetSdk = Build.VERSION_CODES.TIRAMISU)
+        public static final String DISABLED_SYSTEM_INPUT_METHODS = "disabled_system_input_methods";
 
         /**
-         * The package name for the custom bugreport handler app. This app must be bugreport
-         * allow-listed. This is currently used only by Power Menu short press.
+         * Whether to show the IME when a hard keyboard is connected. This is a boolean that
+         * determines if the IME should be shown when a hard keyboard is attached.
          * @hide
          */
-        public static final String CUSTOM_BUGREPORT_HANDLER_APP = "custom_bugreport_handler_app";
+        @TestApi
+        @Readable
+        @SuppressLint("NoSettingsProvider")
+        public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";
 
         /**
-         * The user id for the custom bugreport handler app. This is currently used only by Power
-         * Menu short press.
+         * Whether to enable bounce keys for Physical Keyboard accessibility.
+         *
+         * If set to non-zero value, any key press on physical keyboard within the provided
+         * threshold duration (in milliseconds) of the same key, will be ignored.
+         *
          * @hide
          */
-        public static final String CUSTOM_BUGREPORT_HANDLER_USER = "custom_bugreport_handler_user";
+        @Readable
+        public static final String ACCESSIBILITY_BOUNCE_KEYS = "accessibility_bounce_keys";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#ADB_ENABLED} instead
+         * Whether to enable slow keys for Physical Keyboard accessibility.
+         *
+         * If set to non-zero value, any key press on physical keyboard needs to be pressed and
+         * held for the provided threshold duration (in milliseconds) to be registered in the
+         * system.
+         *
+         * @hide
          */
-        @Deprecated
-        public static final String ADB_ENABLED = Global.ADB_ENABLED;
+        @Readable
+        public static final String ACCESSIBILITY_SLOW_KEYS = "accessibility_slow_keys";
 
         /**
-         * Setting to allow mock locations and location provider status to be injected into the
-         * LocationManager service for testing purposes during application development.  These
-         * locations and status values  override actual location and status information generated
-         * by network, gps, or other location providers.
+         * Whether to enable sticky keys for Physical Keyboard accessibility.
          *
-         * @deprecated This settings is not used anymore.
+         * This is a boolean value that determines if Sticky keys feature is enabled.
+         *
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String ALLOW_MOCK_LOCATION = "mock_location";
+        public static final String ACCESSIBILITY_STICKY_KEYS = "accessibility_sticky_keys";
 
         /**
-         * This is used by Bluetooth Manager to store adapter name
+         * Whether stylus button presses are disabled. This is a boolean that
+         * determines if stylus buttons are ignored.
+         *
          * @hide
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
-        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+        @TestApi
+        @Readable
         @SuppressLint("NoSettingsProvider")
-        public static final String BLUETOOTH_NAME = "bluetooth_name";
+        public static final String STYLUS_BUTTONS_ENABLED = "stylus_buttons_enabled";
 
         /**
-         * This is used by Bluetooth Manager to store adapter address
+         * Preferred default user profile to use with the notes task button shortcut.
+         *
          * @hide
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
-        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
         @SuppressLint("NoSettingsProvider")
-        public static final String BLUETOOTH_ADDRESS = "bluetooth_address";
+        public static final String DEFAULT_NOTE_TASK_PROFILE = "default_note_task_profile";
 
         /**
-         * This is used by Bluetooth Manager to store whether adapter address is valid
-         * @hide
+         * Host name and port for global http proxy. Uses ':' seperator for
+         * between host and port.
+         *
+         * @deprecated Use {@link Global#HTTP_PROXY}
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
-        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-        @SuppressLint("NoSettingsProvider")
-        public static final String BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid";
+        @Deprecated
+        public static final String HTTP_PROXY = Global.HTTP_PROXY;
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to store the broadcast program info.
+         * Package designated as always-on VPN provider.
+         *
          * @hide
          */
-        public static final String BLUETOOTH_LE_BROADCAST_PROGRAM_INFO =
-                "bluetooth_le_broadcast_program_info";
+        public static final String ALWAYS_ON_VPN_APP = "always_on_vpn_app";
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to store the broadcast name.
+         * Whether to block networking outside of VPN connections while always-on is set.
+         * @see #ALWAYS_ON_VPN_APP
+         *
          * @hide
          */
-        public static final String BLUETOOTH_LE_BROADCAST_NAME = "bluetooth_le_broadcast_name";
+        @Readable
+        public static final String ALWAYS_ON_VPN_LOCKDOWN = "always_on_vpn_lockdown";
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to store the broadcast code.
+         * Comma separated list of packages that are allowed to access the network when VPN is in
+         * lockdown mode but not running.
+         * @see #ALWAYS_ON_VPN_LOCKDOWN
+         *
          * @hide
          */
-        public static final String BLUETOOTH_LE_BROADCAST_CODE = "bluetooth_le_broadcast_code";
+        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
+        public static final String ALWAYS_ON_VPN_LOCKDOWN_WHITELIST =
+                "always_on_vpn_lockdown_whitelist";
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to store the app source name.
-         * @hide
+         * Whether applications can be installed for this user via the system's
+         * {@link Intent#ACTION_INSTALL_PACKAGE} mechanism.
+         *
+         * <p>1 = permit app installation via the system package installer intent
+         * <p>0 = do not allow use of the package installer
+         * @deprecated Starting from {@link android.os.Build.VERSION_CODES#O}, apps should use
+         * {@link PackageManager#canRequestPackageInstalls()}
+         * @see PackageManager#canRequestPackageInstalls()
          */
-        public static final String BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME =
-                "bluetooth_le_broadcast_app_source_name";
+        @Deprecated
+        @Readable
+        public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to downgrade the broadcast quality to improve
-         * compatibility.
-         *
-         * <ul>
-         *   <li>0 = false
-         *   <li>1 = true
-         * </ul>
+         * A flag to tell {@link com.android.server.devicepolicy.DevicePolicyManagerService} that
+         * the default for {@link #INSTALL_NON_MARKET_APPS} is reversed for this user on OTA. So it
+         * can set the restriction {@link android.os.UserManager#DISALLOW_INSTALL_UNKNOWN_SOURCES}
+         * on behalf of the profile owner if needed to make the change transparent for profile
+         * owners.
          *
          * @hide
          */
-        public static final String BLUETOOTH_LE_BROADCAST_IMPROVE_COMPATIBILITY =
-                "bluetooth_le_broadcast_improve_compatibility";
+        @Readable
+        public static final String UNKNOWN_SOURCES_DEFAULT_REVERSED =
+                "unknown_sources_default_reversed";
 
         /**
-         * This is used by LocalBluetoothLeBroadcast to store the fallback active device address.
+         * Comma-separated list of location providers that are enabled. Do not rely on this value
+         * being present or correct, or on ContentObserver notifications on the corresponding Uri.
          *
-         * @hide
+         * @deprecated This setting no longer exists from Android S onwards as it no longer is
+         * capable of realistically reflecting location settings. Use {@link
+         * LocationManager#isProviderEnabled(String)} or {@link LocationManager#isLocationEnabled()}
+         * instead.
          */
-        public static final String BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS =
-                "bluetooth_le_broadcast_fallback_active_device_address";
+        @Deprecated
+        @Readable
+        public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
 
         /**
-         * Ringtone routing value for hearing aid. It routes ringtone to hearing aid or device
-         * speaker.
-         * <ul>
-         *     <li> 0 = Default
-         *     <li> 1 = Route to hearing aid
-         *     <li> 2 = Route to device speaker
-         * </ul>
-         * @hide
+         * The current location mode of the device. Do not rely on this value being present or on
+         * ContentObserver notifications on the corresponding Uri.
+         *
+         * @deprecated The preferred methods for checking location mode and listening for changes
+         * are via {@link LocationManager#isLocationEnabled()} and
+         * {@link LocationManager#MODE_CHANGED_ACTION}.
          */
-        public static final String HEARING_AID_RINGTONE_ROUTING =
-                "hearing_aid_ringtone_routing";
+        @Deprecated
+        @Readable
+        public static final String LOCATION_MODE = "location_mode";
 
         /**
-         * Phone call routing value for hearing aid. It routes phone call to hearing aid or
-         * device speaker.
-         * <ul>
-         *     <li> 0 = Default
-         *     <li> 1 = Route to hearing aid
-         *     <li> 2 = Route to device speaker
-         * </ul>
+         * The App or module that changes the location mode.
          * @hide
          */
-        public static final String HEARING_AID_CALL_ROUTING =
-                "hearing_aid_call_routing";
+        @Readable
+        public static final String LOCATION_CHANGER = "location_changer";
 
         /**
-         * Media routing value for hearing aid. It routes media to hearing aid or device
-         * speaker.
-         * <ul>
-         *     <li> 0 = Default
-         *     <li> 1 = Route to hearing aid
-         *     <li> 2 = Route to device speaker
-         * </ul>
+         * The location changer is unknown or unable to detect.
          * @hide
          */
-        public static final String HEARING_AID_MEDIA_ROUTING =
-                "hearing_aid_media_routing";
+        public static final int LOCATION_CHANGER_UNKNOWN = 0;
 
         /**
-         * Notification routing value for hearing aid. It routes notification sounds to hearing aid
-         * or device speaker.
-         * <ul>
-         *     <li> 0 = Default
-         *     <li> 1 = Route to hearing aid
-         *     <li> 2 = Route to device speaker
-         * </ul>
+         * Location settings in system settings.
          * @hide
          */
-        public static final String HEARING_AID_NOTIFICATION_ROUTING =
-                "hearing_aid_notification_routing";
+        public static final int LOCATION_CHANGER_SYSTEM_SETTINGS = 1;
 
         /**
-         * Setting to indicate that on device captions are enabled.
-         *
+         * The location icon in drop down notification drawer.
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";
-
+        public static final int LOCATION_CHANGER_QUICK_SETTINGS = 2;
 
         /**
-         * Setting to indicate live caption button show or hide in the volume
-         * rocker.
-         *
-         * @hide
+         * Location mode is off.
          */
-        public static final String ODI_CAPTIONS_VOLUME_UI_ENABLED =
-                "odi_captions_volume_ui_enabled";
+        public static final int LOCATION_MODE_OFF = 0;
 
         /**
-         * On Android 8.0 (API level 26) and higher versions of the platform,
-         * a 64-bit number (expressed as a hexadecimal string), unique to
-         * each combination of app-signing key, user, and device.
-         * Values of {@code ANDROID_ID} are scoped by signing key and user.
-         * The value may change if a factory reset is performed on the
-         * device or if an APK signing key changes.
-         *
-         * For more information about how the platform handles {@code ANDROID_ID}
-         * in Android 8.0 (API level 26) and higher, see <a
-         * href="{@docRoot}about/versions/oreo/android-8.0-changes.html#privacy-all">
-         * Android 8.0 Behavior Changes</a>.
-         *
-         * <p class="note"><strong>Note:</strong> For apps that were installed
-         * prior to updating the device to a version of Android 8.0
-         * (API level 26) or higher, the value of {@code ANDROID_ID} changes
-         * if the app is uninstalled and then reinstalled after the OTA.
-         * To preserve values across uninstalls after an OTA to Android 8.0
-         * or higher, developers can use
-         * <a href="{@docRoot}guide/topics/data/keyvaluebackup.html">
-         * Key/Value Backup</a>.</p>
-         *
-         * <p>In versions of the platform lower than Android 8.0 (API level 26),
-         * a 64-bit number (expressed as a hexadecimal string) that is randomly
-         * generated when the user first sets up the device and should remain
-         * constant for the lifetime of the user's device.
-         *
-         * On devices that have
-         * <a href="{@docRoot}about/versions/android-4.2.html#MultipleUsers">
-         * multiple users</a>, each user appears as a
-         * completely separate device, so the {@code ANDROID_ID} value is
-         * unique to each user.</p>
+         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
+         * on.
          *
-         * <p class="note"><strong>Note:</strong> If the caller is an Instant App the ID is scoped
-         * to the Instant App, it is generated when the Instant App is first installed and reset if
-         * the user clears the Instant App.
+         * @deprecated See {@link #LOCATION_MODE}.
          */
-        @Readable
-        public static final String ANDROID_ID = "android_id";
+        @Deprecated
+        public static final int LOCATION_MODE_SENSORS_ONLY = 1;
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#BLUETOOTH_ON} instead
+         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
+         * on.
+         *
+         * @deprecated See {@link #LOCATION_MODE}.
          */
         @Deprecated
-        public static final String BLUETOOTH_ON = Global.BLUETOOTH_ON;
+        public static final int LOCATION_MODE_BATTERY_SAVING = 2;
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#DATA_ROAMING} instead
+         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
+         * on.
+         *
+         * @deprecated See {@link #LOCATION_MODE}.
          */
         @Deprecated
-        public static final String DATA_ROAMING = Global.DATA_ROAMING;
+        public static final int LOCATION_MODE_HIGH_ACCURACY = 3;
 
         /**
-         * Stores {@link android.view.inputmethod.InputMethodInfo#getId()} of the input method
-         * service that is currently selected.
-         *
-         * <p>Although the name {@link #DEFAULT_INPUT_METHOD} implies that there is a concept of
-         * <i>default</i> input method, in reality this setting is no more or less than the
-         * <strong>currently selected</strong> input method. This setting can be updated at any
-         * time as a result of user-initiated and system-initiated input method switching.</p>
+         * Location mode is on.
          *
-         * <p>Use {@link ComponentName#unflattenFromString(String)} to parse the stored value.</p>
+         * @hide
          */
-        @Readable
-        public static final String DEFAULT_INPUT_METHOD = "default_input_method";
+        @SystemApi
+        public static final int LOCATION_MODE_ON = LOCATION_MODE_HIGH_ACCURACY;
 
         /**
-         * Used only by {@link com.android.server.inputmethod.InputMethodManagerService} as a
-         * temporary data store of {@link #DEFAULT_INPUT_METHOD} while a virtual-device-specific
-         * input method is set as default.</p>
+         * The current location time zone detection enabled state for the user.
          *
-         * <p>This should be considered to be an implementation detail of
-         * {@link com.android.server.inputmethod.InputMethodManagerService}.  Other system
-         * components should never rely on this value.</p>
+         * See {@link android.app.time.TimeManager#getTimeZoneCapabilitiesAndConfig} for access.
+         * See {@link android.app.time.TimeManager#updateTimeZoneConfiguration} to update.
+         * @hide
+         */
+        public static final String LOCATION_TIME_ZONE_DETECTION_ENABLED =
+                "location_time_zone_detection_enabled";
+
+        /**
+         * The accuracy in meters used for coarsening location for clients with only the coarse
+         * location permission.
          *
-         * @see #DEFAULT_INPUT_METHOD
          * @hide
          */
-        public static final String DEFAULT_DEVICE_INPUT_METHOD = "default_device_input_method";
+        @Readable
+        public static final String LOCATION_COARSE_ACCURACY_M = "locationCoarseAccuracy";
 
         /**
-         * Setting to record the input method subtype used by default, holding the ID
-         * of the desired method.
+         * Whether or not to show display system location accesses.
+         * @hide
          */
-        @Readable
-        public static final String SELECTED_INPUT_METHOD_SUBTYPE =
-                "selected_input_method_subtype";
+        public static final String LOCATION_SHOW_SYSTEM_OPS = "locationShowSystemOps";
 
         /**
-         * The {@link android.view.inputmethod.InputMethodInfo.InputMethodInfo#getId() ID} of the
-         * default voice input method.
-         * <p>
-         * This stores the last known default voice IME. If the related system config value changes,
-         * this is reset by InputMethodManagerService.
-         * <p>
-         * This IME is not necessarily in the enabled IME list. That state is still stored in
-         * {@link #ENABLED_INPUT_METHODS}.
-         *
+         * A flag containing settings used for biometric weak
          * @hide
          */
-        public static final String DEFAULT_VOICE_INPUT_METHOD = "default_voice_input_method";
+        @Deprecated
+        @Readable
+        public static final String LOCK_BIOMETRIC_WEAK_FLAGS =
+                "lock_biometric_weak_flags";
 
         /**
-         * Setting to record the history of input method subtype, holding the pair of ID of IME
-         * and its last used subtype.
+         * Whether lock-to-app will lock the keyguard when exiting.
          * @hide
          */
         @Readable
-        public static final String INPUT_METHODS_SUBTYPE_HISTORY =
-                "input_methods_subtype_history";
+        public static final String LOCK_TO_APP_EXIT_LOCKED = "lock_to_app_exit_locked";
 
         /**
-         * Setting to record the visibility of input method selector
+         * Whether autolock is enabled (0 = false, 1 = true)
+         *
+         * @deprecated Use {@link android.app.KeyguardManager} to determine the state and security
+         *             level of the keyguard. Accessing this setting from an app that is targeting
+         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
          */
+        @Deprecated
         @Readable
-        public static final String INPUT_METHOD_SELECTOR_VISIBILITY =
-                "input_method_selector_visibility";
+        public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
 
         /**
-         * Toggle for enabling stylus handwriting. When enabled, current Input method receives
-         * stylus {@link MotionEvent}s if an {@link Editor} is focused.
+         * Whether lock pattern is visible as user enters (0 = false, 1 = true)
          *
-         * @see #STYLUS_HANDWRITING_DEFAULT_VALUE
-         * @hide
+         * @deprecated Accessing this setting from an app that is targeting
+         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
          */
-        @TestApi
+        @Deprecated
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String STYLUS_HANDWRITING_ENABLED = "stylus_handwriting_enabled";
+        public static final String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
 
         /**
-         * Default value for {@link #STYLUS_HANDWRITING_ENABLED}.
+         * Whether lock pattern will vibrate as user enters (0 = false, 1 =
+         * true)
          *
-         * @hide
+         * @deprecated Starting in {@link VERSION_CODES#JELLY_BEAN_MR1} the
+         *             lockscreen uses
+         *             {@link Settings.System#HAPTIC_FEEDBACK_ENABLED}.
+         *             Accessing this setting from an app that is targeting
+         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
          */
-        @TestApi
+        @Deprecated
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final int STYLUS_HANDWRITING_DEFAULT_VALUE = 1;
+        public static final String
+                LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
 
         /**
-         * The currently selected voice interaction service flattened ComponentName.
+         * Determines the width and height of the LockPatternView widget
          * @hide
          */
-        @TestApi
-        @Readable
-        public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";
+        public static final String LOCK_PATTERN_SIZE = "lock_pattern_size";
 
+        /**
+         * Whether lock pattern will show dots (0 = false, 1 = true)
+         * @hide
+         */
+        public static final String LOCK_DOTS_VISIBLE = "lock_pattern_dotsvisible";
 
         /**
-         * The currently selected credential service(s) flattened ComponentName.
-         *
+         * Whether lockscreen error pattern is visible (0 = false, 1 = true)
          * @hide
          */
-        public static final String CREDENTIAL_SERVICE = "credential_service";
+        public static final String LOCK_SHOW_ERROR_PATH = "lock_pattern_show_error_path";
 
         /**
-         * The currently selected primary credential service flattened ComponentName.
-         *
+         * This preference allows the device to be locked given time after screen goes off,
+         * subject to current DeviceAdmin policy limits.
          * @hide
          */
-        public static final String CREDENTIAL_SERVICE_PRIMARY = "credential_service_primary";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @Readable
+        public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout";
 
         /**
-         * The currently selected autofill service flattened ComponentName.
+         * Whether to show the charging info on the lockscreen while charging
          * @hide
          */
-        @TestApi
+        public static final String LOCKSCREEN_BATTERY_INFO = "lockscreen_charging_info";
+
+        /**
+         * Whether to show the detailed charging info on the lockscreen while charging
+         * @hide
+         */
+        public static final String LOCKSCREEN_CHARGING_INFO_DETAILS = "lockscreen_charging_info_details";
+
+        /**
+         * This preference contains the string that shows for owner info on LockScreen.
+         * @hide
+         * @deprecated
+         */
+        @Deprecated
         @Readable
-        public static final String AUTOFILL_SERVICE = "autofill_service";
+        public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info";
 
         /**
-         * Boolean indicating if Autofill supports field classification.
-         *
-         * @see android.service.autofill.AutofillService
-         *
+         * Ids of the user-selected appwidgets on the lockscreen (comma-delimited).
          * @hide
          */
-        @SystemApi
+        @Deprecated
         @Readable
-        public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION =
-                "autofill_field_classification";
+        public static final String LOCK_SCREEN_APPWIDGET_IDS =
+            "lock_screen_appwidget_ids";
 
         /**
-         * Boolean indicating if the dark mode dialog shown on first toggle has been seen.
-         *
+         * Id of the appwidget shown on the lock screen when appwidgets are disabled.
          * @hide
          */
+        @Deprecated
         @Readable
-        public static final String DARK_MODE_DIALOG_SEEN =
-                "dark_mode_dialog_seen";
+        public static final String LOCK_SCREEN_FALLBACK_APPWIDGET_ID =
+            "lock_screen_fallback_appwidget_id";
 
         /**
-         * Custom time when Dark theme is scheduled to activate.
-         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
+         * Index of the lockscreen appwidget to restore, -1 if none.
          * @hide
          */
+        @Deprecated
         @Readable
-        public static final String DARK_THEME_CUSTOM_START_TIME =
-                "dark_theme_custom_start_time";
+        public static final String LOCK_SCREEN_STICKY_APPWIDGET =
+            "lock_screen_sticky_appwidget";
 
         /**
-         * Custom time when Dark theme is scheduled to deactivate.
-         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
+         * This preference enables showing the owner info on LockScreen.
          * @hide
+         * @deprecated
          */
+        @Deprecated
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String DARK_THEME_CUSTOM_END_TIME =
-                "dark_theme_custom_end_time";
+        public static final String LOCK_SCREEN_OWNER_INFO_ENABLED =
+            "lock_screen_owner_info_enabled";
 
         /**
-         * Defines value returned by {@link android.service.autofill.UserData#getMaxUserDataSize()}.
+         * Indicates whether the user has allowed notifications to be shown atop a securely locked
+         * screen in their full "private" form (same as when the device is unlocked).
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
         @SystemApi
         @Readable
-        public static final String AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE =
-                "autofill_user_data_max_user_data_size";
+        public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS =
+                "lock_screen_allow_private_notifications";
 
         /**
-         * Defines value returned by
-         * {@link android.service.autofill.UserData#getMaxFieldClassificationIdsSize()}.
-         *
+         * When set by a user, allows notification remote input atop a securely locked screen
+         * without having to unlock
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE =
-                "autofill_user_data_max_field_classification_size";
+        public static final String LOCK_SCREEN_ALLOW_REMOTE_INPUT =
+                "lock_screen_allow_remote_input";
 
         /**
-         * Defines value returned by
-         * {@link android.service.autofill.UserData#getMaxCategoryCount()}.
-         *
+         * Indicates which clock face to show on lock screen and AOD formatted as a serialized
+         * {@link org.json.JSONObject} with the format:
+         *     {"clock": id, "_applied_timestamp": timestamp}
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT =
-                "autofill_user_data_max_category_count";
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_FACE = "lock_screen_custom_clock_face";
 
         /**
-         * Defines value returned by {@link android.service.autofill.UserData#getMaxValueLength()}.
-         *
+         * Indicates which clock face to show on lock screen and AOD while docked.
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH =
-                "autofill_user_data_max_value_length";
+        public static final String DOCKED_CLOCK_FACE = "docked_clock_face";
 
         /**
-         * Defines value returned by {@link android.service.autofill.UserData#getMinValueLength()}.
+         * Setting to indicate that content filters should be enabled on web browsers.
+         *
+         * <ul>
+         *   <li> non-positive (less or equal to 0) = Allow all sites
+         *   <li> positive (greater than 0) = Try to block explicit sites
+         * </ul>
          *
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH =
-                "autofill_user_data_min_value_length";
+        public static final String BROWSER_CONTENT_FILTERS_ENABLED =
+                "browser_content_filters_enabled";
 
         /**
-         * Defines whether Content Capture is enabled for the user.
+         * Setting to indicate that content filters should be enabled in web search engines.
          *
-         * <p>Type: {@code int} ({@code 0} for disabled, {@code 1} for enabled).
-         * <p>Default: enabled
+         * <ul>
+         *   <li> non-positive (less or equal to 0) = Off
+         *   <li> positive (greater than 0) = Filter
+         * </ul>
          *
          * @hide
          */
-        @TestApi
         @Readable
-        public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";
+        public static final String SEARCH_CONTENT_FILTERS_ENABLED =
+                "search_content_filters_enabled";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead
+         * Setting to indicate that themes should be enabled in related app.
+         *
+         * <ul>
+         *   <li>0 = Off
+         *   <li>1 = Enable themes
+         * </ul>
+         *
+         * @hide
          */
-        @Deprecated
-        public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;
+        public static final String PACK_THEME_FEATURE_ENABLED =
+                "pack_theme_feature_enabled";
 
         /**
-         * Indicates whether a DPC has been downloaded during provisioning.
-         *
-         * <p>Type: int (0 for false, 1 for true)
+         * Setting to indicate that suggested themes feature should be enabled in related app.
          *
-         * <p>If this is true, then any attempts to begin setup again should result in factory reset
+         * <ul>
+         *   <li>0 = Off
+         *   <li>1 = Enable suggested themes
+         * </ul>
          *
          * @hide
          */
-        @Readable
-        public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
-                "managed_provisioning_dpc_downloaded";
+        public static final String SUGGESTED_THEME_FEATURE_ENABLED =
+                "suggested_theme_feature_enabled";
 
         /**
-         * Indicates whether the device is under restricted secure FRP mode.
-         * Secure FRP mode is enabled when the device is under FRP. On solving of FRP challenge,
-         * device is removed from this mode.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
-         * @deprecated Use Global.SECURE_FRP_MODE
+         * String property which is a comma separated list of package names. These package names
+         * will be added to the existing agent allowlist. Since this contains package names, it must
+         * NOT be marked @Readable.
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String SECURE_FRP_MODE = "secure_frp_mode";
+        public static final String APP_FUNCTION_ADDITIONAL_AGENT_ALLOWLIST =
+                "app_function_additional_agent_allowlist";
 
         /**
-         * Indicates whether the current user has completed setup via the setup wizard.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Set by the system to track if the user needs to see the call to action for
+         * the lockscreen notification policy.
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String USER_SETUP_COMPLETE = "user_setup_complete";
+        public static final String SHOW_NOTE_ABOUT_NOTIFICATION_HIDING =
+                "show_note_about_notification_hiding";
 
         /**
-         * Indicates that the user has not started setup personalization.
-         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
-         *
+         * Set to 1 by the system after trust agents have been initialized.
          * @hide
          */
-        @SystemApi
-        public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0;
+        @Readable
+        public static final String TRUST_AGENTS_INITIALIZED =
+                "trust_agents_initialized";
 
         /**
-         * Indicates that the user has not yet completed setup personalization.
-         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
-         *
+         * Set to 1 by the system after the list of known trust agents have been initialized.
          * @hide
          */
-        @SystemApi
-        public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;
+        public static final String KNOWN_TRUST_AGENTS_INITIALIZED =
+                "known_trust_agents_initialized";
 
         /**
-         * Indicates that the user has snoozed personalization and will complete it later.
-         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
-         *
-         * @hide
+         * The Logging ID (a unique 64-bit value) as a hex string.
+         * Used as a pseudonymous identifier for logging.
+         * @deprecated This identifier is poorly initialized and has
+         * many collisions.  It should not be used.
          */
-        @SystemApi
-        public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2;
+        @Deprecated
+        @Readable
+        public static final String LOGGING_ID = "logging_id";
 
         /**
-         * Indicates that the user has completed setup personalization.
-         * One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.
-         *
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#NETWORK_PREFERENCE} instead
          */
-        @SystemApi
-        public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10;
-
-        /** @hide */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef({
-                USER_SETUP_PERSONALIZATION_NOT_STARTED,
-                USER_SETUP_PERSONALIZATION_STARTED,
-                USER_SETUP_PERSONALIZATION_PAUSED,
-                USER_SETUP_PERSONALIZATION_COMPLETE
-        })
-        public @interface UserSetupPersonalization {}
+        @Deprecated
+        public static final String NETWORK_PREFERENCE = Global.NETWORK_PREFERENCE;
 
         /**
-         * Defines the user's current state of device personalization.
-         * The possible states are defined in {@link UserSetupPersonalization}.
-         *
-         * @hide
+         * No longer supported.
          */
-        @SystemApi
         @Readable
-        public static final String USER_SETUP_PERSONALIZATION_STATE =
-                "user_setup_personalization_state";
+        public static final String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
 
         /**
-         * Whether the current user has been set up via setup wizard (0 = false, 1 = true)
-         * This value differs from USER_SETUP_COMPLETE in that it can be reset back to 0
-         * in case SetupWizard has been re-enabled on TV devices.
-         *
-         * @hide
+         * No longer supported.
          */
         @Readable
-        public static final String TV_USER_SETUP_COMPLETE = "tv_user_setup_complete";
+        public static final String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
 
         /**
-         * The prefix for a category name that indicates whether a suggested action from that
-         * category was marked as completed.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
-         * @hide
+         * No longer supported.
          */
-        @SystemApi
         @Readable
-        public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
+        public static final String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";
 
         /**
-         * Whether or not compress blocks should be released on install.
-         * <p>The setting only determines if the platform will attempt to release
-         * compress blocks; it does not guarantee that the files will have their
-         * compress blocks released. Compression is currently only supported on
-         * some f2fs filesystems.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
-         * @hide
+         * Settings classname to launch when Settings is clicked from All
+         * Applications.  Needed because of user testing between the old
+         * and new Settings apps.
          */
-        public static final String RELEASE_COMPRESS_BLOCKS_ON_INSTALL =
-                "release_compress_blocks_on_install";
+        // TODO: 881807
+        @Readable
+        public static final String SETTINGS_CLASSNAME = "settings_classname";
 
         /**
-         * List of input methods that are currently enabled.  This is a string
-         * containing the IDs of all enabled input methods, each ID separated
-         * by ':'.
-         *
-         * Format like "ime0;subtype0;subtype1;subtype2:ime1:ime2;subtype0"
-         * where imeId is ComponentName and subtype is int32.
-         *
-         * <p>Note: This setting is not readable to the app targeting API level 34 or higher. use
-         * {@link android.view.inputmethod.InputMethodManager#getEnabledInputMethodList()} instead.
+         * @deprecated Use {@link android.provider.Settings.Global#USB_MASS_STORAGE_ENABLED} instead
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.TIRAMISU)
-        public static final String ENABLED_INPUT_METHODS = "enabled_input_methods";
+        @Deprecated
+        public static final String USB_MASS_STORAGE_ENABLED = Global.USB_MASS_STORAGE_ENABLED;
 
         /**
-         * List of system input methods that are currently disabled.  This is a string
-         * containing the IDs of all disabled input methods, each ID separated
-         * by ':'.
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#USE_GOOGLE_MAIL} instead
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.TIRAMISU)
-        public static final String DISABLED_SYSTEM_INPUT_METHODS = "disabled_system_input_methods";
+        @Deprecated
+        public static final String USE_GOOGLE_MAIL = Global.USE_GOOGLE_MAIL;
 
         /**
-         * Whether to show the IME when a hard keyboard is connected. This is a boolean that
-         * determines if the IME should be shown when a hard keyboard is attached.
-         * @hide
+         * If accessibility is enabled.
          */
-        @TestApi
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";
+        public static final String ACCESSIBILITY_ENABLED = "accessibility_enabled";
 
         /**
-         * Whether to enable bounce keys for Physical Keyboard accessibility.
-         *
-         * If set to non-zero value, any key press on physical keyboard within the provided
-         * threshold duration (in milliseconds) of the same key, will be ignored.
-         *
+         * Whether select sound track with audio description by default.
          * @hide
          */
-        @Readable
-        public static final String ACCESSIBILITY_BOUNCE_KEYS = "accessibility_bounce_keys";
+        public static final String ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT =
+                "enabled_accessibility_audio_description_by_default";
 
         /**
-         * Whether to enable slow keys for Physical Keyboard accessibility.
-         *
-         * If set to non-zero value, any key press on physical keyboard needs to be pressed and
-         * held for the provided threshold duration (in milliseconds) to be registered in the
-         * system.
-         *
+         * Setting specifying if the accessibility shortcut is enabled.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_SLOW_KEYS = "accessibility_slow_keys";
+        public static final String ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN =
+                "accessibility_shortcut_on_lock_screen";
 
         /**
-         * Whether to enable sticky keys for Physical Keyboard accessibility.
-         *
-         * This is a boolean value that determines if Sticky keys feature is enabled.
-         *
+         * Setting specifying if the accessibility shortcut dialog has been shown to this user.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_STICKY_KEYS = "accessibility_sticky_keys";
+        public static final String ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN =
+                "accessibility_shortcut_dialog_shown";
 
         /**
-         * Whether stylus button presses are disabled. This is a boolean that
-         * determines if stylus buttons are ignored.
+         * Setting specifying if the timeout restriction
+         * {@link ViewConfiguration#getAccessibilityShortcutKeyTimeout()}
+         * of the accessibility shortcut dialog is skipped.
          *
          * @hide
          */
-        @TestApi
-        @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String STYLUS_BUTTONS_ENABLED = "stylus_buttons_enabled";
+        public static final String SKIP_ACCESSIBILITY_SHORTCUT_DIALOG_TIMEOUT_RESTRICTION =
+                "skip_accessibility_shortcut_dialog_timeout_restriction";
 
         /**
-         * Preferred default user profile to use with the notes task button shortcut.
+         * Setting specifying the accessibility services, accessibility shortcut targets,
+         * or features to be toggled via the accessibility shortcut.
          *
+         * <p> This is a colon-separated string list which contains the flattened
+         * {@link ComponentName} and the class name of a system class implementing a supported
+         * accessibility feature.
          * @hide
          */
-        @SuppressLint("NoSettingsProvider")
-        public static final String DEFAULT_NOTE_TASK_PROFILE = "default_note_task_profile";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
+        @Readable
+        public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE =
+                "accessibility_shortcut_target_service";
 
         /**
-         * Host name and port for global http proxy. Uses ':' seperator for
-         * between host and port.
-         *
-         * @deprecated Use {@link Global#HTTP_PROXY}
+         * Setting specifying the accessibility service or feature to be toggled via the
+         * accessibility button in the navigation bar. This is either a flattened
+         * {@link ComponentName} or the class name of a system class implementing a supported
+         * accessibility feature.
+         * @hide
          */
-        @Deprecated
-        public static final String HTTP_PROXY = Global.HTTP_PROXY;
+        @Readable
+        public static final String ACCESSIBILITY_BUTTON_TARGET_COMPONENT =
+                "accessibility_button_target_component";
 
         /**
-         * Package designated as always-on VPN provider.
+         * Setting specifying the accessibility services, accessibility shortcut targets,
+         * or features to be toggled via the accessibility button in the navigation bar,
+         * or the floating accessibility button.
          *
+         * <p> This is a colon-separated string list which contains the flattened
+         * {@link ComponentName} and the class name of a system class implementing a supported
+         * accessibility feature.
          * @hide
          */
-        public static final String ALWAYS_ON_VPN_APP = "always_on_vpn_app";
+        @Readable
+        public static final String ACCESSIBILITY_BUTTON_TARGETS = "accessibility_button_targets";
 
         /**
-         * Whether to block networking outside of VPN connections while always-on is set.
-         * @see #ALWAYS_ON_VPN_APP
+         * Setting specifying the accessibility services, shortcut targets or features
+         * to be toggled via the gesture shortcut
          *
+         * <p> This is a colon-separated string list which contains the flattened
+         * {@link ComponentName} and the class name of a system class
+         * implementing a supported accessibility feature.
          * @hide
          */
         @Readable
-        public static final String ALWAYS_ON_VPN_LOCKDOWN = "always_on_vpn_lockdown";
+        public static final String ACCESSIBILITY_GESTURE_TARGETS =
+                "accessibility_gesture_targets";
 
         /**
-         * Comma separated list of packages that are allowed to access the network when VPN is in
-         * lockdown mode but not running.
-         * @see #ALWAYS_ON_VPN_LOCKDOWN
+         * Setting specifying the accessibility services, accessibility shortcut targets,
+         * or features to be toggled via a tile in the quick settings panel.
          *
+         * <p> This is a colon-separated string list which contains the flattened
+         * {@link ComponentName} and the class name of a system class implementing a supported
+         * accessibility feature.
          * @hide
          */
-        @Readable(maxTargetSdk = Build.VERSION_CODES.S)
-        public static final String ALWAYS_ON_VPN_LOCKDOWN_WHITELIST =
-                "always_on_vpn_lockdown_whitelist";
+        public static final String ACCESSIBILITY_QS_TARGETS = "accessibility_qs_targets";
 
         /**
-         * Whether applications can be installed for this user via the system's
-         * {@link Intent#ACTION_INSTALL_PACKAGE} mechanism.
+         * Setting specifying the accessibility services, accessibility shortcut targets,
+         * or features to be toggled via a keyboard shortcut gesture.
          *
-         * <p>1 = permit app installation via the system package installer intent
-         * <p>0 = do not allow use of the package installer
-         * @deprecated Starting from {@link android.os.Build.VERSION_CODES#O}, apps should use
-         * {@link PackageManager#canRequestPackageInstalls()}
-         * @see PackageManager#canRequestPackageInstalls()
+         * <p> This is a colon-separated string list which contains the flattened
+         * {@link ComponentName} and the class name of a system class implementing a supported
+         * accessibility feature.
+         *
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
+        public static final String ACCESSIBILITY_KEY_GESTURE_TARGETS =
+                "accessibility_key_gesture_targets";
 
         /**
-         * A flag to tell {@link com.android.server.devicepolicy.DevicePolicyManagerService} that
-         * the default for {@link #INSTALL_NON_MARKET_APPS} is reversed for this user on OTA. So it
-         * can set the restriction {@link android.os.UserManager#DISALLOW_INSTALL_UNKNOWN_SOURCES}
-         * on behalf of the profile owner if needed to make the change transparent for profile
-         * owners.
+         * The system class name of magnification controller which is a target to be toggled via
+         * accessibility shortcut or accessibility button.
          *
          * @hide
          */
         @Readable
-        public static final String UNKNOWN_SOURCES_DEFAULT_REVERSED =
-                "unknown_sources_default_reversed";
+        public static final String ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER =
+                "com.android.server.accessibility.MagnificationController";
 
         /**
-         * Comma-separated list of location providers that are enabled. Do not rely on this value
-         * being present or correct, or on ContentObserver notifications on the corresponding Uri.
-         *
-         * @deprecated This setting no longer exists from Android S onwards as it no longer is
-         * capable of realistically reflecting location settings. Use {@link
-         * LocationManager#isProviderEnabled(String)} or {@link LocationManager#isLocationEnabled()}
-         * instead.
+         * If touch exploration is enabled.
          */
-        @Deprecated
         @Readable
-        public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+        public static final String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";
 
         /**
-         * The current location mode of the device. Do not rely on this value being present or on
-         * ContentObserver notifications on the corresponding Uri.
-         *
-         * @deprecated The preferred methods for checking location mode and listening for changes
-         * are via {@link LocationManager#isLocationEnabled()} and
-         * {@link LocationManager#MODE_CHANGED_ACTION}.
+         * List of the enabled accessibility providers.
          */
-        @Deprecated
         @Readable
-        public static final String LOCATION_MODE = "location_mode";
+        public static final String ENABLED_ACCESSIBILITY_SERVICES =
+            "enabled_accessibility_services";
 
         /**
-         * The App or module that changes the location mode.
+         * List of the notified non-accessibility category accessibility services.
+         *
          * @hide
          */
         @Readable
-        public static final String LOCATION_CHANGER = "location_changer";
+        public static final String NOTIFIED_NON_ACCESSIBILITY_CATEGORY_SERVICES =
+                "notified_non_accessibility_category_services";
 
         /**
-         * The location changer is unknown or unable to detect.
+         * List of the accessibility services to which the user has granted
+         * permission to put the device into touch exploration mode.
+         *
          * @hide
          */
-        public static final int LOCATION_CHANGER_UNKNOWN = 0;
+        @Readable
+        public static final String TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES =
+            "touch_exploration_granted_accessibility_services";
 
         /**
-         * Location settings in system settings.
+         * Is talkback service enabled or not. 0 == no, 1 == yes
+         *
          * @hide
          */
-        public static final int LOCATION_CHANGER_SYSTEM_SETTINGS = 1;
+        public static final String WEAR_TALKBACK_ENABLED = "wear_talkback_enabled";
 
         /**
-         * The location icon in drop down notification drawer.
+         * Whether the Global Actions Panel is enabled.
          * @hide
          */
-        public static final int LOCATION_CHANGER_QUICK_SETTINGS = 2;
+        @Readable
+        public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "global_actions_panel_enabled";
 
         /**
-         * Location mode is off.
+         * Whether the Global Actions Panel can be toggled on or off in Settings.
+         * @hide
          */
-        public static final int LOCATION_MODE_OFF = 0;
+        @Readable
+        public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =
+                "global_actions_panel_available";
 
         /**
-         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
-         * on.
-         *
-         * @deprecated See {@link #LOCATION_MODE}.
+         * Enables debug mode for the Global Actions Panel.
+         * @hide
          */
-        @Deprecated
-        public static final int LOCATION_MODE_SENSORS_ONLY = 1;
+        @Readable
+        public static final String GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED =
+                "global_actions_panel_debug_enabled";
 
         /**
-         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
-         * on.
-         *
-         * @deprecated See {@link #LOCATION_MODE}.
+         * Whether the hush gesture has ever been used
+         * @hide
          */
-        @Deprecated
-        public static final int LOCATION_MODE_BATTERY_SAVING = 2;
+        @SystemApi
+        @Readable
+        public static final String HUSH_GESTURE_USED = "hush_gesture_used";
 
         /**
-         * This mode no longer has any distinct meaning, but is interpreted as the location mode is
-         * on.
-         *
-         * @deprecated See {@link #LOCATION_MODE}.
+         * Number of times the user has manually clicked the ringer toggle
+         * @hide
          */
-        @Deprecated
-        public static final int LOCATION_MODE_HIGH_ACCURACY = 3;
+        @Readable
+        public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";
 
         /**
-         * Location mode is on.
-         *
+         * Whether to play a sound for charging events.
          * @hide
          */
-        @SystemApi
-        public static final int LOCATION_MODE_ON = LOCATION_MODE_HIGH_ACCURACY;
+        @Readable
+        public static final String CHARGING_SOUNDS_ENABLED = "charging_sounds_enabled";
 
         /**
-         * The current location time zone detection enabled state for the user.
-         *
-         * See {@link android.app.time.TimeManager#getTimeZoneCapabilitiesAndConfig} for access.
-         * See {@link android.app.time.TimeManager#updateTimeZoneConfiguration} to update.
+         * Whether to vibrate for charging events.
          * @hide
          */
-        public static final String LOCATION_TIME_ZONE_DETECTION_ENABLED =
-                "location_time_zone_detection_enabled";
+        @Readable
+        public static final String CHARGING_VIBRATION_ENABLED = "charging_vibration_enabled";
 
         /**
-         * The accuracy in meters used for coarsening location for clients with only the coarse
-         * location permission.
-         *
+         * If 0, turning on dnd manually will last indefinitely.
+         * Else if non-negative, turning on dnd manually will last for this many minutes.
+         * Else (if negative), turning on dnd manually will surface a dialog that prompts
+         * user to specify a duration.
          * @hide
          */
         @Readable
-        public static final String LOCATION_COARSE_ACCURACY_M = "locationCoarseAccuracy";
+        public static final String ZEN_DURATION = "zen_duration";
+
+        /** @hide */ public static final int ZEN_DURATION_PROMPT = -1;
+        /** @hide */ public static final int ZEN_DURATION_FOREVER = 0;
 
         /**
-         * Whether or not to show display system location accesses.
+         * Whether the in call notification is enabled to play sound during calls.  The value is
+         * boolean (1 or 0).
          * @hide
          */
-        public static final String LOCATION_SHOW_SYSTEM_OPS = "locationShowSystemOps";
+        @Readable
+        public static final String IN_CALL_NOTIFICATION_ENABLED = "in_call_notification_enabled";
 
         /**
-         * A flag containing settings used for biometric weak
+         * Uri of the slice that's presented on the keyguard.
+         * Defaults to a slice with the date and next alarm.
+         *
          * @hide
          */
-        @Deprecated
         @Readable
-        public static final String LOCK_BIOMETRIC_WEAK_FLAGS =
-                "lock_biometric_weak_flags";
+        public static final String KEYGUARD_SLICE_URI = "keyguard_slice_uri";
 
         /**
-         * Whether lock-to-app will lock the keyguard when exiting.
+         * The adjustment in font weight. This is used to draw text in bold.
+         *
+         * <p> This value can be negative. To display bolded text, the adjustment used is 300,
+         * which is the difference between
+         * {@link android.graphics.fonts.FontStyle#FONT_WEIGHT_NORMAL} and
+         * {@link android.graphics.fonts.FontStyle#FONT_WEIGHT_BOLD}.
+         *
          * @hide
          */
         @Readable
-        public static final String LOCK_TO_APP_EXIT_LOCKED = "lock_to_app_exit_locked";
+        public static final String FONT_WEIGHT_ADJUSTMENT = "font_weight_adjustment";
 
         /**
-         * Whether autolock is enabled (0 = false, 1 = true)
+         * Whether to speak passwords while in accessibility mode.
          *
-         * @deprecated Use {@link android.app.KeyguardManager} to determine the state and security
-         *             level of the keyguard. Accessing this setting from an app that is targeting
-         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
+         * @deprecated The speaking of passwords is controlled by individual accessibility services.
+         * Apps should ignore this setting and provide complete information to accessibility
+         * at all times, which was the behavior when this value was {@code true}.
          */
         @Deprecated
         @Readable
-        public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+        public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";
 
         /**
-         * Whether lock pattern is visible as user enters (0 = false, 1 = true)
+         * Whether to draw text with high contrast while in accessibility mode.
          *
-         * @deprecated Accessing this setting from an app that is targeting
-         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
+        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =
+                "high_text_contrast_enabled";
 
         /**
-         * Whether lock pattern will vibrate as user enters (0 = false, 1 =
-         * true)
+         * Setting that specifies the status of the High Contrast Text
+         * rectangle refresh's one-time prompt.
+         * 0 = UNKNOWN
+         * 1 = PROMPT_SHOWN
+         * 2 = PROMPT_UNNECESSARY
          *
-         * @deprecated Starting in {@link VERSION_CODES#JELLY_BEAN_MR1} the
-         *             lockscreen uses
-         *             {@link Settings.System#HAPTIC_FEEDBACK_ENABLED}.
-         *             Accessing this setting from an app that is targeting
-         *             {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String
-                LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+        public static final String ACCESSIBILITY_HCT_RECT_PROMPT_STATUS =
+                "accessibility_hct_rect_prompt_status";
 
         /**
-         * Determines the width and height of the LockPatternView widget
+         * The color contrast, float in [-1, 1], 1 being the highest contrast.
+         *
          * @hide
          */
-        public static final String LOCK_PATTERN_SIZE = "lock_pattern_size";
+        public static final String CONTRAST_LEVEL = "contrast_level";
 
         /**
-         * Whether lock pattern will show dots (0 = false, 1 = true)
+         * Setting that specifies whether the display magnification is enabled via a system-wide
+         * triple tap gesture. Display magnifications allows the user to zoom in the display content
+         * and is targeted to low vision users. The current magnification scale is controlled by
+         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
+         *
          * @hide
          */
-        public static final String LOCK_DOTS_VISIBLE = "lock_pattern_dotsvisible";
+        @UnsupportedAppUsage
+        @TestApi
+        @Readable
+        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
+                "accessibility_display_magnification_enabled";
 
         /**
-         * Whether lockscreen error pattern is visible (0 = false, 1 = true)
+         * Setting that specifies whether the display magnification is enabled via a shortcut
+         * affordance within the system's navigation area. Display magnifications allows the user to
+         * zoom in the display content and is targeted to low vision users. The current
+         * magnification scale is controlled by {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
+         *
+         * @deprecated Use {@link #ACCESSIBILITY_BUTTON_TARGETS} instead.
+         * {@link #ACCESSIBILITY_BUTTON_TARGETS} holds the magnification system class name
+         * when navigation bar magnification is enabled.
          * @hide
          */
-        public static final String LOCK_SHOW_ERROR_PATH = "lock_pattern_show_error_path";
+        @SystemApi
+        @Readable
+        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED =
+                "accessibility_display_magnification_navbar_enabled";
 
         /**
-         * This preference allows the device to be locked given time after screen goes off,
-         * subject to current DeviceAdmin policy limits.
+         * Setting that specifies what the display magnification scale is.
+         * Display magnifications allows the user to zoom in the display
+         * content and is targeted to low vision users. Whether a display
+         * magnification is performed is controlled by
+         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED} and
+         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED}
+         *
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout";
+        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE =
+                "accessibility_display_magnification_scale";
 
         /**
-         * This preference contains the string that shows for owner info on LockScreen.
+         * Unused mangnification setting
+         *
          * @hide
          * @deprecated
          */
         @Deprecated
         @Readable
-        public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info";
+        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE =
+                "accessibility_display_magnification_auto_update";
 
         /**
-         * Ids of the user-selected appwidgets on the lockscreen (comma-delimited).
+         * Accessibility Window Magnification Allow diagonal scrolling value. The value is boolean.
+         * 1 : on, 0 : off
+         *
          * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String LOCK_SCREEN_APPWIDGET_IDS =
-            "lock_screen_appwidget_ids";
+        public static final String ACCESSIBILITY_ALLOW_DIAGONAL_SCROLLING =
+                "accessibility_allow_diagonal_scrolling";
+
 
         /**
-         * Id of the appwidget shown on the lock screen when appwidgets are disabled.
+         * Setting that specifies what mode the soft keyboard is in (default or hidden). Can be
+         * modified from an AccessibilityService using the SoftKeyboardController.
+         *
          * @hide
          */
-        @Deprecated
         @Readable
-        public static final String LOCK_SCREEN_FALLBACK_APPWIDGET_ID =
-            "lock_screen_fallback_appwidget_id";
+        public static final String ACCESSIBILITY_SOFT_KEYBOARD_MODE =
+                "accessibility_soft_keyboard_mode";
 
         /**
-         * Index of the lockscreen appwidget to restore, -1 if none.
+         * Default soft keyboard behavior.
+         *
+         * @hide
+         */
+        public static final int SHOW_MODE_AUTO = 0;
+
+        /**
+         * Soft keyboard is never shown.
+         *
          * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String LOCK_SCREEN_STICKY_APPWIDGET =
-            "lock_screen_sticky_appwidget";
+        public static final int SHOW_MODE_HIDDEN = 1;
 
         /**
-         * This preference enables showing the owner info on LockScreen.
+         * Setting that specifies whether timed text (captions) should be
+         * displayed in video content. Text display properties are controlled by
+         * the following settings:
+         * <ul>
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_LOCALE}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_EDGE_COLOR}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_EDGE_TYPE}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_TYPEFACE}
+         * <li>{@link #ACCESSIBILITY_CAPTIONING_FONT_SCALE}
+         * </ul>
+         *
          * @hide
-         * @deprecated
          */
-        @Deprecated
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String LOCK_SCREEN_OWNER_INFO_ENABLED =
-            "lock_screen_owner_info_enabled";
+        public static final String ACCESSIBILITY_CAPTIONING_ENABLED =
+                "accessibility_captioning_enabled";
 
         /**
-         * Indicates whether the user has allowed notifications to be shown atop a securely locked
-         * screen in their full "private" form (same as when the device is unlocked).
-         * <p>
-         * Type: int (0 for false, 1 for true)
+         * Setting that specifies the language for captions as a locale string,
+         * e.g. en_US.
          *
+         * @see java.util.Locale#toString
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS =
-                "lock_screen_allow_private_notifications";
+        public static final String ACCESSIBILITY_CAPTIONING_LOCALE =
+                "accessibility_captioning_locale";
 
         /**
-         * When set by a user, allows notification remote input atop a securely locked screen
-         * without having to unlock
+         * Integer property that specifies the preset style for captions, one
+         * of:
+         * <ul>
+         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#PRESET_CUSTOM}
+         * <li>a valid index of {@link android.view.accessibility.CaptioningManager.CaptionStyle#PRESETS}
+         * </ul>
+         *
+         * @see java.util.Locale#toString
          * @hide
          */
         @Readable
-        public static final String LOCK_SCREEN_ALLOW_REMOTE_INPUT =
-                "lock_screen_allow_remote_input";
+        public static final String ACCESSIBILITY_CAPTIONING_PRESET =
+                "accessibility_captioning_preset";
 
         /**
-         * Indicates which clock face to show on lock screen and AOD formatted as a serialized
-         * {@link org.json.JSONObject} with the format:
-         *     {"clock": id, "_applied_timestamp": timestamp}
+         * Integer property that specifes the background color for captions as a
+         * packed 32-bit color.
+         *
+         * @see android.graphics.Color#argb
          * @hide
          */
         @Readable
-        public static final String LOCK_SCREEN_CUSTOM_CLOCK_FACE = "lock_screen_custom_clock_face";
+        public static final String ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR =
+                "accessibility_captioning_background_color";
 
         /**
-         * Indicates which clock face to show on lock screen and AOD while docked.
+         * Integer property that specifes the foreground color for captions as a
+         * packed 32-bit color.
+         *
+         * @see android.graphics.Color#argb
          * @hide
          */
         @Readable
-        public static final String DOCKED_CLOCK_FACE = "docked_clock_face";
+        public static final String ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR =
+                "accessibility_captioning_foreground_color";
 
         /**
-         * Setting to indicate that content filters should be enabled on web browsers.
-         *
+         * Integer property that specifes the edge type for captions, one of:
          * <ul>
-         *   <li> non-positive (less or equal to 0) = Allow all sites
-         *   <li> positive (greater than 0) = Try to block explicit sites
+         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_NONE}
+         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_OUTLINE}
+         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_DROP_SHADOW}
          * </ul>
          *
+         * @see #ACCESSIBILITY_CAPTIONING_EDGE_COLOR
          * @hide
          */
         @Readable
-        public static final String BROWSER_CONTENT_FILTERS_ENABLED =
-                "browser_content_filters_enabled";
+        public static final String ACCESSIBILITY_CAPTIONING_EDGE_TYPE =
+                "accessibility_captioning_edge_type";
 
         /**
-         * Setting to indicate that content filters should be enabled in web search engines.
-         *
-         * <ul>
-         *   <li> non-positive (less or equal to 0) = Off
-         *   <li> positive (greater than 0) = Filter
-         * </ul>
+         * Integer property that specifes the edge color for captions as a
+         * packed 32-bit color.
          *
+         * @see #ACCESSIBILITY_CAPTIONING_EDGE_TYPE
+         * @see android.graphics.Color#argb
          * @hide
          */
         @Readable
-        public static final String SEARCH_CONTENT_FILTERS_ENABLED =
-                "search_content_filters_enabled";
+        public static final String ACCESSIBILITY_CAPTIONING_EDGE_COLOR =
+                "accessibility_captioning_edge_color";
 
         /**
-         * Setting to indicate that themes should be enabled in related app.
-         *
-         * <ul>
-         *   <li>0 = Off
-         *   <li>1 = Enable themes
-         * </ul>
+         * Integer property that specifes the window color for captions as a
+         * packed 32-bit color.
          *
+         * @see android.graphics.Color#argb
          * @hide
          */
-        public static final String PACK_THEME_FEATURE_ENABLED =
-                "pack_theme_feature_enabled";
+        @Readable
+        public static final String ACCESSIBILITY_CAPTIONING_WINDOW_COLOR =
+                "accessibility_captioning_window_color";
 
         /**
-         * Setting to indicate that suggested themes feature should be enabled in related app.
-         *
+         * String property that specifies the typeface for captions, one of:
          * <ul>
-         *   <li>0 = Off
-         *   <li>1 = Enable suggested themes
+         * <li>DEFAULT
+         * <li>MONOSPACE
+         * <li>SANS_SERIF
+         * <li>SERIF
          * </ul>
          *
+         * @see android.graphics.Typeface
          * @hide
          */
-        public static final String SUGGESTED_THEME_FEATURE_ENABLED =
-                "suggested_theme_feature_enabled";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @Readable
+        public static final String ACCESSIBILITY_CAPTIONING_TYPEFACE =
+                "accessibility_captioning_typeface";
 
         /**
-         * String property which is a comma separated list of package names. These package names
-         * will be added to the existing agent allowlist. Since this contains package names, it must
-         * NOT be marked @Readable.
+         * Floating point property that specifies font scaling for captions.
+         *
          * @hide
          */
-        public static final String APP_FUNCTION_ADDITIONAL_AGENT_ALLOWLIST =
-                "app_function_additional_agent_allowlist";
+        @Readable
+        public static final String ACCESSIBILITY_CAPTIONING_FONT_SCALE =
+                "accessibility_captioning_font_scale";
 
         /**
-         * Set by the system to track if the user needs to see the call to action for
-         * the lockscreen notification policy.
-         * @hide
+         * Setting that specifies whether display color inversion is enabled.
          */
         @Readable
-        public static final String SHOW_NOTE_ABOUT_NOTIFICATION_HIDING =
-                "show_note_about_notification_hiding";
+        public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED =
+                "accessibility_display_inversion_enabled";
 
         /**
-         * Set to 1 by the system after trust agents have been initialized.
+         * Flag that specifies whether font size has been changed. The flag will
+         * be set when users change the scaled value of font size for the first time.
          * @hide
          */
         @Readable
-        public static final String TRUST_AGENTS_INITIALIZED =
-                "trust_agents_initialized";
+        public static final String ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED =
+                "accessibility_font_scaling_has_been_changed";
 
         /**
-         * Set to 1 by the system after the list of known trust agents have been initialized.
+         * Setting that specifies whether display color space adjustment is
+         * enabled.
+         *
          * @hide
          */
-        public static final String KNOWN_TRUST_AGENTS_INITIALIZED =
-                "known_trust_agents_initialized";
-
-        /**
-         * The Logging ID (a unique 64-bit value) as a hex string.
-         * Used as a pseudonymous identifier for logging.
-         * @deprecated This identifier is poorly initialized and has
-         * many collisions.  It should not be used.
-         */
-        @Deprecated
+        @UnsupportedAppUsage
         @Readable
-        public static final String LOGGING_ID = "logging_id";
+        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED =
+                "accessibility_display_daltonizer_enabled";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#NETWORK_PREFERENCE} instead
+         * Integer property that specifies the type of color space adjustment to
+         * perform. Valid values are defined in AccessibilityManager and Settings arrays.xml:
+         * - AccessibilityManager.DALTONIZER_DISABLED = -1
+         * - AccessibilityManager.DALTONIZER_SIMULATE_MONOCHROMACY = 0
+         * - <item>@string/daltonizer_mode_protanomaly</item> = 11
+         * - AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY and
+         *       <item>@string/daltonizer_mode_deuteranomaly</item> = 12
+         * - <item>@string/daltonizer_mode_tritanomaly</item> = 13
+         *
+         * @hide
          */
-        @Deprecated
-        public static final String NETWORK_PREFERENCE = Global.NETWORK_PREFERENCE;
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @Readable
+        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER =
+                "accessibility_display_daltonizer";
 
         /**
-         * No longer supported.
+         * Integer property that determines the saturation level of color correction. Default value
+         * is defined in Settings config.xml.
+         * [0-10] inclusive where 0 would look as if color space adustment is not applied at all.
+         *
+         * @hide
          */
-        @Readable
-        public static final String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
+        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL =
+                "accessibility_display_daltonizer_saturation_level";
 
         /**
-         * No longer supported.
+         * Setting that specifies whether automatic click when the mouse pointer stops moving is
+         * enabled.
+         *
+         * @hide
          */
+        @UnsupportedAppUsage
         @Readable
-        public static final String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
+        public static final String ACCESSIBILITY_AUTOCLICK_ENABLED =
+                "accessibility_autoclick_enabled";
 
         /**
-         * No longer supported.
+         * Integer setting specifying amount of time in ms the mouse pointer has to stay still
+         * before performing click when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
+         *
+         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * @hide
          */
         @Readable
-        public static final String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";
+        public static final String ACCESSIBILITY_AUTOCLICK_DELAY =
+                "accessibility_autoclick_delay";
 
         /**
-         * Settings classname to launch when Settings is clicked from All
-         * Applications.  Needed because of user testing between the old
-         * and new Settings apps.
+         * Integer setting specifying the autoclick cursor area size (the radius of the autoclick
+         * ring indicator) when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
+         *
+         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * @hide
          */
-        // TODO: 881807
-        @Readable
-        public static final String SETTINGS_CLASSNAME = "settings_classname";
+        public static final String ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE =
+                "accessibility_autoclick_cursor_area_size";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#USB_MASS_STORAGE_ENABLED} instead
+         * Setting that specifies whether minor cursor movement will be ignored when
+         * {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
+         *
+         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * @hide
          */
-        @Deprecated
-        public static final String USB_MASS_STORAGE_ENABLED = Global.USB_MASS_STORAGE_ENABLED;
+        public static final String ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT =
+                "accessibility_autoclick_ignore_minor_cursor_movement";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#USE_GOOGLE_MAIL} instead
+         * String setting that stores the position of the autoclick panel when
+         * {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set. The position is stored as a
+         * comma-separated string containing gravity, x-coordinate, y-coordinate, and corner index.
+         * For example, "8388659,15,30,0", where 8388659 means gravity Gravity.START | Gravity.TOP.
+         *
+         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * @hide
          */
-        @Deprecated
-        public static final String USE_GOOGLE_MAIL = Global.USE_GOOGLE_MAIL;
+        public static final String ACCESSIBILITY_AUTOCLICK_PANEL_POSITION =
+                "accessibility_autoclick_panel_position";
 
         /**
-         * If accessibility is enabled.
+         * Setting that specifies whether autoclick type reverts to left click after performing
+         * an action when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
+         *
+         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * @hide
          */
-        @Readable
-        public static final String ACCESSIBILITY_ENABLED = "accessibility_enabled";
+        public static final String ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK =
+                "accessibility_autoclick_revert_to_left_click";
 
         /**
-         * Whether select sound track with audio description by default.
+         * Whether or not larger size icons are used for the pointer of mouse/trackpad for
+         * accessibility.
+         * (0 = false, 1 = true)
+         *
+         * @deprecated This setting is no longer in use, as the size of pointer icons is now
+         *             controlled by the {@link #POINTER_SCALE} setting. The value of this setting
+         *             is ignored.
          * @hide
          */
-        public static final String ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT =
-                "enabled_accessibility_audio_description_by_default";
+        @UnsupportedAppUsage
+        @Readable
+        @Deprecated
+        public static final String ACCESSIBILITY_LARGE_POINTER_ICON =
+                "accessibility_large_pointer_icon";
 
         /**
-         * Setting specifying if the accessibility shortcut is enabled.
+         * The timeout for considering a press to be a long press in milliseconds.
          * @hide
          */
+        @UnsupportedAppUsage
         @Readable
-        public static final String ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN =
-                "accessibility_shortcut_on_lock_screen";
+        @TestApi
+        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
+        public static final String LONG_PRESS_TIMEOUT = "long_press_timeout";
 
         /**
-         * Setting specifying if the accessibility shortcut dialog has been shown to this user.
+         * The duration in milliseconds between the first tap's up event and the second tap's
+         * down event for an interaction to be considered part of the same multi-press.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN =
-                "accessibility_shortcut_dialog_shown";
+        @TestApi
+        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
+        public static final String MULTI_PRESS_TIMEOUT = "multi_press_timeout";
 
         /**
-         * Setting specifying if the timeout restriction
-         * {@link ViewConfiguration#getAccessibilityShortcutKeyTimeout()}
-         * of the accessibility shortcut dialog is skipped.
+         * Whether to enable key repeats for Physical Keyboard.
          *
+         * If set to false, continuous key presses on
+         * physical keyboard will not cause the pressed key to repeated.
          * @hide
          */
-        public static final String SKIP_ACCESSIBILITY_SHORTCUT_DIALOG_TIMEOUT_RESTRICTION =
-                "skip_accessibility_shortcut_dialog_timeout_restriction";
+        @Readable
+        public static final String KEY_REPEAT_ENABLED = "key_repeat_enabled";
 
         /**
-         * Setting specifying the accessibility services, accessibility shortcut targets,
-         * or features to be toggled via the accessibility shortcut.
-         *
-         * <p> This is a colon-separated string list which contains the flattened
-         * {@link ComponentName} and the class name of a system class implementing a supported
-         * accessibility feature.
+         * The duration before a key repeat begins in milliseconds.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
         @Readable
-        public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE =
-                "accessibility_shortcut_target_service";
+        public static final String KEY_REPEAT_TIMEOUT_MS = "key_repeat_timeout";
 
         /**
-         * Setting specifying the accessibility service or feature to be toggled via the
-         * accessibility button in the navigation bar. This is either a flattened
-         * {@link ComponentName} or the class name of a system class implementing a supported
-         * accessibility feature.
+         * The duration between successive key repeats in milliseconds.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_BUTTON_TARGET_COMPONENT =
-                "accessibility_button_target_component";
+        public static final String KEY_REPEAT_DELAY_MS = "key_repeat_delay";
 
         /**
-         * Setting specifying the accessibility services, accessibility shortcut targets,
-         * or features to be toggled via the accessibility button in the navigation bar,
-         * or the floating accessibility button.
+         * Setting that specifies recommended timeout in milliseconds for controls
+         * which don't need user's interactions.
          *
-         * <p> This is a colon-separated string list which contains the flattened
-         * {@link ComponentName} and the class name of a system class implementing a supported
-         * accessibility feature.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_BUTTON_TARGETS = "accessibility_button_targets";
+        public static final String ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS =
+                "accessibility_non_interactive_ui_timeout_ms";
 
         /**
-         * Setting specifying the accessibility services, shortcut targets or features
-         * to be toggled via the gesture shortcut
+         * Setting that specifies recommended timeout in milliseconds for controls
+         * which need user's interactions.
          *
-         * <p> This is a colon-separated string list which contains the flattened
-         * {@link ComponentName} and the class name of a system class
-         * implementing a supported accessibility feature.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_GESTURE_TARGETS =
-                "accessibility_gesture_targets";
+        public static final String ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS =
+                "accessibility_interactive_ui_timeout_ms";
+
 
         /**
-         * Setting specifying the accessibility services, accessibility shortcut targets,
-         * or features to be toggled via a tile in the quick settings panel.
+         * Setting that specifies whether Reduce Bright Colors, or brightness dimming by color
+         * adjustment, is enabled.
          *
-         * <p> This is a colon-separated string list which contains the flattened
-         * {@link ComponentName} and the class name of a system class implementing a supported
-         * accessibility feature.
          * @hide
          */
-        public static final String ACCESSIBILITY_QS_TARGETS = "accessibility_qs_targets";
+        public static final String REDUCE_BRIGHT_COLORS_ACTIVATED =
+                "reduce_bright_colors_activated";
 
         /**
-         * Setting specifying the accessibility services, accessibility shortcut targets,
-         * or features to be toggled via a keyboard shortcut gesture.
-         *
-         * <p> This is a colon-separated string list which contains the flattened
-         * {@link ComponentName} and the class name of a system class implementing a supported
-         * accessibility feature.
+         * Setting that specifies the level of Reduce Bright Colors in intensity. The range is
+         * [0, 100].
          *
          * @hide
          */
-        public static final String ACCESSIBILITY_KEY_GESTURE_TARGETS =
-                "accessibility_key_gesture_targets";
+        public static final String REDUCE_BRIGHT_COLORS_LEVEL =
+                "reduce_bright_colors_level";
 
         /**
-         * The system class name of magnification controller which is a target to be toggled via
-         * accessibility shortcut or accessibility button.
+         * Setting that specifies whether Reduce Bright Colors should persist across reboots.
          *
          * @hide
          */
-        @Readable
-        public static final String ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER =
-                "com.android.server.accessibility.MagnificationController";
+        public static final String REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS =
+                "reduce_bright_colors_persist_across_reboots";
 
         /**
-         * If touch exploration is enabled.
+         * Integer setting that specifies the duration in ms required to invert the text cursor's
+         * pixels.
+         *
+         * @see ViewConfiguration#getTextCursorBlinkIntervalMillis()
+         *
+         * @hide
          */
-        @Readable
-        public static final String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";
+        public static final String ACCESSIBILITY_TEXT_CURSOR_BLINK_INTERVAL_MS =
+                "accessibility_text_cursor_blink_interval_ms";
 
         /**
-         * List of the enabled accessibility providers.
+         * Setting that holds EM_VALUE (proprietary)
+         *
+         * @hide
          */
-        @Readable
-        public static final String ENABLED_ACCESSIBILITY_SERVICES =
-            "enabled_accessibility_services";
-
+        public static final String EM_VALUE =
+                "em_value";
         /**
-         * List of the notified non-accessibility category accessibility services.
+         * Setting that specifies whether High Dynamic Range brightness is enabled.
          *
          * @hide
          */
-        @Readable
-        public static final String NOTIFIED_NON_ACCESSIBILITY_CATEGORY_SERVICES =
-                "notified_non_accessibility_category_services";
+        public static final String HDR_BRIGHTNESS_ENABLED =
+                "hdr_brightness_enabled";
 
         /**
-         * List of the accessibility services to which the user has granted
-         * permission to put the device into touch exploration mode.
+         * Setting that specifies the intensity of the High Dynamic Range brightness. The range is
+         * [0, 1], which is which is used to scale the HDR/SDR ratio.
          *
          * @hide
          */
-        @Readable
-        public static final String TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES =
-            "touch_exploration_granted_accessibility_services";
+        public static final String HDR_BRIGHTNESS_BOOST_LEVEL =
+                "hdr_brightness_boost_level";
 
         /**
-         * Is talkback service enabled or not. 0 == no, 1 == yes
+         * List of the enabled print services.
+         *
+         * N and beyond uses {@link #DISABLED_PRINT_SERVICES}. But this might be used in an upgrade
+         * from pre-N.
          *
          * @hide
          */
-        public static final String WEAR_TALKBACK_ENABLED = "wear_talkback_enabled";
+        @UnsupportedAppUsage
+        @Readable
+        public static final String ENABLED_PRINT_SERVICES =
+            "enabled_print_services";
 
         /**
-         * Whether the Global Actions Panel is enabled.
+         * List of the disabled print services.
+         *
          * @hide
          */
+        @TestApi
         @Readable
-        public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "global_actions_panel_enabled";
+        public static final String DISABLED_PRINT_SERVICES =
+            "disabled_print_services";
 
         /**
-         * Whether the Global Actions Panel can be toggled on or off in Settings.
+         * The saved value for WindowManagerService.setForcedDisplayDensity()
+         * formatted as a single integer representing DPI. If unset, then use
+         * the real display density.
+         *
          * @hide
          */
         @Readable
-        public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =
-                "global_actions_panel_available";
+        public static final String DISPLAY_DENSITY_FORCED = "display_density_forced";
 
         /**
-         * Enables debug mode for the Global Actions Panel.
-         * @hide
+         * Setting to always use the default text-to-speech settings regardless
+         * of the application settings.
+         * 1 = override application settings,
+         * 0 = use application settings (if specified).
+         *
+         * @deprecated  The value of this setting is no longer respected by
+         * the framework text to speech APIs as of the Ice Cream Sandwich release.
          */
+        @Deprecated
         @Readable
-        public static final String GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED =
-                "global_actions_panel_debug_enabled";
+        public static final String TTS_USE_DEFAULTS = "tts_use_defaults";
 
         /**
-         * Whether the hush gesture has ever been used
-         * @hide
+         * Default text-to-speech engine speech rate. 100 = 1x
          */
-        @SystemApi
         @Readable
-        public static final String HUSH_GESTURE_USED = "hush_gesture_used";
+        public static final String TTS_DEFAULT_RATE = "tts_default_rate";
 
         /**
-         * Number of times the user has manually clicked the ringer toggle
-         * @hide
+         * Default text-to-speech engine pitch. 100 = 1x
          */
         @Readable
-        public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";
+        public static final String TTS_DEFAULT_PITCH = "tts_default_pitch";
 
         /**
-         * Whether to play a sound for charging events.
-         * @hide
+         * Default text-to-speech engine.
          */
         @Readable
-        public static final String CHARGING_SOUNDS_ENABLED = "charging_sounds_enabled";
+        public static final String TTS_DEFAULT_SYNTH = "tts_default_synth";
 
         /**
-         * Whether to vibrate for charging events.
-         * @hide
+         * Default text-to-speech language.
+         *
+         * @deprecated this setting is no longer in use, as of the Ice Cream
+         * Sandwich release. Apps should never need to read this setting directly,
+         * instead can query the TextToSpeech framework classes for the default
+         * locale. {@link TextToSpeech#getLanguage()}.
          */
+        @Deprecated
         @Readable
-        public static final String CHARGING_VIBRATION_ENABLED = "charging_vibration_enabled";
+        public static final String TTS_DEFAULT_LANG = "tts_default_lang";
 
         /**
-         * If 0, turning on dnd manually will last indefinitely.
-         * Else if non-negative, turning on dnd manually will last for this many minutes.
-         * Else (if negative), turning on dnd manually will surface a dialog that prompts
-         * user to specify a duration.
-         * @hide
+         * Default text-to-speech country.
+         *
+         * @deprecated this setting is no longer in use, as of the Ice Cream
+         * Sandwich release. Apps should never need to read this setting directly,
+         * instead can query the TextToSpeech framework classes for the default
+         * locale. {@link TextToSpeech#getLanguage()}.
          */
+        @Deprecated
         @Readable
-        public static final String ZEN_DURATION = "zen_duration";
-
-        /** @hide */ public static final int ZEN_DURATION_PROMPT = -1;
-        /** @hide */ public static final int ZEN_DURATION_FOREVER = 0;
+        public static final String TTS_DEFAULT_COUNTRY = "tts_default_country";
 
         /**
-         * Whether the in call notification is enabled to play sound during calls.  The value is
-         * boolean (1 or 0).
-         * @hide
+         * Default text-to-speech locale variant.
+         *
+         * @deprecated this setting is no longer in use, as of the Ice Cream
+         * Sandwich release. Apps should never need to read this setting directly,
+         * instead can query the TextToSpeech framework classes for the
+         * locale that is in use {@link TextToSpeech#getLanguage()}.
          */
+        @Deprecated
         @Readable
-        public static final String IN_CALL_NOTIFICATION_ENABLED = "in_call_notification_enabled";
+        public static final String TTS_DEFAULT_VARIANT = "tts_default_variant";
 
         /**
-         * Uri of the slice that's presented on the keyguard.
-         * Defaults to a slice with the date and next alarm.
+         * Stores the default tts locales on a per engine basis. Stored as
+         * a comma seperated list of values, each value being of the form
+         * {@code engine_name:locale} for example,
+         * {@code com.foo.ttsengine:eng-USA,com.bar.ttsengine:esp-ESP}. This
+         * supersedes {@link #TTS_DEFAULT_LANG}, {@link #TTS_DEFAULT_COUNTRY} and
+         * {@link #TTS_DEFAULT_VARIANT}. Apps should never need to read this
+         * setting directly, and can query the TextToSpeech framework classes
+         * for the locale that is in use.
          *
          * @hide
          */
         @Readable
-        public static final String KEYGUARD_SLICE_URI = "keyguard_slice_uri";
+        public static final String TTS_DEFAULT_LOCALE = "tts_default_locale";
 
         /**
-         * The adjustment in font weight. This is used to draw text in bold.
-         *
-         * <p> This value can be negative. To display bolded text, the adjustment used is 300,
-         * which is the difference between
-         * {@link android.graphics.fonts.FontStyle#FONT_WEIGHT_NORMAL} and
-         * {@link android.graphics.fonts.FontStyle#FONT_WEIGHT_BOLD}.
-         *
-         * @hide
+         * Space delimited list of plugin packages that are enabled.
          */
         @Readable
-        public static final String FONT_WEIGHT_ADJUSTMENT = "font_weight_adjustment";
+        public static final String TTS_ENABLED_PLUGINS = "tts_enabled_plugins";
 
         /**
-         * Whether to speak passwords while in accessibility mode.
-         *
-         * @deprecated The speaking of passwords is controlled by individual accessibility services.
-         * Apps should ignore this setting and provide complete information to accessibility
-         * at all times, which was the behavior when this value was {@code true}.
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON}
+         * instead.
          */
         @Deprecated
-        @Readable
-        public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";
+        public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
+                Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
 
         /**
-         * Whether to draw text with high contrast while in accessibility mode.
-         *
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY}
+         * instead.
          */
-        @Readable
-        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =
-                "high_text_contrast_enabled";
+        @Deprecated
+        public static final String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY =
+                Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY;
 
         /**
-         * Setting that specifies the status of the High Contrast Text
-         * rectangle refresh's one-time prompt.
-         * 0 = UNKNOWN
-         * 1 = PROMPT_SHOWN
-         * 2 = PROMPT_UNNECESSARY
-         *
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NUM_OPEN_NETWORKS_KEPT}
+         * instead.
          */
-        public static final String ACCESSIBILITY_HCT_RECT_PROMPT_STATUS =
-                "accessibility_hct_rect_prompt_status";
+        @Deprecated
+        public static final String WIFI_NUM_OPEN_NETWORKS_KEPT =
+                Global.WIFI_NUM_OPEN_NETWORKS_KEPT;
 
         /**
-         * The color contrast, float in [-1, 1], 1 being the highest contrast.
-         *
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_ON}
+         * instead.
          */
-        public static final String CONTRAST_LEVEL = "contrast_level";
+        @Deprecated
+        public static final String WIFI_ON = Global.WIFI_ON;
 
         /**
-         * Setting that specifies whether the display magnification is enabled via a system-wide
-         * triple tap gesture. Display magnifications allows the user to zoom in the display content
-         * and is targeted to low vision users. The current magnification scale is controlled by
-         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
-         *
-         * @hide
+         * The acceptable packet loss percentage (range 0 - 100) before trying
+         * another AP on the same network.
+         * @deprecated This setting is not used.
          */
-        @UnsupportedAppUsage
-        @TestApi
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
-                "accessibility_display_magnification_enabled";
+        public static final String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE =
+                "wifi_watchdog_acceptable_packet_loss_percentage";
 
         /**
-         * Setting that specifies whether the display magnification is enabled via a shortcut
-         * affordance within the system's navigation area. Display magnifications allows the user to
-         * zoom in the display content and is targeted to low vision users. The current
-         * magnification scale is controlled by {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
-         *
-         * @deprecated Use {@link #ACCESSIBILITY_BUTTON_TARGETS} instead.
-         * {@link #ACCESSIBILITY_BUTTON_TARGETS} holds the magnification system class name
-         * when navigation bar magnification is enabled.
-         * @hide
+         * The number of access points required for a network in order for the
+         * watchdog to monitor it.
+         * @deprecated This setting is not used.
          */
-        @SystemApi
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED =
-                "accessibility_display_magnification_navbar_enabled";
+        public static final String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";
 
         /**
-         * Setting that specifies what the display magnification scale is.
-         * Display magnifications allows the user to zoom in the display
-         * content and is targeted to low vision users. Whether a display
-         * magnification is performed is controlled by
-         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED} and
-         * {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED}
-         *
-         * @hide
+         * The delay between background checks.
+         * @deprecated This setting is not used.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE =
-                "accessibility_display_magnification_scale";
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS =
+                "wifi_watchdog_background_check_delay_ms";
 
         /**
-         * Unused mangnification setting
-         *
-         * @hide
-         * @deprecated
+         * Whether the Wi-Fi watchdog is enabled for background checking even
+         * after it thinks the user has connected to a good access point.
+         * @deprecated This setting is not used.
          */
         @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE =
-                "accessibility_display_magnification_auto_update";
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED =
+                "wifi_watchdog_background_check_enabled";
 
         /**
-         * Accessibility Window Magnification Allow diagonal scrolling value. The value is boolean.
-         * 1 : on, 0 : off
-         *
-         * @hide
+         * The timeout for a background ping
+         * @deprecated This setting is not used.
          */
-        public static final String ACCESSIBILITY_ALLOW_DIAGONAL_SCROLLING =
-                "accessibility_allow_diagonal_scrolling";
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS =
+                "wifi_watchdog_background_check_timeout_ms";
 
+        /**
+         * The number of initial pings to perform that *may* be ignored if they
+         * fail. Again, if these fail, they will *not* be used in packet loss
+         * calculation. For example, one network always seemed to time out for
+         * the first couple pings, so this is set to 3 by default.
+         * @deprecated This setting is not used.
+         */
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT =
+            "wifi_watchdog_initial_ignored_ping_count";
 
         /**
-         * Setting that specifies what mode the soft keyboard is in (default or hidden). Can be
-         * modified from an AccessibilityService using the SoftKeyboardController.
-         *
-         * @hide
+         * The maximum number of access points (per network) to attempt to test.
+         * If this number is reached, the watchdog will no longer monitor the
+         * initial connection state for the network. This is a safeguard for
+         * networks containing multiple APs whose DNS does not respond to pings.
+         * @deprecated This setting is not used.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_SOFT_KEYBOARD_MODE =
-                "accessibility_soft_keyboard_mode";
+        public static final String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";
 
         /**
-         * Default soft keyboard behavior.
-         *
-         * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_WATCHDOG_ON} instead
          */
-        public static final int SHOW_MODE_AUTO = 0;
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
 
         /**
-         * Soft keyboard is never shown.
-         *
-         * @hide
+         * A comma-separated list of SSIDs for which the Wi-Fi watchdog should be enabled.
+         * @deprecated This setting is not used.
          */
-        public static final int SHOW_MODE_HIDDEN = 1;
+        @Deprecated
+        @Readable
+        public static final String WIFI_WATCHDOG_WATCH_LIST = "wifi_watchdog_watch_list";
 
         /**
-         * Setting that specifies whether timed text (captions) should be
-         * displayed in video content. Text display properties are controlled by
-         * the following settings:
-         * <ul>
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_LOCALE}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_EDGE_COLOR}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_EDGE_TYPE}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_TYPEFACE}
-         * <li>{@link #ACCESSIBILITY_CAPTIONING_FONT_SCALE}
-         * </ul>
-         *
-         * @hide
+         * The number of pings to test if an access point is a good connection.
+         * @deprecated This setting is not used.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_ENABLED =
-                "accessibility_captioning_enabled";
+        public static final String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
 
         /**
-         * Setting that specifies the language for captions as a locale string,
-         * e.g. en_US.
-         *
-         * @see java.util.Locale#toString
-         * @hide
+         * The delay between pings.
+         * @deprecated This setting is not used.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_LOCALE =
-                "accessibility_captioning_locale";
+        public static final String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
 
         /**
-         * Integer property that specifies the preset style for captions, one
-         * of:
-         * <ul>
-         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#PRESET_CUSTOM}
-         * <li>a valid index of {@link android.view.accessibility.CaptioningManager.CaptionStyle#PRESETS}
-         * </ul>
-         *
-         * @see java.util.Locale#toString
-         * @hide
+         * The timeout per ping.
+         * @deprecated This setting is not used.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_PRESET =
-                "accessibility_captioning_preset";
+        public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
 
         /**
-         * Integer property that specifes the background color for captions as a
-         * packed 32-bit color.
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_MAX_DHCP_RETRY_COUNT} instead
+         */
+        @Deprecated
+        public static final String WIFI_MAX_DHCP_RETRY_COUNT = Global.WIFI_MAX_DHCP_RETRY_COUNT;
+
+        /**
+         * @deprecated Use
+         * {@link android.provider.Settings.Global#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS} instead
+         */
+        @Deprecated
+        public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =
+                Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS;
+
+        /**
+         * The number of milliseconds to hold on to a PendingIntent based request. This delay gives
+         * the receivers of the PendingIntent an opportunity to make a new network request before
+         * the Network satisfying the request is potentially removed.
          *
-         * @see android.graphics.Color#argb
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR =
-                "accessibility_captioning_background_color";
+        public static final String CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS =
+                "connectivity_release_pending_intent_delay_ms";
 
         /**
-         * Integer property that specifes the foreground color for captions as a
-         * packed 32-bit color.
+         * Whether background data usage is allowed.
          *
-         * @see android.graphics.Color#argb
-         * @hide
+         * @deprecated As of {@link VERSION_CODES#ICE_CREAM_SANDWICH},
+         *             availability of background data depends on several
+         *             combined factors. When background data is unavailable,
+         *             {@link ConnectivityManager#getActiveNetworkInfo()} will
+         *             now appear disconnected.
          */
+        @Deprecated
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR =
-                "accessibility_captioning_foreground_color";
+        public static final String BACKGROUND_DATA = "background_data";
 
         /**
-         * Integer property that specifes the edge type for captions, one of:
-         * <ul>
-         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_NONE}
-         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_OUTLINE}
-         * <li>{@link android.view.accessibility.CaptioningManager.CaptionStyle#EDGE_TYPE_DROP_SHADOW}
-         * </ul>
-         *
-         * @see #ACCESSIBILITY_CAPTIONING_EDGE_COLOR
-         * @hide
+         * Origins for which browsers should allow geolocation by default.
+         * The value is a space-separated list of origins.
          */
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_EDGE_TYPE =
-                "accessibility_captioning_edge_type";
+        public static final String ALLOWED_GEOLOCATION_ORIGINS
+                = "allowed_geolocation_origins";
 
         /**
-         * Integer property that specifes the edge color for captions as a
-         * packed 32-bit color.
-         *
-         * @see #ACCESSIBILITY_CAPTIONING_EDGE_TYPE
-         * @see android.graphics.Color#argb
+         * The preferred TTY mode     0 = TTy Off, CDMA default
+         *                            1 = TTY Full
+         *                            2 = TTY HCO
+         *                            3 = TTY VCO
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_EDGE_COLOR =
-                "accessibility_captioning_edge_color";
+        public static final String PREFERRED_TTY_MODE =
+                "preferred_tty_mode";
 
         /**
-         * Integer property that specifes the window color for captions as a
-         * packed 32-bit color.
-         *
-         * @see android.graphics.Color#argb
+         * Whether the enhanced voice privacy mode is enabled.
+         * 0 = normal voice privacy
+         * 1 = enhanced voice privacy
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_WINDOW_COLOR =
-                "accessibility_captioning_window_color";
+        public static final String ENHANCED_VOICE_PRIVACY_ENABLED = "enhanced_voice_privacy_enabled";
 
         /**
-         * String property that specifies the typeface for captions, one of:
-         * <ul>
-         * <li>DEFAULT
-         * <li>MONOSPACE
-         * <li>SANS_SERIF
-         * <li>SERIF
-         * </ul>
-         *
-         * @see android.graphics.Typeface
+         * Whether the TTY mode mode is enabled.
+         * 0 = disabled
+         * 1 = enabled
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_TYPEFACE =
-                "accessibility_captioning_typeface";
+        public static final String TTY_MODE_ENABLED = "tty_mode_enabled";
 
         /**
-         * Floating point property that specifies font scaling for captions.
-         *
-         * @hide
+         * User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT
+         * calls when supported by the device and carrier. Boolean value.
+         * 0 = OFF
+         * 1 = ON
          */
         @Readable
-        public static final String ACCESSIBILITY_CAPTIONING_FONT_SCALE =
-                "accessibility_captioning_font_scale";
+        public static final String RTT_CALLING_MODE = "rtt_calling_mode";
 
         /**
-         * Setting that specifies whether display color inversion is enabled.
+        /**
+         * Controls whether settings backup is enabled.
+         * Type: int ( 0 = disabled, 1 = enabled )
+         * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED =
-                "accessibility_display_inversion_enabled";
+        public static final String BACKUP_ENABLED = "backup_enabled";
 
         /**
-         * Flag that specifies whether font size has been changed. The flag will
-         * be set when users change the scaled value of font size for the first time.
+         * Controls whether application data is automatically restored from backup
+         * at install time.
+         * Type: int ( 0 = disabled, 1 = enabled )
          * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED =
-                "accessibility_font_scaling_has_been_changed";
+        public static final String BACKUP_AUTO_RESTORE = "backup_auto_restore";
 
         /**
-         * Setting that specifies whether display color space adjustment is
-         * enabled.
-         *
+         * Controls whether framework backup scheduling is enabled.
          * @hide
          */
-        @UnsupportedAppUsage
-        @Readable
-        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED =
-                "accessibility_display_daltonizer_enabled";
+        public static final String BACKUP_SCHEDULING_ENABLED = "backup_scheduling_enabled";
 
         /**
-         * Integer property that specifies the type of color space adjustment to
-         * perform. Valid values are defined in AccessibilityManager and Settings arrays.xml:
-         * - AccessibilityManager.DALTONIZER_DISABLED = -1
-         * - AccessibilityManager.DALTONIZER_SIMULATE_MONOCHROMACY = 0
-         * - <item>@string/daltonizer_mode_protanomaly</item> = 11
-         * - AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY and
-         *       <item>@string/daltonizer_mode_deuteranomaly</item> = 12
-         * - <item>@string/daltonizer_mode_tritanomaly</item> = 13
-         *
+         * Indicates whether settings backup has been fully provisioned.
+         * Type: int ( 0 = unprovisioned, 1 = fully provisioned )
          * @hide
          */
         @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER =
-                "accessibility_display_daltonizer";
+        public static final String BACKUP_PROVISIONED = "backup_provisioned";
 
         /**
-         * Integer property that determines the saturation level of color correction. Default value
-         * is defined in Settings config.xml.
-         * [0-10] inclusive where 0 would look as if color space adustment is not applied at all.
-         *
+         * Component of the transport to use for backup/restore.
          * @hide
          */
-        public static final String ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL =
-                "accessibility_display_daltonizer_saturation_level";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @Readable
+        public static final String BACKUP_TRANSPORT = "backup_transport";
 
         /**
-         * Setting that specifies whether automatic click when the mouse pointer stops moving is
-         * enabled.
+         * Indicates the version for which the setup wizard was last shown. The version gets
+         * bumped for each release when there is new setup information to show.
          *
          * @hide
          */
-        @UnsupportedAppUsage
+        @SystemApi
         @Readable
-        public static final String ACCESSIBILITY_AUTOCLICK_ENABLED =
-                "accessibility_autoclick_enabled";
+        public static final String LAST_SETUP_SHOWN = "last_setup_shown";
 
         /**
-         * Integer setting specifying amount of time in ms the mouse pointer has to stay still
-         * before performing click when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
-         *
-         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * The interval in milliseconds after which Wi-Fi is considered idle.
+         * When idle, it is possible for the device to be switched from Wi-Fi to
+         * the mobile data network.
          * @hide
+         * @deprecated Use {@link android.provider.Settings.Global#WIFI_IDLE_MS}
+         * instead.
          */
-        @Readable
-        public static final String ACCESSIBILITY_AUTOCLICK_DELAY =
-                "accessibility_autoclick_delay";
+        @Deprecated
+        public static final String WIFI_IDLE_MS = Global.WIFI_IDLE_MS;
 
         /**
-         * Integer setting specifying the autoclick cursor area size (the radius of the autoclick
-         * ring indicator) when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
+         * The global search provider chosen by the user (if multiple global
+         * search providers are installed). This will be the provider returned
+         * by {@link SearchManager#getGlobalSearchActivity()} if it's still
+         * installed. This setting is stored as a flattened component name as
+         * per {@link ComponentName#flattenToString()}.
          *
-         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
          * @hide
          */
-        public static final String ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE =
-                "accessibility_autoclick_cursor_area_size";
+        @Readable
+        public static final String SEARCH_GLOBAL_SEARCH_ACTIVITY =
+                "search_global_search_activity";
 
         /**
-         * Setting that specifies whether minor cursor movement will be ignored when
-         * {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
-         *
-         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * The number of promoted sources in GlobalSearch.
          * @hide
          */
-        public static final String ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT =
-                "accessibility_autoclick_ignore_minor_cursor_movement";
-
+        @Readable
+        public static final String SEARCH_NUM_PROMOTED_SOURCES = "search_num_promoted_sources";
         /**
-         * String setting that stores the position of the autoclick panel when
-         * {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set. The position is stored as a
-         * comma-separated string containing gravity, x-coordinate, y-coordinate, and corner index.
-         * For example, "8388659,15,30,0", where 8388659 means gravity Gravity.START | Gravity.TOP.
-         *
-         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * The maximum number of suggestions returned by GlobalSearch.
          * @hide
          */
-        public static final String ACCESSIBILITY_AUTOCLICK_PANEL_POSITION =
-                "accessibility_autoclick_panel_position";
-
+        @Readable
+        public static final String SEARCH_MAX_RESULTS_TO_DISPLAY = "search_max_results_to_display";
         /**
-         * Setting that specifies whether autoclick type reverts to left click after performing
-         * an action when {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set.
-         *
-         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED
+         * The number of suggestions GlobalSearch will ask each non-web search source for.
          * @hide
          */
-        public static final String ACCESSIBILITY_AUTOCLICK_REVERT_TO_LEFT_CLICK =
-                "accessibility_autoclick_revert_to_left_click";
-
+        @Readable
+        public static final String SEARCH_MAX_RESULTS_PER_SOURCE = "search_max_results_per_source";
         /**
-         * Whether or not larger size icons are used for the pointer of mouse/trackpad for
-         * accessibility.
-         * (0 = false, 1 = true)
-         *
-         * @deprecated This setting is no longer in use, as the size of pointer icons is now
-         *             controlled by the {@link #POINTER_SCALE} setting. The value of this setting
-         *             is ignored.
+         * The number of suggestions the GlobalSearch will ask the web search source for.
          * @hide
          */
-        @UnsupportedAppUsage
         @Readable
-        @Deprecated
-        public static final String ACCESSIBILITY_LARGE_POINTER_ICON =
-                "accessibility_large_pointer_icon";
-
+        public static final String SEARCH_WEB_RESULTS_OVERRIDE_LIMIT =
+                "search_web_results_override_limit";
         /**
-         * The timeout for considering a press to be a long press in milliseconds.
+         * The number of milliseconds that GlobalSearch will wait for suggestions from
+         * promoted sources before continuing with all other sources.
          * @hide
          */
-        @UnsupportedAppUsage
         @Readable
-        @TestApi
-        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
-        public static final String LONG_PRESS_TIMEOUT = "long_press_timeout";
-
+        public static final String SEARCH_PROMOTED_SOURCE_DEADLINE_MILLIS =
+                "search_promoted_source_deadline_millis";
         /**
-         * The duration in milliseconds between the first tap's up event and the second tap's
-         * down event for an interaction to be considered part of the same multi-press.
+         * The number of milliseconds before GlobalSearch aborts search suggesiton queries.
          * @hide
          */
         @Readable
-        @TestApi
-        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
-        public static final String MULTI_PRESS_TIMEOUT = "multi_press_timeout";
-
+        public static final String SEARCH_SOURCE_TIMEOUT_MILLIS = "search_source_timeout_millis";
         /**
-         * Whether to enable key repeats for Physical Keyboard.
-         *
-         * If set to false, continuous key presses on
-         * physical keyboard will not cause the pressed key to repeated.
+         * The maximum number of milliseconds that GlobalSearch shows the previous results
+         * after receiving a new query.
          * @hide
          */
         @Readable
-        public static final String KEY_REPEAT_ENABLED = "key_repeat_enabled";
-
+        public static final String SEARCH_PREFILL_MILLIS = "search_prefill_millis";
         /**
-         * The duration before a key repeat begins in milliseconds.
+         * The maximum age of log data used for shortcuts in GlobalSearch.
          * @hide
          */
         @Readable
-        public static final String KEY_REPEAT_TIMEOUT_MS = "key_repeat_timeout";
-
+        public static final String SEARCH_MAX_STAT_AGE_MILLIS = "search_max_stat_age_millis";
         /**
-         * The duration between successive key repeats in milliseconds.
+         * The maximum age of log data used for source ranking in GlobalSearch.
          * @hide
          */
         @Readable
-        public static final String KEY_REPEAT_DELAY_MS = "key_repeat_delay";
-
+        public static final String SEARCH_MAX_SOURCE_EVENT_AGE_MILLIS =
+                "search_max_source_event_age_millis";
         /**
-         * Setting that specifies recommended timeout in milliseconds for controls
-         * which don't need user's interactions.
-         *
+         * The minimum number of impressions needed to rank a source in GlobalSearch.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS =
-                "accessibility_non_interactive_ui_timeout_ms";
-
+        public static final String SEARCH_MIN_IMPRESSIONS_FOR_SOURCE_RANKING =
+                "search_min_impressions_for_source_ranking";
         /**
-         * Setting that specifies recommended timeout in milliseconds for controls
-         * which need user's interactions.
-         *
+         * The minimum number of clicks needed to rank a source in GlobalSearch.
          * @hide
          */
         @Readable
-        public static final String ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS =
-                "accessibility_interactive_ui_timeout_ms";
-
-
+        public static final String SEARCH_MIN_CLICKS_FOR_SOURCE_RANKING =
+                "search_min_clicks_for_source_ranking";
         /**
-         * Setting that specifies whether Reduce Bright Colors, or brightness dimming by color
-         * adjustment, is enabled.
-         *
+         * The maximum number of shortcuts shown by GlobalSearch.
          * @hide
          */
-        public static final String REDUCE_BRIGHT_COLORS_ACTIVATED =
-                "reduce_bright_colors_activated";
-
+        @Readable
+        public static final String SEARCH_MAX_SHORTCUTS_RETURNED = "search_max_shortcuts_returned";
         /**
-         * Setting that specifies the level of Reduce Bright Colors in intensity. The range is
-         * [0, 100].
-         *
+         * The size of the core thread pool for suggestion queries in GlobalSearch.
          * @hide
          */
-        public static final String REDUCE_BRIGHT_COLORS_LEVEL =
-                "reduce_bright_colors_level";
-
+        @Readable
+        public static final String SEARCH_QUERY_THREAD_CORE_POOL_SIZE =
+                "search_query_thread_core_pool_size";
         /**
-         * Setting that specifies whether Reduce Bright Colors should persist across reboots.
-         *
+         * The maximum size of the thread pool for suggestion queries in GlobalSearch.
          * @hide
          */
-        public static final String REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS =
-                "reduce_bright_colors_persist_across_reboots";
-
+        @Readable
+        public static final String SEARCH_QUERY_THREAD_MAX_POOL_SIZE =
+                "search_query_thread_max_pool_size";
         /**
-         * Integer setting that specifies the duration in ms required to invert the text cursor's
-         * pixels.
-         *
-         * @see ViewConfiguration#getTextCursorBlinkIntervalMillis()
-         *
+         * The size of the core thread pool for shortcut refreshing in GlobalSearch.
          * @hide
          */
-        public static final String ACCESSIBILITY_TEXT_CURSOR_BLINK_INTERVAL_MS =
-                "accessibility_text_cursor_blink_interval_ms";
-
+        @Readable
+        public static final String SEARCH_SHORTCUT_REFRESH_CORE_POOL_SIZE =
+                "search_shortcut_refresh_core_pool_size";
         /**
-         * Setting that holds EM_VALUE (proprietary)
-         *
+         * The maximum size of the thread pool for shortcut refreshing in GlobalSearch.
          * @hide
          */
-        public static final String EM_VALUE =
-                "em_value";
+        @Readable
+        public static final String SEARCH_SHORTCUT_REFRESH_MAX_POOL_SIZE =
+                "search_shortcut_refresh_max_pool_size";
         /**
-         * Setting that specifies whether High Dynamic Range brightness is enabled.
-         *
+         * The maximun time that excess threads in the GlobalSeach thread pools will
+         * wait before terminating.
          * @hide
          */
-        public static final String HDR_BRIGHTNESS_ENABLED =
-                "hdr_brightness_enabled";
-
+        @Readable
+        public static final String SEARCH_THREAD_KEEPALIVE_SECONDS =
+                "search_thread_keepalive_seconds";
         /**
-         * Setting that specifies the intensity of the High Dynamic Range brightness. The range is
-         * [0, 1], which is which is used to scale the HDR/SDR ratio.
-         *
+         * The maximum number of concurrent suggestion queries to each source.
          * @hide
          */
-        public static final String HDR_BRIGHTNESS_BOOST_LEVEL =
-                "hdr_brightness_boost_level";
+        @Readable
+        public static final String SEARCH_PER_SOURCE_CONCURRENT_QUERY_LIMIT =
+                "search_per_source_concurrent_query_limit";
 
         /**
-         * List of the enabled print services.
-         *
-         * N and beyond uses {@link #DISABLED_PRINT_SERVICES}. But this might be used in an upgrade
-         * from pre-N.
-         *
+         * Whether or not alert sounds are played on StorageManagerService events.
+         * (0 = false, 1 = true)
          * @hide
          */
-        @UnsupportedAppUsage
         @Readable
-        public static final String ENABLED_PRINT_SERVICES =
-            "enabled_print_services";
+        public static final String MOUNT_PLAY_NOTIFICATION_SND = "mount_play_not_snd";
 
         /**
-         * List of the disabled print services.
-         *
+         * Whether or not UMS auto-starts on UMS host detection. (0 = false, 1 = true)
          * @hide
          */
-        @TestApi
         @Readable
-        public static final String DISABLED_PRINT_SERVICES =
-            "disabled_print_services";
+        public static final String MOUNT_UMS_AUTOSTART = "mount_ums_autostart";
 
         /**
-         * The saved value for WindowManagerService.setForcedDisplayDensity()
-         * formatted as a single integer representing DPI. If unset, then use
-         * the real display density.
-         *
+         * Whether or not a notification is displayed on UMS host detection. (0 = false, 1 = true)
          * @hide
          */
         @Readable
-        public static final String DISPLAY_DENSITY_FORCED = "display_density_forced";
+        public static final String MOUNT_UMS_PROMPT = "mount_ums_prompt";
 
         /**
-         * Setting to always use the default text-to-speech settings regardless
-         * of the application settings.
-         * 1 = override application settings,
-         * 0 = use application settings (if specified).
-         *
-         * @deprecated  The value of this setting is no longer respected by
-         * the framework text to speech APIs as of the Ice Cream Sandwich release.
+         * Whether or not a notification is displayed while UMS is enabled. (0 = false, 1 = true)
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String TTS_USE_DEFAULTS = "tts_use_defaults";
+        public static final String MOUNT_UMS_NOTIFY_ENABLED = "mount_ums_notify_enabled";
 
         /**
-         * Default text-to-speech engine speech rate. 100 = 1x
+         * If nonzero, ANRs in invisible background processes bring up a dialog.
+         * Otherwise, the process will be silently killed.
+         *
+         * Also prevents ANRs and crash dialogs from being suppressed.
+         * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
         @Readable
-        public static final String TTS_DEFAULT_RATE = "tts_default_rate";
+        @SuppressLint("NoSettingsProvider")
+        public static final String ANR_SHOW_BACKGROUND = "anr_show_background";
 
         /**
-         * Default text-to-speech engine pitch. 100 = 1x
+         * If nonzero, crashes in foreground processes will bring up a dialog.
+         * Otherwise, the process will be silently killed.
+         * @hide
          */
+        @TestApi
         @Readable
-        public static final String TTS_DEFAULT_PITCH = "tts_default_pitch";
+        @SuppressLint("NoSettingsProvider")
+        public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION =
+                "show_first_crash_dialog_dev_option";
 
         /**
-         * Default text-to-speech engine.
+         * The {@link ComponentName} string of the service to be used as the voice recognition
+         * service.
+         *
+         * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String TTS_DEFAULT_SYNTH = "tts_default_synth";
+        public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service";
 
         /**
-         * Default text-to-speech language.
+         * The {@link ComponentName} string of the selected spell checker service which is
+         * one of the services managed by the text service manager.
          *
-         * @deprecated this setting is no longer in use, as of the Ice Cream
-         * Sandwich release. Apps should never need to read this setting directly,
-         * instead can query the TextToSpeech framework classes for the default
-         * locale. {@link TextToSpeech#getLanguage()}.
+         * @hide
          */
-        @Deprecated
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
         @Readable
-        public static final String TTS_DEFAULT_LANG = "tts_default_lang";
+        @SuppressLint("NoSettingsProvider")
+        public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker";
 
         /**
-         * Default text-to-speech country.
+         * {@link android.view.textservice.SpellCheckerSubtype#hashCode()} of the selected subtype
+         * of the selected spell checker service which is one of the services managed by the text
+         * service manager.
          *
-         * @deprecated this setting is no longer in use, as of the Ice Cream
-         * Sandwich release. Apps should never need to read this setting directly,
-         * instead can query the TextToSpeech framework classes for the default
-         * locale. {@link TextToSpeech#getLanguage()}.
+         * @hide
          */
-        @Deprecated
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
         @Readable
-        public static final String TTS_DEFAULT_COUNTRY = "tts_default_country";
+        @SuppressLint("NoSettingsProvider")
+        public static final String SELECTED_SPELL_CHECKER_SUBTYPE =
+                "selected_spell_checker_subtype";
 
         /**
-         * Default text-to-speech locale variant.
+         * Whether spell checker is enabled or not.
          *
-         * @deprecated this setting is no longer in use, as of the Ice Cream
-         * Sandwich release. Apps should never need to read this setting directly,
-         * instead can query the TextToSpeech framework classes for the
-         * locale that is in use {@link TextToSpeech#getLanguage()}.
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String TTS_DEFAULT_VARIANT = "tts_default_variant";
+        public static final String SPELL_CHECKER_ENABLED = "spell_checker_enabled";
 
         /**
-         * Stores the default tts locales on a per engine basis. Stored as
-         * a comma seperated list of values, each value being of the form
-         * {@code engine_name:locale} for example,
-         * {@code com.foo.ttsengine:eng-USA,com.bar.ttsengine:esp-ESP}. This
-         * supersedes {@link #TTS_DEFAULT_LANG}, {@link #TTS_DEFAULT_COUNTRY} and
-         * {@link #TTS_DEFAULT_VARIANT}. Apps should never need to read this
-         * setting directly, and can query the TextToSpeech framework classes
-         * for the locale that is in use.
+         * What happens when the user presses the Power button while in-call
+         * and the screen is on.<br/>
+         * <b>Values:</b><br/>
+         * 1 - The Power button turns off the screen and locks the device. (Default behavior)<br/>
+         * 2 - The Power button hangs up the current call.<br/>
          *
          * @hide
          */
+        @UnsupportedAppUsage
         @Readable
-        public static final String TTS_DEFAULT_LOCALE = "tts_default_locale";
+        public static final String INCALL_POWER_BUTTON_BEHAVIOR = "incall_power_button_behavior";
 
         /**
-         * Space delimited list of plugin packages that are enabled.
+         * Whether the user allows minimal post processing or not.
+         *
+         * <p>Values:
+         * 0 - Not allowed. Any preferences set through the Window.setPreferMinimalPostProcessing
+         *     API will be ignored.
+         * 1 - Allowed. Any preferences set through the Window.setPreferMinimalPostProcessing API
+         *     will be respected and the appropriate signals will be sent to display.
+         *     (Default behaviour)
+         *
+         * @hide
          */
         @Readable
-        public static final String TTS_ENABLED_PLUGINS = "tts_enabled_plugins";
+        public static final String MINIMAL_POST_PROCESSING_ALLOWED =
+                "minimal_post_processing_allowed";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON}
-         * instead.
+         * Whether to mirror the built-in display on all connected displays.
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
-                Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
+        @TestApi
+        @Readable
+        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
+        public static final String MIRROR_BUILT_IN_DISPLAY = "mirror_built_in_display";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY}
-         * instead.
+         * Whether to include the default display in the display topology.
+         *
+         * Note that this value is used for projected mode.
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY =
-                Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY;
+        public static final String INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY =
+                "include_default_display_in_topology";
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_NUM_OPEN_NETWORKS_KEPT}
-         * instead.
+         * No mode switching will happen.
+         *
+         * @see #MATCH_CONTENT_FRAME_RATE
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_NUM_OPEN_NETWORKS_KEPT =
-                Global.WIFI_NUM_OPEN_NETWORKS_KEPT;
+        public static final int MATCH_CONTENT_FRAMERATE_NEVER = 0;
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_ON}
-         * instead.
+         * Allow only refresh rate switching between modes in the same configuration group.
+         * This way only switches without visual interruptions for the user will be allowed.
+         *
+         * @see #MATCH_CONTENT_FRAME_RATE
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_ON = Global.WIFI_ON;
+        public static final int MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY = 1;
 
         /**
-         * The acceptable packet loss percentage (range 0 - 100) before trying
-         * another AP on the same network.
-         * @deprecated This setting is not used.
-         */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE =
-                "wifi_watchdog_acceptable_packet_loss_percentage";
+         * Allow refresh rate switching between all refresh rates even if the switch will have
+         * visual interruptions for the user.
+         *
+         * @see #MATCH_CONTENT_FRAME_RATE
+         * @hide
+         */
+        public static final int MATCH_CONTENT_FRAMERATE_ALWAYS = 2;
 
         /**
-         * The number of access points required for a network in order for the
-         * watchdog to monitor it.
-         * @deprecated This setting is not used.
+         * User's preference for refresh rate switching.
+         *
+         * <p>Values:
+         * 0 - Never switch refresh rates.
+         * 1 - Switch refresh rates only when it can be done seamlessly. (Default behaviour)
+         * 2 - Always prefer refresh rate switching even if it's going to have visual interruptions
+         *     for the user.
+         *
+         * @see android.view.Surface#setFrameRate
+         * @see #MATCH_CONTENT_FRAMERATE_NEVER
+         * @see #MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY
+         * @see #MATCH_CONTENT_FRAMERATE_ALWAYS
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";
+        public static final String MATCH_CONTENT_FRAME_RATE =
+                "match_content_frame_rate";
 
         /**
-         * The delay between background checks.
-         * @deprecated This setting is not used.
+         * INCALL_POWER_BUTTON_BEHAVIOR value for "turn off screen".
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS =
-                "wifi_watchdog_background_check_delay_ms";
+        public static final int INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF = 0x1;
 
         /**
-         * Whether the Wi-Fi watchdog is enabled for background checking even
-         * after it thinks the user has connected to a good access point.
-         * @deprecated This setting is not used.
+         * INCALL_POWER_BUTTON_BEHAVIOR value for "hang up".
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED =
-                "wifi_watchdog_background_check_enabled";
+        public static final int INCALL_POWER_BUTTON_BEHAVIOR_HANGUP = 0x2;
 
         /**
-         * The timeout for a background ping
-         * @deprecated This setting is not used.
+         * INCALL_POWER_BUTTON_BEHAVIOR default value.
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS =
-                "wifi_watchdog_background_check_timeout_ms";
+        public static final int INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT =
+                INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF;
 
         /**
-         * The number of initial pings to perform that *may* be ignored if they
-         * fail. Again, if these fail, they will *not* be used in packet loss
-         * calculation. For example, one network always seemed to time out for
-         * the first couple pings, so this is set to 3 by default.
-         * @deprecated This setting is not used.
+         * What happens when the user presses the Back button while in-call
+         * and the screen is on.<br/>
+         * <b>Values:</b><br/>
+         * 0 - The Back buttons does nothing different.<br/>
+         * 1 - The Back button hangs up the current call.<br/>
+         *
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT =
-            "wifi_watchdog_initial_ignored_ping_count";
+        public static final String INCALL_BACK_BUTTON_BEHAVIOR = "incall_back_button_behavior";
 
         /**
-         * The maximum number of access points (per network) to attempt to test.
-         * If this number is reached, the watchdog will no longer monitor the
-         * initial connection state for the network. This is a safeguard for
-         * networks containing multiple APs whose DNS does not respond to pings.
-         * @deprecated This setting is not used.
+         * INCALL_BACK_BUTTON_BEHAVIOR value for no action.
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";
+        public static final int INCALL_BACK_BUTTON_BEHAVIOR_NONE = 0x0;
 
         /**
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_WATCHDOG_ON} instead
+         * INCALL_BACK_BUTTON_BEHAVIOR value for "hang up".
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
+        public static final int INCALL_BACK_BUTTON_BEHAVIOR_HANGUP = 0x1;
 
         /**
-         * A comma-separated list of SSIDs for which the Wi-Fi watchdog should be enabled.
-         * @deprecated This setting is not used.
+         * INCALL_POWER_BUTTON_BEHAVIOR default value.
+         * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String WIFI_WATCHDOG_WATCH_LIST = "wifi_watchdog_watch_list";
+        public static final int INCALL_BACK_BUTTON_BEHAVIOR_DEFAULT =
+                INCALL_BACK_BUTTON_BEHAVIOR_NONE;
 
         /**
-         * The number of pings to test if an access point is a good connection.
-         * @deprecated This setting is not used.
+         * Whether the device should wake when the wake gesture sensor detects motion.
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
+        public static final String WAKE_GESTURE_ENABLED = "wake_gesture_enabled";
 
         /**
-         * The delay between pings.
-         * @deprecated This setting is not used.
+         * Whether the device should doze if configured.
+         * @hide
          */
-        @Deprecated
+        @UnsupportedAppUsage
         @Readable
-        public static final String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
+        public static final String DOZE_ENABLED = "doze_enabled";
 
         /**
-         * The timeout per ping.
-         * @deprecated This setting is not used.
+         * Indicates whether doze should be always on.
+         * <p>
+         * Type: int (0 for false, 1 for true)
+         *
+         * @hide
          */
-        @Deprecated
+        @SystemApi
         @Readable
-        public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
+        public static final String DOZE_ALWAYS_ON = "doze_always_on";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_MAX_DHCP_RETRY_COUNT} instead
+         * Indicates whether doze turns on automatically
+         * 0 = disabled (default)
+         * 1 = from sunset to sunrise
+         * 2 = custom time
+         * 3 = from sunset till a time
+         * 4 = from a time till sunrise
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_MAX_DHCP_RETRY_COUNT = Global.WIFI_MAX_DHCP_RETRY_COUNT;
+        @Readable
+        public static final String DOZE_ALWAYS_ON_AUTO_MODE = "doze_always_on_auto_mode";
 
         /**
-         * @deprecated Use
-         * {@link android.provider.Settings.Global#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS} instead
+         * The custom time {@link DOZE_ALWAYS_ON} should be on at
+         * Only relevant when {@link DOZE_ALWAYS_ON_AUTO_MODE} is set to 2 and above
+         * 0 = Disabled (default)
+         * format: HH:mm,HH:mm (since,till)
+         * @hide
          */
-        @Deprecated
-        public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =
-                Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS;
+        @Readable
+        public static final String DOZE_ALWAYS_ON_AUTO_TIME = "doze_always_on_auto_time";
 
         /**
-         * The number of milliseconds to hold on to a PendingIntent based request. This delay gives
-         * the receivers of the PendingIntent an opportunity to make a new network request before
-         * the Network satisfying the request is potentially removed.
+         * Indicates whether doze should briefly show AOD when the screen turns off.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
         @Readable
-        public static final String CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS =
-                "connectivity_release_pending_intent_delay_ms";
+        public static final String DOZE_PEEK = "doze_peek";
 
         /**
-         * Whether background data usage is allowed.
+         * Indicates how long doze peek should stay visible when the screen turns off.
+         * <p>
+         * Type: int (seconds)
          *
-         * @deprecated As of {@link VERSION_CODES#ICE_CREAM_SANDWICH},
-         *             availability of background data depends on several
-         *             combined factors. When background data is unavailable,
-         *             {@link ConnectivityManager#getActiveNetworkInfo()} will
-         *             now appear disconnected.
+         * @hide
          */
-        @Deprecated
         @Readable
-        public static final String BACKGROUND_DATA = "background_data";
+        public static final String DOZE_PEEK_DURATION = "doze_peek_duration";
 
         /**
-         * Origins for which browsers should allow geolocation by default.
-         * The value is a space-separated list of origins.
+         * Indicates whether ambient wallpaper is visible with AOD.
+         * <p>
+         * Type: int (0 for false, 1 for true)
+         *
+         * @hide
          */
-        @Readable
-        public static final String ALLOWED_GEOLOCATION_ORIGINS
-                = "allowed_geolocation_origins";
+        public static final String DOZE_ALWAYS_ON_WALLPAPER_ENABLED =
+                "doze_always_on_wallpaper_enabled";
 
         /**
-         * The preferred TTY mode     0 = TTy Off, CDMA default
-         *                            1 = TTY Full
-         *                            2 = TTY HCO
-         *                            3 = TTY VCO
+         * Whether the device should pulse on pick up gesture.
          * @hide
          */
         @Readable
-        public static final String PREFERRED_TTY_MODE =
-                "preferred_tty_mode";
+        public static final String DOZE_PICK_UP_GESTURE = "doze_pick_up_gesture";
 
         /**
-         * Whether the enhanced voice privacy mode is enabled.
-         * 0 = normal voice privacy
-         * 1 = enhanced voice privacy
+         * Whether the device should pulse on long press gesture.
          * @hide
          */
         @Readable
-        public static final String ENHANCED_VOICE_PRIVACY_ENABLED = "enhanced_voice_privacy_enabled";
+        public static final String DOZE_PULSE_ON_LONG_PRESS = "doze_pulse_on_long_press";
 
         /**
-         * Whether the TTY mode mode is enabled.
-         * 0 = disabled
-         * 1 = enabled
+         * Whether the device should pulse on double tap gesture.
          * @hide
          */
         @Readable
-        public static final String TTY_MODE_ENABLED = "tty_mode_enabled";
+        public static final String DOZE_DOUBLE_TAP_GESTURE = "doze_pulse_on_double_tap";
 
         /**
-         * User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT
-         * calls when supported by the device and carrier. Boolean value.
-         * 0 = OFF
-         * 1 = ON
+         * Whether the device should respond to the SLPI tap gesture.
+         * @hide
          */
         @Readable
-        public static final String RTT_CALLING_MODE = "rtt_calling_mode";
+        public static final String DOZE_TAP_SCREEN_GESTURE = "doze_tap_gesture";
 
         /**
-        /**
-         * Controls whether settings backup is enabled.
-         * Type: int ( 0 = disabled, 1 = enabled )
+         * Gesture that wakes up the display, showing some version of the lock screen.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String BACKUP_ENABLED = "backup_enabled";
+        public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_screen_gesture";
 
         /**
-         * Controls whether application data is automatically restored from backup
-         * at install time.
-         * Type: int ( 0 = disabled, 1 = enabled )
+         * Gesture that wakes up the display, toggling between {@link Display.STATE_OFF} and
+         * {@link Display.STATE_DOZE}.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String BACKUP_AUTO_RESTORE = "backup_auto_restore";
+        public static final String DOZE_WAKE_DISPLAY_GESTURE = "doze_wake_display_gesture";
 
         /**
-         * Controls whether framework backup scheduling is enabled.
+         * Gesture that wakes up the display on quick pickup, toggling between
+         * {@link Display.STATE_OFF} and {@link Display.STATE_DOZE}.
          * @hide
          */
-        public static final String BACKUP_SCHEDULING_ENABLED = "backup_scheduling_enabled";
+        public static final String DOZE_QUICK_PICKUP_GESTURE = "doze_quick_pickup_gesture";
 
         /**
-         * Indicates whether settings backup has been fully provisioned.
-         * Type: int ( 0 = unprovisioned, 1 = fully provisioned )
+         * Whether the device should suppress the current doze configuration and disable dozing.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String BACKUP_PROVISIONED = "backup_provisioned";
+        public static final String SUPPRESS_DOZE = "suppress_doze";
 
         /**
-         * Component of the transport to use for backup/restore.
+         * Pulse notifications on tilt
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @Readable
-        public static final String BACKUP_TRANSPORT = "backup_transport";
+        public static final String DOZE_TILT_GESTURE = "doze_tilt_gesture";
 
         /**
-         * Indicates the version for which the setup wizard was last shown. The version gets
-         * bumped for each release when there is new setup information to show.
-         *
+         * Pulse notifications on hand wave
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String LAST_SETUP_SHOWN = "last_setup_shown";
+        public static final String DOZE_HANDWAVE_GESTURE = "doze_handwave_gesture";
 
         /**
-         * The interval in milliseconds after which Wi-Fi is considered idle.
-         * When idle, it is possible for the device to be switched from Wi-Fi to
-         * the mobile data network.
+         * Pulse notifications on removal from pocket
          * @hide
-         * @deprecated Use {@link android.provider.Settings.Global#WIFI_IDLE_MS}
-         * instead.
          */
-        @Deprecated
-        public static final String WIFI_IDLE_MS = Global.WIFI_IDLE_MS;
+        public static final String DOZE_POCKET_GESTURE = "doze_pocket_gesture";
 
         /**
-         * The global search provider chosen by the user (if multiple global
-         * search providers are installed). This will be the provider returned
-         * by {@link SearchManager#getGlobalSearchActivity()} if it's still
-         * installed. This setting is stored as a flattened component name as
-         * per {@link ComponentName#flattenToString()}.
-         *
+         * Wake up instead of pulsing notifications
          * @hide
          */
-        @Readable
-        public static final String SEARCH_GLOBAL_SEARCH_ACTIVITY =
-                "search_global_search_activity";
+        public static final String RAISE_TO_WAKE_GESTURE = "raise_to_wake_gesture";
 
         /**
-         * The number of promoted sources in GlobalSearch.
+         * Vibrate when pulsing notifications on gesture
          * @hide
          */
-        @Readable
-        public static final String SEARCH_NUM_PROMOTED_SOURCES = "search_num_promoted_sources";
+        public static final String DOZE_GESTURE_VIBRATE = "doze_gesture_vibrate";
+
         /**
-         * The maximum number of suggestions returned by GlobalSearch.
+         * Gesture that skips media.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MAX_RESULTS_TO_DISPLAY = "search_max_results_to_display";
+        public static final String SKIP_GESTURE = "skip_gesture";
+
         /**
-         * The number of suggestions GlobalSearch will ask each non-web search source for.
+         * Count of successful gestures.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MAX_RESULTS_PER_SOURCE = "search_max_results_per_source";
+        public static final String SKIP_GESTURE_COUNT = "skip_gesture_count";
+
         /**
-         * The number of suggestions the GlobalSearch will ask the web search source for.
+         * Count of non-gesture interaction.
          * @hide
          */
         @Readable
-        public static final String SEARCH_WEB_RESULTS_OVERRIDE_LIMIT =
-                "search_web_results_override_limit";
+        public static final String SKIP_TOUCH_COUNT = "skip_touch_count";
+
         /**
-         * The number of milliseconds that GlobalSearch will wait for suggestions from
-         * promoted sources before continuing with all other sources.
+         * Direction to advance media for skip gesture
          * @hide
          */
         @Readable
-        public static final String SEARCH_PROMOTED_SOURCE_DEADLINE_MILLIS =
-                "search_promoted_source_deadline_millis";
+        public static final String SKIP_DIRECTION = "skip_gesture_direction";
+
         /**
-         * The number of milliseconds before GlobalSearch aborts search suggesiton queries.
+         * Gesture that silences sound (alarms, notification, calls).
          * @hide
          */
         @Readable
-        public static final String SEARCH_SOURCE_TIMEOUT_MILLIS = "search_source_timeout_millis";
+        public static final String SILENCE_GESTURE = "silence_gesture";
+
         /**
-         * The maximum number of milliseconds that GlobalSearch shows the previous results
-         * after receiving a new query.
+         * Count of successful silence alarms gestures.
          * @hide
          */
         @Readable
-        public static final String SEARCH_PREFILL_MILLIS = "search_prefill_millis";
+        public static final String SILENCE_ALARMS_GESTURE_COUNT = "silence_alarms_gesture_count";
+
         /**
-         * The maximum age of log data used for shortcuts in GlobalSearch.
+         * Count of successful silence timer gestures.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MAX_STAT_AGE_MILLIS = "search_max_stat_age_millis";
+        public static final String SILENCE_TIMER_GESTURE_COUNT = "silence_timer_gesture_count";
+
         /**
-         * The maximum age of log data used for source ranking in GlobalSearch.
+         * Count of successful silence call gestures.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MAX_SOURCE_EVENT_AGE_MILLIS =
-                "search_max_source_event_age_millis";
+        public static final String SILENCE_CALL_GESTURE_COUNT = "silence_call_gesture_count";
+
         /**
-         * The minimum number of impressions needed to rank a source in GlobalSearch.
+         * Count of non-gesture interaction.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MIN_IMPRESSIONS_FOR_SOURCE_RANKING =
-                "search_min_impressions_for_source_ranking";
+        public static final String SILENCE_ALARMS_TOUCH_COUNT = "silence_alarms_touch_count";
+
         /**
-         * The minimum number of clicks needed to rank a source in GlobalSearch.
+         * Count of non-gesture interaction.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MIN_CLICKS_FOR_SOURCE_RANKING =
-                "search_min_clicks_for_source_ranking";
+        public static final String SILENCE_TIMER_TOUCH_COUNT = "silence_timer_touch_count";
+
         /**
-         * The maximum number of shortcuts shown by GlobalSearch.
+         * Count of non-gesture interaction.
          * @hide
          */
         @Readable
-        public static final String SEARCH_MAX_SHORTCUTS_RETURNED = "search_max_shortcuts_returned";
+        public static final String SILENCE_CALL_TOUCH_COUNT = "silence_call_touch_count";
+
         /**
-         * The size of the core thread pool for suggestion queries in GlobalSearch.
+         * Number of successful "Motion Sense" tap gestures to pause media.
          * @hide
          */
         @Readable
-        public static final String SEARCH_QUERY_THREAD_CORE_POOL_SIZE =
-                "search_query_thread_core_pool_size";
+        public static final String AWARE_TAP_PAUSE_GESTURE_COUNT = "aware_tap_pause_gesture_count";
+
         /**
-         * The maximum size of the thread pool for suggestion queries in GlobalSearch.
+         * Number of touch interactions to pause media when a "Motion Sense" gesture could
+         * have been used.
          * @hide
          */
         @Readable
-        public static final String SEARCH_QUERY_THREAD_MAX_POOL_SIZE =
-                "search_query_thread_max_pool_size";
+        public static final String AWARE_TAP_PAUSE_TOUCH_COUNT = "aware_tap_pause_touch_count";
+
         /**
-         * The size of the core thread pool for shortcut refreshing in GlobalSearch.
+         * For user preference if swipe bottom to expand notification gesture enabled.
          * @hide
          */
-        @Readable
-        public static final String SEARCH_SHORTCUT_REFRESH_CORE_POOL_SIZE =
-                "search_shortcut_refresh_core_pool_size";
+        public static final String SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
+                "swipe_bottom_to_notification_enabled";
+
         /**
-         * The maximum size of the thread pool for shortcut refreshing in GlobalSearch.
+         * Controls whether One-Handed mode is currently activated.
          * @hide
          */
-        @Readable
-        public static final String SEARCH_SHORTCUT_REFRESH_MAX_POOL_SIZE =
-                "search_shortcut_refresh_max_pool_size";
+        public static final String ONE_HANDED_MODE_ACTIVATED = "one_handed_mode_activated";
+
         /**
-         * The maximun time that excess threads in the GlobalSeach thread pools will
-         * wait before terminating.
+         * For user preference if One-Handed Mode enabled.
          * @hide
          */
-        @Readable
-        public static final String SEARCH_THREAD_KEEPALIVE_SECONDS =
-                "search_thread_keepalive_seconds";
+        public static final String ONE_HANDED_MODE_ENABLED = "one_handed_mode_enabled";
+
         /**
-         * The maximum number of concurrent suggestion queries to each source.
+         * For user preference if One-Handed Mode timeout.
          * @hide
          */
-        @Readable
-        public static final String SEARCH_PER_SOURCE_CONCURRENT_QUERY_LIMIT =
-                "search_per_source_concurrent_query_limit";
+        public static final String ONE_HANDED_MODE_TIMEOUT = "one_handed_mode_timeout";
 
         /**
-         * Whether or not alert sounds are played on StorageManagerService events.
-         * (0 = false, 1 = true)
+         * For user taps app to exit One-Handed Mode.
          * @hide
          */
-        @Readable
-        public static final String MOUNT_PLAY_NOTIFICATION_SND = "mount_play_not_snd";
+        public static final String TAPS_APP_TO_EXIT = "taps_app_to_exit";
 
         /**
-         * Whether or not UMS auto-starts on UMS host detection. (0 = false, 1 = true)
+         * Internal use, one handed mode tutorial showed times.
          * @hide
          */
-        @Readable
-        public static final String MOUNT_UMS_AUTOSTART = "mount_ums_autostart";
+        public static final String ONE_HANDED_TUTORIAL_SHOW_COUNT =
+                "one_handed_tutorial_show_count";
 
         /**
-         * Whether or not a notification is displayed on UMS host detection. (0 = false, 1 = true)
+         * Toggle to enable/disable for the apps to use the Ui translation for Views. The value
+         * indicates whether the Ui translation is enabled by the user.
+         * <p>
+         * Type: {@code int} ({@code 0} for disabled, {@code 1} for enabled)
+         *
          * @hide
          */
+        @SystemApi
         @Readable
-        public static final String MOUNT_UMS_PROMPT = "mount_ums_prompt";
+        @SuppressLint("NoSettingsProvider")
+        public static final String UI_TRANSLATION_ENABLED = "ui_translation_enabled";
 
         /**
-         * Whether or not a notification is displayed while UMS is enabled. (0 = false, 1 = true)
+         * The current night mode that has been selected by the user.  Owned
+         * and controlled by UiModeManagerService.  Constants are as per
+         * UiModeManager.
          * @hide
          */
         @Readable
-        public static final String MOUNT_UMS_NOTIFY_ENABLED = "mount_ums_notify_enabled";
+        public static final String UI_NIGHT_MODE = "ui_night_mode";
 
         /**
-         * If nonzero, ANRs in invisible background processes bring up a dialog.
-         * Otherwise, the process will be silently killed.
-         *
-         * Also prevents ANRs and crash dialogs from being suppressed.
+         * The current night mode custom type that has been selected by the user.  Owned
+         * and controlled by UiModeManagerService. Constants are as per UiModeManager.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
         @Readable
         @SuppressLint("NoSettingsProvider")
-        public static final String ANR_SHOW_BACKGROUND = "anr_show_background";
+        public static final String UI_NIGHT_MODE_CUSTOM_TYPE = "ui_night_mode_custom_type";
 
         /**
-         * If nonzero, crashes in foreground processes will bring up a dialog.
-         * Otherwise, the process will be silently killed.
+         * The current night mode that has been overridden to turn on by the system.  Owned
+         * and controlled by UiModeManagerService.  Constants are as per
+         * UiModeManager.
          * @hide
          */
-        @TestApi
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION =
-                "show_first_crash_dialog_dev_option";
+        public static final String UI_NIGHT_MODE_OVERRIDE_ON = "ui_night_mode_override_on";
 
         /**
-         * The {@link ComponentName} string of the service to be used as the voice recognition
-         * service.
-         *
+         * The last computed night mode bool the last time the phone was on
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @Readable
-        public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service";
+        public static final String UI_NIGHT_MODE_LAST_COMPUTED = "ui_night_mode_last_computed";
 
         /**
-         * The {@link ComponentName} string of the selected spell checker service which is
-         * one of the services managed by the text service manager.
-         *
+         * The current night mode that has been overridden to turn off by the system.  Owned
+         * and controlled by UiModeManagerService.  Constants are as per
+         * UiModeManager.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker";
+        public static final String UI_NIGHT_MODE_OVERRIDE_OFF = "ui_night_mode_override_off";
 
         /**
-         * {@link android.view.textservice.SpellCheckerSubtype#hashCode()} of the selected subtype
-         * of the selected spell checker service which is one of the services managed by the text
-         * service manager.
-         *
+         * Whether screensavers are enabled.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String SELECTED_SPELL_CHECKER_SUBTYPE =
-                "selected_spell_checker_subtype";
+        public static final String SCREENSAVER_ENABLED = "screensaver_enabled";
 
         /**
-         * Whether spell checker is enabled or not.
+         * The user's chosen screensaver components.
          *
+         * These will be launched by the PhoneWindowManager after a timeout when not on
+         * battery, or upon dock insertion (if SCREENSAVER_ACTIVATE_ON_DOCK is set to 1).
          * @hide
          */
         @Readable
-        public static final String SPELL_CHECKER_ENABLED = "spell_checker_enabled";
+        public static final String SCREENSAVER_COMPONENTS = "screensaver_components";
 
         /**
-         * What happens when the user presses the Power button while in-call
-         * and the screen is on.<br/>
-         * <b>Values:</b><br/>
-         * 1 - The Power button turns off the screen and locks the device. (Default behavior)<br/>
-         * 2 - The Power button hangs up the current call.<br/>
-         *
+         * If screensavers are enabled, whether the screensaver should be automatically launched
+         * when the device is inserted into a (desk) dock.
          * @hide
          */
-        @UnsupportedAppUsage
         @Readable
-        public static final String INCALL_POWER_BUTTON_BEHAVIOR = "incall_power_button_behavior";
+        public static final String SCREENSAVER_ACTIVATE_ON_DOCK = "screensaver_activate_on_dock";
 
         /**
-         * Whether the user allows minimal post processing or not.
-         *
-         * <p>Values:
-         * 0 - Not allowed. Any preferences set through the Window.setPreferMinimalPostProcessing
-         *     API will be ignored.
-         * 1 - Allowed. Any preferences set through the Window.setPreferMinimalPostProcessing API
-         *     will be respected and the appropriate signals will be sent to display.
-         *     (Default behaviour)
-         *
+         * If screensavers are enabled, whether the screensaver should be automatically launched
+         * when the screen times out when not on battery.
          * @hide
          */
         @Readable
-        public static final String MINIMAL_POST_PROCESSING_ALLOWED =
-                "minimal_post_processing_allowed";
+        public static final String SCREENSAVER_ACTIVATE_ON_SLEEP = "screensaver_activate_on_sleep";
 
         /**
-         * Whether to mirror the built-in display on all connected displays.
+         * If screensavers are enabled, whether the screensaver should be
+         * automatically launched when the device is stationary and upright.
          * @hide
          */
-        @TestApi
         @Readable
-        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
-        public static final String MIRROR_BUILT_IN_DISPLAY = "mirror_built_in_display";
+        public static final String SCREENSAVER_ACTIVATE_ON_POSTURED =
+                "screensaver_activate_on_postured";
 
         /**
-         * Whether to include the default display in the display topology.
-         *
-         * Note that this value is used for projected mode.
+         * If screensavers are enabled, the default screensaver component.
          * @hide
          */
-        public static final String INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY =
-                "include_default_display_in_topology";
+        @Readable
+        public static final String SCREENSAVER_DEFAULT_COMPONENT = "screensaver_default_component";
 
         /**
-         * No mode switching will happen.
+         * Whether complications are enabled to be shown over the screensaver by the user.
          *
-         * @see #MATCH_CONTENT_FRAME_RATE
          * @hide
          */
-        public static final int MATCH_CONTENT_FRAMERATE_NEVER = 0;
+        public static final String SCREENSAVER_COMPLICATIONS_ENABLED =
+                "screensaver_complications_enabled";
 
         /**
-         * Allow only refresh rate switching between modes in the same configuration group.
-         * This way only switches without visual interruptions for the user will be allowed.
+         * Defines the enabled state for the glanceable hub.
          *
-         * @see #MATCH_CONTENT_FRAME_RATE
          * @hide
          */
-        public static final int MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY = 1;
+        @TestApi
+        @Readable
+        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
+        public static final String GLANCEABLE_HUB_ENABLED = "glanceable_hub_enabled";
 
         /**
-         * Allow refresh rate switching between all refresh rates even if the switch will have
-         * visual interruptions for the user.
+         * Indicates that glanceable hub should never be started automatically.
          *
-         * @see #MATCH_CONTENT_FRAME_RATE
          * @hide
          */
-        public static final int MATCH_CONTENT_FRAMERATE_ALWAYS = 2;
+        public static final int GLANCEABLE_HUB_START_NEVER = 0;
 
         /**
-         * User's preference for refresh rate switching.
-         *
-         * <p>Values:
-         * 0 - Never switch refresh rates.
-         * 1 - Switch refresh rates only when it can be done seamlessly. (Default behaviour)
-         * 2 - Always prefer refresh rate switching even if it's going to have visual interruptions
-         *     for the user.
+         * Indicates that glanceable hub should be started when charging.
          *
-         * @see android.view.Surface#setFrameRate
-         * @see #MATCH_CONTENT_FRAMERATE_NEVER
-         * @see #MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY
-         * @see #MATCH_CONTENT_FRAMERATE_ALWAYS
          * @hide
          */
-        public static final String MATCH_CONTENT_FRAME_RATE =
-                "match_content_frame_rate";
+        public static final int GLANCEABLE_HUB_START_CHARGING = 1;
 
         /**
-         * INCALL_POWER_BUTTON_BEHAVIOR value for "turn off screen".
+         * Indicates that glanceable hub should be started when charging and upright.
+         *
          * @hide
          */
-        public static final int INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF = 0x1;
+        public static final int GLANCEABLE_HUB_START_CHARGING_UPRIGHT = 2;
 
         /**
-         * INCALL_POWER_BUTTON_BEHAVIOR value for "hang up".
+         * Indicates that glanceable hub should be started when docked.
+         *
          * @hide
          */
-        public static final int INCALL_POWER_BUTTON_BEHAVIOR_HANGUP = 0x2;
+        public static final int GLANCEABLE_HUB_START_DOCKED = 3;
+
+        /** @hide */
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({
+                GLANCEABLE_HUB_START_NEVER,
+                GLANCEABLE_HUB_START_CHARGING,
+                GLANCEABLE_HUB_START_CHARGING_UPRIGHT,
+                GLANCEABLE_HUB_START_DOCKED,
+        })
+        public @interface WhenToStartGlanceableHub {
+        }
 
         /**
-         * INCALL_POWER_BUTTON_BEHAVIOR default value.
+         * Indicates when to start glanceable hub. Possible values are:
+         * 0: Never
+         * 1: While charging always
+         * 2: While upright and charging
+         * 3: While docked
+         *
          * @hide
          */
-        public static final int INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT =
-                INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF;
+        public static final String WHEN_TO_START_GLANCEABLE_HUB =
+                "when_to_start_glanceable_hub";
 
         /**
-         * What happens when the user presses the Back button while in-call
-         * and the screen is on.<br/>
-         * <b>Values:</b><br/>
-         * 0 - The Back buttons does nothing different.<br/>
-         * 1 - The Back button hangs up the current call.<br/>
+         * Whether glanceable hub should only start when charging wirelessly.
          *
          * @hide
          */
-        @Readable
-        public static final String INCALL_BACK_BUTTON_BEHAVIOR = "incall_back_button_behavior";
+        public static final String GLANCEABLE_HUB_RESTRICT_TO_WIRELESS_CHARGING =
+                "glanceable_hub_restrict_to_writeless_charging";
 
         /**
-         * INCALL_BACK_BUTTON_BEHAVIOR value for no action.
+         * Nothing should be done during low light
+         *
          * @hide
          */
-        public static final int INCALL_BACK_BUTTON_BEHAVIOR_NONE = 0x0;
+        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_NONE = 0;
 
         /**
-         * INCALL_BACK_BUTTON_BEHAVIOR value for "hang up".
+         * The screen should turn completely off in low light.
+         *
          * @hide
          */
-        public static final int INCALL_BACK_BUTTON_BEHAVIOR_HANGUP = 0x1;
+        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_SCREEN_OFF = 1;
 
         /**
-         * INCALL_POWER_BUTTON_BEHAVIOR default value.
+         * The screen should switch to a low light clock dream if dreaming is enabled in low light.
+         *
          * @hide
          */
-        public static final int INCALL_BACK_BUTTON_BEHAVIOR_DEFAULT =
-                INCALL_BACK_BUTTON_BEHAVIOR_NONE;
+        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_LOW_LIGHT_CLOCK_DREAM = 2;
 
         /**
-         * Whether the device should wake when the wake gesture sensor detects motion.
+         * The screen should not show dreams if enabled (AOD will be permitted).
+         *
          * @hide
          */
-        @Readable
-        public static final String WAKE_GESTURE_ENABLED = "wake_gesture_enabled";
+        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_NO_DREAM = 3;
+
+        /** @hide */
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({
+                LOW_LIGHT_DISPLAY_BEHAVIOR_NONE,
+                LOW_LIGHT_DISPLAY_BEHAVIOR_SCREEN_OFF,
+                LOW_LIGHT_DISPLAY_BEHAVIOR_LOW_LIGHT_CLOCK_DREAM,
+                LOW_LIGHT_DISPLAY_BEHAVIOR_NO_DREAM,
+        })
+        public @interface LowLightDisplayBehavior {
+        }
 
         /**
-         * Whether the device should doze if configured.
+         * Indicates display behavior in low light. Options are:
+         * 0: None
+         * 1: Keep screen off
+         * 2: Show low light clock dream
+         * 3: Disable dreaming
+         *
          * @hide
          */
-        @UnsupportedAppUsage
-        @Readable
-        public static final String DOZE_ENABLED = "doze_enabled";
+        public static final String LOW_LIGHT_DISPLAY_BEHAVIOR =
+                "low_light_display_behavior";
 
         /**
-         * Indicates whether doze should be always on.
-         * <p>
-         * Type: int (0 for false, 1 for true)
+         * Indicates whether display behavior in low light is enabled.
          *
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String DOZE_ALWAYS_ON = "doze_always_on";
+        public static final String LOW_LIGHT_DISPLAY_BEHAVIOR_ENABLED =
+                "low_light_display_behavior_enabled";
 
         /**
-         * Indicates whether ambient wallpaper is visible with AOD.
-         * <p>
-         * Type: int (0 for false, 1 for true)
+         * Whether home controls are enabled to be shown over the screensaver by the user.
          *
          * @hide
          */
-        public static final String DOZE_ALWAYS_ON_WALLPAPER_ENABLED =
-                "doze_always_on_wallpaper_enabled";
+        public static final String SCREENSAVER_HOME_CONTROLS_ENABLED =
+                "screensaver_home_controls_enabled";
 
         /**
-         * Whether the device should pulse on pick up gesture.
+         * Whether screensaver should only start when charging wirelessly.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_PICK_UP_GESTURE = "doze_pulse_on_pick_up";
+        public static final String SCREENSAVER_RESTRICT_TO_WIRELESS_CHARGING =
+                "screensaver_restrict_to_writeless_charging";
 
         /**
-         * Whether the device should pulse on long press gesture.
+         * Default, indicates that the user has not yet started the dock setup flow.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_PULSE_ON_LONG_PRESS = "doze_pulse_on_long_press";
+        public static final int DOCK_SETUP_NOT_STARTED = 0;
 
         /**
-         * Whether the device should pulse on double tap gesture.
+         * Indicates that the user has started but not yet completed dock setup.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_DOUBLE_TAP_GESTURE = "doze_pulse_on_double_tap";
+        public static final int DOCK_SETUP_STARTED = 1;
 
         /**
-         * Whether the device should respond to the SLPI tap gesture.
+         * Indicates that the user has snoozed dock setup and will complete it later.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_TAP_SCREEN_GESTURE = "doze_tap_gesture";
+        public static final int DOCK_SETUP_PAUSED = 2;
 
         /**
-         * Gesture that wakes up the display, showing some version of the lock screen.
+         * Indicates that the user has been prompted to start dock setup.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_screen_gesture";
+        public static final int DOCK_SETUP_PROMPTED = 3;
 
         /**
-         * Gesture that wakes up the display, toggling between {@link Display.STATE_OFF} and
-         * {@link Display.STATE_DOZE}.
+         * Indicates that the user has started dock setup but never finished it.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String DOZE_WAKE_DISPLAY_GESTURE = "doze_wake_display_gesture";
+        public static final int DOCK_SETUP_INCOMPLETE = 4;
 
         /**
-         * Gesture that wakes up the display on quick pickup, toggling between
-         * {@link Display.STATE_OFF} and {@link Display.STATE_DOZE}.
+         * Indicates that the user has completed dock setup.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        public static final String DOZE_QUICK_PICKUP_GESTURE = "doze_quick_pickup_gesture";
+        public static final int DOCK_SETUP_COMPLETED = 10;
 
         /**
-         * Whether the device should suppress the current doze configuration and disable dozing.
+         * Indicates that dock setup timed out before the user could complete it.
+         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String SUPPRESS_DOZE = "suppress_doze";
+        public static final int DOCK_SETUP_TIMED_OUT = 11;
+
+        /** @hide */
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({
+                DOCK_SETUP_NOT_STARTED,
+                DOCK_SETUP_STARTED,
+                DOCK_SETUP_PAUSED,
+                DOCK_SETUP_PROMPTED,
+                DOCK_SETUP_INCOMPLETE,
+                DOCK_SETUP_COMPLETED,
+                DOCK_SETUP_TIMED_OUT
+        })
+        public @interface DockSetupState {
+        }
 
         /**
-         * Gesture that skips media.
+         * Defines the user's current state of dock setup.
+         * The possible states are defined in {@link DockSetupState}.
+         *
          * @hide
          */
-        @Readable
-        public static final String SKIP_GESTURE = "skip_gesture";
+        public static final String DOCK_SETUP_STATE = "dock_setup_state";
+
 
         /**
-         * Count of successful gestures.
+         * Default, indicates that the user has not yet started the hub mode tutorial.
+         *
          * @hide
          */
-        @Readable
-        public static final String SKIP_GESTURE_COUNT = "skip_gesture_count";
+        public static final int HUB_MODE_TUTORIAL_NOT_STARTED = 0;
 
         /**
-         * Count of non-gesture interaction.
+         * Indicates that the user has started but not yet completed the hub mode tutorial.
+         * One of the possible states for {@link #HUB_MODE_TUTORIAL_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String SKIP_TOUCH_COUNT = "skip_touch_count";
+        public static final int HUB_MODE_TUTORIAL_STARTED = 1;
 
         /**
-         * Direction to advance media for skip gesture
+         * Any value greater than or equal to this value is considered that the user has
+         * completed the hub mode tutorial.
+         *
+         * One of the possible states for {@link #HUB_MODE_TUTORIAL_STATE}.
+         *
          * @hide
          */
-        @Readable
-        public static final String SKIP_DIRECTION = "skip_gesture_direction";
+        public static final int HUB_MODE_TUTORIAL_COMPLETED = 10;
+
+        /** @hide */
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef({
+                HUB_MODE_TUTORIAL_NOT_STARTED,
+                HUB_MODE_TUTORIAL_STARTED,
+                HUB_MODE_TUTORIAL_COMPLETED
+        })
+        public @interface HubModeTutorialState {
+        }
 
         /**
-         * Gesture that silences sound (alarms, notification, calls).
+         * Defines the user's current state of navigating through the hub mode tutorial.
+         * Some possible states are defined in {@link HubModeTutorialState}.
+         *
+         * Any value greater than or equal to {@link HUB_MODE_TUTORIAL_COMPLETED} indicates that
+         * the user has completed that version of the hub mode tutorial. And tutorial may be
+         * shown again when a new version becomes available.
          * @hide
          */
-        @Readable
-        public static final String SILENCE_GESTURE = "silence_gesture";
+        public static final String HUB_MODE_TUTORIAL_STATE = "hub_mode_tutorial_state";
 
         /**
-         * Count of successful silence alarms gestures.
+         * The default NFC payment component
+         *
+         * @deprecated please use {@link android.app.role.RoleManager#getRoleHolders(String)}
+         * with {@link android.app.role.RoleManager#ROLE_WALLET} parameter.
          * @hide
          */
-        @Readable
-        public static final String SILENCE_ALARMS_GESTURE_COUNT = "silence_alarms_gesture_count";
+        @Deprecated
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";
 
         /**
-         * Count of successful silence timer gestures.
+         * Whether NFC payment is handled by the foreground application or a default.
          * @hide
          */
         @Readable
-        public static final String SILENCE_TIMER_GESTURE_COUNT = "silence_timer_gesture_count";
+        public static final String NFC_PAYMENT_FOREGROUND = "nfc_payment_foreground";
 
         /**
-         * Count of successful silence call gestures.
+         * Specifies the package name currently configured to be the primary sms application
          * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String SILENCE_CALL_GESTURE_COUNT = "silence_call_gesture_count";
+        public static final String SMS_DEFAULT_APPLICATION = "sms_default_application";
 
         /**
-         * Count of non-gesture interaction.
+         * Specifies the package name currently configured to be the default dialer application
          * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String SILENCE_ALARMS_TOUCH_COUNT = "silence_alarms_touch_count";
+        public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application";
 
         /**
-         * Count of non-gesture interaction.
+         * Specifies the component name currently configured to be the default call screening
+         * application
          * @hide
          */
         @Readable
-        public static final String SILENCE_TIMER_TOUCH_COUNT = "silence_timer_touch_count";
+        public static final String CALL_SCREENING_DEFAULT_COMPONENT =
+                "call_screening_default_component";
 
         /**
-         * Count of non-gesture interaction.
+         * Specifies the package name currently configured to be the emergency assistance application
+         *
+         * @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE
+         *
          * @hide
          */
         @Readable
-        public static final String SILENCE_CALL_TOUCH_COUNT = "silence_call_touch_count";
+        public static final String EMERGENCY_ASSISTANCE_APPLICATION = "emergency_assistance_application";
 
         /**
-         * Number of successful "Motion Sense" tap gestures to pause media.
+         * Specifies whether the current app context on scren (assist data) will be sent to the
+         * assist application (active voice interaction service).
+         *
          * @hide
          */
         @Readable
-        public static final String AWARE_TAP_PAUSE_GESTURE_COUNT = "aware_tap_pause_gesture_count";
+        public static final String ASSIST_STRUCTURE_ENABLED = "assist_structure_enabled";
 
         /**
-         * Number of touch interactions to pause media when a "Motion Sense" gesture could
-         * have been used.
+         * Specifies whether a screenshot of the screen contents will be sent to the assist
+         * application (active voice interaction service).
+         *
          * @hide
          */
         @Readable
-        public static final String AWARE_TAP_PAUSE_TOUCH_COUNT = "aware_tap_pause_touch_count";
+        public static final String ASSIST_SCREENSHOT_ENABLED = "assist_screenshot_enabled";
 
         /**
-         * For user preference if swipe bottom to expand notification gesture enabled.
+         * Specifies whether the screen will show an animation if screen contents are sent to the
+         * assist application (active voice interaction service).
+         *
+         * Note that the disclosure will be forced for third-party assistants or if the device
+         * does not support disabling it.
+         *
          * @hide
          */
-        public static final String SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =
-                "swipe_bottom_to_notification_enabled";
+        @Readable
+        public static final String ASSIST_DISCLOSURE_ENABLED = "assist_disclosure_enabled";
 
         /**
-         * Controls whether One-Handed mode is currently activated.
+         * Control if rotation suggestions are sent to System UI when in rotation locked mode.
+         * Done to enable screen rotation while the screen rotation is locked. Enabling will
+         * poll the accelerometer in rotation locked mode.
+         *
+         * If 0, then rotation suggestions are not sent to System UI. If 1, suggestions are sent.
+         *
          * @hide
          */
-        public static final String ONE_HANDED_MODE_ACTIVATED = "one_handed_mode_activated";
+        @Readable
+        public static final String SHOW_ROTATION_SUGGESTIONS = "show_rotation_suggestions";
 
         /**
-         * For user preference if One-Handed Mode enabled.
+         * The disabled state of SHOW_ROTATION_SUGGESTIONS.
          * @hide
          */
-        public static final String ONE_HANDED_MODE_ENABLED = "one_handed_mode_enabled";
+        public static final int SHOW_ROTATION_SUGGESTIONS_DISABLED = 0x0;
 
         /**
-         * For user preference if One-Handed Mode timeout.
+         * The enabled state of SHOW_ROTATION_SUGGESTIONS.
          * @hide
          */
-        public static final String ONE_HANDED_MODE_TIMEOUT = "one_handed_mode_timeout";
+        public static final int SHOW_ROTATION_SUGGESTIONS_ENABLED = 0x1;
 
         /**
-         * For user taps app to exit One-Handed Mode.
+         * The default state of SHOW_ROTATION_SUGGESTIONS.
          * @hide
          */
-        public static final String TAPS_APP_TO_EXIT = "taps_app_to_exit";
+        public static final int SHOW_ROTATION_SUGGESTIONS_DEFAULT =
+                SHOW_ROTATION_SUGGESTIONS_ENABLED;
 
         /**
-         * Internal use, one handed mode tutorial showed times.
+         * The number of accepted rotation suggestions. Used to determine if the user has been
+         * introduced to rotation suggestions.
          * @hide
          */
-        public static final String ONE_HANDED_TUTORIAL_SHOW_COUNT =
-                "one_handed_tutorial_show_count";
+        @Readable
+        public static final String NUM_ROTATION_SUGGESTIONS_ACCEPTED =
+                "num_rotation_suggestions_accepted";
 
         /**
-         * Toggle to enable/disable for the apps to use the Ui translation for Views. The value
-         * indicates whether the Ui translation is enabled by the user.
-         * <p>
-         * Type: {@code int} ({@code 0} for disabled, {@code 1} for enabled)
+         * Read only list of the service components that the current user has explicitly allowed to
+         * see and assist with all of the user's notifications.
          *
+         * @deprecated Use
+         * {@link NotificationManager#isNotificationAssistantAccessGranted(ComponentName)}.
          * @hide
          */
-        @SystemApi
+        @Deprecated
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String UI_TRANSLATION_ENABLED = "ui_translation_enabled";
+        public static final String ENABLED_NOTIFICATION_ASSISTANT =
+                "enabled_notification_assistant";
 
         /**
-         * The current night mode that has been selected by the user.  Owned
-         * and controlled by UiModeManagerService.  Constants are as per
-         * UiModeManager.
+         * Read only list of the service components that the current user has explicitly allowed to
+         * see all of the user's notifications, separated by ':'.
+         *
          * @hide
+         * @deprecated Use
+         * {@link NotificationManager#isNotificationListenerAccessGranted(ComponentName)}.
          */
+        @Deprecated
+        @UnsupportedAppUsage
         @Readable
-        public static final String UI_NIGHT_MODE = "ui_night_mode";
+        public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners";
 
         /**
-         * The current night mode custom type that has been selected by the user.  Owned
-         * and controlled by UiModeManagerService. Constants are as per UiModeManager.
+         * Read only list of the packages that the current user has explicitly allowed to
+         * manage do not disturb, separated by ':'.
+         *
+         * @deprecated Use {@link NotificationManager#isNotificationPolicyAccessGranted()}.
          * @hide
          */
+        @Deprecated
+        @TestApi
         @Readable
-        @SuppressLint("NoSettingsProvider")
-        public static final String UI_NIGHT_MODE_CUSTOM_TYPE = "ui_night_mode_custom_type";
+        public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES =
+                "enabled_notification_policy_access_packages";
 
         /**
-         * The current night mode that has been overridden to turn on by the system.  Owned
-         * and controlled by UiModeManagerService.  Constants are as per
-         * UiModeManager.
+         * Defines whether managed profile ringtones should be synced from it's parent profile
+         * <p>
+         * 0 = ringtones are not synced
+         * 1 = ringtones are synced from the profile's parent (default)
+         * <p>
+         * This value is only used for managed profiles.
          * @hide
          */
+        @TestApi
         @Readable
-        public static final String UI_NIGHT_MODE_OVERRIDE_ON = "ui_night_mode_override_on";
+        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
+        public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
 
         /**
-         * The last computed night mode bool the last time the phone was on
          * @hide
          */
-        public static final String UI_NIGHT_MODE_LAST_COMPUTED = "ui_night_mode_last_computed";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
+        @Readable
+        public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations";
 
         /**
-         * The current night mode that has been overridden to turn off by the system.  Owned
-         * and controlled by UiModeManagerService.  Constants are as per
-         * UiModeManager.
+         * This is the query URI for finding a print service to install.
+         *
          * @hide
          */
         @Readable
-        public static final String UI_NIGHT_MODE_OVERRIDE_OFF = "ui_night_mode_override_off";
+        public static final String PRINT_SERVICE_SEARCH_URI = "print_service_search_uri";
 
         /**
-         * Whether screensavers are enabled.
+         * This is the query URI for finding a NFC payment service to install.
+         *
          * @hide
          */
         @Readable
-        public static final String SCREENSAVER_ENABLED = "screensaver_enabled";
+        public static final String PAYMENT_SERVICE_SEARCH_URI = "payment_service_search_uri";
 
         /**
-         * The user's chosen screensaver components.
+         * This is the query URI for finding a auto fill service to install.
          *
-         * These will be launched by the PhoneWindowManager after a timeout when not on
-         * battery, or upon dock insertion (if SCREENSAVER_ACTIVATE_ON_DOCK is set to 1).
          * @hide
          */
         @Readable
-        public static final String SCREENSAVER_COMPONENTS = "screensaver_components";
+        public static final String AUTOFILL_SERVICE_SEARCH_URI = "autofill_service_search_uri";
 
         /**
-         * If screensavers are enabled, whether the screensaver should be automatically launched
-         * when the device is inserted into a (desk) dock.
-         * @hide
+         * If enabled, apps should try to skip any introductory hints on first launch. This might
+         * apply to users that are already familiar with the environment or temporary users.
+         * <p>
+         * Type : int (0 to show hints, 1 to skip showing hints)
          */
         @Readable
-        public static final String SCREENSAVER_ACTIVATE_ON_DOCK = "screensaver_activate_on_dock";
+        public static final String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
 
         /**
-         * If screensavers are enabled, whether the screensaver should be automatically launched
-         * when the screen times out when not on battery.
+         * Persisted playback time after a user confirmation of an unsafe volume level.
+         *
          * @hide
          */
         @Readable
-        public static final String SCREENSAVER_ACTIVATE_ON_SLEEP = "screensaver_activate_on_sleep";
+        public static final String UNSAFE_VOLUME_MUSIC_ACTIVE_MS = "unsafe_volume_music_active_ms";
 
         /**
-         * If screensavers are enabled, whether the screensaver should be
-         * automatically launched when the device is stationary and upright.
+         * Indicates whether the spatial audio feature was enabled for this user.
+         *
+         * Type : int (0 disabled, 1 enabled)
+         *
          * @hide
          */
-        @Readable
-        public static final String SCREENSAVER_ACTIVATE_ON_POSTURED =
-                "screensaver_activate_on_postured";
+        public static final String SPATIAL_AUDIO_ENABLED = "spatial_audio_enabled";
 
         /**
-         * If screensavers are enabled, the default screensaver component.
+         * Internal collection of audio device inventory items
+         * The device item stored are {@link com.android.server.audio.AdiDeviceState}
          * @hide
          */
-        @Readable
-        public static final String SCREENSAVER_DEFAULT_COMPONENT = "screensaver_default_component";
+        public static final String AUDIO_DEVICE_INVENTORY = "audio_device_inventory";
 
         /**
-         * Whether complications are enabled to be shown over the screensaver by the user.
-         *
+         * Stores a boolean that defines whether the CSD as a feature is enabled or not.
          * @hide
          */
-        public static final String SCREENSAVER_COMPLICATIONS_ENABLED =
-                "screensaver_complications_enabled";
+        public static final String AUDIO_SAFE_CSD_AS_A_FEATURE_ENABLED =
+                "audio_safe_csd_as_a_feature_enabled";
 
         /**
-         * Defines the enabled state for the glanceable hub.
+         * Indicates whether notification display on the lock screen is enabled.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        @TestApi
+        @SystemApi
         @Readable
-        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.
-        public static final String GLANCEABLE_HUB_ENABLED = "glanceable_hub_enabled";
+        public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS =
+                "lock_screen_show_notifications";
 
         /**
-         * Indicates that glanceable hub should never be started automatically.
+         * Indicates whether the lock screen should display silent notifications.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        public static final int GLANCEABLE_HUB_START_NEVER = 0;
+        @Readable
+        public static final String LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS =
+                "lock_screen_show_silent_notifications";
 
         /**
-         * Indicates that glanceable hub should be started when charging.
+         * Indicates whether "seen" notifications should be suppressed from the lockscreen.
+         * <p>
+         * Type: int (0 for unset_off, 1 for true, 2 for false)
+         * 0 is the default value for phones, which is equivalent to off in effect, before
+         * the notification minimalism feature, this setting is default hidden to phones, we use
+         * 0 instead of 2 to mark that we need to hide this setting toggle in the Settings app.
          *
          * @hide
          */
-        public static final int GLANCEABLE_HUB_START_CHARGING = 1;
+        public static final String LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS =
+                "lock_screen_show_only_unseen_notifications";
 
         /**
-         * Indicates that glanceable hub should be started when charging and upright.
+         * Indicates whether to minimalize the number of notifications to show on the lockscreen.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        public static final int GLANCEABLE_HUB_START_CHARGING_UPRIGHT = 2;
+        public static final String LOCK_SCREEN_NOTIFICATION_MINIMALISM =
+                "lock_screen_notification_minimalism";
 
         /**
-         * Indicates that glanceable hub should be started when docked.
+         * Indicates whether snooze options should be shown on notifications
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        public static final int GLANCEABLE_HUB_START_DOCKED = 3;
-
-        /** @hide */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef({
-                GLANCEABLE_HUB_START_NEVER,
-                GLANCEABLE_HUB_START_CHARGING,
-                GLANCEABLE_HUB_START_CHARGING_UPRIGHT,
-                GLANCEABLE_HUB_START_DOCKED,
-        })
-        public @interface WhenToStartGlanceableHub {
-        }
+        @Readable
+        public static final String SHOW_NOTIFICATION_SNOOZE = "show_notification_snooze";
 
         /**
-         * Indicates when to start glanceable hub. Possible values are:
-         * 0: Never
-         * 1: While charging always
-         * 2: While upright and charging
-         * 3: While docked
+         * Controls whether dual shade is enabled. This splits notifications and quick settings to
+         * have their own independently expandable/collapsible panels, appearing on either side of
+         * the large screen (including unfolded device) or sharing a space on a narrow screen
+         * (including a folded device). Both panels will now cover the screen only partially
+         * (wrapping their content), so a running app or the lockscreen will remain visible in the
+         * background.
+         * <p>
+         * Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        public static final String WHEN_TO_START_GLANCEABLE_HUB =
-                "when_to_start_glanceable_hub";
+        @android.provider.Settings.Readable
+        public static final String DUAL_SHADE = "dual_shade";
 
-        /**
-         * Whether glanceable hub should only start when charging wirelessly.
-         *
+       /**
+         * 1 if it is allowed to remove the primary GAIA account. 0 by default.
          * @hide
          */
-        public static final String GLANCEABLE_HUB_RESTRICT_TO_WIRELESS_CHARGING =
-                "glanceable_hub_restrict_to_writeless_charging";
+        public static final String ALLOW_PRIMARY_GAIA_ACCOUNT_REMOVAL_FOR_TESTS =
+                "allow_primary_gaia_account_removal_for_tests";
 
         /**
-         * Nothing should be done during low light
-         *
+         * List of TV inputs that are currently hidden. This is a string
+         * containing the IDs of all hidden TV inputs. Each ID is encoded by
+         * {@link android.net.Uri#encode(String)} and separated by ':'.
          * @hide
          */
-        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_NONE = 0;
+        @Readable
+        public static final String TV_INPUT_HIDDEN_INPUTS = "tv_input_hidden_inputs";
 
         /**
-         * The screen should turn completely off in low light.
-         *
+         * List of custom TV input labels. This is a string containing <TV input id, custom name>
+         * pairs. TV input id and custom name are encoded by {@link android.net.Uri#encode(String)}
+         * and separated by ','. Each pair is separated by ':'.
          * @hide
          */
-        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_SCREEN_OFF = 1;
+        @Readable
+        public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels";
 
         /**
-         * The screen should switch to a low light clock dream if dreaming is enabled in low light.
+         * Whether TV app uses non-system inputs.
+         *
+         * <p>
+         * The value is boolean (1 or 0), where 1 means non-system TV inputs are allowed,
+         * and 0 means non-system TV inputs are not allowed.
+         *
+         * <p>
+         * Devices such as sound bars may have changed the system property allow_third_party_inputs
+         * to false so the TV Application only uses HDMI and other built in inputs. This setting
+         * allows user to override the default and have the TV Application use third party TV inputs
+         * available on play store.
          *
          * @hide
          */
-        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_LOW_LIGHT_CLOCK_DREAM = 2;
+        @Readable
+        public static final String TV_APP_USES_NON_SYSTEM_INPUTS = "tv_app_uses_non_system_inputs";
 
         /**
-         * The screen should not show dreams if enabled (AOD will be permitted).
+         * Whether automatic routing of system audio to USB audio peripheral is disabled.
+         * The value is boolean (1 or 0), where 1 means automatic routing is disabled,
+         * and 0 means automatic routing is enabled.
          *
          * @hide
          */
-        public static final int LOW_LIGHT_DISPLAY_BEHAVIOR_NO_DREAM = 3;
-
-        /** @hide */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef({
-                LOW_LIGHT_DISPLAY_BEHAVIOR_NONE,
-                LOW_LIGHT_DISPLAY_BEHAVIOR_SCREEN_OFF,
-                LOW_LIGHT_DISPLAY_BEHAVIOR_LOW_LIGHT_CLOCK_DREAM,
-                LOW_LIGHT_DISPLAY_BEHAVIOR_NO_DREAM,
-        })
-        public @interface LowLightDisplayBehavior {
-        }
+        @Readable
+        public static final String USB_AUDIO_AUTOMATIC_ROUTING_DISABLED =
+                "usb_audio_automatic_routing_disabled";
 
         /**
-         * Indicates display behavior in low light. Options are:
-         * 0: None
-         * 1: Keep screen off
-         * 2: Show low light clock dream
-         * 3: Disable dreaming
+         * The timeout in milliseconds before the device fully goes to sleep after
+         * a period of inactivity.  This value sets an upper bound on how long the device
+         * will stay awake or dreaming without user activity.  It should generally
+         * be longer than {@link Settings.System#SCREEN_OFF_TIMEOUT} as otherwise the device
+         * will sleep before it ever has a chance to dream.
+         * <p>
+         * Use -1 to disable this timeout.
+         * </p>
          *
          * @hide
          */
-        public static final String LOW_LIGHT_DISPLAY_BEHAVIOR =
-                "low_light_display_behavior";
+        @Readable
+        public static final String SLEEP_TIMEOUT = "sleep_timeout";
 
         /**
-         * Indicates whether display behavior in low light is enabled.
+         * The timeout in milliseconds before the device goes to sleep due to user inattentiveness,
+         * even if the system is holding wakelocks. It should generally be longer than {@code
+         * config_attentiveWarningDuration}, as otherwise the device will show the attentive
+         * warning constantly. Small timeouts are discouraged, as they will cause the device to
+         * go to sleep quickly after waking up.
+         * <p>
+         * Use -1 to disable this timeout.
+         * </p>
          *
          * @hide
          */
-        public static final String LOW_LIGHT_DISPLAY_BEHAVIOR_ENABLED =
-                "low_light_display_behavior_enabled";
+        @Readable
+        public static final String ATTENTIVE_TIMEOUT = "attentive_timeout";
 
         /**
-         * Whether home controls are enabled to be shown over the screensaver by the user.
-         *
+         * Controls whether double tap to wake is enabled.
          * @hide
          */
-        public static final String SCREENSAVER_HOME_CONTROLS_ENABLED =
-                "screensaver_home_controls_enabled";
+        @Readable
+        public static final String DOUBLE_TAP_TO_WAKE = "double_tap_to_wake";
 
         /**
-         * Whether screensaver should only start when charging wirelessly.
-         *
+         * Controls whether double tap to sleep is enabled.
          * @hide
          */
-        public static final String SCREENSAVER_RESTRICT_TO_WIRELESS_CHARGING =
-                "screensaver_restrict_to_writeless_charging";
+        public static final String DOUBLE_TAP_TO_SLEEP = "double_tap_to_sleep";
 
         /**
-         * Default, indicates that the user has not yet started the dock setup flow.
+         * The current assistant component. It could be a voice interaction service,
+         * or an activity that handles ACTION_ASSIST, or empty which means using the default
+         * handling.
+         *
+         * <p>This should be set indirectly by setting the {@link
+         * android.app.role.RoleManager#ROLE_ASSISTANT assistant role}.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_NOT_STARTED = 0;
+        @UnsupportedAppUsage
+        @Readable
+        public static final String ASSISTANT = "assistant";
 
         /**
-         * Indicates that the user has started but not yet completed dock setup.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * Whether the camera launch gesture should be disabled.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_STARTED = 1;
+        @Readable
+        public static final String CAMERA_GESTURE_DISABLED = "camera_gesture_disabled";
 
         /**
-         * Indicates that the user has snoozed dock setup and will complete it later.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * Whether the emergency gesture should be enabled.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_PAUSED = 2;
+        public static final String EMERGENCY_GESTURE_ENABLED = "emergency_gesture_enabled";
 
         /**
-         * Indicates that the user has been prompted to start dock setup.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * Whether the emergency gesture sound should be enabled.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_PROMPTED = 3;
+        public static final String EMERGENCY_GESTURE_SOUND_ENABLED =
+                "emergency_gesture_sound_enabled";
 
         /**
-         * Indicates that the user has started dock setup but never finished it.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * Whether the emergency gesture UI is currently showing.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_INCOMPLETE = 4;
+        public static final String EMERGENCY_GESTURE_UI_SHOWING = "emergency_gesture_ui_showing";
 
         /**
-         * Indicates that the user has completed dock setup.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * The last time the emergency gesture UI was started.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_COMPLETED = 10;
+        public static final String EMERGENCY_GESTURE_UI_LAST_STARTED_MILLIS =
+                "emergency_gesture_ui_last_started_millis";
 
         /**
-         * Indicates that dock setup timed out before the user could complete it.
-         * One of the possible states for {@link #DOCK_SETUP_STATE}.
+         * Whether double tap the power button gesture is enabled.
          *
          * @hide
          */
-        public static final int DOCK_SETUP_TIMED_OUT = 11;
-
-        /** @hide */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef({
-                DOCK_SETUP_NOT_STARTED,
-                DOCK_SETUP_STARTED,
-                DOCK_SETUP_PAUSED,
-                DOCK_SETUP_PROMPTED,
-                DOCK_SETUP_INCOMPLETE,
-                DOCK_SETUP_COMPLETED,
-                DOCK_SETUP_TIMED_OUT
-        })
-        public @interface DockSetupState {
-        }
+        @Readable
+        public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
+                "double_tap_power_button_gesture_enabled";
 
         /**
-         * Defines the user's current state of dock setup.
-         * The possible states are defined in {@link DockSetupState}.
-         *
+         * Double tap power button gesture behavior.
+         * 0 = Camera launch
+         * 1 = Wallet launch
          * @hide
          */
-        public static final String DOCK_SETUP_STATE = "dock_setup_state";
-
+        @Readable
+        public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE =
+                "double_tap_power_button_gesture";
 
         /**
-         * Default, indicates that the user has not yet started the hub mode tutorial.
+         * Whether the camera launch gesture to double tap the power button when the screen is off
+         * should be disabled.
          *
          * @hide
          */
-        public static final int HUB_MODE_TUTORIAL_NOT_STARTED = 0;
+        @Readable
+        public static final String CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED =
+                "camera_double_tap_power_gesture_disabled";
 
         /**
-         * Indicates that the user has started but not yet completed the hub mode tutorial.
-         * One of the possible states for {@link #HUB_MODE_TUTORIAL_STATE}.
+         * Whether the camera double twist gesture to flip between front and back mode should be
+         * enabled.
          *
          * @hide
          */
-        public static final int HUB_MODE_TUTORIAL_STARTED = 1;
+        @Readable
+        public static final String CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED =
+                "camera_double_twist_to_flip_enabled";
 
         /**
-         * Any value greater than or equal to this value is considered that the user has
-         * completed the hub mode tutorial.
-         *
-         * One of the possible states for {@link #HUB_MODE_TUTORIAL_STATE}.
+         * Whether or not the smart camera lift trigger that launches the camera when the user moves
+         * the phone into a position for taking photos should be enabled.
          *
          * @hide
          */
-        public static final int HUB_MODE_TUTORIAL_COMPLETED = 10;
-
-        /** @hide */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef({
-                HUB_MODE_TUTORIAL_NOT_STARTED,
-                HUB_MODE_TUTORIAL_STARTED,
-                HUB_MODE_TUTORIAL_COMPLETED
-        })
-        public @interface HubModeTutorialState {
-        }
+        @Readable
+        public static final String CAMERA_LIFT_TRIGGER_ENABLED = "camera_lift_trigger_enabled";
 
         /**
-         * Defines the user's current state of navigating through the hub mode tutorial.
-         * Some possible states are defined in {@link HubModeTutorialState}.
+         * The default enable state of the camera lift trigger.
          *
-         * Any value greater than or equal to {@link HUB_MODE_TUTORIAL_COMPLETED} indicates that
-         * the user has completed that version of the hub mode tutorial. And tutorial may be
-         * shown again when a new version becomes available.
          * @hide
          */
-        public static final String HUB_MODE_TUTORIAL_STATE = "hub_mode_tutorial_state";
+        public static final int CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT = 1;
 
         /**
-         * The default NFC payment component
+         * Whether or not the flashlight (camera torch mode) is available required to turn
+         * on flashlight.
          *
-         * @deprecated please use {@link android.app.role.RoleManager#getRoleHolders(String)}
-         * with {@link android.app.role.RoleManager#ROLE_WALLET} parameter.
          * @hide
          */
-        @Deprecated
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";
+        @Readable
+        public static final String FLASHLIGHT_AVAILABLE = "flashlight_available";
 
         /**
-         * Whether NFC payment is handled by the foreground application or a default.
+         * Whether or not flashlight is enabled.
+         *
          * @hide
          */
         @Readable
-        public static final String NFC_PAYMENT_FOREGROUND = "nfc_payment_foreground";
+        public static final String FLASHLIGHT_ENABLED = "flashlight_enabled";
 
         /**
-         * Specifies the package name currently configured to be the primary sms application
+         * Whether or not face unlock is allowed on Keyguard.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String SMS_DEFAULT_APPLICATION = "sms_default_application";
+        public static final String FACE_UNLOCK_KEYGUARD_ENABLED = "face_unlock_keyguard_enabled";
 
         /**
-         * Specifies the package name currently configured to be the default dialer application
+         * Whether or not face unlock dismisses the keyguard.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
         @Readable
-        public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application";
+        public static final String FACE_UNLOCK_DISMISSES_KEYGUARD =
+                "face_unlock_dismisses_keyguard";
 
         /**
-         * Specifies the component name currently configured to be the default call screening
-         * application
+         * Whether or not media is shown automatically when bypassing as a heads up.
          * @hide
          */
         @Readable
-        public static final String CALL_SCREENING_DEFAULT_COMPONENT =
-                "call_screening_default_component";
+        public static final String SHOW_MEDIA_WHEN_BYPASSING =
+                "show_media_when_bypassing";
 
         /**
-         * Specifies the package name currently configured to be the emergency assistance application
-         *
-         * @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE
-         *
+         * Whether or not face unlock requires attention. This is a cached value, the source of
+         * truth is obtained through the HAL.
          * @hide
          */
         @Readable
-        public static final String EMERGENCY_ASSISTANCE_APPLICATION = "emergency_assistance_application";
+        public static final String FACE_UNLOCK_ATTENTION_REQUIRED =
+                "face_unlock_attention_required";
 
         /**
-         * Specifies whether the current app context on scren (assist data) will be sent to the
-         * assist application (active voice interaction service).
-         *
+         * Whether or not face unlock requires a diverse set of poses during enrollment. This is a
+         * cached value, the source of truth is obtained through the HAL.
          * @hide
          */
         @Readable
-        public static final String ASSIST_STRUCTURE_ENABLED = "assist_structure_enabled";
+        public static final String FACE_UNLOCK_DIVERSITY_REQUIRED =
+                "face_unlock_diversity_required";
+
 
         /**
-         * Specifies whether a screenshot of the screen contents will be sent to the assist
-         * application (active voice interaction service).
-         *
+         * Whether or not face unlock is allowed for apps (through BiometricPrompt).
          * @hide
          */
         @Readable
-        public static final String ASSIST_SCREENSHOT_ENABLED = "assist_screenshot_enabled";
+        public static final String FACE_UNLOCK_APP_ENABLED = "face_unlock_app_enabled";
 
         /**
-         * Specifies whether the screen will show an animation if screen contents are sent to the
-         * assist application (active voice interaction service).
-         *
-         * Note that the disclosure will be forced for third-party assistants or if the device
-         * does not support disabling it.
-         *
+         * Whether or not face unlock always requires user confirmation, meaning {@link
+         * android.hardware.biometrics.BiometricPrompt.Builder#setConfirmationRequired(boolean)}
+         * is always 'true'. This overrides the behavior that apps choose in the
+         * setConfirmationRequired API.
          * @hide
          */
         @Readable
-        public static final String ASSIST_DISCLOSURE_ENABLED = "assist_disclosure_enabled";
+        public static final String FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION =
+                "face_unlock_always_require_confirmation";
 
         /**
-         * Control if rotation suggestions are sent to System UI when in rotation locked mode.
-         * Done to enable screen rotation while the screen rotation is locked. Enabling will
-         * poll the accelerometer in rotation locked mode.
+         * Whether or not a user should re enroll their face.
          *
-         * If 0, then rotation suggestions are not sent to System UI. If 1, suggestions are sent.
+         * Face unlock re enroll.
+         *  0 = No re enrollment.
+         *  1 = Re enrollment is required.
          *
          * @hide
          */
         @Readable
-        public static final String SHOW_ROTATION_SUGGESTIONS = "show_rotation_suggestions";
+        public static final String FACE_UNLOCK_RE_ENROLL = "face_unlock_re_enroll";
 
         /**
-         * The disabled state of SHOW_ROTATION_SUGGESTIONS.
+         * The time (in millis) to wait for a power button before sending a
+         * successful auth in to keyguard(for side fingerprint)
          * @hide
          */
-        public static final int SHOW_ROTATION_SUGGESTIONS_DISABLED = 0x0;
+        @Readable
+        public static final String FINGERPRINT_SIDE_FPS_KG_POWER_WINDOW =
+                "fingerprint_side_fps_kg_power_window";
 
         /**
-         * The enabled state of SHOW_ROTATION_SUGGESTIONS.
+         * The time (in millis) to wait for a power button before sending
+         * a successful auth in biometric prompt(for side fingerprint)
          * @hide
          */
-        public static final int SHOW_ROTATION_SUGGESTIONS_ENABLED = 0x1;
+        @Readable
+        public static final String FINGERPRINT_SIDE_FPS_BP_POWER_WINDOW =
+                "fingerprint_side_fps_bp_power_window";
 
         /**
-         * The default state of SHOW_ROTATION_SUGGESTIONS.
+         * The time (in millis) that a finger tap will wait for a power button
+         * before dismissing the power dialog during enrollment(for side
+         * fingerprint)
          * @hide
          */
-        public static final int SHOW_ROTATION_SUGGESTIONS_DEFAULT =
-                SHOW_ROTATION_SUGGESTIONS_ENABLED;
+        @Readable
+        public static final String FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW =
+                "fingerprint_side_fps_enroll_tap_window";
 
         /**
-         * The number of accepted rotation suggestions. Used to determine if the user has been
-         * introduced to rotation suggestions.
+         * The time (in millis) that a power event will ignore future authentications
+         * (for side fingerprint)
          * @hide
          */
         @Readable
-        public static final String NUM_ROTATION_SUGGESTIONS_ACCEPTED =
-                "num_rotation_suggestions_accepted";
+        public static final String FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME =
+                "fingerprint_side_fps_auth_downtime";
 
         /**
-         * Read only list of the service components that the current user has explicitly allowed to
-         * see and assist with all of the user's notifications.
-         *
-         * @deprecated Use
-         * {@link NotificationManager#isNotificationAssistantAccessGranted(ComponentName)}.
+         * Whether or not a SFPS device is enabling the performant auth setting.
+         * The "_V2" suffix was added to re-introduce the default behavior for
+         * users. See b/265264294 fore more details.
          * @hide
          */
-        @Deprecated
-        @Readable
-        public static final String ENABLED_NOTIFICATION_ASSISTANT =
-                "enabled_notification_assistant";
+        public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled_v2";
 
         /**
-         * Read only list of the service components that the current user has explicitly allowed to
-         * see all of the user's notifications, separated by ':'.
-         *
+         * Whether or not the UDFPS device is enabling the screen off unlock settings.
          * @hide
-         * @deprecated Use
-         * {@link NotificationManager#isNotificationListenerAccessGranted(ComponentName)}.
          */
-        @Deprecated
-        @UnsupportedAppUsage
+        @TestApi
         @Readable
-        public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners";
+        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi without associated feature
+        public static final String SCREEN_OFF_UNLOCK_UDFPS_ENABLED = "screen_off_udfps_enabled";
 
         /**
-         * Read only list of the packages that the current user has explicitly allowed to
-         * manage do not disturb, separated by ':'.
-         *
-         * @deprecated Use {@link NotificationManager#isNotificationPolicyAccessGranted()}.
+         * Whether or not debugging is enabled.
          * @hide
          */
-        @Deprecated
-        @TestApi
         @Readable
-        public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES =
-                "enabled_notification_policy_access_packages";
+        public static final String BIOMETRIC_DEBUG_ENABLED =
+                "biometric_debug_enabled";
 
         /**
-         * Defines whether managed profile ringtones should be synced from it's parent profile
-         * <p>
-         * 0 = ringtones are not synced
-         * 1 = ringtones are synced from the profile's parent (default)
-         * <p>
-         * This value is only used for managed profiles.
+         * Whether or not both fingerprint and face virtual sensors are enabled.
          * @hide
          */
         @TestApi
         @Readable
-        @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
-        public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
+        public static final String BIOMETRIC_VIRTUAL_ENABLED = "biometric_virtual_enabled";
 
         /**
+         * Whether or not fingerprint virtual sensors are enabled.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
-        @Readable
-        public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations";
+        @FlaggedApi("com.android.server.biometrics.face_vhal_feature")
+        public static final String BIOMETRIC_FINGERPRINT_VIRTUAL_ENABLED =
+                "biometric_fingerprint_virtual_enabled";
 
         /**
-         * This is the query URI for finding a print service to install.
-         *
+         * Whether or not face virtual sensors are enabled.
          * @hide
          */
-        @Readable
-        public static final String PRINT_SERVICE_SEARCH_URI = "print_service_search_uri";
+        @FlaggedApi("com.android.server.biometrics.face_vhal_feature")
+        public static final String BIOMETRIC_FACE_VIRTUAL_ENABLED =
+                "biometric_face_virtual_enabled";
 
         /**
-         * This is the query URI for finding a NFC payment service to install.
+         * Whether or not biometric is allowed on Keyguard.
+         *
+         * @deprecated Use {@link #FINGERPRINT_KEYGUARD_ENABLED} or {@link #FACE_KEYGUARD_ENABLED}
+         * instead.
          *
          * @hide
          */
+        @Deprecated
         @Readable
-        public static final String PAYMENT_SERVICE_SEARCH_URI = "payment_service_search_uri";
+        public static final String BIOMETRIC_KEYGUARD_ENABLED = "biometric_keyguard_enabled";
 
         /**
-         * This is the query URI for finding a auto fill service to install.
+         * Whether or not biometric is allowed for apps (through BiometricPrompt).
+         *
+         * @deprecated Use {@link #FINGERPRINT_APP_ENABLED} or {@link #FACE_APP_ENABLED} instead.
          *
          * @hide
          */
+        @Deprecated
         @Readable
-        public static final String AUTOFILL_SERVICE_SEARCH_URI = "autofill_service_search_uri";
+        public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";
 
         /**
-         * If enabled, apps should try to skip any introductory hints on first launch. This might
-         * apply to users that are already familiar with the environment or temporary users.
-         * <p>
-         * Type : int (0 to show hints, 1 to skip showing hints)
+         * Whether or not fingerprint is allowed on Keyguard.
+         * @hide
          */
         @Readable
-        public static final String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
+        public static final String FINGERPRINT_KEYGUARD_ENABLED = "fingerprint_keyguard_enabled";
 
         /**
-         * Persisted playback time after a user confirmation of an unsafe volume level.
-         *
+         * Whether or not fingerprint is allowed for apps (through BiometricPrompt).
          * @hide
          */
         @Readable
-        public static final String UNSAFE_VOLUME_MUSIC_ACTIVE_MS = "unsafe_volume_music_active_ms";
+        public static final String FINGERPRINT_APP_ENABLED = "fingerptint_app_enabled";
 
         /**
-         * Indicates whether the spatial audio feature was enabled for this user.
-         *
-         * Type : int (0 disabled, 1 enabled)
-         *
+         * Whether or not face is allowed on Keyguard.
          * @hide
          */
-        public static final String SPATIAL_AUDIO_ENABLED = "spatial_audio_enabled";
+        @Readable
+        public static final String FACE_KEYGUARD_ENABLED = "face_keyguard_enabled";
 
         /**
-         * Internal collection of audio device inventory items
-         * The device item stored are {@link com.android.server.audio.AdiDeviceState}
+         * Whether or not face is allowed for apps (through BiometricPrompt).
          * @hide
          */
-        public static final String AUDIO_DEVICE_INVENTORY = "audio_device_inventory";
+        @Readable
+        public static final String FACE_APP_ENABLED = "face_app_enabled";
 
         /**
-         * Stores a boolean that defines whether the CSD as a feature is enabled or not.
+         * Whether or not mandatory biometrics is enabled.
          * @hide
          */
-        public static final String AUDIO_SAFE_CSD_AS_A_FEATURE_ENABLED =
-                "audio_safe_csd_as_a_feature_enabled";
+        public static final String MANDATORY_BIOMETRICS = "mandatory_biometrics";
 
         /**
-         * Indicates whether notification display on the lock screen is enabled.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Whether or not requirements for mandatory biometrics is satisfied.
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS =
-                "lock_screen_show_notifications";
+        public static final String MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED =
+                "mandatory_biometrics_requirements_satisfied";
 
         /**
-         * Indicates whether the lock screen should display silent notifications.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Whether or not active unlock triggers on wake.
          * @hide
          */
-        @Readable
-        public static final String LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS =
-                "lock_screen_show_silent_notifications";
+        public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake";
 
         /**
-         * Indicates whether "seen" notifications should be suppressed from the lockscreen.
-         * <p>
-         * Type: int (0 for unset_off, 1 for true, 2 for false)
-         * 0 is the default value for phones, which is equivalent to off in effect, before
-         * the notification minimalism feature, this setting is default hidden to phones, we use
-         * 0 instead of 2 to mark that we need to hide this setting toggle in the Settings app.
-         *
+         * Whether or not active unlock triggers on unlock intent.
          * @hide
          */
-        public static final String LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS =
-                "lock_screen_show_only_unseen_notifications";
+        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT =
+                "active_unlock_on_unlock_intent";
 
         /**
-         * Indicates whether to minimalize the number of notifications to show on the lockscreen.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Whether or not active unlock triggers on biometric failure.
          * @hide
          */
-        public static final String LOCK_SCREEN_NOTIFICATION_MINIMALISM =
-                "lock_screen_notification_minimalism";
+        public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
+                "active_unlock_on_biometric_fail";
 
         /**
-         * Indicates whether snooze options should be shown on notifications
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Whether or not active unlock triggers on legacy unlock intents.
          * @hide
          */
-        @Readable
-        public static final String SHOW_NOTIFICATION_SNOOZE = "show_notification_snooze";
+        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_LEGACY =
+                "active_unlock_on_unlock_intent_legacy";
 
         /**
-         * Controls whether dual shade is enabled. This splits notifications and quick settings to
-         * have their own independently expandable/collapsible panels, appearing on either side of
-         * the large screen (including unfolded device) or sharing a space on a narrow screen
-         * (including a folded device). Both panels will now cover the screen only partially
-         * (wrapping their content), so a running app or the lockscreen will remain visible in the
-         * background.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * If active unlock triggers on biometric failures, include the following error codes
+         * as a biometric failure. See {@link android.hardware.biometrics.BiometricFaceConstants}.
+         * Error codes should be separated by a pipe. For example: "1|4|5". If active unlock
+         * should never trigger on any face errors, this should be set to an empty string.
+         * A null value will use the system default value (TIMEOUT).
          * @hide
          */
-        @android.provider.Settings.Readable
-        public static final String DUAL_SHADE = "dual_shade";
+        public static final String ACTIVE_UNLOCK_ON_FACE_ERRORS =
+                "active_unlock_on_face_errors";
 
-       /**
-         * 1 if it is allowed to remove the primary GAIA account. 0 by default.
+        /**
+         * If active unlock triggers on biometric failures, include the following acquired info
+         * as a "biometric failure". See {@link android.hardware.biometrics.BiometricFaceConstants}.
+         * Acquired codes should be separated by a pipe. For example: "1|4|5". If active unlock
+         * should never on trigger on any acquired info messages, this should be
+         * set to an empty string. A null value will use the system default value (none).
          * @hide
          */
-        public static final String ALLOW_PRIMARY_GAIA_ACCOUNT_REMOVAL_FOR_TESTS =
-                "allow_primary_gaia_account_removal_for_tests";
+        public static final String ACTIVE_UNLOCK_ON_FACE_ACQUIRE_INFO =
+                "active_unlock_on_face_acquire_info";
 
         /**
-         * List of TV inputs that are currently hidden. This is a string
-         * containing the IDs of all hidden TV inputs. Each ID is encoded by
-         * {@link android.net.Uri#encode(String)} and separated by ':'.
+         * If active unlock triggers on biometric failures, then also request active unlock on
+         * unlock intent when each setting (BiometricType) is the only biometric type enrolled.
+         * Biometric types should be separated by a pipe. For example: "0|3" or "0". If this
+         * setting should be disabled, then this should be set to an empty string. A null value
+         * will use the system default value (0 / None).
+         *   0 = None, 1 = Any face, 2 = Any fingerprint, 3 = Under display fingerprint
          * @hide
          */
-        @Readable
-        public static final String TV_INPUT_HIDDEN_INPUTS = "tv_input_hidden_inputs";
+        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_WHEN_BIOMETRIC_ENROLLED =
+                "active_unlock_on_unlock_intent_when_biometric_enrolled";
 
         /**
-         * List of custom TV input labels. This is a string containing <TV input id, custom name>
-         * pairs. TV input id and custom name are encoded by {@link android.net.Uri#encode(String)}
-         * and separated by ','. Each pair is separated by ':'.
+         * If active unlock triggers on unlock intents, then also request active unlock on
+         * these wake-up reasons. See {@link PowerManager.WakeReason} for value mappings.
+         * WakeReasons should be separated by a pipe. For example: "0|3" or "0". If this
+         * setting should be disabled, then this should be set to an empty string. A null value
+         * will use the system default value (WAKE_REASON_UNFOLD_DEVICE).
          * @hide
          */
-        @Readable
-        public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels";
+        public static final String ACTIVE_UNLOCK_WAKEUPS_CONSIDERED_UNLOCK_INTENTS =
+                "active_unlock_wakeups_considered_unlock_intents";
 
         /**
-         * Whether TV app uses non-system inputs.
-         *
-         * <p>
-         * The value is boolean (1 or 0), where 1 means non-system TV inputs are allowed,
-         * and 0 means non-system TV inputs are not allowed.
-         *
-         * <p>
-         * Devices such as sound bars may have changed the system property allow_third_party_inputs
-         * to false so the TV Application only uses HDMI and other built in inputs. This setting
-         * allows user to override the default and have the TV Application use third party TV inputs
-         * available on play store.
-         *
+         * If active unlock triggers and succeeds on these wakeups, force dismiss keyguard on
+         * these wake reasons. See {@link PowerManager#WakeReason} for value mappings.
+         * WakeReasons should be separated by a pipe. For example: "0|3" or "0". If this
+         * setting should be disabled, then this should be set to an empty string. A null value
+         * will use the system default value (WAKE_REASON_UNFOLD_DEVICE).
          * @hide
          */
-        @Readable
-        public static final String TV_APP_USES_NON_SYSTEM_INPUTS = "tv_app_uses_non_system_inputs";
+        public static final String ACTIVE_UNLOCK_WAKEUPS_TO_FORCE_DISMISS_KEYGUARD =
+                "active_unlock_wakeups_to_force_dismiss_keyguard";
 
         /**
-         * Whether automatic routing of system audio to USB audio peripheral is disabled.
-         * The value is boolean (1 or 0), where 1 means automatic routing is disabled,
-         * and 0 means automatic routing is enabled.
+         * Whether the assist gesture should be enabled.
          *
          * @hide
          */
         @Readable
-        public static final String USB_AUDIO_AUTOMATIC_ROUTING_DISABLED =
-                "usb_audio_automatic_routing_disabled";
+        public static final String ASSIST_GESTURE_ENABLED = "assist_gesture_enabled";
 
         /**
-         * The timeout in milliseconds before the device fully goes to sleep after
-         * a period of inactivity.  This value sets an upper bound on how long the device
-         * will stay awake or dreaming without user activity.  It should generally
-         * be longer than {@link Settings.System#SCREEN_OFF_TIMEOUT} as otherwise the device
-         * will sleep before it ever has a chance to dream.
-         * <p>
-         * Use -1 to disable this timeout.
-         * </p>
+         * Sensitivity control for the assist gesture.
          *
          * @hide
          */
         @Readable
-        public static final String SLEEP_TIMEOUT = "sleep_timeout";
+        public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";
 
         /**
-         * The timeout in milliseconds before the device goes to sleep due to user inattentiveness,
-         * even if the system is holding wakelocks. It should generally be longer than {@code
-         * config_attentiveWarningDuration}, as otherwise the device will show the attentive
-         * warning constantly. Small timeouts are discouraged, as they will cause the device to
-         * go to sleep quickly after waking up.
-         * <p>
-         * Use -1 to disable this timeout.
-         * </p>
+         * Whether the assist gesture should silence alerts.
          *
          * @hide
          */
         @Readable
-        public static final String ATTENTIVE_TIMEOUT = "attentive_timeout";
+        public static final String ASSIST_GESTURE_SILENCE_ALERTS_ENABLED =
+                "assist_gesture_silence_alerts_enabled";
 
         /**
-         * Controls whether double tap to wake is enabled.
+         * Whether the assist gesture should wake the phone.
+         *
          * @hide
          */
         @Readable
-        public static final String DOUBLE_TAP_TO_WAKE = "double_tap_to_wake";
+        public static final String ASSIST_GESTURE_WAKE_ENABLED =
+                "assist_gesture_wake_enabled";
 
         /**
-         * Controls whether double tap to sleep is enabled.
+         * Indicates whether the Assist Gesture Deferred Setup has been completed.
+         * <p>
+         * Type: int (0 for false, 1 for true)
+         *
          * @hide
          */
-        public static final String DOUBLE_TAP_TO_SLEEP = "double_tap_to_sleep";
+        @SystemApi
+        @Readable
+        public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete";
 
         /**
-         * The current assistant component. It could be a voice interaction service,
-         * or an activity that handles ACTION_ASSIST, or empty which means using the default
-         * handling.
-         *
-         * <p>This should be set indirectly by setting the {@link
-         * android.app.role.RoleManager#ROLE_ASSISTANT assistant role}.
+         * Whether the assistant can be triggered by a touch gesture.
          *
          * @hide
          */
-        @UnsupportedAppUsage
-        @Readable
-        public static final String ASSISTANT = "assistant";
+        public static final String ASSIST_TOUCH_GESTURE_ENABLED =
+                "assist_touch_gesture_enabled";
 
         /**
-         * Whether the camera launch gesture should be disabled.
+         * Whether the assistant can be triggered by long-pressing the home button
          *
          * @hide
          */
-        @Readable
-        public static final String CAMERA_GESTURE_DISABLED = "camera_gesture_disabled";
+        public static final String ASSIST_LONG_PRESS_HOME_ENABLED =
+                "assist_long_press_home_enabled";
 
         /**
-         * Whether the emergency gesture should be enabled.
+         * Whether all entrypoints (e.g. long-press home, long-press nav handle)
+         * can trigger contextual search.
          *
          * @hide
          */
-        public static final String EMERGENCY_GESTURE_ENABLED = "emergency_gesture_enabled";
+        public static final String SEARCH_ALL_ENTRYPOINTS_ENABLED =
+                "search_all_entrypoints_enabled";
 
         /**
-         * Whether the emergency gesture sound should be enabled.
-         *
+         * Whether or not the accessibility data streaming is enbled for the
+         * {@link VisualQueryDetectedResult#setAccessibilityDetectionData}.
          * @hide
          */
-        public static final String EMERGENCY_GESTURE_SOUND_ENABLED =
-                "emergency_gesture_sound_enabled";
+        public static final String VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED =
+                "visual_query_accessibility_detection_enabled";
 
         /**
-         * Whether the emergency gesture UI is currently showing.
+         * Timeout to be used for unbinding to the configured remote
+         * {@link android.service.ondeviceintelligence.OnDeviceIntelligenceService} if there are no
+         * requests in the queue. A value of -1 represents to never unbind.
          *
          * @hide
          */
-        public static final String EMERGENCY_GESTURE_UI_SHOWING = "emergency_gesture_ui_showing";
+        public static final String ON_DEVICE_INTELLIGENCE_UNBIND_TIMEOUT_MS =
+                "on_device_intelligence_unbind_timeout_ms";
+
 
         /**
-         * The last time the emergency gesture UI was started.
+         * Timeout that represents maximum idle time before which a callback should be populated.
          *
          * @hide
          */
-        public static final String EMERGENCY_GESTURE_UI_LAST_STARTED_MILLIS =
-                "emergency_gesture_ui_last_started_millis";
+        public static final String ON_DEVICE_INTELLIGENCE_IDLE_TIMEOUT_MS =
+                "on_device_intelligence_idle_timeout_ms";
 
         /**
-         * Whether double tap the power button gesture is enabled.
+         * Timeout to be used for unbinding to the configured remote
+         * {@link android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService} if there
+         * are no requests in the queue. A value of -1 represents to never unbind.
          *
          * @hide
          */
-        @Readable
-        public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
-                "double_tap_power_button_gesture_enabled";
+        public static final String ON_DEVICE_INFERENCE_UNBIND_TIMEOUT_MS =
+                "on_device_inference_unbind_timeout_ms";
 
         /**
-         * Double tap power button gesture behavior.
-         * 0 = Camera launch
-         * 1 = Wallet launch
+         * Control whether Night display is currently activated.
          * @hide
          */
         @Readable
-        public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE =
-                "double_tap_power_button_gesture";
+        public static final String NIGHT_DISPLAY_ACTIVATED = "night_display_activated";
 
         /**
-         * Whether the camera launch gesture to double tap the power button when the screen is off
-         * should be disabled.
-         *
+         * Control whether Night display will automatically activate/deactivate.
          * @hide
          */
         @Readable
-        public static final String CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED =
-                "camera_double_tap_power_gesture_disabled";
+        public static final String NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
 
         /**
-         * Whether the camera double twist gesture to flip between front and back mode should be
-         * enabled.
-         *
+         * Control the color temperature of Night Display, represented in Kelvin.
          * @hide
          */
         @Readable
-        public static final String CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED =
-                "camera_double_twist_to_flip_enabled";
+        public static final String NIGHT_DISPLAY_COLOR_TEMPERATURE =
+                "night_display_color_temperature";
 
         /**
-         * Whether or not the smart camera lift trigger that launches the camera when the user moves
-         * the phone into a position for taking photos should be enabled.
-         *
+         * Custom time when Night display is scheduled to activate.
+         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
          * @hide
          */
         @Readable
-        public static final String CAMERA_LIFT_TRIGGER_ENABLED = "camera_lift_trigger_enabled";
+        public static final String NIGHT_DISPLAY_CUSTOM_START_TIME =
+                "night_display_custom_start_time";
 
         /**
-         * The default enable state of the camera lift trigger.
-         *
+         * Custom time when Night display is scheduled to deactivate.
+         * Represented as milliseconds from midnight (e.g. 21600000 == 6am).
          * @hide
          */
-        public static final int CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT = 1;
+        @Readable
+        public static final String NIGHT_DISPLAY_CUSTOM_END_TIME = "night_display_custom_end_time";
 
         /**
-         * Whether or not the flashlight (camera torch mode) is available required to turn
-         * on flashlight.
-         *
+         * A String representing the LocalDateTime when Night display was last activated. Use to
+         * decide whether to apply the current activated state after a reboot or user change. In
+         * legacy cases, this is represented by the time in milliseconds (since epoch).
          * @hide
          */
         @Readable
-        public static final String FLASHLIGHT_AVAILABLE = "flashlight_available";
+        public static final String NIGHT_DISPLAY_LAST_ACTIVATED_TIME =
+                "night_display_last_activated_time";
 
         /**
-         * Whether or not flashlight is enabled.
-         *
+         * Control display engine mode.
          * @hide
          */
-        @Readable
-        public static final String FLASHLIGHT_ENABLED = "flashlight_enabled";
+        public static final String DISPLAY_ENGINE_MODE = "display_engine_mode";
 
         /**
-         * Whether or not face unlock is allowed on Keyguard.
+         * Control whether display white balance is currently enabled.
          * @hide
          */
         @Readable
-        public static final String FACE_UNLOCK_KEYGUARD_ENABLED = "face_unlock_keyguard_enabled";
+        public static final String DISPLAY_WHITE_BALANCE_ENABLED = "display_white_balance_enabled";
 
         /**
-         * Whether or not face unlock dismisses the keyguard.
+         * Used by DisplayManager to backup/restore the user-selected resolution mode.
          * @hide
          */
         @Readable
-        public static final String FACE_UNLOCK_DISMISSES_KEYGUARD =
-                "face_unlock_dismisses_keyguard";
+        public static final String SCREEN_RESOLUTION_MODE = "screen_resolution_mode";
 
         /**
-         * Whether or not media is shown automatically when bypassing as a heads up.
+         * Resolution Mode Constants for SCREEN_RESOLUTION_MODE setting.
+         *
          * @hide
          */
-        @Readable
-        public static final String SHOW_MEDIA_WHEN_BYPASSING =
-                "show_media_when_bypassing";
+        @IntDef(prefix = { "RESOLUTION_MODE_" }, value = {
+                RESOLUTION_MODE_UNKNOWN,
+                RESOLUTION_MODE_HIGH,
+                RESOLUTION_MODE_FULL
+        })
+        @Retention(RetentionPolicy.SOURCE)
+        public @interface ResolutionMode {}
+        /** @hide */
+        public static final int RESOLUTION_MODE_UNKNOWN = 0;
+        /** @hide */
+        public static final int RESOLUTION_MODE_HIGH = 1;
+        /** @hide */
+        public static final int RESOLUTION_MODE_FULL = 2;
 
         /**
-         * Whether or not face unlock requires attention. This is a cached value, the source of
-         * truth is obtained through the HAL.
+         * Names of the service components that the current user has explicitly allowed to
+         * be a VR mode listener, separated by ':'.
+         *
          * @hide
          */
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
         @Readable
-        public static final String FACE_UNLOCK_ATTENTION_REQUIRED =
-                "face_unlock_attention_required";
+        public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";
 
         /**
-         * Whether or not face unlock requires a diverse set of poses during enrollment. This is a
-         * cached value, the source of truth is obtained through the HAL.
+         * Behavior of the display while in VR mode.
+         *
+         * One of {@link #VR_DISPLAY_MODE_LOW_PERSISTENCE} or {@link #VR_DISPLAY_MODE_OFF}.
+         *
          * @hide
          */
         @Readable
-        public static final String FACE_UNLOCK_DIVERSITY_REQUIRED =
-                "face_unlock_diversity_required";
-
+        public static final String VR_DISPLAY_MODE = "vr_display_mode";
 
         /**
-         * Whether or not face unlock is allowed for apps (through BiometricPrompt).
-         * @hide
+         * Lower the display persistence while the system is in VR mode.
+         *
+         * @see PackageManager#FEATURE_VR_MODE_HIGH_PERFORMANCE
+         *
+         * @hide.
          */
-        @Readable
-        public static final String FACE_UNLOCK_APP_ENABLED = "face_unlock_app_enabled";
+        public static final int VR_DISPLAY_MODE_LOW_PERSISTENCE = 0;
 
         /**
-         * Whether or not face unlock always requires user confirmation, meaning {@link
-         * android.hardware.biometrics.BiometricPrompt.Builder#setConfirmationRequired(boolean)}
-         * is always 'true'. This overrides the behavior that apps choose in the
-         * setConfirmationRequired API.
-         * @hide
-         */
-        @Readable
-        public static final String FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION =
-                "face_unlock_always_require_confirmation";
+         * Do not alter the display persistence while the system is in VR mode.
+         *
+         * @see PackageManager#FEATURE_VR_MODE_HIGH_PERFORMANCE
+         *
+         * @hide.
+         */
+        public static final int VR_DISPLAY_MODE_OFF = 1;
 
         /**
-         * Whether or not a user should re enroll their face.
+         * The latest SDK version that CarrierAppUtils#disableCarrierAppsUntilPrivileged has been
+         * executed for.
          *
-         * Face unlock re enroll.
-         *  0 = No re enrollment.
-         *  1 = Re enrollment is required.
+         * <p>This is used to ensure that we only take one pass which will disable apps that are not
+         * privileged (if any). From then on, we only want to enable apps (when a matching SIM is
+         * inserted), to avoid disabling an app that the user might actively be using.
+         *
+         * <p>Will be set to {@link android.os.Build.VERSION#SDK_INT} once executed. Note that older
+         * SDK versions prior to R set 1 for this value.
          *
          * @hide
          */
         @Readable
-        public static final String FACE_UNLOCK_RE_ENROLL = "face_unlock_re_enroll";
+        public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
 
         /**
-         * The time (in millis) to wait for a power button before sending a
-         * successful auth in to keyguard(for side fingerprint)
+         * Whether parent user can access remote contact in managed profile.
+         *
          * @hide
          */
         @Readable
-        public static final String FINGERPRINT_SIDE_FPS_KG_POWER_WINDOW =
-                "fingerprint_side_fps_kg_power_window";
+        public static final String MANAGED_PROFILE_CONTACT_REMOTE_SEARCH =
+                "managed_profile_contact_remote_search";
 
         /**
-         * The time (in millis) to wait for a power button before sending
-         * a successful auth in biometric prompt(for side fingerprint)
+         * Whether parent profile can access remote calendar data in managed profile.
+         *
          * @hide
          */
         @Readable
-        public static final String FINGERPRINT_SIDE_FPS_BP_POWER_WINDOW =
-                "fingerprint_side_fps_bp_power_window";
+        public static final String CROSS_PROFILE_CALENDAR_ENABLED =
+                "cross_profile_calendar_enabled";
 
         /**
-         * The time (in millis) that a finger tap will wait for a power button
-         * before dismissing the power dialog during enrollment(for side
-         * fingerprint)
+         * Whether or not the automatic storage manager is enabled and should run on the device.
+         *
          * @hide
          */
         @Readable
-        public static final String FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW =
-                "fingerprint_side_fps_enroll_tap_window";
+        public static final String AUTOMATIC_STORAGE_MANAGER_ENABLED =
+                "automatic_storage_manager_enabled";
 
         /**
-         * The time (in millis) that a power event will ignore future authentications
-         * (for side fingerprint)
+         * How many days of information for the automatic storage manager to retain on the device.
+         *
          * @hide
          */
         @Readable
-        public static final String FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME =
-                "fingerprint_side_fps_auth_downtime";
+        public static final String AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN =
+                "automatic_storage_manager_days_to_retain";
 
         /**
-         * Whether or not a SFPS device is enabling the performant auth setting.
-         * The "_V2" suffix was added to re-introduce the default behavior for
-         * users. See b/265264294 fore more details.
+         * Default number of days of information for the automatic storage manager to retain.
+         *
          * @hide
          */
-        public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled_v2";
+        public static final int AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT = 90;
 
         /**
-         * Whether or not the UDFPS device is enabling the screen off unlock settings.
+         * How many bytes the automatic storage manager has cleared out.
+         *
          * @hide
          */
-        @TestApi
         @Readable
-        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi without associated feature
-        public static final String SCREEN_OFF_UNLOCK_UDFPS_ENABLED = "screen_off_udfps_enabled";
+        public static final String AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED =
+                "automatic_storage_manager_bytes_cleared";
 
         /**
-         * Whether or not debugging is enabled.
+         * Last run time for the automatic storage manager.
+         *
          * @hide
          */
         @Readable
-        public static final String BIOMETRIC_DEBUG_ENABLED =
-                "biometric_debug_enabled";
-
+        public static final String AUTOMATIC_STORAGE_MANAGER_LAST_RUN =
+                "automatic_storage_manager_last_run";
         /**
-         * Whether or not both fingerprint and face virtual sensors are enabled.
+         * If the automatic storage manager has been disabled by policy. Note that this doesn't
+         * mean that the automatic storage manager is prevented from being re-enabled -- this only
+         * means that it was turned off by policy at least once.
+         *
          * @hide
          */
-        @TestApi
         @Readable
-        public static final String BIOMETRIC_VIRTUAL_ENABLED = "biometric_virtual_enabled";
+        public static final String AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY =
+                "automatic_storage_manager_turned_off_by_policy";
 
         /**
-         * Whether or not fingerprint virtual sensors are enabled.
+         * Whether SystemUI navigation keys is enabled.
          * @hide
          */
-        @FlaggedApi("com.android.server.biometrics.face_vhal_feature")
-        public static final String BIOMETRIC_FINGERPRINT_VIRTUAL_ENABLED =
-                "biometric_fingerprint_virtual_enabled";
+        @Readable
+        public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
+                "system_navigation_keys_enabled";
 
         /**
-         * Whether or not face virtual sensors are enabled.
+         * Holds comma separated list of ordering of QS tiles.
+         *
          * @hide
          */
-        @FlaggedApi("com.android.server.biometrics.face_vhal_feature")
-        public static final String BIOMETRIC_FACE_VIRTUAL_ENABLED =
-                "biometric_face_virtual_enabled";
+        @Readable(maxTargetSdk = VERSION_CODES.TIRAMISU)
+        public static final String QS_TILES = "sysui_qs_tiles";
 
         /**
-         * Whether or not biometric is allowed on Keyguard.
+         * Whether this user has enabled Quick controls.
          *
-         * @deprecated Use {@link #FINGERPRINT_KEYGUARD_ENABLED} or {@link #FACE_KEYGUARD_ENABLED}
-         * instead.
+         * 0 indicates disabled and 1 indicates enabled. A non existent value should be treated as
+         * enabled.
          *
+         * @deprecated Controls are migrated to Quick Settings, rendering this unnecessary and will
+         *             be removed in a future release.
          * @hide
          */
-        @Deprecated
         @Readable
-        public static final String BIOMETRIC_KEYGUARD_ENABLED = "biometric_keyguard_enabled";
+        @Deprecated
+        public static final String CONTROLS_ENABLED = "controls_enabled";
 
         /**
-         * Whether or not biometric is allowed for apps (through BiometricPrompt).
-         *
-         * @deprecated Use {@link #FINGERPRINT_APP_ENABLED} or {@link #FACE_APP_ENABLED} instead.
+         * Whether power menu content (cards, passes, controls) will be shown when device is locked.
          *
+         * 0 indicates hide and 1 indicates show. A non existent value will be treated as hide.
          * @hide
          */
-        @Deprecated
+        @TestApi
         @Readable
-        public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";
+        public static final String POWER_MENU_LOCKED_SHOW_CONTENT =
+                "power_menu_locked_show_content";
 
         /**
-         * Whether or not fingerprint is allowed on Keyguard.
+         * Whether home controls should be accessible from the lockscreen
+         *
          * @hide
          */
-        @Readable
-        public static final String FINGERPRINT_KEYGUARD_ENABLED = "fingerprint_keyguard_enabled";
+        public static final String LOCKSCREEN_SHOW_CONTROLS = "lockscreen_show_controls";
 
         /**
-         * Whether or not fingerprint is allowed for apps (through BiometricPrompt).
+         * Whether trivial home controls can be used without authentication
+         *
          * @hide
          */
-        @Readable
-        public static final String FINGERPRINT_APP_ENABLED = "fingerptint_app_enabled";
+        public static final String LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS =
+                "lockscreen_allow_trivial_controls";
 
         /**
-         * Whether or not face is allowed on Keyguard.
+         * Whether wallet should be accessible from the lockscreen
+         *
          * @hide
          */
-        @Readable
-        public static final String FACE_KEYGUARD_ENABLED = "face_keyguard_enabled";
+        public static final String LOCKSCREEN_SHOW_WALLET = "lockscreen_show_wallet";
 
         /**
-         * Whether or not face is allowed for apps (through BiometricPrompt).
+         * Whether to use the lockscreen double-line clock
+         *
          * @hide
          */
-        @Readable
-        public static final String FACE_APP_ENABLED = "face_app_enabled";
+        public static final String LOCKSCREEN_USE_DOUBLE_LINE_CLOCK =
+                "lockscreen_use_double_line_clock";
 
         /**
-         * Whether or not mandatory biometrics is enabled.
+         * Whether to show the vibrate icon in the Status Bar (default off)
+         *
          * @hide
          */
-        public static final String MANDATORY_BIOMETRICS = "mandatory_biometrics";
+        public static final String STATUS_BAR_SHOW_VIBRATE_ICON = "status_bar_show_vibrate_icon";
 
         /**
-         * Whether or not requirements for mandatory biometrics is satisfied.
+         * Specifies whether the web action API is enabled.
+         *
          * @hide
          */
-        public static final String MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED =
-                "mandatory_biometrics_requirements_satisfied";
+        @SystemApi
+        @Readable
+        public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";
 
         /**
-         * Whether or not active unlock triggers on wake.
+         * Whether qr code scanner should be accessible from the lockscreen
+         *
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake";
+        public static final String LOCK_SCREEN_SHOW_QR_CODE_SCANNER =
+                "lock_screen_show_qr_code_scanner";
 
         /**
-         * Whether or not active unlock triggers on unlock intent.
+         * Whether or not to enable qr code code scanner setting to enable/disable lockscreen
+         * entry point. Any value apart from null means setting needs to be enabled
+         *
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT =
-                "active_unlock_on_unlock_intent";
+        public static final String SHOW_QR_CODE_SCANNER_SETTING =
+                "show_qr_code_scanner_setting";
 
         /**
-         * Whether or not active unlock triggers on biometric failure.
+         * Has this pairable device been paired or upgraded from a previously paired system.
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
-                "active_unlock_on_biometric_fail";
+        @Readable
+        public static final String DEVICE_PAIRED = "device_paired";
 
         /**
-         * Whether or not active unlock triggers on legacy unlock intents.
+         * Specifies additional package name for broadcasting the CMAS messages.
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_LEGACY =
-                "active_unlock_on_unlock_intent_legacy";
+        @Readable
+        public static final String CMAS_ADDITIONAL_BROADCAST_PKG = "cmas_additional_broadcast_pkg";
 
         /**
-         * If active unlock triggers on biometric failures, include the following error codes
-         * as a biometric failure. See {@link android.hardware.biometrics.BiometricFaceConstants}.
-         * Error codes should be separated by a pipe. For example: "1|4|5". If active unlock
-         * should never trigger on any face errors, this should be set to an empty string.
-         * A null value will use the system default value (TIMEOUT).
+         * Whether the launcher should show any notification badges.
+         * The value is boolean (1 or 0).
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_FACE_ERRORS =
-                "active_unlock_on_face_errors";
+        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+        @TestApi
+        @Readable
+        public static final String NOTIFICATION_BADGING = "notification_badging";
 
         /**
-         * If active unlock triggers on biometric failures, include the following acquired info
-         * as a "biometric failure". See {@link android.hardware.biometrics.BiometricFaceConstants}.
-         * Acquired codes should be separated by a pipe. For example: "1|4|5". If active unlock
-         * should never on trigger on any acquired info messages, this should be
-         * set to an empty string. A null value will use the system default value (none).
+         * When enabled the system will maintain a rolling history of received notifications. When
+         * disabled the history will be disabled and deleted.
+         *
+         * The value 1 - enable, 0 - disable
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_FACE_ACQUIRE_INFO =
-                "active_unlock_on_face_acquire_info";
+        @Readable
+        public static final String NOTIFICATION_HISTORY_ENABLED = "notification_history_enabled";
 
         /**
-         * If active unlock triggers on biometric failures, then also request active unlock on
-         * unlock intent when each setting (BiometricType) is the only biometric type enrolled.
-         * Biometric types should be separated by a pipe. For example: "0|3" or "0". If this
-         * setting should be disabled, then this should be set to an empty string. A null value
-         * will use the system default value (0 / None).
-         *   0 = None, 1 = Any face, 2 = Any fingerprint, 3 = Under display fingerprint
+         * When enabled conversations marked as favorites will be set to bubble.
+         *
+         * The value 1 - enable, 0 - disable
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_WHEN_BIOMETRIC_ENROLLED =
-                "active_unlock_on_unlock_intent_when_biometric_enrolled";
+        @Readable
+        public static final String BUBBLE_IMPORTANT_CONVERSATIONS
+                = "bubble_important_conversations";
 
         /**
-         * If active unlock triggers on unlock intents, then also request active unlock on
-         * these wake-up reasons. See {@link PowerManager.WakeReason} for value mappings.
-         * WakeReasons should be separated by a pipe. For example: "0|3" or "0". If this
-         * setting should be disabled, then this should be set to an empty string. A null value
-         * will use the system default value (WAKE_REASON_UNFOLD_DEVICE).
+         * When enabled, notifications able to bubble will display an affordance allowing the user
+         * to bubble them.
+         * The value is boolean (1 to enable or 0 to disable).
+         *
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_WAKEUPS_CONSIDERED_UNLOCK_INTENTS =
-                "active_unlock_wakeups_considered_unlock_intents";
+        @TestApi
+        @SuppressLint("NoSettingsProvider")
+        @Readable
+        public static final String NOTIFICATION_BUBBLES = "notification_bubbles";
 
         /**
-         * If active unlock triggers and succeeds on these wakeups, force dismiss keyguard on
-         * these wake reasons. See {@link PowerManager#WakeReason} for value mappings.
-         * WakeReasons should be separated by a pipe. For example: "0|3" or "0". If this
-         * setting should be disabled, then this should be set to an empty string. A null value
-         * will use the system default value (WAKE_REASON_UNFOLD_DEVICE).
+         * Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right
+         * swipe).
+         *
          * @hide
          */
-        public static final String ACTIVE_UNLOCK_WAKEUPS_TO_FORCE_DISMISS_KEYGUARD =
-                "active_unlock_wakeups_to_force_dismiss_keyguard";
+        @Readable
+        public static final String NOTIFICATION_DISMISS_RTL = "notification_dismiss_rtl";
 
         /**
-         * Whether the assist gesture should be enabled.
-         *
+         * Comma separated list of QS tiles that have been auto-added already.
          * @hide
          */
         @Readable
-        public static final String ASSIST_GESTURE_ENABLED = "assist_gesture_enabled";
+        public static final String QS_AUTO_ADDED_TILES = "qs_auto_tiles";
 
         /**
-         * Sensitivity control for the assist gesture.
-         *
+         * The duration of timeout, in milliseconds, to switch from a non-Dock User to the
+         * Dock User when the device is docked.
          * @hide
          */
-        @Readable
-        public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";
+        public static final String TIMEOUT_TO_DOCK_USER = "timeout_to_dock_user";
 
         /**
-         * Whether the assist gesture should silence alerts.
+         * Backup manager behavioral parameters.
+         * This is encoded as a key=value list, separated by commas. Ex:
+         *
+         * "key_value_backup_interval_milliseconds=14400000,key_value_backup_require_charging=true"
+         *
+         * The following keys are supported:
+         *
+         * <pre>
+         * key_value_backup_interval_milliseconds  (long)
+         * key_value_backup_fuzz_milliseconds      (long)
+         * key_value_backup_require_charging       (boolean)
+         * key_value_backup_required_network_type  (int)
+         * full_backup_interval_milliseconds       (long)
+         * full_backup_require_charging            (boolean)
+         * full_backup_required_network_type       (int)
+         * backup_finished_notification_receivers  (String[])
+         * </pre>
+         *
+         * backup_finished_notification_receivers uses ":" as delimiter for values.
          *
+         * <p>
+         * Type: string
          * @hide
          */
         @Readable
-        public static final String ASSIST_GESTURE_SILENCE_ALERTS_ENABLED =
-                "assist_gesture_silence_alerts_enabled";
+        public static final String BACKUP_MANAGER_CONSTANTS = "backup_manager_constants";
+
 
         /**
-         * Whether the assist gesture should wake the phone.
+         * Local transport parameters so we can configure it for tests.
+         * This is encoded as a key=value list, separated by commas.
+         *
+         * The following keys are supported:
+         *
+         * <pre>
+         * fake_encryption_flag  (boolean)
+         * </pre>
          *
+         * <p>
+         * Type: string
          * @hide
          */
         @Readable
-        public static final String ASSIST_GESTURE_WAKE_ENABLED =
-                "assist_gesture_wake_enabled";
+        public static final String BACKUP_LOCAL_TRANSPORT_PARAMETERS =
+                "backup_local_transport_parameters";
 
         /**
-         * Indicates whether the Assist Gesture Deferred Setup has been completed.
-         * <p>
-         * Type: int (0 for false, 1 for true)
-         *
+         * Flag to set if the system should predictively attempt to re-enable Bluetooth while
+         * the user is driving.
          * @hide
          */
-        @SystemApi
         @Readable
-        public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete";
+        public static final String BLUETOOTH_ON_WHILE_DRIVING = "bluetooth_on_while_driving";
 
         /**
-         * Whether the assistant can be triggered by a touch gesture.
-         *
+         * Volume dialog timeout in ms.
          * @hide
          */
-        public static final String ASSIST_TOUCH_GESTURE_ENABLED =
-                "assist_touch_gesture_enabled";
+        public static final String VOLUME_DIALOG_DISMISS_TIMEOUT = "volume_dialog_dismiss_timeout";
 
         /**
-         * Whether the assistant can be triggered by long-pressing the home button
-         *
+         * Volume dialog haptic feedback
          * @hide
          */
-        public static final String ASSIST_LONG_PRESS_HOME_ENABLED =
-                "assist_long_press_home_enabled";
+        public static final String VOLUME_DIALOG_HAPTIC_FEEDBACK = "volume_dialog_haptic_feedback";
 
         /**
-         * Whether all entrypoints (e.g. long-press home, long-press nav handle)
-         * can trigger contextual search.
+         * What behavior should be invoked when the volume hush gesture is triggered
+         * One of VOLUME_HUSH_OFF, VOLUME_HUSH_VIBRATE, VOLUME_HUSH_MUTE, VOLUME_HUSH_CYCLE.
          *
          * @hide
          */
-        public static final String SEARCH_ALL_ENTRYPOINTS_ENABLED =
-                "search_all_entrypoints_enabled";
+        @SystemApi
+        @Readable
+        public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture";
+
+        /** @hide */
+        @SystemApi
+        public static final int VOLUME_HUSH_OFF = 0;
+        /** @hide */
+        @SystemApi
+        public static final int VOLUME_HUSH_VIBRATE = 1;
+        /** @hide */
+        @SystemApi
+        public static final int VOLUME_HUSH_MUTE = 2;
+        /** @hide */
+        public static final int VOLUME_HUSH_CYCLE = 3;
 
         /**
-         * Whether or not the accessibility data streaming is enbled for the
-         * {@link VisualQueryDetectedResult#setAccessibilityDetectionData}.
+         * The number of times (integer) the user has manually enabled battery saver.
          * @hide
          */
-        public static final String VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED =
-                "visual_query_accessibility_detection_enabled";
+        @Readable
+        public static final String LOW_POWER_MANUAL_ACTIVATION_COUNT =
+                "low_power_manual_activation_count";
 
         /**
-         * Timeout to be used for unbinding to the configured remote
-         * {@link android.service.ondeviceintelligence.OnDeviceIntelligenceService} if there are no
-         * requests in the queue. A value of -1 represents to never unbind.
+         * Whether the "first time battery saver warning" dialog needs to be shown (0: default)
+         * or not (1).
          *
          * @hide
          */
-        public static final String ON_DEVICE_INTELLIGENCE_UNBIND_TIMEOUT_MS =
-                "on_device_intelligence_unbind_timeout_ms";
-
+        @Readable
+        public static final String LOW_POWER_WARNING_ACKNOWLEDGED =
+                "low_power_warning_acknowledged";
 
         /**
-         * Timeout that represents maximum idle time before which a callback should be populated.
+         * Whether the "first time extra battery saver warning" dialog needs to be shown
+         * (0: default) or not (1).
          *
          * @hide
          */
-        public static final String ON_DEVICE_INTELLIGENCE_IDLE_TIMEOUT_MS =
-                "on_device_intelligence_idle_timeout_ms";
+        public static final String EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED =
+                "extra_low_power_warning_acknowledged";
 
         /**
-         * Timeout to be used for unbinding to the configured remote
-         * {@link android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService} if there
-         * are no requests in the queue. A value of -1 represents to never unbind.
+         * Whether the emergency thermal alert would be disabled
+         * (0: default) or not (1).
          *
          * @hide
          */
-        public static final String ON_DEVICE_INFERENCE_UNBIND_TIMEOUT_MS =
-                "on_device_inference_unbind_timeout_ms";
+        public static final String EMERGENCY_THERMAL_ALERT_DISABLED =
+                "emergency_thermal_alert_disabled";
 
         /**
-         * Control whether Night display is currently activated.
+         * 0 (default) Auto battery saver suggestion has not been suppressed. 1) it has been
+         * suppressed.
          * @hide
          */
         @Readable
-        public static final String NIGHT_DISPLAY_ACTIVATED = "night_display_activated";
+        public static final String SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION =
+                "suppress_auto_battery_saver_suggestion";
 
         /**
-         * Control whether Night display will automatically activate/deactivate.
+         * List of packages, which data need to be unconditionally cleared before full restore.
+         * Type: string
          * @hide
          */
         @Readable
-        public static final String NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
+        public static final String PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE =
+                "packages_to_clear_data_before_full_restore";
 
         /**
-         * Control the color temperature of Night Display, represented in Kelvin.
+         * How often to check for location access.
          * @hide
+         *
+         * @deprecated This has been moved to DeviceConfig property
+         * {@link LocationAccessCheck#PROPERTY_LOCATION_ACCESS_PERIODIC_INTERVAL_MILLIS} in a T
+         * module update
+         *
+         * Before Android T set this property to control the interval for the check
+         * On Android T set this and the DeviceConfig property
+         * After Android T set the DeviceConfig property
          */
+        @SystemApi
+        @Deprecated
         @Readable
-        public static final String NIGHT_DISPLAY_COLOR_TEMPERATURE =
-                "night_display_color_temperature";
+        public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS =
+                "location_access_check_interval_millis";
 
         /**
-         * Custom time when Night display is scheduled to activate.
-         * Represented as milliseconds from midnight (e.g. 79200000 == 10pm).
+         * Delay between granting location access and checking it.
          * @hide
+         *
+         * @deprecated This has been moved to DeviceConfig property
+         * {@link LocationAccessCheck#PROPERTY_LOCATION_ACCESS_CHECK_DELAY_MILLIS} in a T module
+         * update
+         *
+         * Before Android T set this property to control the delay for the check
+         * On Android T set this and the DeviceConfig property
+         * After Android T set the DeviceConfig property
          */
+        @SystemApi
+        @Deprecated
         @Readable
-        public static final String NIGHT_DISPLAY_CUSTOM_START_TIME =
-                "night_display_custom_start_time";
+        public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS =
+                "location_access_check_delay_millis";
 
         /**
-         * Custom time when Night display is scheduled to deactivate.
-         * Represented as milliseconds from midnight (e.g. 21600000 == 6am).
+         * @deprecated This setting does not have any effect anymore
          * @hide
          */
+        @SystemApi
+        @Deprecated
         @Readable
-        public static final String NIGHT_DISPLAY_CUSTOM_END_TIME = "night_display_custom_end_time";
+        public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE =
+                "location_permissions_upgrade_to_q_mode";
 
         /**
-         * A String representing the LocalDateTime when Night display was last activated. Use to
-         * decide whether to apply the current activated state after a reboot or user change. In
-         * legacy cases, this is represented by the time in milliseconds (since epoch).
+         * Whether or not the system Auto Revoke feature is disabled.
          * @hide
          */
+        @SystemApi
         @Readable
-        public static final String NIGHT_DISPLAY_LAST_ACTIVATED_TIME =
-                "night_display_last_activated_time";
+        public static final String AUTO_REVOKE_DISABLED = "auto_revoke_disabled";
 
         /**
-         * Control whether display white balance is currently enabled.
+         * Map of android.theme.customization.* categories to the enabled overlay package for that
+         * category, formatted as a serialized {@link org.json.JSONObject}. If there is no
+         * corresponding package included for a category, then all overlay packages in that
+         * category must be disabled.
+         *
+         * A few category keys have special meaning and are used for Material You theming.
+         *
+         * A {@code FabricatedOverlay} containing Material You tonal palettes will be generated
+         * in case {@code android.theme.customization.system_palette} contains a
+         * {@link android.annotation.ColorInt}.
+         *
+         * The strategy used for generating the tonal palettes can be defined with the
+         * {@code android.theme.customization.theme_style} key, with one of the following options:
+         * <ul>
+         *   <li> {@code TONAL_SPOT} is a mid vibrancy palette that uses an accent 3 analogous to
+         *   accent 1.</li>
+         *   <li> {@code VIBRANT} is a high vibrancy palette that harmoniously blends subtle shifts
+         *   between colors.</li>
+         *   <li> {@code EXPRESSIVE} is a high vibrancy palette that pairs unexpected and unique
+         *   accents colors together.</li>
+         *   <li> {@code SPRITZ} is a low vibrancy palette that creates a soft wash between
+         *   colors.</li>
+         *   <li> {@code RAINBOW} uses both chromatic accents and neutral surfaces to create a more
+         *   subtle color experience for users.</li>
+         *   <li> {@code FRUIT_SALAD} experiments with the concept of "two tone colors" to give
+         *   users more expression.</li>
+         * </ul>
+         *
+         * Example of valid fabricated theme specification:
+         * <pre>
+         * {
+         *     "android.theme.customization.system_palette":"B1611C",
+         *     "android.theme.customization.theme_style":"EXPRESSIVE"
+         * }
+         * </pre>
          * @hide
          */
+        @SystemApi
         @Readable
-        public static final String DISPLAY_WHITE_BALANCE_ENABLED = "display_white_balance_enabled";
+        public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES =
+                "theme_customization_overlay_packages";
 
         /**
-         * Used by DisplayManager to backup/restore the user-selected resolution mode.
+         * Indicates whether the nav bar is forced to always be visible, even in immersive mode.
+         * <p>Type: int (0 for false, 1 for true)
+         *
          * @hide
          */
-        @Readable
-        public static final String SCREEN_RESOLUTION_MODE = "screen_resolution_mode";
+        public static final String NAV_BAR_FORCE_VISIBLE = "nav_bar_force_visible";
 
         /**
-         * Resolution Mode Constants for SCREEN_RESOLUTION_MODE setting.
+         * Indicates whether the device is in kids nav mode.
+         * <p>Type: int (0 for false, 1 for true)
          *
          * @hide
          */
-        @IntDef(prefix = { "RESOLUTION_MODE_" }, value = {
-                RESOLUTION_MODE_UNKNOWN,
-                RESOLUTION_MODE_HIGH,
-                RESOLUTION_MODE_FULL
-        })
-        @Retention(RetentionPolicy.SOURCE)
-        public @interface ResolutionMode {}
-        /** @hide */
-        public static final int RESOLUTION_MODE_UNKNOWN = 0;
-        /** @hide */
-        public static final int RESOLUTION_MODE_HIGH = 1;
-        /** @hide */
-        public static final int RESOLUTION_MODE_FULL = 2;
+        public static final String NAV_BAR_KIDS_MODE = "nav_bar_kids_mode";
 
         /**
-         * Names of the service components that the current user has explicitly allowed to
-         * be a VR mode listener, separated by ':'.
-         *
+         * This defines the order in which the 3-button navigation bar's buttons are displayed.
+         * 0 = left-to-right (back, home, recent)
+         * 1 = right-to-left (recent, home, back)
+         * @hide
+         */
+        public static final String NAVIGATIONBAR_KEY_ORDER = "navigationbar_key_order";
+
+        /**
+         * Navigation bar mode.
+         *  0 = 3 button
+         *  1 = 2 button
+         *  2 = fully gestural
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
         @Readable
-        public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";
+        public static final String NAVIGATION_MODE =
+                "navigation_mode";
 
         /**
-         * Behavior of the display while in VR mode.
-         *
-         * One of {@link #VR_DISPLAY_MODE_LOW_PERSISTENCE} or {@link #VR_DISPLAY_MODE_OFF}.
-         *
+         * The value is from another(source) device's {@link #NAVIGATION_MODE} during restore.
+         * It's supposed to be written only by
+         * {@link com.android.providers.settings.SettingsHelper}.
+         * This setting should not be added into backup array.
+         * <p>Value: -1 = Can't get value from restore(default),
+         *  0 = 3 button,
+         *  1 = 2 button,
+         *  2 = fully gestural.
          * @hide
          */
-        @Readable
-        public static final String VR_DISPLAY_MODE = "vr_display_mode";
+        public static final String NAVIGATION_MODE_RESTORE = "navigation_mode_restore";
 
         /**
-         * Lower the display persistence while the system is in VR mode.
-         *
-         * @see PackageManager#FEATURE_VR_MODE_HIGH_PERFORMANCE
-         *
-         * @hide.
+         * Scale factor for the back gesture inset size on the left side of the screen.
+         * @hide
          */
-        public static final int VR_DISPLAY_MODE_LOW_PERSISTENCE = 0;
+        @Readable
+        public static final String BACK_GESTURE_INSET_SCALE_LEFT =
+                "back_gesture_inset_scale_left";
 
         /**
-         * Do not alter the display persistence while the system is in VR mode.
-         *
-         * @see PackageManager#FEATURE_VR_MODE_HIGH_PERFORMANCE
-         *
-         * @hide.
+         * Scale factor for the back gesture inset size on the right side of the screen.
+         * @hide
          */
-        public static final int VR_DISPLAY_MODE_OFF = 1;
+        @Readable
+        public static final String BACK_GESTURE_INSET_SCALE_RIGHT =
+                "back_gesture_inset_scale_right";
 
         /**
-         * The latest SDK version that CarrierAppUtils#disableCarrierAppsUntilPrivileged has been
-         * executed for.
-         *
-         * <p>This is used to ensure that we only take one pass which will disable apps that are not
-         * privileged (if any). From then on, we only want to enable apps (when a matching SIM is
-         * inserted), to avoid disabling an app that the user might actively be using.
-         *
-         * <p>Will be set to {@link android.os.Build.VERSION#SDK_INT} once executed. Note that older
-         * SDK versions prior to R set 1 for this value.
-         *
+         * Current provider of proximity-based sharing services.
+         * Default value in @string/config_defaultNearbySharingComponent.
+         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
         @Readable
-        public static final String CARRIER_APPS_HANDLED = "carrier_apps_handled";
+        public static final String NEARBY_SHARING_COMPONENT = "nearby_sharing_component";
 
         /**
-         * Whether parent user can access remote contact in managed profile.
-         *
+         * Nearby Sharing Slice URI for the SliceProvider to
+         * read Nearby Sharing scan results and then draw the UI.
          * @hide
          */
-        @Readable
-        public static final String MANAGED_PROFILE_CONTACT_REMOTE_SEARCH =
-                "managed_profile_contact_remote_search";
+        public static final String NEARBY_SHARING_SLICE_URI = "nearby_sharing_slice_uri";
 
         /**
-         * Whether parent profile can access remote calendar data in managed profile.
-         *
+         * Current provider of Fast Pair saved devices page.
+         * Default value in @string/config_defaultNearbyFastPairSettingsDevicesComponent.
+         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        @Readable
-        public static final String CROSS_PROFILE_CALENDAR_ENABLED =
-                "cross_profile_calendar_enabled";
+        public static final String NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT =
+                "nearby_fast_pair_settings_devices_component";
 
         /**
-         * Whether or not the automatic storage manager is enabled and should run on the device.
-         *
+         * Current provider of the component for requesting ambient context consent.
+         * Default value in @string/config_defaultAmbientContextConsentComponent.
+         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        @Readable
-        public static final String AUTOMATIC_STORAGE_MANAGER_ENABLED =
-                "automatic_storage_manager_enabled";
+        public static final String AMBIENT_CONTEXT_CONSENT_COMPONENT =
+                "ambient_context_consent_component";
 
         /**
-         * How many days of information for the automatic storage manager to retain on the device.
-         *
+         * Current provider of the intent extra key for the caller's package name while
+         * requesting ambient context consent.
+         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        @Readable
-        public static final String AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN =
-                "automatic_storage_manager_days_to_retain";
+        public static final String AMBIENT_CONTEXT_PACKAGE_NAME_EXTRA_KEY =
+                "ambient_context_package_name_key";
 
         /**
-         * Default number of days of information for the automatic storage manager to retain.
-         *
+         * Current provider of the intent extra key for the event code int array while
+         * requesting ambient context consent.
+         * Default value in @string/config_ambientContextEventArrayExtraKey.
+         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        public static final int AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT = 90;
+        public static final String AMBIENT_CONTEXT_EVENT_ARRAY_EXTRA_KEY =
+                "ambient_context_event_array_key";
 
         /**
-         * How many bytes the automatic storage manager has cleared out.
-         *
+         * Controls whether aware is enabled.
          * @hide
          */
         @Readable
-        public static final String AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED =
-                "automatic_storage_manager_bytes_cleared";
+        public static final String AWARE_ENABLED = "aware_enabled";
 
         /**
-         * Last run time for the automatic storage manager.
-         *
+         * Controls whether aware_lock is enabled.
          * @hide
          */
         @Readable
-        public static final String AUTOMATIC_STORAGE_MANAGER_LAST_RUN =
-                "automatic_storage_manager_last_run";
+        public static final String AWARE_LOCK_ENABLED = "aware_lock_enabled";
+
         /**
-         * If the automatic storage manager has been disabled by policy. Note that this doesn't
-         * mean that the automatic storage manager is prevented from being re-enabled -- this only
-         * means that it was turned off by policy at least once.
-         *
+         * Controls whether tap gesture is enabled.
          * @hide
          */
         @Readable
-        public static final String AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY =
-                "automatic_storage_manager_turned_off_by_policy";
+        public static final String TAP_GESTURE = "tap_gesture";
 
         /**
-         * Whether SystemUI navigation keys is enabled.
+         * Controls whether the people strip is enabled.
          * @hide
          */
         @Readable
-        public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
-                "system_navigation_keys_enabled";
+        public static final String PEOPLE_STRIP = "people_strip";
 
         /**
-         * Holds comma separated list of ordering of QS tiles.
-         *
+         * Whether or not to enable media resumption
+         * When enabled, media controls in quick settings will populate on boot and persist if
+         * resumable via a MediaBrowserService.
+         * @see Settings.Global#SHOW_MEDIA_ON_QUICK_SETTINGS
          * @hide
          */
-        @Readable(maxTargetSdk = VERSION_CODES.TIRAMISU)
-        public static final String QS_TILES = "sysui_qs_tiles";
+        @Readable
+        public static final String MEDIA_CONTROLS_RESUME = "qs_media_resumption";
 
         /**
-         * Whether this user has enabled Quick controls.
-         *
-         * 0 indicates disabled and 1 indicates enabled. A non existent value should be treated as
-         * enabled.
-         *
-         * @deprecated Controls are migrated to Quick Settings, rendering this unnecessary and will
-         *             be removed in a future release.
+         * Whether to enable media controls on lock screen.
+         * When enabled, media controls will appear on lock screen.
          * @hide
          */
-        @Readable
-        @Deprecated
-        public static final String CONTROLS_ENABLED = "controls_enabled";
+        public static final String MEDIA_CONTROLS_LOCK_SCREEN = "media_controls_lock_screen";
 
         /**
-         * Whether power menu content (cards, passes, controls) will be shown when device is locked.
-         *
-         * 0 indicates hide and 1 indicates show. A non existent value will be treated as hide.
+         * Whether to enable camera extensions software fallback.
          * @hide
          */
-        @TestApi
         @Readable
-        public static final String POWER_MENU_LOCKED_SHOW_CONTENT =
-                "power_menu_locked_show_content";
+        public static final String CAMERA_EXTENSIONS_FALLBACK = "camera_extensions_fallback";
 
         /**
-         * Whether home controls should be accessible from the lockscreen
+         * Controls magnification mode when magnification is enabled via a system-wide triple tap
+         * gesture or the accessibility shortcut.
          *
+         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
+         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
          * @hide
          */
-        public static final String LOCKSCREEN_SHOW_CONTROLS = "lockscreen_show_controls";
+        @TestApi
+        @Readable
+        public static final String ACCESSIBILITY_MAGNIFICATION_MODE =
+                "accessibility_magnification_mode";
 
         /**
-         * Whether trivial home controls can be used without authentication
-         *
+         * Magnification mode value that is a default value for the magnification logging feature.
          * @hide
          */
-        public static final String LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS =
-                "lockscreen_allow_trivial_controls";
+        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_NONE = 0x0;
 
         /**
-         * Whether wallet should be accessible from the lockscreen
-         *
+         * Magnification mode value that magnifies whole display.
          * @hide
          */
-        public static final String LOCKSCREEN_SHOW_WALLET = "lockscreen_show_wallet";
+        @TestApi
+        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN = 0x1;
 
         /**
-         * Whether to use the lockscreen double-line clock
-         *
+         * Magnification mode value that magnifies magnify particular region in a window
          * @hide
          */
-        public static final String LOCKSCREEN_USE_DOUBLE_LINE_CLOCK =
-                "lockscreen_use_double_line_clock";
+        @TestApi
+        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;
 
         /**
-         * Whether to show the vibrate icon in the Status Bar (default off)
-         *
+         * Magnification mode value that is capable of magnifying whole display and particular
+         * region in a window.
          * @hide
          */
-        public static final String STATUS_BAR_SHOW_VIBRATE_ICON = "status_bar_show_vibrate_icon";
+        @TestApi
+        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;
 
         /**
-         * Specifies whether the web action API is enabled.
+         * Whether the magnification always on feature is enabled. If true, the magnifier will not
+         * deactivate on Activity transitions; it will only zoom out to 100%.
          *
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";
+        public static final String ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED =
+                "accessibility_magnification_always_on_enabled";
 
         /**
-         * Whether qr code scanner should be accessible from the lockscreen
+         * Controls how the magnification follows the cursor.
          *
          * @hide
          */
-        public static final String LOCK_SCREEN_SHOW_QR_CODE_SCANNER =
-                "lock_screen_show_qr_code_scanner";
+        public static final String ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE =
+                "accessibility_magnification_cursor_following_mode";
 
         /**
-         * Whether or not to enable qr code code scanner setting to enable/disable lockscreen
-         * entry point. Any value apart from null means setting needs to be enabled
+         * Magnification cursor following mode value for the continuous mode.
          *
          * @hide
          */
-        public static final String SHOW_QR_CODE_SCANNER_SETTING =
-                "show_qr_code_scanner_setting";
+        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS = 0;
 
         /**
-         * Has this pairable device been paired or upgraded from a previously paired system.
+         * Magnification cursor following mode value for the center mode.
+         *
          * @hide
          */
-        @Readable
-        public static final String DEVICE_PAIRED = "device_paired";
+        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER = 1;
 
         /**
-         * Specifies additional package name for broadcasting the CMAS messages.
+         * Magnification cursor following mode value for the edge mode.
+         *
          * @hide
          */
-        @Readable
-        public static final String CMAS_ADDITIONAL_BROADCAST_PKG = "cmas_additional_broadcast_pkg";
+        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE = 2;
 
         /**
-         * Whether the launcher should show any notification badges.
-         * The value is boolean (1 or 0).
+         * Different cursor following settings that can be used as values with
+         * {@link #ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE}.
          * @hide
          */
-        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
-        @TestApi
-        @Readable
-        public static final String NOTIFICATION_BADGING = "notification_badging";
-
-        /**
-         * When enabled the system will maintain a rolling history of received notifications. When
-         * disabled the history will be disabled and deleted.
-         *
-         * The value 1 - enable, 0 - disable
+        @Retention(RetentionPolicy.SOURCE)
+        @IntDef(prefix = { "ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_" },
+                value = {
+                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS,
+                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER,
+                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE})
+        public @interface AccessibilityMagnificationCursorFollowingMode {}
+
+        /**
+         * Whether the following typing focus feature for magnification is enabled.
          * @hide
          */
-        @Readable
-        public static final String NOTIFICATION_HISTORY_ENABLED = "notification_history_enabled";
+        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED =
+                "accessibility_magnification_follow_typing_enabled";
 
         /**
-         * When enabled conversations marked as favorites will be set to bubble.
-         *
-         * The value 1 - enable, 0 - disable
+         * Whether the following keyboard focus feature for magnification is enabled.
          * @hide
          */
-        @Readable
-        public static final String BUBBLE_IMPORTANT_CONVERSATIONS
-                = "bubble_important_conversations";
+        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED =
+                "accessibility_magnification_follow_keyboard_enabled";
 
         /**
-         * When enabled, notifications able to bubble will display an affordance allowing the user
-         * to bubble them.
-         * The value is boolean (1 to enable or 0 to disable).
-         *
+         * Whether the magnification joystick controller feature is enabled.
          * @hide
          */
-        @TestApi
-        @SuppressLint("NoSettingsProvider")
-        @Readable
-        public static final String NOTIFICATION_BUBBLES = "notification_bubbles";
+        public static final String ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED =
+                "accessibility_magnification_joystick_enabled";
 
         /**
-         * Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right
-         * swipe).
+         * Setting that specifies whether the display magnification is enabled via a system-wide
+         * two fingers triple tap gesture.
          *
          * @hide
          */
-        @Readable
-        public static final String NOTIFICATION_DISMISS_RTL = "notification_dismiss_rtl";
+        public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =
+                "accessibility_magnification_two_finger_triple_tap_enabled";
 
         /**
-         * Comma separated list of QS tiles that have been auto-added already.
+         * Whether to always expand notification bundles in the notification shade.
+         * 1 = expand, 0 = collapse.
          * @hide
          */
-        @Readable
-        public static final String QS_AUTO_ADDED_TILES = "qs_auto_tiles";
+        public static final String NOTIFICATION_BUNDLES_ALWAYS_EXPAND =
+                "notification_bundles_always_expand";
 
         /**
-         * The duration of timeout, in milliseconds, to switch from a non-Dock User to the
-         * Dock User when the device is docked.
+         * Whether the magnify navigation bar and keyboard feature is enabled.
+         *
          * @hide
          */
-        public static final String TIMEOUT_TO_DOCK_USER = "timeout_to_dock_user";
+        public static final String ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME =
+                "accessibility_magnification_magnify_nav_and_ime";
 
         /**
-         * Backup manager behavioral parameters.
-         * This is encoded as a key=value list, separated by commas. Ex:
-         *
-         * "key_value_backup_interval_milliseconds=14400000,key_value_backup_require_charging=true"
-         *
-         * The following keys are supported:
-         *
-         * <pre>
-         * key_value_backup_interval_milliseconds  (long)
-         * key_value_backup_fuzz_milliseconds      (long)
-         * key_value_backup_require_charging       (boolean)
-         * key_value_backup_required_network_type  (int)
-         * full_backup_interval_milliseconds       (long)
-         * full_backup_require_charging            (boolean)
-         * full_backup_required_network_type       (int)
-         * backup_finished_notification_receivers  (String[])
-         * </pre>
+         * For pinch to zoom anywhere feature.
          *
-         * backup_finished_notification_receivers uses ":" as delimiter for values.
+         * If true, you should be able to pinch to magnify the window anywhere.
          *
-         * <p>
-         * Type: string
          * @hide
          */
-        @Readable
-        public static final String BACKUP_MANAGER_CONSTANTS = "backup_manager_constants";
-
+        public static final String ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED =
+                "accessibility_pinch_to_zoom_anywhere_enabled";
 
         /**
-         * Local transport parameters so we can configure it for tests.
-         * This is encoded as a key=value list, separated by commas.
-         *
-         * The following keys are supported:
+         * For magnification feature where panning can be controlled with a single finger.
          *
-         * <pre>
-         * fake_encryption_flag  (boolean)
-         * </pre>
+         * If true, you can pan using a single finger gesture.
          *
-         * <p>
-         * Type: string
          * @hide
          */
-        @Readable
-        public static final String BACKUP_LOCAL_TRANSPORT_PARAMETERS =
-                "backup_local_transport_parameters";
+        public static final String ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED =
+                "accessibility_single_finger_panning_enabled";
 
         /**
-         * Flag to set if the system should predictively attempt to re-enable Bluetooth while
-         * the user is driving.
+         * Controls magnification capability. Accessibility magnification is capable of at least one
+         * of the magnification modes.
+         *
+         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
+         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
+         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_ALL
          * @hide
          */
+        @TestApi
         @Readable
-        public static final String BLUETOOTH_ON_WHILE_DRIVING = "bluetooth_on_while_driving";
+        public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY =
+                "accessibility_magnification_capability";
 
         /**
-         * Volume dialog timeout in ms.
+         *  Whether to show the window magnification prompt dialog when the user uses full-screen
+         *  magnification first time after database is upgraded.
+         *
          * @hide
          */
-        public static final String VOLUME_DIALOG_DISMISS_TIMEOUT = "volume_dialog_dismiss_timeout";
+        public static final String ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT =
+                "accessibility_show_window_magnification_prompt";
 
         /**
-         * What behavior should be invoked when the volume hush gesture is triggered
-         * One of VOLUME_HUSH_OFF, VOLUME_HUSH_VIBRATE, VOLUME_HUSH_MUTE.
+         * Controls the accessibility button mode. System will force-set the value to {@link
+         * #ACCESSIBILITY_BUTTON_MODE_GESTURE} if {@link #NAVIGATION_MODE} is button; force-set the
+         * value to {@link ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} if {@link #NAVIGATION_MODE} is
+         * gestural; otherwise, remain the option.
+         * <ul>
+         *    <li> 0 = button in navigation bar </li>
+         *    <li> 1 = button floating on the display </li>
+         *    <li> 2 = button using gesture to trigger </li>
+         * </ul>
          *
+         * @see #ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR
+         * @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU
+         * @see #ACCESSIBILITY_BUTTON_MODE_GESTURE
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture";
-
-        /** @hide */
-        @SystemApi
-        public static final int VOLUME_HUSH_OFF = 0;
-        /** @hide */
-        @SystemApi
-        public static final int VOLUME_HUSH_VIBRATE = 1;
-        /** @hide */
-        @SystemApi
-        public static final int VOLUME_HUSH_MUTE = 2;
+        public static final String ACCESSIBILITY_BUTTON_MODE =
+                "accessibility_button_mode";
 
         /**
-         * The number of times (integer) the user has manually enabled battery saver.
+         * Accessibility button mode value that specifying the accessibility service or feature to
+         * be toggled via the button in the navigation bar.
+         *
          * @hide
          */
-        @Readable
-        public static final String LOW_POWER_MANUAL_ACTIVATION_COUNT =
-                "low_power_manual_activation_count";
+        public static final int ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR = 0x0;
 
         /**
-         * Whether the "first time battery saver warning" dialog needs to be shown (0: default)
-         * or not (1).
+         * Accessibility button mode value that specifying the accessibility service or feature to
+         * be toggled via the button floating on the display.
          *
          * @hide
          */
-        @Readable
-        public static final String LOW_POWER_WARNING_ACKNOWLEDGED =
-                "low_power_warning_acknowledged";
+        public static final int ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU = 0x1;
 
         /**
-         * Whether the "first time extra battery saver warning" dialog needs to be shown
-         * (0: default) or not (1).
+         * Accessibility button mode value that specifying the accessibility service or feature to
+         * be toggled via the gesture.
          *
          * @hide
          */
-        public static final String EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED =
-                "extra_low_power_warning_acknowledged";
+        public static final int ACCESSIBILITY_BUTTON_MODE_GESTURE = 0x2;
 
         /**
-         * Whether the emergency thermal alert would be disabled
-         * (0: default) or not (1).
+         * The size of the accessibility floating menu.
+         * <ul>
+         *     <li> 0 = small size
+         *     <li> 1 = large size
+         * </ul>
          *
          * @hide
          */
-        public static final String EMERGENCY_THERMAL_ALERT_DISABLED =
-                "emergency_thermal_alert_disabled";
+        public static final String ACCESSIBILITY_FLOATING_MENU_SIZE =
+                "accessibility_floating_menu_size";
 
         /**
-         * 0 (default) Auto battery saver suggestion has not been suppressed. 1) it has been
-         * suppressed.
+         * The icon type of the accessibility floating menu.
+         * <ul>
+         *     <li> 0 = full circle type
+         *     <li> 1 = half circle type
+         * </ul>
+         *
          * @hide
          */
-        @Readable
-        public static final String SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION =
-                "suppress_auto_battery_saver_suggestion";
+        public static final String ACCESSIBILITY_FLOATING_MENU_ICON_TYPE =
+                "accessibility_floating_menu_icon_type";
 
         /**
-         * List of packages, which data need to be unconditionally cleared before full restore.
-         * Type: string
+         * Whether the fade effect for the accessibility floating menu is enabled.
+         *
          * @hide
          */
-        @Readable
-        public static final String PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE =
-                "packages_to_clear_data_before_full_restore";
+        public static final String ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED =
+                "accessibility_floating_menu_fade_enabled";
 
         /**
-         * How often to check for location access.
-         * @hide
-         *
-         * @deprecated This has been moved to DeviceConfig property
-         * {@link LocationAccessCheck#PROPERTY_LOCATION_ACCESS_PERIODIC_INTERVAL_MILLIS} in a T
-         * module update
+         * The opacity value for the accessibility floating menu fade out effect, from 0.0
+         * (transparent) to 1.0 (opaque).
          *
-         * Before Android T set this property to control the interval for the check
-         * On Android T set this and the DeviceConfig property
-         * After Android T set the DeviceConfig property
+         * @hide
          */
-        @SystemApi
-        @Deprecated
-        @Readable
-        public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS =
-                "location_access_check_interval_millis";
+        public static final String ACCESSIBILITY_FLOATING_MENU_OPACITY =
+                "accessibility_floating_menu_opacity";
 
         /**
-         * Delay between granting location access and checking it.
+         * Prompts the user to the Accessibility button is replaced with the floating menu.
+         * <ul>
+         *    <li> 0 = disabled </li>
+         *    <li> 1 = enabled </li>
+         * </ul>
+         *
          * @hide
+         */
+        public static final String ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT =
+                "accessibility_floating_menu_migration_tooltip_prompt";
+
+        /**
+         * For the force dark theme feature which inverts any apps that don't already support dark
+         * theme.
          *
-         * @deprecated This has been moved to DeviceConfig property
-         * {@link LocationAccessCheck#PROPERTY_LOCATION_ACCESS_CHECK_DELAY_MILLIS} in a T module
-         * update
+         * If true, it will automatically invert any app that is mainly light.
          *
-         * Before Android T set this property to control the delay for the check
-         * On Android T set this and the DeviceConfig property
-         * After Android T set the DeviceConfig property
+         * This is related to the force dark override setting, however it will always force the apps
+         * colors and will ignore any developer hints or opt-out APIs.
+         *
+         * @hide
          */
-        @SystemApi
-        @Deprecated
+        @TestApi
         @Readable
-        public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS =
-                "location_access_check_delay_millis";
+        @FlaggedApi(android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR)
+        @SuppressLint("NoSettingsProvider")
+        public static final String ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED =
+                "accessibility_force_invert_color_enabled";
 
         /**
-         * @deprecated This setting does not have any effect anymore
+         * Whether to enable mouse keys for Physical Keyboard accessibility.
+         *
+         * If set to true, key presses (of the mouse keys) on
+         * physical keyboard will control mouse pointer on the display.
+         *
          * @hide
          */
-        @SystemApi
-        @Deprecated
         @Readable
-        public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE =
-                "location_permissions_upgrade_to_q_mode";
+        public static final String ACCESSIBILITY_MOUSE_KEYS_ENABLED =
+                "accessibility_mouse_keys_enabled";
 
         /**
-         * Whether or not the system Auto Revoke feature is disabled.
+         * The current float acceleration value for mouse keys movement.
+         *
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String AUTO_REVOKE_DISABLED = "auto_revoke_disabled";
+        public static final String ACCESSIBILITY_MOUSE_KEYS_ACCELERATION =
+                "accessibility_mouse_keys_acceleration";
 
         /**
-         * Map of android.theme.customization.* categories to the enabled overlay package for that
-         * category, formatted as a serialized {@link org.json.JSONObject}. If there is no
-         * corresponding package included for a category, then all overlay packages in that
-         * category must be disabled.
-         *
-         * A few category keys have special meaning and are used for Material You theming.
-         *
-         * A {@code FabricatedOverlay} containing Material You tonal palettes will be generated
-         * in case {@code android.theme.customization.system_palette} contains a
-         * {@link android.annotation.ColorInt}.
-         *
-         * The strategy used for generating the tonal palettes can be defined with the
-         * {@code android.theme.customization.theme_style} key, with one of the following options:
-         * <ul>
-         *   <li> {@code TONAL_SPOT} is a mid vibrancy palette that uses an accent 3 analogous to
-         *   accent 1.</li>
-         *   <li> {@code VIBRANT} is a high vibrancy palette that harmoniously blends subtle shifts
-         *   between colors.</li>
-         *   <li> {@code EXPRESSIVE} is a high vibrancy palette that pairs unexpected and unique
-         *   accents colors together.</li>
-         *   <li> {@code SPRITZ} is a low vibrancy palette that creates a soft wash between
-         *   colors.</li>
-         *   <li> {@code RAINBOW} uses both chromatic accents and neutral surfaces to create a more
-         *   subtle color experience for users.</li>
-         *   <li> {@code FRUIT_SALAD} experiments with the concept of "two tone colors" to give
-         *   users more expression.</li>
-         * </ul>
+         * The max speed as a factor of the minimum speed for mouse keys movement.
          *
-         * Example of valid fabricated theme specification:
-         * <pre>
-         * {
-         *     "android.theme.customization.system_palette":"B1611C",
-         *     "android.theme.customization.theme_style":"EXPRESSIVE"
-         * }
-         * </pre>
          * @hide
          */
-        @SystemApi
-        @Readable
-        public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES =
-                "theme_customization_overlay_packages";
+        public static final String ACCESSIBILITY_MOUSE_KEYS_MAX_SPEED =
+                "accessibility_mouse_keys_max_speed";
 
         /**
-         * Indicates whether the nav bar is forced to always be visible, even in immersive mode.
-         * <p>Type: int (0 for false, 1 for true)
+         * Whether the primary keys are selected to control the mouse keys.
          *
          * @hide
          */
-        public static final String NAV_BAR_FORCE_VISIBLE = "nav_bar_force_visible";
+        public static final String ACCESSIBILITY_MOUSE_KEYS_USE_PRIMARY_KEYS =
+                "accessibility_mouse_keys_use_primary_keys";
 
         /**
-         * Indicates whether the device is in kids nav mode.
-         * <p>Type: int (0 for false, 1 for true)
+         * Whether the Adaptive connectivity option is enabled.
          *
          * @hide
          */
-        public static final String NAV_BAR_KIDS_MODE = "nav_bar_kids_mode";
+        public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled";
 
         /**
-         * This defines the order in which the 3-button navigation bar's buttons are displayed.
-         * 0 = left-to-right (back, home, recent)
-         * 1 = right-to-left (recent, home, back)
+         * Whether the Adaptive wifi scorer switch is enabled.
+         *
          * @hide
          */
-        public static final String NAVIGATIONBAR_KEY_ORDER = "navigationbar_key_order";
+        public static final String ADAPTIVE_CONNECTIVITY_WIFI_ENABLED =
+                "adaptive_connectivity_wifi_enabled";
 
         /**
-         * Navigation bar mode.
-         *  0 = 3 button
-         *  1 = 2 button
-         *  2 = fully gestural
+         * Whether the Adaptive 5G PM switch is enabled.
+         *
          * @hide
          */
-        @Readable
-        public static final String NAVIGATION_MODE =
-                "navigation_mode";
+        public static final String ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED =
+                "adaptive_connectivity_mobile_network_enabled";
 
         /**
-         * The value is from another(source) device's {@link #NAVIGATION_MODE} during restore.
-         * It's supposed to be written only by
-         * {@link com.android.providers.settings.SettingsHelper}.
-         * This setting should not be added into backup array.
-         * <p>Value: -1 = Can't get value from restore(default),
-         *  0 = 3 button,
-         *  1 = 2 button,
-         *  2 = fully gestural.
+         * Controls the 'Sunlight boost' toggle in wearable devices (high brightness mode).
+         *
+         * Valid values for this key are: '0' (disabled) or '1' (enabled).
+         *
          * @hide
          */
-        public static final String NAVIGATION_MODE_RESTORE = "navigation_mode_restore";
+        public static final String HBM_SETTING_KEY =
+                "com.android.server.display.HBM_SETTING_KEY";
 
         /**
-         * Scale factor for the back gesture inset size on the left side of the screen.
+         * Whether to show privacy indicator for location
          * @hide
          */
-        @Readable
-        public static final String BACK_GESTURE_INSET_SCALE_LEFT =
-                "back_gesture_inset_scale_left";
+        public static final String ENABLE_LOCATION_PRIVACY_INDICATOR = "enable_location_privacy_indicator";
 
         /**
-         * Scale factor for the back gesture inset size on the right side of the screen.
+         * Whether to show privacy indicator for camera
          * @hide
          */
-        @Readable
-        public static final String BACK_GESTURE_INSET_SCALE_RIGHT =
-                "back_gesture_inset_scale_right";
+        public static final String ENABLE_CAMERA_PRIVACY_INDICATOR = "enable_camera_privacy_indicator";
 
         /**
-         * Current provider of proximity-based sharing services.
-         * Default value in @string/config_defaultNearbySharingComponent.
-         * No VALIDATOR as this setting will not be backed up.
+         * Whether to show privacy indicator for media projection
          * @hide
          */
-        @Readable
-        public static final String NEARBY_SHARING_COMPONENT = "nearby_sharing_component";
+        public static final String ENABLE_PROJECTION_PRIVACY_INDICATOR = "enable_projection_privacy_indicator";
 
         /**
-         * Nearby Sharing Slice URI for the SliceProvider to
-         * read Nearby Sharing scan results and then draw the UI.
+         * Whether to allow swipe down on lockscreen to view Quick Panel
          * @hide
          */
-        public static final String NEARBY_SHARING_SLICE_URI = "nearby_sharing_slice_uri";
+        public static final String ENABLE_LOCKSCREEN_QUICK_SETTINGS = "enable_lockscreen_quick_settings";
 
         /**
-         * Current provider of Fast Pair saved devices page.
-         * Default value in @string/config_defaultNearbyFastPairSettingsDevicesComponent.
-         * No VALIDATOR as this setting will not be backed up.
+         * Pulse lockscreen music visualizer
          * @hide
          */
-        public static final String NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT =
-                "nearby_fast_pair_settings_devices_component";
+        public static final String LOCKSCREEN_PULSE_ENABLED = "lockscreen_pulse_enabled";
 
         /**
-         * Current provider of the component for requesting ambient context consent.
-         * Default value in @string/config_defaultAmbientContextConsentComponent.
-         * No VALIDATOR as this setting will not be backed up.
+         * Pulse lockscreen music visualizer on ambient display
          * @hide
          */
-        public static final String AMBIENT_CONTEXT_CONSENT_COMPONENT =
-                "ambient_context_consent_component";
+        public static final String AMBIENT_PULSE_ENABLED = "ambient_pulse_enabled";
 
         /**
-         * Current provider of the intent extra key for the caller's package name while
-         * requesting ambient context consent.
-         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        public static final String AMBIENT_CONTEXT_PACKAGE_NAME_EXTRA_KEY =
-                "ambient_context_package_name_key";
+        public static final String PULSE_BAR_COUNT = "pulse_bar_count";
 
         /**
-         * Current provider of the intent extra key for the event code int array while
-         * requesting ambient context consent.
-         * Default value in @string/config_ambientContextEventArrayExtraKey.
-         * No VALIDATOR as this setting will not be backed up.
          * @hide
          */
-        public static final String AMBIENT_CONTEXT_EVENT_ARRAY_EXTRA_KEY =
-                "ambient_context_event_array_key";
+        public static final String PULSE_ROUNDED_BARS = "pulse_rounded_bars";
 
         /**
-         * Controls whether aware is enabled.
          * @hide
          */
-        @Readable
-        public static final String AWARE_ENABLED = "aware_enabled";
+        public static final String PULSE_COLOR = "pulse_color";
 
         /**
-         * Controls whether aware_lock is enabled.
          * @hide
          */
-        @Readable
-        public static final String AWARE_LOCK_ENABLED = "aware_lock_enabled";
+        public static final String PULSE_RENDERER = "pulse_renderer";
 
         /**
-         * Controls whether tap gesture is enabled.
          * @hide
          */
-        @Readable
-        public static final String TAP_GESTURE = "tap_gesture";
+        public static final String PULSE_SHOW_ON_AMBIENT = "pulse_show_on_ambient";
 
         /**
-         * Controls whether the people strip is enabled.
          * @hide
          */
-        @Readable
-        public static final String PEOPLE_STRIP = "people_strip";
+        public static final String PULSE_HEIGHT_MULTIPLIER = "pulse_height_multiplier";
 
         /**
-         * Whether or not to enable media resumption
-         * When enabled, media controls in quick settings will populate on boot and persist if
-         * resumable via a MediaBrowserService.
-         * @see Settings.Global#SHOW_MEDIA_ON_QUICK_SETTINGS
          * @hide
          */
-        @Readable
-        public static final String MEDIA_CONTROLS_RESUME = "qs_media_resumption";
-
+        public static final String PULSE_CUSTOM_COLOR = "pulse_custom_color";
+        
         /**
-         * Whether to enable media controls on lock screen.
-         * When enabled, media controls will appear on lock screen.
          * @hide
          */
-        public static final String MEDIA_CONTROLS_LOCK_SCREEN = "media_controls_lock_screen";
+	public static final String PULSE_BASS_HAPTICS = "pulse_bass_haptics";
 
         /**
-         * Whether to enable camera extensions software fallback.
+         * Whether to show or hide the arrow for back gesture
          * @hide
          */
-        @Readable
-        public static final String CAMERA_EXTENSIONS_FALLBACK = "camera_extensions_fallback";
+        public static final String BACK_GESTURE_ARROW = "back_gesture_arrow";
 
         /**
-         * Controls magnification mode when magnification is enabled via a system-wide triple tap
-         * gesture or the accessibility shortcut.
-         *
-         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
-         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
+         * Whether or not to vibrate when back gesture is used
          * @hide
          */
-        @TestApi
-        @Readable
-        public static final String ACCESSIBILITY_MAGNIFICATION_MODE =
-                "accessibility_magnification_mode";
+        public static final String BACK_GESTURE_HAPTIC = "back_gesture_haptic";
 
         /**
-         * Magnification mode value that is a default value for the magnification logging feature.
+         * Which navigation bar layout to use
+         * 0 = Normal (Default)
+         * 1 = Compact
+         * 2 = Left-leaning
+         * 3 = Right-leaning
          * @hide
          */
-        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_NONE = 0x0;
+        public static final String NAVBAR_LAYOUT_MODE = "navbar_layout_mode";
 
         /**
-         * Magnification mode value that magnifies whole display.
+         * Show navigation space below IME
          * @hide
          */
-        @TestApi
-        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN = 0x1;
+        public static final String NAVBAR_IME_SPACE = "navbar_ime_space";
 
         /**
-         * Magnification mode value that magnifies magnify particular region in a window
+         * Per-apps device spoofing
          * @hide
          */
-        @TestApi
-        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;
+        @Readable
+        public static final String PER_APPS_DEVICE_SPOOF = "per_apps_device_spoof";
 
         /**
-         * Magnification mode value that is capable of magnifying whole display and particular
-         * region in a window.
+         * Custom device spoof profiles for per-app spoofing
          * @hide
          */
-        @TestApi
-        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;
+        @Readable
+        public static final String CUSTOM_SPOOF_PROFILES = "custom_spoof_profiles";
+
+        /** 
+         * @hide 
+         */
+        @Readable
+        public static final String PER_APPS_DEVICE_SPOOF_ENABLED = "per_apps_device_spoof_enabled";
+
+        /** 
+         * @hide 
+         */
+        @Readable
+        public static final String PER_APPS_DEVICE_SPOOF_CACHE = "per_apps_device_spoof_cache";
 
         /**
-         * Whether the magnification always on feature is enabled. If true, the magnifier will not
-         * deactivate on Activity transitions; it will only zoom out to 100%.
-         *
+         * Whether to use system accent color for lock screen clock text
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED =
-                "accessibility_magnification_always_on_enabled";
+        public static final String CLOCK_TEXT_ACCENT_COLOR = "clock_text_accent_color";
 
         /**
-         * Controls how the magnification follows the cursor.
-         *
+         * Lock screen clock text opacity (0-100)
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE =
-                "accessibility_magnification_cursor_following_mode";
+        public static final String CLOCK_TEXT_OPACITY = "clock_text_opacity";
 
         /**
-         * Magnification cursor following mode value for the continuous mode.
-         *
+         * Whether to show an overlay in the bottom corner of the screen on copying stuff
+         * into the clipboard.
          * @hide
          */
-        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS = 0;
+        public static final String SHOW_CLIPBOARD_OVERLAY = "show_clipboard_overlay";
 
         /**
-         * Magnification cursor following mode value for the center mode.
-         *
+         * Whether to enable DOZE only when charging
          * @hide
          */
-        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER = 1;
+        public static final String DOZE_ON_CHARGE = "doze_on_charge";
 
         /**
-         * Magnification cursor following mode value for the edge mode.
-         *
+         * Whether to pulse ambient on new music tracks
          * @hide
          */
-        public static final int ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE = 2;
+        public static final String PULSE_ON_NEW_TRACKS = "pulse_on_new_tracks";
 
         /**
-         * Different cursor following settings that can be used as values with
-         * {@link #ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE}.
+         * Whether to show media squiggle animation
          * @hide
          */
-        @Retention(RetentionPolicy.SOURCE)
-        @IntDef(prefix = { "ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_" },
-                value = {
-                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CONTINUOUS,
-                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_CENTER,
-                        ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE_EDGE})
-        public @interface AccessibilityMagnificationCursorFollowingMode {}
+        public static final String MEDIA_SQUIGGLE_ANIMATION = "media_squiggle_animation";
 
         /**
-         * Whether the following typing focus feature for magnification is enabled.
+         * Control whether the process CPU info meter should be shown.
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED =
-                "accessibility_magnification_follow_typing_enabled";
+        public static final String SHOW_CPU_OVERLAY = "show_cpu_overlay";
 
         /**
-         * Whether the following keyboard focus feature for magnification is enabled.
+         * Control whether the process FPS info meter should be shown.
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_KEYBOARD_ENABLED =
-                "accessibility_magnification_follow_keyboard_enabled";
+        public static final String SHOW_FPS_OVERLAY = "show_fps_overlay";
 
         /**
-         * Whether the magnification joystick controller feature is enabled.
+         * Whether to enable clipboard auto clear
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED =
-                "accessibility_magnification_joystick_enabled";
+        public static final String CLIPBOARD_AUTO_CLEAR_ENABLED = "clipboard_auto_clear_enabled";
 
         /**
-         * Setting that specifies whether the display magnification is enabled via a system-wide
-         * two fingers triple tap gesture.
-         *
+         * Idle Manager
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =
-                "accessibility_magnification_two_finger_triple_tap_enabled";
+        public static final String IDLE_MANAGER = "idle_manager";
 
         /**
-         * Whether to always expand notification bundles in the notification shade.
-         * 1 = expand, 0 = collapse.
          * @hide
          */
-        public static final String NOTIFICATION_BUNDLES_ALWAYS_EXPAND =
-                "notification_bundles_always_expand";
+        public static final String IDLE_MANAGER_APPS = "idle_manager_apps";
 
         /**
-         * Whether the magnify navigation bar and keyboard feature is enabled.
-         *
          * @hide
          */
-        public static final String ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME =
-                "accessibility_magnification_magnify_nav_and_ime";
+        public static final String IDLE_MANAGER_TIMEOUT = "idle_manager_timeout";
 
         /**
-         * For pinch to zoom anywhere feature.
-         *
-         * If true, you should be able to pinch to magnify the window anywhere.
-         *
          * @hide
          */
-        public static final String ACCESSIBILITY_PINCH_TO_ZOOM_ANYWHERE_ENABLED =
-                "accessibility_pinch_to_zoom_anywhere_enabled";
+        public static final String IDLE_MANAGER_KILL_STATS = "idle_manager_kill_stats";
 
         /**
-         * For magnification feature where panning can be controlled with a single finger.
-         *
-         * If true, you can pan using a single finger gesture.
-         *
+         * Lockscreen custom clock face
          * @hide
          */
-        public static final String ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED =
-                "accessibility_single_finger_panning_enabled";
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_STYLE = "lock_screen_custom_clock_style";
 
         /**
-         * Controls magnification capability. Accessibility magnification is capable of at least one
-         * of the magnification modes.
-         *
-         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
-         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
-         * @see #ACCESSIBILITY_MAGNIFICATION_MODE_ALL
+         * Whether to use default, system accent or custom color for lock screen clock text
          * @hide
          */
-        @TestApi
-        @Readable
-        public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY =
-                "accessibility_magnification_capability";
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_COLOR_MODE = "lock_screen_custom_clock_color_mode";
 
         /**
-         *  Whether to show the window magnification prompt dialog when the user uses full-screen
-         *  magnification first time after database is upgraded.
-         *
+         * Custom color for lock screen clock text
          * @hide
          */
-        public static final String ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT =
-                "accessibility_show_window_magnification_prompt";
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_CUSTOM_COLOR = "lock_screen_custom_clock_custom_color";
 
         /**
-         * Controls the accessibility button mode. System will force-set the value to {@link
-         * #ACCESSIBILITY_BUTTON_MODE_GESTURE} if {@link #NAVIGATION_MODE} is button; force-set the
-         * value to {@link ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} if {@link #NAVIGATION_MODE} is
-         * gestural; otherwise, remain the option.
-         * <ul>
-         *    <li> 0 = button in navigation bar </li>
-         *    <li> 1 = button floating on the display </li>
-         *    <li> 2 = button using gesture to trigger </li>
-         * </ul>
-         *
-         * @see #ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR
-         * @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU
-         * @see #ACCESSIBILITY_BUTTON_MODE_GESTURE
+         * Lock screen clock text opacity (0-100)
          * @hide
          */
-        public static final String ACCESSIBILITY_BUTTON_MODE =
-                "accessibility_button_mode";
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_OPACITY = "lock_screen_custom_clock_opacity";
 
         /**
-         * Accessibility button mode value that specifying the accessibility service or feature to
-         * be toggled via the button in the navigation bar.
-         *
+         * Adjust top margin for custom clock
          * @hide
          */
-        public static final int ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR = 0x0;
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_MARGIN_TOP = "lock_screen_custom_clock_margin_top";
 
         /**
-         * Accessibility button mode value that specifying the accessibility service or feature to
-         * be toggled via the button floating on the display.
-         *
+         * Custom clock size
          * @hide
          */
-        public static final int ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU = 0x1;
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_SIZE = "lock_screen_custom_clock_size_scale";
 
         /**
-         * Accessibility button mode value that specifying the accessibility service or feature to
-         * be toggled via the gesture.
-         *
+         * Custom clock animation
          * @hide
          */
-        public static final int ACCESSIBILITY_BUTTON_MODE_GESTURE = 0x2;
+        public static final String LOCK_SCREEN_CUSTOM_CLOCK_AOD_ANIM = "lock_screen_custom_clock_aod_anim";
 
         /**
-         * The size of the accessibility floating menu.
-         * <ul>
-         *     <li> 0 = small size
-         *     <li> 1 = large size
-         * </ul>
-         *
+         * Timeout length for clipboard auto clear
          * @hide
          */
-        public static final String ACCESSIBILITY_FLOATING_MENU_SIZE =
-                "accessibility_floating_menu_size";
+        public static final String CLIPBOARD_AUTO_CLEAR_TIMEOUT = "clipboard_auto_clear_timeout";
 
         /**
-         * The icon type of the accessibility floating menu.
-         * <ul>
-         *     <li> 0 = full circle type
-         *     <li> 1 = half circle type
-         * </ul>
+         * Whether to turn off Private DNS {@link #PRIVATE_DNS_MODE}
+         * when a VPN is connected
+         * <p>
+         * Set to 1 for true and 0 for false. Default 0.
          *
          * @hide
          */
-        public static final String ACCESSIBILITY_FLOATING_MENU_ICON_TYPE =
-                "accessibility_floating_menu_icon_type";
+        public static final String VPN_ENFORCE_DNS = "vpn_enforce_dns";
 
         /**
-         * Whether the fade effect for the accessibility floating menu is enabled.
+         * A setting used to store the last mode of {@link #PRIVATE_DNS_MODE}
+         * used for {@link #VPN_ENFORCE_DNS}
+         * Not for backup!
          *
          * @hide
          */
-        public static final String ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED =
-                "accessibility_floating_menu_fade_enabled";
+        public static final String VPN_ENFORCE_DNS_STORE = "vpn_enforce_dns_store";
 
         /**
-         * The opacity value for the accessibility floating menu fade out effect, from 0.0
-         * (transparent) to 1.0 (opaque).
-         *
+         * Whether to show ambient instead of waking for the tap gesture
          * @hide
          */
-        public static final String ACCESSIBILITY_FLOATING_MENU_OPACITY =
-                "accessibility_floating_menu_opacity";
+        public static final String DOZE_TAP_GESTURE_AMBIENT = "doze_tap_gesture_ambient";
 
         /**
-         * Prompts the user to the Accessibility button is replaced with the floating menu.
-         * <ul>
-         *    <li> 0 = disabled </li>
-         *    <li> 1 = enabled </li>
-         * </ul>
-         *
+         * Whether to show ambient instead of waking for the pickup gesture
+         * Do note quick pickup (device sensor) is already configured to do that
          * @hide
          */
-        public static final String ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT =
-                "accessibility_floating_menu_migration_tooltip_prompt";
-
+        public static final String DOZE_PICK_UP_GESTURE_AMBIENT = "doze_pick_up_gesture_ambient";
+        
         /**
-         * For the force dark theme feature which inverts any apps that don't already support dark
-         * theme.
-         *
-         * If true, it will automatically invert any app that is mainly light.
-         *
-         * This is related to the force dark override setting, however it will always force the apps
-         * colors and will ignore any developer hints or opt-out APIs.
-         *
+         * Translucent notifications
          * @hide
          */
-        @TestApi
-        @Readable
-        @FlaggedApi(android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR)
-        @SuppressLint("NoSettingsProvider")
-        public static final String ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED =
-                "accessibility_force_invert_color_enabled";
+        public static final String NOTIFICATION_ROW_TRANSPARENCY = "notification_row_transparency";
 
         /**
-         * Whether to enable mouse keys for Physical Keyboard accessibility.
-         *
-         * If set to true, key presses (of the mouse keys) on
-         * physical keyboard will control mouse pointer on the display.
-         *
+         * Translucent lockscreen notifications
          * @hide
          */
-        @Readable
-        public static final String ACCESSIBILITY_MOUSE_KEYS_ENABLED =
-                "accessibility_mouse_keys_enabled";
+        public static final String NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN = "notification_row_transparency_lockscreen";
 
         /**
-         * The current float acceleration value for mouse keys movement.
-         *
+         * Whether to use PixelProps spoof for google apps
          * @hide
          */
-        public static final String ACCESSIBILITY_MOUSE_KEYS_ACCELERATION =
-                "accessibility_mouse_keys_acceleration";
+        @Readable
+        public static final String PI_PP_SPOOF = "pi_pp_spoof";
 
         /**
-         * The max speed as a factor of the minimum speed for mouse keys movement.
-         *
+         * Whether to use Tensor spoof for google apps
          * @hide
          */
-        public static final String ACCESSIBILITY_MOUSE_KEYS_MAX_SPEED =
-                "accessibility_mouse_keys_max_speed";
+        @Readable
+        public static final String PI_TENSOR_SPOOF = "pi_tensor_spoof";
 
         /**
-         * Whether the primary keys are selected to control the mouse keys.
-         *
+         * Whether to use PIF spoof for Play store
          * @hide
          */
-        public static final String ACCESSIBILITY_MOUSE_KEYS_USE_PRIMARY_KEYS =
-                "accessibility_mouse_keys_use_primary_keys";
+        @Readable
+        public static final String PI_VENDING_SPOOF = "pi_vending_spoof";
 
         /**
-         * Whether the Adaptive connectivity option is enabled.
-         *
+         * Whether to use spoof for photos
          * @hide
          */
-        public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled";
+        @Readable
+        public static final String PI_PHOTOS_SPOOF = "pi_photos_spoof";
 
         /**
-         * Whether the Adaptive wifi scorer switch is enabled.
-         *
+         * Whether to use spoof for snapchat
          * @hide
          */
-        public static final String ADAPTIVE_CONNECTIVITY_WIFI_ENABLED =
-                "adaptive_connectivity_wifi_enabled";
+        @Readable
+        public static final String PI_SNAPCHAT_SPOOF = "pi_snapchat_spoof";
 
         /**
-         * Whether the Adaptive 5G PM switch is enabled.
-         *
+         * Whether to enable Smart Pixels
          * @hide
          */
-        public static final String ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED =
-                "adaptive_connectivity_mobile_network_enabled";
+        public static final String SMART_PIXEL_FILTER_ENABLED = "smart_pixel_filter_enabled";
 
         /**
-         * Controls the 'Sunlight boost' toggle in wearable devices (high brightness mode).
-         *
-         * Valid values for this key are: '0' (disabled) or '1' (enabled).
-         *
+         * Smart Pixels percentage
          * @hide
          */
-        public static final String HBM_SETTING_KEY =
-                "com.android.server.display.HBM_SETTING_KEY";
+        public static final String SMART_PIXEL_FILTER_PERCENT = "smart_pixel_filter_percent";
 
         /**
          * Keys we no longer back up under the current schema, but want to continue to
@@ -13624,11 +15107,10 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
                 "hinge_angle_lidevent_enabled";
 
         /**
-         * Whether lockscreen weather is enabled.
-         *
+         * Whether lockscreen smartspace is enabled.
          * @hide
          */
-        public static final String LOCK_SCREEN_WEATHER_ENABLED = "lockscreen_weather_enabled";
+        public static final String LOCKSCREEN_SMARTSPACE_ENABLED = "lockscreen_smartspace_enabled";
 
         /**
          * Whether the feature that the device will fire a haptic when users scroll and hit
@@ -13733,6 +15215,92 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         public static final String OTP_NOTIFICATION_REDACTION_LOCK_TIME =
                 "otp_redaction_lock_time";
 
+        /**
+         * Whether to vibrate for the dt2w gesture
+         * @hide
+         */
+        public static final String DOZE_DOUBLE_TAP_GESTURE_VIBRATE = "doze_double_tap_gesture_vibrate";
+
+        /**
+         * Whether to vibrate for the tap gesture
+         * @hide
+         */
+        public static final String DOZE_TAP_GESTURE_VIBRATE = "doze_tap_gesture_vibrate";
+
+        /**
+         * Whether to vibrate for the pickup gesture
+         * @hide
+         */
+        public static final String DOZE_PICK_UP_GESTURE_VIBRATE = "doze_pick_up_gesture_vibrate";
+
+        /**
+         * Boolean value whether activate keyguard affordance shortcuts on short press
+         * @hide
+         */
+        public static final String KEYGUARD_AFFORDANCE_SINGLE_TAP = "keyguard_affordance_single_tap";
+
+        /**
+         * Whether to enable Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_ENABLED = "sleep_mode_enabled";
+
+        /**
+         * Indicates whether Sleep Mode turns on automatically
+         * 0 = disabled (default)
+         * 1 = from sunset to sunrise
+         * 2 = custom time
+         * 3 = from sunset till a time
+         * 4 = from a time till sunrise
+         * @hide
+         */
+        public static final String SLEEP_MODE_AUTO_MODE = "sleep_mode_auto_mode";
+
+        /**
+         * The custom time {@link SLEEP_MODE_ENABLED} should be on at
+         * Only relevant when {@link SLEEP_MODE_AUTO_MODE} is set to 2 and above
+         * 0 = Disabled (default)
+         * format: HH:mm,HH:mm (since,till)
+         * @hide
+         */
+        public static final String SLEEP_MODE_AUTO_TIME = "sleep_mode_auto_time";
+
+        /**
+         * Whether to disable Wi-Fi in Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_WIFI_TOGGLE = "sleep_mode_wifi_toggle";
+
+        /**
+         * Whether to disable Bluetooth in Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_BLUETOOTH_TOGGLE = "sleep_mode_bluetooth_toggle";
+
+        /**
+         * Whether to disable Mobile data in Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_CELLULAR_TOGGLE = "sleep_mode_cellular_toggle";
+
+        /**
+         * Whether to disable Sensors in Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_SENSORS_TOGGLE = "sleep_mode_sensors_toggle";
+        
+        /**
+         * Whether to reduce background activity in Sleep Mode
+         * @hide
+         */
+        public static final String SLEEP_MODE_IDLE_TOGGLE = "sleep_mode_idle_toggle";
+
+        /**
+         * Ringer in Sleep Mode (0:OFF, 1:Vibrate, 2:DND, 3:Silent)
+         * @hide
+         */
+        public static final String SLEEP_MODE_RINGER_MODE = "sleep_mode_ringer_mode";
+
         /**
          * These entries are considered common between the personal and the managed profile,
          * since the managed profile doesn't get to change them.
@@ -13851,6 +15419,7 @@ public static void setLocationProviderEnabled(ContentResolver cr,
          *
          * @hide
          */
+        @Readable
         public static final String CHARGE_OPTIMIZATION_MODE = "charge_optimization_mode";
 
         /**
@@ -13893,6 +15462,31 @@ public static void setLocationProviderEnabled(ContentResolver cr,
          */
         public static final String IDENTITY_CHECK_NOTIFICATION_VIEW_DETAILS_CLICKED =
                 "identity_check_notification_view_details_clicked";
+
+        /**
+         * @hide
+         */
+        public static final String SPOOF_PIF_CONFIG = "spoof_pif_config";
+
+        /**
+         * @hide
+         */
+        public static final String SPOOF_GAMEPROPS_CONFIG = "spoof_gameprops_config";
+
+        /**
+         * @hide
+         */
+        public static final String SPOOF_TRICKYSTORE_TARGET = "spoof_trickystore_target";
+
+        /**
+         * @hide
+         */
+        public static final String SPOOF_TRICKYSTORE_KEYBOX = "spoof_trickystore_keybox";
+
+        /**
+         * @hide
+         */
+        public static final String SPOOF_TRICKYSTORE_PATCH = "spoof_trickystore_patch";
     }
 
     /**
@@ -17527,6 +19121,30 @@ public static final class Global extends NameValueTable {
         public static final String PREFERRED_NETWORK_MODE =
                 "preferred_network_mode";
 
+        /**
+         * Force LTE Carrier Aggregation setting per SIM slot.
+         * Use FORCE_LTE_CA_0 for SIM slot 0 (first SIM)
+         * Use FORCE_LTE_CA_1 for SIM slot 1 (second SIM)
+         * 
+         * Type: int (0 = disabled, 1 = enabled)
+         * @hide
+         */
+        public static final String FORCE_LTE_CA = "force_lte_ca";
+
+        /**
+         * Force LTE Carrier Aggregation for SIM slot 0
+         * Type: int (0 = disabled, 1 = enabled)
+         * @hide
+         */
+        public static final String FORCE_LTE_CA_0 = "force_lte_ca_0";
+
+        /**
+         * Force LTE Carrier Aggregation for SIM slot 1
+         * Type: int (0 = disabled, 1 = enabled)
+         * @hide
+         */
+        public static final String FORCE_LTE_CA_1 = "force_lte_ca_1";
+
         /**
          * Name of an application package to be debugged.
          */
@@ -19098,6 +20716,12 @@ public static final class Global extends NameValueTable {
          */
         public static final String ONE_HANDED_KEYGUARD_SIDE = "one_handed_keyguard_side";
 
+        /**
+         * Whether refresh rate should be switched to 60Hz on power save mode.
+         * @hide
+         */
+        public static final String LOW_POWER_REFRESH_RATE = "low_power_rr_switch";
+
         /**
          * A list of uids that are allowed to use restricted networks.
          *
@@ -19164,6 +20788,32 @@ public static final class Global extends NameValueTable {
                 CLOCKWORK_HOME_READY,
         };
 
+        /**
+         * The amount of time in milliseconds before wifi is turned off
+         * @hide
+         */
+        public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout";
+
+        /**
+         * The amount of time in milliseconds before bluetooth is turned off
+         * @hide
+         */
+        public static final String BLUETOOTH_OFF_TIMEOUT = "bluetooth_off_timeout";
+
+        /**
+         * Sensor block per-package
+         * @hide
+         */
+        @Readable
+        public static final String SENSOR_BLOCK = "sensor_block";
+
+        /**
+         * Sensor blocked packages
+         * @hide
+         */
+        @Readable
+        public static final String SENSOR_BLOCKED_APP = "sensor_blocked_app";
+
         /**
          * Keys we no longer back up under the current schema, but want to continue to
          * process when restoring historical backup datasets.
@@ -20298,6 +21948,31 @@ public static boolean putFloat(ContentResolver cr, String name, float value) {
          */
         public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode";
 
+	/**
+         * Control whether FLAG_SECURE is ignored for all windows.
+         * @hide
+         */
+        @Readable
+        public static final String WINDOW_IGNORE_SECURE = "window_ignore_secure";
+
+        /**
+         * Control whether application downgrade is allowed.
+         * @hide
+         */
+        public static final String PM_DOWNGRADE_ALLOWED = "pm_downgrade_allowed";
+
+        /**
+         * Control whether to hide screen capture status from apps.
+         * @hide
+         */
+        public static final String HIDE_SCREEN_CAPTURE_STATUS = "hide_screen_capture_status";
+
+        /**
+         * Control whether to remove the restriction when selecting folders through SAF.
+         * @hide
+         */
+        public static final String NO_STORAGE_RESTRICT = "no_storage_restrict";
+
         /**
          * Setting indicating whether Low Power Standby is enabled, if supported.
          *
@@ -21717,6 +23392,9 @@ public static Map<String, String> getStrings(@NonNull ContentResolver resolver,
         @RequiresPermission(Manifest.permission.WRITE_DEVICE_CONFIG)
         public static boolean putString(@NonNull String namespace,
                 @NonNull String name, @Nullable String value, boolean makeDefault) {
+            if (DeviceConfigUtils.shouldDenyDeviceConfigControl(namespace, name)) {
+                return true;
+            }
             ContentResolver resolver = getContentResolver();
             return sNameValueCache.putStringForUser(resolver, createCompositeName(namespace, name),
                     value, null, makeDefault, resolver.getUserId(),
@@ -21738,7 +23416,9 @@ public static boolean putString(@NonNull String namespace,
         public static boolean setStrings(@NonNull String namespace,
                 @NonNull Map<String, String> keyValues)
                 throws DeviceConfig.BadConfigException {
-            return setStrings(getContentResolver(), namespace, keyValues);
+            boolean result = setStrings(getContentResolver(), namespace, keyValues);
+            DeviceConfigUtils.setDefaultProperties(namespace, null);
+            return result;
         }
 
         /**
@@ -21788,6 +23468,9 @@ public static boolean setStrings(@NonNull ContentResolver resolver,
         @RequiresPermission(Manifest.permission.WRITE_DEVICE_CONFIG)
         public static boolean deleteString(@NonNull String namespace,
                 @NonNull String name) {
+            if (DeviceConfigUtils.shouldDenyDeviceConfigControl(namespace, name)) {
+                return true;
+            }
             ContentResolver resolver = getContentResolver();
             return sNameValueCache.deleteStringForUser(resolver,
                     createCompositeName(namespace, name), resolver.getUserId());
@@ -21829,6 +23512,7 @@ public static void resetToDefaults(@ResetMode int resetMode,
             } catch (RemoteException e) {
                 Log.w(TAG, "Can't reset to defaults for " + CONTENT_URI, e);
             }
+            DeviceConfigUtils.setDefaultProperties(null, null);
         }
 
         /**
@@ -22321,6 +24005,12 @@ private Panel() {
         @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
         public static final String ACTION_VOLUME =
                 "android.settings.panel.action.VOLUME";
+
+        /**
+         * @hide
+         */
+        public static final String ACTION_APP_VOLUME =
+                "android.settings.panel.action.APP_VOLUME";
     }
 
     /**
diff --git a/core/java/android/security/gameprops/GamePropsSpoofService.java b/core/java/android/security/gameprops/GamePropsSpoofService.java
new file mode 100644
index 0000000000000..a6cbb8ae86ffd
--- /dev/null
+++ b/core/java/android/security/gameprops/GamePropsSpoofService.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.gameprops;
+
+import android.app.ActivityManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Build;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.JsonReader;
+import android.util.Log;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Unified device-props spoofing service.
+ *
+ * Handles two independent sources:
+ *
+ *   1. JSON game-props config (stored in Settings.Secure via system_server) — the original
+ *      GamePropsSpoofService behaviour, keyed by package name with arbitrary Build field maps.
+ *
+ *   2. Per-app spoof map (stored in Settings.Secure.PER_APPS_DEVICE_SPOOF) — formerly
+ *      PerAppsPropsUtils, maps a package name to a named device profile (e.g. "ROG8P").
+ *      Requires a Context to read Settings.Secure at spoof time.
+ *
+ * Source (1) takes priority: if a package has a JSON game-props entry that entry is applied
+ * and per-app lookup is skipped for that package.
+ *
+ * @hide
+ */
+public final class GamePropsSpoofService {
+
+    private static final String TAG = "GameProps";
+
+    // -------------------------------------------------------------------------
+    // Settings keys (mirrors Settings.Secure constants used by the UI)
+    // -------------------------------------------------------------------------
+
+    /** Comma-separated "pkg:profileId" pairs for the active per-app spoof map. */
+    private static final String SETTING_PER_APPS        = "per_apps_device_spoof";
+    /** Master enable flag for per-app spoofing (int, default 1). */
+    private static final String SETTING_PER_APPS_ENABLED = "per_apps_device_spoof_enabled";
+    /** JSON array of custom user-defined profiles. */
+    private static final String SETTING_CUSTOM_PROFILES = "custom_spoof_profiles";
+
+    // -------------------------------------------------------------------------
+    // Singleton
+    // -------------------------------------------------------------------------
+
+    private static GamePropsSpoofService sInstance;
+
+    private GamePropsSpoofService() {}
+
+    /** @hide */
+    public static synchronized GamePropsSpoofService getInstance() {
+        if (sInstance == null) {
+            sInstance = new GamePropsSpoofService();
+            sInstance.loadConfig();
+        }
+        return sInstance;
+    }
+
+    // -------------------------------------------------------------------------
+    // JSON game-props state (source 1)
+    // -------------------------------------------------------------------------
+
+    private volatile boolean mEnabled      = false;
+    private volatile boolean mDebug        = false;
+    private volatile boolean mConfigLoaded = false;
+
+    /** packageName → { fieldName → value } from JSON game-props config */
+    private final Map<String, Map<String, String>> mGameConfigs = new ConcurrentHashMap<>();
+
+    // -------------------------------------------------------------------------
+    // Built-in device profiles (formerly in PerAppsPropsUtils static block)
+    // -------------------------------------------------------------------------
+
+    /**
+     * Built-in named profiles.  Keys match the profile IDs used by
+     * UserSelectedAppSpoofSettings / PerAppsPropsUtils.
+     *
+     * @hide
+     */
+    public static final Map<String, Map<String, Object>> BUILTIN_PROFILES;
+
+    static {
+        BUILTIN_PROFILES = new HashMap<>();
+        BUILTIN_PROFILES.put("BS4C",    profile("Black Shark", "2SM-X706B",   "Xiaomi",  "2SM-X706B",   "BlackShark/PRS-H0/Black Shark 4:13/TQ3A.230805.001/20230315:user/release-keys",                                    "2SM-X706B"));
+        BUILTIN_PROFILES.put("F5",      profile("Xiaomi",      "23049PCD8G",  "Xiaomi",  "marble",      "Xiaomi/marble_global/marble:14/UKQ1.230917.001/V816.0.2.0.UMRMIXM:user/release-keys",                            "marble"));
+        BUILTIN_PROFILES.put("GZF5",    profile("samsung",     "SM-F9460",    "samsung", "Galaxy Z Fold 5", "samsung/q2qzh/q2q:15/UP1A.231005.007/F946BXXU1BWK4:user/release-keys",                                       "SM-F9460"));
+        BUILTIN_PROFILES.put("HMV2R",   profile("HONOR",       "VER-N49DP",   "HONOR",   "Honor Magic V2 RSR", "HONOR/VER-N49DP/VER:13/ENG.20240918.123456:user/release-keys",                                            "VER-N49DP"));
+        BUILTIN_PROFILES.put("LY700",   profile("Lenovo",      "Lenovo TB-9707F", "Lenovo", "Lenovo Y700", null,                                                                                                           null));
+        BUILTIN_PROFILES.put("LY70023", profile("Lenovo",      "TB-9707F",    "Lenovo",  "Legion Y700 (2023)", "Lenovo/TB-9707F/Lenovo TB-9707F:13/TQ3A.230805.001/20230901:user/release-keys",                          "TB-9707F"));
+        BUILTIN_PROFILES.put("MI11TP",  profile("Xiaomi",      "2107113SG",   "Xiaomi",  "Xiaomi 11T Pro", "Xiaomi/2107113SI/Mi 11T Pro:13/RKQ1.211001.001/20230410:user/release-keys",                                  "2107113SG"));
+        BUILTIN_PROFILES.put("MI13",    profile("Xiaomi",      "2211133G",    "Xiaomi",  "Xiaomi 13",   "Xiaomi/fuxi_eea/fuxi:13/TKQ1.221114.001/OS2.0.102.0.VMCEUXM:user/release-keys",                                 "2211133G"));
+        BUILTIN_PROFILES.put("MI13P",   profile("Xiaomi",      "2210132G",    "Xiaomi",  "Xiaomi 13 Pro", "Xiaomi/fuxi_eea/fuxi:13/TKQ1.221114.001/OS2.0.102.0.VMCEUXM:user/release-keys",                              "2210132G"));
+        BUILTIN_PROFILES.put("MI14P",   profile("Xiaomi",      "23116PN5BC",  "Xiaomi",  "houji",       "Xiaomi/houji/houji:14/UKQ1.230917.001/V816.0.2.0.UNBCNXM:user/release-keys",                                   "houji"));
+        BUILTIN_PROFILES.put("OP12",    profile("OnePlus",     "CPH2581",     "OnePlus", "OP594DL1",    "OnePlus/OP594DL1/OP594DL1:14/UKQ1.230917.001/1702951307528:user/release-keys",                                  "OP594DL1"));
+        BUILTIN_PROFILES.put("OP13",    profile("OnePlus",     "PJZ110",      "OnePlus", "OnePlus 13",  "OnePlus/PJZ110/OP5D0DL1:15/AP3A.240617.008/V.1bd19a1-1-2:user/release-keys",                                   "PJZ110"));
+        BUILTIN_PROFILES.put("OP8P5G",  profile("OnePlus",     "IN2023",      "OnePlus", "OnePlus 8 Pro 5G", "OnePlus/IN2023/OnePlus8Pro:13/RKQ1.211119.001/20230501:user/release-keys",                                 "IN2023"));
+        BUILTIN_PROFILES.put("PXL",     profile("google",      "marlin",      "Google",  "Pixel XL",    "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys",                                          "marlin"));
+        BUILTIN_PROFILES.put("PXL10PXL",profile("google",      "Pixel 10 Pro XL", "Google", "mustang", "google/mustang/mustang:16/CP1A.260305.018/14887507:user/release-keys",                                           "mustang"));
+        BUILTIN_PROFILES.put("RM9P",    profile("nubia",       "NX769J",      "ZTE",     "REDMAGIC 9 Pro", "nubia/NX769J/NX769J:14/UKQ1.230917.001/20240813.173312:user/release-keys",                                  "NX769J"));
+        BUILTIN_PROFILES.put("RM10P",   profile("nubia",       "NX789J",      "ZTE",     "RedMagic 10 Pro", "nubia/NX789J-UN/NX789J:15/AQ3A.240812.002/20241212.194919:user/release-keys",                              "NX789J"));
+        BUILTIN_PROFILES.put("RM15P5G", profile("realme",      "RMX5101",     "realme",  "Realme 15 Pro 5G", "realme/RMX5101IN/RE60B4L1:15/AP3A.240617.008/V.R4T2.26cec0e-80bb4e-80b757:user/release-keys",            "RMX5101"));
+        BUILTIN_PROFILES.put("RMX14",   profile("realme",      "RMX5070",     "realme",  "Realme 14",   null,                                                                                                             null));
+        BUILTIN_PROFILES.put("RMP35G",  profile("realme",      "RMX5070",     "realme",  "Realme P3 5G", "realme/RMX5070/RMX5070:15/SKQ1.230119.001/eng.user.20250415.155201:user/release-keys",                        "RMX5070"));
+        BUILTIN_PROFILES.put("ROG6DU",  profile("ASUS",        "AI2203",      "ASUS",    "ROG Phone 6D Ultimate", "ASUS/AI2203/ROG Phone 6D:14/UP1A.231005.007/20240315:user/release-keys",                             "AI2203"));
+        BUILTIN_PROFILES.put("ROG8P",   profile("asus",        "ASUS_AI2401_D", "asus",  "ASUS_AI2401_D", "asus/ASUS_AI2401_D/ASUS_AI2401:14/UKQ1.230804.001/34.0210.0210.222-0:user/release-keys",                   "ASUS_AI2401_D"));
+        BUILTIN_PROFILES.put("ROG9P",   profile("Asus",        "ASUS_AI2501",  "Asus",   "ROG Phone 9 PRO", null,                                                                                                        null));
+        BUILTIN_PROFILES.put("S25U",    profile("Samsung",     "SM-S938B",    "samsung", "Samsung S25 Ultra", null,                                                                                                       null));
+    }
+
+    /** Convenience builder for a profile map. Null fp/product are skipped. */
+    private static Map<String, Object> profile(String brand, String model, String manufacturer,
+            String device, String fingerprint, String product) {
+        Map<String, Object> m = new HashMap<>();
+        m.put("BRAND",        brand);
+        m.put("MODEL",        model);
+        m.put("MANUFACTURER", manufacturer);
+        m.put("DEVICE",       device);
+        if (fingerprint != null) m.put("FINGERPRINT", fingerprint);
+        if (product     != null) m.put("PRODUCT",     product);
+        return m;
+    }
+
+    // -------------------------------------------------------------------------
+    // JSON config loading (source 1)
+    // -------------------------------------------------------------------------
+
+    /** @hide */
+    public void loadConfig() {
+        mGameConfigs.clear();
+        mEnabled      = false;
+        mConfigLoaded = false;
+
+        String content;
+        try {
+            content = ActivityManager.getService().getSpoofGamePropsConfig();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to fetch gameprops config from system_server", e);
+            return;
+        }
+
+        if (content == null || content.isEmpty()) {
+            Log.w(TAG, "No gameprops config in Settings.Secure");
+            return;
+        }
+
+        try {
+            parseJson(content);
+            mConfigLoaded = true;
+            Log.i(TAG, "Game props config loaded, games=" + mGameConfigs.size()
+                    + ", enabled=" + mEnabled);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse game props config", e);
+        }
+    }
+
+    private void parseJson(String content) {
+        try (JsonReader reader = new JsonReader(new StringReader(content))) {
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String key = reader.nextName();
+                if ("enabled".equals(key)) {
+                    mEnabled = reader.nextBoolean();
+                } else if ("debug".equals(key)) {
+                    mDebug = reader.nextBoolean();
+                } else if ("games".equals(key)) {
+                    parseGames(reader);
+                } else {
+                    reader.skipValue();
+                }
+            }
+            reader.endObject();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse JSON config", e);
+        }
+    }
+
+    private void parseGames(JsonReader reader) throws IOException {
+        reader.beginObject();
+        while (reader.hasNext()) {
+            String packageName = reader.nextName();
+            Map<String, String> gameProps = new HashMap<>();
+            reader.beginObject();
+            while (reader.hasNext()) {
+                gameProps.put(reader.nextName(), reader.nextString());
+            }
+            reader.endObject();
+            if (!gameProps.isEmpty()) {
+                mGameConfigs.put(packageName, gameProps);
+                if (mDebug) Log.d(TAG, "Loaded config for " + packageName
+                        + ": " + gameProps.size() + " props");
+            }
+        }
+        reader.endObject();
+    }
+
+    // -------------------------------------------------------------------------
+    // Public spoof entry points
+    // -------------------------------------------------------------------------
+
+    /**
+     * Apply spoofing for the given package.
+     *
+     * Checks JSON game-props first (source 1). If no entry is found there,
+     * falls back to the per-app Settings.Secure map (source 2) when a Context
+     * is supplied.
+     *
+     * @hide
+     */
+    public void spoofForPackage(String packageName, Context context) {
+        if (packageName == null) return;
+
+        // Source 1 — JSON game-props config
+        if (mEnabled && mConfigLoaded) {
+            Map<String, String> gameProps = mGameConfigs.get(packageName);
+            if (gameProps != null && !gameProps.isEmpty()) {
+                if (mDebug) Log.d(TAG, "Spoofing via game-props for: " + packageName);
+                for (Map.Entry<String, String> entry : gameProps.entrySet()) {
+                    spoofField(entry.getKey(), entry.getValue(), packageName);
+                }
+                return; // source 1 wins; skip per-app lookup
+            }
+        }
+
+        // Source 2 — per-app Settings.Secure map (formerly PerAppsPropsUtils)
+        if (context != null) {
+            applyPerAppSpoof(packageName, context);
+        }
+    }
+
+    /**
+     * Convenience overload for callers that only have the JSON game-props path
+     * (no Context available).
+     *
+     * @hide
+     */
+    public void spoofForPackage(String packageName) {
+        spoofForPackage(packageName, null);
+    }
+
+    // -------------------------------------------------------------------------
+    // Per-app spoof logic (source 2 — formerly PerAppsPropsUtils.setProps)
+    // -------------------------------------------------------------------------
+
+    private void applyPerAppSpoof(String packageName, Context context) {
+        // Check master enable flag
+        try {
+            int enabled = Settings.Secure.getInt(
+                    context.getContentResolver(), SETTING_PER_APPS_ENABLED, 1);
+            if (enabled == 0) return;
+        } catch (Exception e) {
+            if (mDebug) Log.d(TAG, "Could not read per-apps enabled flag: " + e.getMessage());
+            return;
+        }
+
+        // Read active map: "pkg1:profileId1,pkg2:profileId2,..."
+        String spoofedApps;
+        try {
+            spoofedApps = Settings.Secure.getString(
+                    context.getContentResolver(), SETTING_PER_APPS);
+        } catch (Exception e) {
+            if (mDebug) Log.d(TAG, "Failed to read per-apps setting: " + e.getMessage());
+            return;
+        }
+
+        if (TextUtils.isEmpty(spoofedApps)) return;
+
+        // Find this package's assigned profile ID
+        String profileId = null;
+        for (String entry : spoofedApps.split(",")) {
+            String[] parts = entry.split(":");
+            if (parts.length == 2 && packageName.equals(parts[0])) {
+                profileId = parts[1];
+                break;
+            }
+        }
+        if (profileId == null) return;
+
+        // Build combined profile map: built-ins + custom user profiles
+        Map<String, Map<String, Object>> allProfiles = new HashMap<>(BUILTIN_PROFILES);
+        loadCustomProfiles(context, allProfiles);
+
+        Map<String, Object> props = allProfiles.get(profileId);
+        if (props == null) {
+            if (mDebug) Log.d(TAG, "Unknown profile id '" + profileId
+                    + "' for package " + packageName);
+            return;
+        }
+
+        if (mDebug) Log.d(TAG, "Per-app spoof: " + packageName + " → " + profileId);
+        for (Map.Entry<String, Object> prop : props.entrySet()) {
+            Object v = prop.getValue();
+            if (v != null) spoofField(prop.getKey(), v.toString(), packageName);
+        }
+    }
+
+    /**
+     * Reads custom profiles from Settings.Secure and merges them into {@code out}.
+     * Any profile whose id collides with a built-in is skipped (built-ins win).
+     */
+    private void loadCustomProfiles(Context context, Map<String, Map<String, Object>> out) {
+        String json;
+        try {
+            json = Settings.Secure.getString(
+                    context.getContentResolver(), SETTING_CUSTOM_PROFILES);
+        } catch (Exception e) {
+            return;
+        }
+        if (TextUtils.isEmpty(json)) return;
+
+        try {
+            JSONArray arr = new JSONArray(json);
+            for (int i = 0; i < arr.length(); i++) {
+                JSONObject obj = arr.getJSONObject(i);
+                String id = obj.getString("id");
+                if (out.containsKey(id)) continue; // built-in takes priority
+
+                Map<String, Object> props = new HashMap<>();
+                props.put("BRAND",        obj.optString("brand",        ""));
+                props.put("MANUFACTURER", obj.optString("manufacturer", ""));
+                props.put("DEVICE",       obj.optString("device",       ""));
+                props.put("MODEL",        obj.optString("model",        ""));
+                String fp   = obj.optString("fingerprint", "");
+                String prod = obj.optString("product",     "");
+                if (!TextUtils.isEmpty(fp))   props.put("FINGERPRINT", fp);
+                if (!TextUtils.isEmpty(prod)) props.put("PRODUCT",     prod);
+                out.put(id, props);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse custom spoof profiles", e);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Reflection helpers
+    // -------------------------------------------------------------------------
+
+    private void spoofField(String fieldName, String value, String packageName) {
+        if (value == null || value.isEmpty()) {
+            if (mDebug) Log.d(TAG, fieldName + " is empty, skipping");
+            return;
+        }
+        try {
+            Field field = getDeclaredField(Build.class, fieldName);
+            if (field == null) field = getDeclaredField(Build.VERSION.class, fieldName);
+            if (field == null) {
+                if (mDebug) Log.d(TAG, "Field not found: " + fieldName);
+                return;
+            }
+
+            field.setAccessible(true);
+            String oldValue = String.valueOf(field.get(null));
+            if (value.equals(oldValue)) {
+                if (mDebug) Log.d(TAG, "[" + fieldName + "]: " + value + " (unchanged)");
+                return;
+            }
+
+            Class<?> type = field.getType();
+            Object newValue;
+            if (type == String.class)       newValue = value;
+            else if (type == int.class)     newValue = Integer.parseInt(value);
+            else if (type == long.class)    newValue = Long.parseLong(value);
+            else if (type == boolean.class) newValue = Boolean.parseBoolean(value);
+            else {
+                Log.w(TAG, "Unsupported field type: " + type);
+                return;
+            }
+
+            field.set(null, newValue);
+            if (mDebug) Log.d(TAG, "[" + packageName + "][" + fieldName + "]: "
+                    + oldValue + " → " + value);
+
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to spoof " + fieldName + " for " + packageName, e);
+        }
+    }
+
+    private static Field getDeclaredField(Class<?> clazz, String name) {
+        try {
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Accessors (unchanged public API)
+    // -------------------------------------------------------------------------
+
+    /** @hide */
+    public boolean isEnabled() {
+        return mEnabled && mConfigLoaded;
+    }
+
+    /** @hide */
+    public boolean hasConfigForPackage(String packageName) {
+        return mGameConfigs.containsKey(packageName);
+    }
+
+    /** @hide */
+    public Map<String, Map<String, String>> getAllGameConfigs() {
+        return new ConcurrentHashMap<>(mGameConfigs);
+    }
+
+    /** @hide */
+    public boolean isConfigLoaded() {
+        return mConfigLoaded;
+    }
+}
diff --git a/core/java/android/security/pif/PlayIntegritySpoofService.java b/core/java/android/security/pif/PlayIntegritySpoofService.java
new file mode 100644
index 0000000000000..3c28e450cbbbe
--- /dev/null
+++ b/core/java/android/security/pif/PlayIntegritySpoofService.java
@@ -0,0 +1,523 @@
+package android.security.pif;
+
+import android.app.ActivityManager;
+import android.app.ActivityThread;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.JsonReader;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/** @hide */
+public final class PlayIntegritySpoofService {
+    private static final String TAG = "PIF";
+
+    private static final String DROIDGUARD_PACKAGE = "com.google.android.gms.unstable";
+    private static final String VENDING_PACKAGE = "com.android.vending";
+    private static final String GMS_PACKAGE = "com.google.android.gms";
+
+    private static final String ROM_SIGNATURE_DATA = "MIIFyTCCA7GgAwIBAgIVALyxxl+zDS9SL68SzOr48309eAZyMA0GCSqGSIb3DQEBCwUAMHQxCzAJ" +
+            "BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw" +
+            "EgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAg" +
+            "Fw0yMjExMDExODExMzVaGA8yMDUyMTEwMTE4MTEzNVowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgT" +
+            "CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC0dvb2dsZSBJbmMu" +
+            "MRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMIICIjANBgkqhkiG9w0BAQEFAAOC" +
+            "Ag8AMIICCgKCAgEAsqtalIy/nctKlrhd1UVoDffFGnDf9GLi0QQhsVoJkfF16vDDydZJOycG7/kQ" +
+            "ziRZhFdcoMrIYZzzw0ppBjsSe1AiWMuKXwTBaEtxN99S1xsJiW4/QMI6N6kMunydWRMsbJ6aAxi1" +
+            "lVq0bxSwr8Sg/8u9HGVivfdG8OpUM+qjuV5gey5xttNLK3BZDrAlco8RkJZryAD40flmJZrWXJmc" +
+            "r2HhJJUnqG4Z3MSziEgW1u1JnnY3f/BFdgYsA54SgdUGdQP3aqzSjIpGK01/vjrXvifHazSANjvl" +
+            "0AUE5i6AarMw2biEKB2ySUDp8idC5w12GpqDrhZ/QkW8yBSa87KbkMYXuRA2Gq1fYbQx3YJraw0U" +
+            "gZ4M3fFKpt6raxxM5j0sWHlULD7dAZMERvNESVrKG3tQ7B39WAD8QLGYc45DFEGOhKv5Fv8510h5" +
+            "sXK502IvGpI4FDwz2rbtAgJ0j+16db5wCSW5ThvNPhCheyciajc8dU1B5tJzZN/ksBpzne4Xf9gO" +
+            "LZ9ZU0+3Z5gHVvTS/YpxBFwiFpmL7dvGxew0cXGSsG5UTBlgr7i0SX0WhY4Djjo8IfPwrvvA0QaC" +
+            "FamdYXKqBsSHgEyXS9zgGIFPt2jWdhaS+sAa//5SXcWro0OdiKPuwEzLgj759ke1sHRnvO735dYn" +
+            "5whVbzlGyLBh3L0CAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUU1eXQ7NoYKjvOQlh" +
+            "5V8jHQMoxA8wHwYDVR0jBBgwFoAUU1eXQ7NoYKjvOQlh5V8jHQMoxA8wDQYJKoZIhvcNAQELBQAD" +
+            "ggIBAHFIazRLs3itnZKllPnboSd6sHbzeJURKehx8GJPvIC+xWlwWyFO5+GHmgc3yh/SVd3Xja/k" +
+            "8Ud59WEYTjyJJWTw0Jygx37rHW7VGn2HDuy/x0D+els+S8HeLD1toPFMepjIXJn7nHLhtmzTPlDW" +
+            "DrhiaYsls/k5Izf89xYnI4euuOY2+1gsweJqFGfbznqyqy8xLyzoZ6bvBJtgeY+G3i/9Be14HseS" +
+            "Na4FvI1Oze/l2gUu1IXzN6DGWR/lxEyt+TncJfBGKbjafYrfSh3zsE4N3TU7BeOL5INirOMjre/j" +
+            "VgB1YQG5qLVaPoz6mdn75AbBBm5a5ahApLiKqzy/hP+1rWgw8Ikb7vbUqov/bnY3IlIU6XcPJTCD" +
+            "b9aRZQkStvYpQd82XTyxD/T0GgRLnUj5Uv6iZlikFx1KNj0YNS2T3gyvL++J9B0Y6gAkiG0EtNpl" +
+            "z7Pomsv5pVdmHVdKMjqWw5/6zYzVmu5cXFtR384Ti1qwML1xkD6TC3VIv88rKIEjrkY2c+v1frh9" +
+            "fRJ2OmzXmML9NgHTjEiJR2Ib2iNrMKxkuTIs9oxKZgrJtJKvdU9qJJKM5PnZuNuHhGs6A/9gt9Oc" +
+            "cetYeQvVSqeEmQluWfcunQn9C9Vwi2BJIiVJh4IdWZf5/e2PlSSQ9CJjz2bKI17pzdxOmjQfE0JS" +
+            "F7Xt";
+
+    private static PlayIntegritySpoofService sInstance;
+
+    private volatile int mVerboseLogs = 0;
+    private volatile boolean mSpoofBuild = true;
+    private volatile boolean mSpoofProps = true;
+    private volatile boolean mSpoofProvider = true;
+    private volatile boolean mSpoofSignature = false;
+    private volatile boolean mSpoofVendingBuild = true;
+    private volatile boolean mSpoofVendingSdk = false;
+    private volatile boolean mDebug = false;
+
+    private final Map<String, String> mBuildFields = new ConcurrentHashMap<>();
+    private final Map<String, String> mSystemProps = new ConcurrentHashMap<>();
+
+    private volatile boolean mConfigLoaded = false;
+    private volatile boolean mSignatureSpoofed = false;
+
+    private PlayIntegritySpoofService() {}
+
+    public static synchronized PlayIntegritySpoofService getInstance() {
+        if (sInstance == null) {
+            sInstance = new PlayIntegritySpoofService();
+            sInstance.loadConfig();
+        }
+        return sInstance;
+    }
+
+    public void loadConfig() {
+        mBuildFields.clear();
+        mSystemProps.clear();
+        mConfigLoaded = false;
+
+        String content;
+        try {
+            content = ActivityManager.getService().getSpoofPifConfig();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to fetch PIF config from system_server", e);
+            return;
+        }
+
+        if (content == null || content.isEmpty()) {
+            Log.w(TAG, "No PIF config in Settings.Secure");
+            return;
+        }
+
+        try {
+            String trimmed = content.trim();
+            if (trimmed.startsWith("{")) {
+                parseJson(content);
+            } else {
+                parseProp(content);
+            }
+
+            mConfigLoaded = true;
+            Log.i(TAG, "PIF config loaded, fields=" + mBuildFields.size()
+                + ", props=" + mSystemProps.size());
+
+            // Sync SECURITY_PATCH to system props so apps reading these directly
+            // see the spoofed date, matching what the upstream module does via resetprop.
+            String secPatch = mBuildFields.get("SECURITY_PATCH");
+            if (secPatch != null && !secPatch.isEmpty()) {
+                mSystemProps.put("ro.build.version.security_patch", secPatch);
+                mSystemProps.put("ro.vendor.build.security_patch", secPatch);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load PIF config", e);
+        }
+    }
+
+    private void parseProp(String content) {
+        String[] lines = content.split("\n");
+        for (String line : lines) {
+            line = line.trim();
+            if (line.isEmpty() || line.startsWith("#")) continue;
+
+            int eqIdx = line.indexOf('=');
+            if (eqIdx <= 0) continue;
+
+            String key = line.substring(0, eqIdx).trim();
+            String value = line.substring(eqIdx + 1).trim();
+
+            int commentIdx = value.indexOf('#');
+            if (commentIdx >= 0) {
+                value = value.substring(0, commentIdx).trim();
+            }
+
+            if (value.isEmpty()) continue;
+
+            processKeyValue(key, value);
+        }
+    }
+
+    private void parseJson(String content) {
+        try (JsonReader reader = new JsonReader(new StringReader(content))) {
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String key = reader.nextName();
+                String value;
+                switch (reader.peek()) {
+                    case BOOLEAN:
+                        value = String.valueOf(reader.nextBoolean());
+                        break;
+                    case NUMBER:
+                        value = reader.nextString();
+                        break;
+                    case NULL:
+                        reader.nextNull();
+                        continue;
+                    default:
+                        value = reader.nextString();
+                        break;
+                }
+                processKeyValue(key, value);
+            }
+            reader.endObject();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse JSON config", e);
+        }
+    }
+
+    private void processKeyValue(String key, String value) {
+        switch (key) {
+            case "verboseLogs":
+            case "VERBOSE_LOGS":
+                try {
+                    mVerboseLogs = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    mVerboseLogs = 0;
+                }
+                break;
+            case "spoofBuild":
+                mSpoofBuild = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "spoofProps":
+                mSpoofProps = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "spoofProvider":
+                mSpoofProvider = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "spoofSignature":
+                mSpoofSignature = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "spoofVendingBuild":
+                mSpoofVendingBuild = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "spoofVendingSdk":
+                mSpoofVendingSdk = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            case "DEBUG":
+                mDebug = "1".equals(value) || "true".equalsIgnoreCase(value);
+                break;
+            default:
+                if (key.contains(".") || key.startsWith("*")) {
+                    mSystemProps.put(key, value);
+                } else {
+                    mBuildFields.put(key, value);
+                }
+                break;
+        }
+    }
+
+    public boolean shouldSpoof(String processName) {
+        if (!mConfigLoaded) return false;
+        return DROIDGUARD_PACKAGE.equals(processName) || VENDING_PACKAGE.equals(processName);
+    }
+
+    public boolean isGmsProcess(String dataDir) {
+        if (dataDir == null) return false;
+        return dataDir.endsWith("/" + GMS_PACKAGE) || dataDir.endsWith("/" + VENDING_PACKAGE);
+    }
+
+    public boolean isDroidGuard(String processName) {
+        return DROIDGUARD_PACKAGE.equals(processName);
+    }
+
+    public boolean isVending(String processName) {
+        return VENDING_PACKAGE.equals(processName);
+    }
+
+    public void spoofBuildFields(String processName) {
+        if (!mConfigLoaded) return;
+
+        boolean isVending = isVending(processName);
+        boolean isDroidGuard = isDroidGuard(processName);
+
+        if (!isDroidGuard && !isVending) return;
+
+        if (isVending) {
+            if (!mSpoofVendingBuild) {
+                if (mVerboseLogs > 0) Log.d(TAG, "Vending build spoofing disabled");
+                return;
+            }
+            for (Map.Entry<String, String> entry : mBuildFields.entrySet()) {
+                if ("SDK_INT".equals(entry.getKey())) continue;
+                spoofField(entry.getKey(), entry.getValue(), "PS");
+            }
+            return;
+        }
+
+        if (!mSpoofBuild) {
+            if (mVerboseLogs > 0) Log.d(TAG, "Build spoofing disabled");
+            return;
+        }
+
+        for (Map.Entry<String, String> entry : mBuildFields.entrySet()) {
+            spoofField(entry.getKey(), entry.getValue(), "DG");
+        }
+
+        // spoofVendingSdk when enabled applies an additional SDK_INT override
+        // specifically for DroidGuard to match legacy attestation paths.
+        // It has no effect on Vending.
+        if (mSpoofVendingSdk) {
+            spoofSdkInt();
+        }
+    }
+
+    public void spoofSignature() {
+        if (!mSpoofSignature || mSignatureSpoofed) return;
+
+        Signature spoofedSignature = new Signature(Base64.decode(ROM_SIGNATURE_DATA, Base64.DEFAULT));
+        Parcelable.Creator<PackageInfo> originalCreator = PackageInfo.CREATOR;
+        Parcelable.Creator<PackageInfo> customCreator = new CustomPackageInfoCreator(originalCreator, spoofedSignature);
+
+        try {
+            Field creatorField = findField(PackageInfo.class, "CREATOR");
+            creatorField.setAccessible(true);
+            creatorField.set(null, customCreator);
+            creatorField.setAccessible(false);
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't replace PackageInfoCreator: " + e);
+            return;
+        }
+
+        try {
+            Field cacheField = findField(PackageManager.class, "sPackageInfoCache");
+            cacheField.setAccessible(true);
+            Object cache = cacheField.get(null);
+            if (cache != null) {
+                Method clearMethod = cache.getClass().getMethod("clear");
+                clearMethod.invoke(cache);
+            }
+            cacheField.setAccessible(false);
+        } catch (Exception e) {
+            if (mDebug) Log.d(TAG, "Couldn't clear PackageInfoCache: " + e);
+        }
+
+        try {
+            Field creatorsField = findField(Parcel.class, "mCreators");
+            creatorsField.setAccessible(true);
+            Map<?, ?> mCreators = (Map<?, ?>) creatorsField.get(null);
+            if (mCreators != null) mCreators.clear();
+            creatorsField.setAccessible(false);
+        } catch (Exception e) {
+            if (mDebug) Log.d(TAG, "Couldn't clear Parcel mCreators: " + e);
+        }
+
+        try {
+            Field creatorsField = findField(Parcel.class, "sPairedCreators");
+            creatorsField.setAccessible(true);
+            Map<?, ?> sPairedCreators = (Map<?, ?>) creatorsField.get(null);
+            if (sPairedCreators != null) sPairedCreators.clear();
+            creatorsField.setAccessible(false);
+        } catch (Exception e) {
+            if (mDebug) Log.d(TAG, "Couldn't clear Parcel sPairedCreators: " + e);
+        }
+
+        mSignatureSpoofed = true;
+        Log.i(TAG, "Signature spoofing enabled via Parcelable.Creator");
+    }
+
+    private Field findField(Class<?> clazz, String fieldName) throws NoSuchFieldException {
+        Class<?> currentClass = clazz;
+        while (currentClass != null && !currentClass.equals(Object.class)) {
+            try {
+                return currentClass.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e) {
+                currentClass = currentClass.getSuperclass();
+            }
+        }
+        throw new NoSuchFieldException("Field '" + fieldName + "' not found");
+    }
+
+    private void spoofSdkInt() {
+        // Only called for DroidGuard. Reads SDK_INT from config so it stays
+        // consistent with the spoofed fingerprint. Falls back to 32 if unset.
+        String configSdk = mBuildFields.get("SDK_INT");
+        int targetSdk;
+        try {
+            targetSdk = (configSdk != null) ? Integer.parseInt(configSdk) : 32;
+        } catch (NumberFormatException e) {
+            targetSdk = 32;
+        }
+
+        try {
+            Field field = Build.VERSION.class.getDeclaredField("SDK_INT");
+            field.setAccessible(true);
+            int oldValue = field.getInt(null);
+            if (oldValue != targetSdk) {
+                field.set(null, targetSdk);
+                Log.d(TAG + "/Java:DG", "[SDK_INT]: " + oldValue + " -> " + targetSdk);
+            }
+            field.setAccessible(false);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to spoof SDK_INT", e);
+        }
+    }
+
+    private void spoofField(String fieldName, String value, String logSuffix) {
+        if (value == null || value.isEmpty()) {
+            if (mVerboseLogs > 0) Log.d(TAG, fieldName + " is empty, skipping");
+            return;
+        }
+
+        try {
+            Field field;
+            String oldValue;
+
+            if (hasField(Build.class, fieldName)) {
+                field = Build.class.getDeclaredField(fieldName);
+            } else if (hasField(Build.VERSION.class, fieldName)) {
+                field = Build.VERSION.class.getDeclaredField(fieldName);
+            } else {
+                if (mVerboseLogs > 1) Log.d(TAG, "Field not found: " + fieldName);
+                return;
+            }
+
+            field.setAccessible(true);
+            oldValue = String.valueOf(field.get(null));
+
+            if (value.equals(oldValue)) {
+                if (mVerboseLogs > 2) Log.d(TAG, "[" + fieldName + "]: " + value + " (unchanged)");
+                field.setAccessible(false);
+                return;
+            }
+
+            Class<?> fieldType = field.getType();
+            Object newValue;
+
+            if (fieldType == String.class) {
+                newValue = value;
+            } else if (fieldType == int.class) {
+                newValue = Integer.parseInt(value);
+            } else if (fieldType == long.class) {
+                newValue = Long.parseLong(value);
+            } else if (fieldType == boolean.class) {
+                newValue = Boolean.parseBoolean(value);
+            } else {
+                Log.w(TAG, "Unsupported field type: " + fieldType);
+                field.setAccessible(false);
+                return;
+            }
+
+            field.set(null, newValue);
+            field.setAccessible(false);
+
+            Log.d(TAG + "/Java:" + logSuffix, "[" + fieldName + "]: " + oldValue + " -> " + value);
+
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to spoof " + fieldName, e);
+        }
+    }
+
+    private boolean hasField(Class<?> clazz, String fieldName) {
+        for (Field f : clazz.getDeclaredFields()) {
+            if (f.getName().equals(fieldName)) return true;
+        }
+        return false;
+    }
+
+    public String getSpoofedProperty(String key) {
+        if (!mSpoofProps || !mConfigLoaded) return null;
+
+        String value = mSystemProps.get(key);
+        if (value != null) return value;
+
+        for (Map.Entry<String, String> entry : mSystemProps.entrySet()) {
+            String pattern = entry.getKey();
+            if (pattern.startsWith("*") && key.endsWith(pattern.substring(1))) {
+                return entry.getValue();
+            }
+        }
+
+        return null;
+    }
+
+    public boolean isSpoofSignatureEnabled() {
+        return mSpoofSignature && mConfigLoaded;
+    }
+
+    public boolean isSpoofProviderEnabled() {
+        return mSpoofProvider && mConfigLoaded;
+    }
+
+    public int getVerboseLogs() {
+        return mVerboseLogs;
+    }
+
+    public Map<String, String> getBuildFields() {
+        return mBuildFields;
+    }
+
+    public Map<String, String> getSystemProps() {
+        return mSystemProps;
+    }
+
+    public boolean isConfigLoaded() {
+        return mConfigLoaded;
+    }
+
+    public byte[] getRomSignatureBytes() {
+        return Base64.decode(ROM_SIGNATURE_DATA, Base64.DEFAULT);
+    }
+
+    public void logBuildFields() {
+        if (mVerboseLogs < 100) return;
+        for (Field field : Build.class.getDeclaredFields()) {
+            try {
+                Log.d(TAG, "Build." + field.getName() + " = " + field.get(null));
+            } catch (Exception e) {
+            }
+        }
+        for (Field field : Build.VERSION.class.getDeclaredFields()) {
+            try {
+                Log.d(TAG, "Build.VERSION." + field.getName() + " = " + field.get(null));
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    private static class CustomPackageInfoCreator implements Parcelable.Creator<PackageInfo> {
+        private final Parcelable.Creator<PackageInfo> originalCreator;
+        private final Signature spoofedSignature;
+
+        CustomPackageInfoCreator(Parcelable.Creator<PackageInfo> originalCreator, Signature spoofedSignature) {
+            this.originalCreator = originalCreator;
+            this.spoofedSignature = spoofedSignature;
+        }
+
+        @Override
+        @SuppressWarnings("deprecation")
+        public PackageInfo createFromParcel(Parcel source) {
+            PackageInfo packageInfo = originalCreator.createFromParcel(source);
+            if ("android".equals(packageInfo.packageName)) {
+                if (packageInfo.signatures != null && packageInfo.signatures.length > 0) {
+                    packageInfo.signatures[0] = spoofedSignature;
+                }
+                if (packageInfo.signingInfo != null) {
+                    Signature[] signaturesArray = packageInfo.signingInfo.getApkContentsSigners();
+                    if (signaturesArray != null && signaturesArray.length > 0) {
+                        signaturesArray[0] = spoofedSignature;
+                    }
+                }
+            }
+            return packageInfo;
+        }
+
+        @Override
+        public PackageInfo[] newArray(int size) {
+            return originalCreator.newArray(size);
+        }
+    }
+}
diff --git a/core/java/android/security/trickystore/AttestationUtils.java b/core/java/android/security/trickystore/AttestationUtils.java
new file mode 100644
index 0000000000000..442463825f907
--- /dev/null
+++ b/core/java/android/security/trickystore/AttestationUtils.java
@@ -0,0 +1,300 @@
+package android.security.trickystore;
+
+import android.os.Build;
+import android.os.SystemProperties;
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyProperties;
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.*;
+
+import java.io.ByteArrayInputStream;
+import java.security.*;
+import java.security.cert.*;
+
+/**
+ * @hide
+ */
+public final class AttestationUtils {
+    private static final String TAG = "AttestationUtils";
+
+    private static byte[] sBootKey;
+    private static byte[] sBootHash;
+    private static volatile boolean sTeeBroken = false;
+
+    private AttestationUtils() {}
+
+    public static void setTeeBroken(boolean broken) {
+        sTeeBroken = broken;
+    }
+
+    public static boolean isTeeBroken() {
+        return sTeeBroken;
+    }
+
+    public static byte[] getBootKey() {
+        if (sBootKey == null) {
+            sBootKey = generateRandomBytes(32);
+        }
+        return sBootKey;
+    }
+
+    public static byte[] getBootHash() {
+        if (sBootHash == null) {
+            sBootHash = getBootHashFromProp();
+            if (sBootHash == null && !sTeeBroken) {
+                sBootHash = extractBootHashFromTee();
+            }
+            if (sBootHash == null) {
+                Log.w(TAG, "Failed to get boot hash from prop and TEE, using random bytes");
+                sBootHash = generateRandomBytes(32);
+            }
+        }
+        return sBootHash;
+    }
+
+    public static void initBootHash() {
+        Log.i(TAG, "initBootHash: Starting boot hash initialization");
+        byte[] hash = getBootHashFromProp();
+        if (hash != null) {
+            sBootHash = hash;
+            Log.i(TAG, "initBootHash: Boot hash already set from prop: " + bytesToHex(hash));
+            return;
+        }
+        Log.i(TAG, "initBootHash: No prop set, attempting TEE extraction");
+        hash = extractBootHashFromTee();
+        if (hash != null) {
+            sBootHash = hash;
+            Log.i(TAG, "initBootHash: TEE extraction successful, setting prop");
+            setVbmetaDigestProp(bytesToHex(hash));
+        } else {
+            Log.e(TAG, "initBootHash: Failed to extract boot hash from TEE");
+        }
+    }
+
+    private static void setVbmetaDigestProp(String digest) {
+        try {
+            SystemProperties.set("ro.boot.vbmeta.digest", digest);
+            Log.i(TAG, "Set ro.boot.vbmeta.digest property to TEE boot hash");
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to set vbmeta.digest property", e);
+        }
+    }
+
+    private static byte[] extractBootHashFromTee() {
+        try {
+            String alias = "trickystore_attestation_key";
+            
+            KeyPairGenerator kpg = KeyPairGenerator.getInstance(
+                KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
+            KeyGenParameterSpec spec = new KeyGenParameterSpec.Builder(alias,
+                    KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY)
+                    .setDigests(KeyProperties.DIGEST_SHA256)
+                    .setAttestationChallenge(new byte[32])
+                    .build();
+            kpg.initialize(spec);
+            kpg.generateKeyPair();
+            
+            KeyStore ks = KeyStore.getInstance("AndroidKeyStore");
+            ks.load(null);
+            java.security.cert.Certificate[] chain = ks.getCertificateChain(alias);
+            
+            if (chain == null || chain.length == 0) {
+                Log.e(TAG, "No certificate chain from AndroidKeyStore");
+                ks.deleteEntry(alias);
+                return null;
+            }
+            
+            X509Certificate leafCert = (X509Certificate) chain[0];
+            byte[] extValue = leafCert.getExtensionValue("1.3.6.1.4.1.11129.2.1.17");
+            
+            ks.deleteEntry(alias);
+            
+            if (extValue == null) {
+                Log.e(TAG, "No attestation extension in certificate");
+                return null;
+            }
+            
+            ASN1InputStream ais = new ASN1InputStream(extValue);
+            ASN1OctetString octet = (ASN1OctetString) ais.readObject();
+            ais.close();
+            
+            ASN1InputStream seqStream = new ASN1InputStream(octet.getOctets());
+            ASN1Sequence keyDesc = (ASN1Sequence) seqStream.readObject();
+            seqStream.close();
+            
+            ASN1Sequence teeEnforced = (ASN1Sequence) keyDesc.getObjectAt(7);
+            
+            for (int i = 0; i < teeEnforced.size(); i++) {
+                ASN1TaggedObject tagged = (ASN1TaggedObject) teeEnforced.getObjectAt(i);
+                if (tagged.getTagNo() == 704) {
+                    ASN1Sequence rootOfTrust = (ASN1Sequence) tagged.getBaseObject();
+                    if (rootOfTrust.size() >= 4) {
+                        ASN1OctetString bootHashOctet = (ASN1OctetString) rootOfTrust.getObjectAt(3);
+                        byte[] hash = bootHashOctet.getOctets();
+                        Log.i(TAG, "Extracted boot hash from TEE: " + bytesToHex(hash));
+                        return hash;
+                    }
+                }
+            }
+            
+            Log.e(TAG, "RootOfTrust not found in TEE enforced list");
+            return null;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to extract boot hash from TEE", e);
+            return null;
+        }
+    }
+
+    public static byte[] getBootHashFromProp() {
+        String digest = SystemProperties.get("ro.boot.vbmeta.digest", null);
+        if (digest == null || digest.isEmpty() || digest.length() != 64) {
+            return null;
+        }
+        try {
+            return hexStringToByteArray(digest);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse vbmeta.digest", e);
+            return null;
+        }
+    }
+
+    public static int getOsVersion() {
+        switch (Build.VERSION.SDK_INT) {
+            case Build.VERSION_CODES.Q: return 100000;
+            case Build.VERSION_CODES.R: return 110000;
+            case Build.VERSION_CODES.S: return 120000;
+            case Build.VERSION_CODES.S_V2: return 120100;
+            case Build.VERSION_CODES.TIRAMISU: return 130000;
+            case Build.VERSION_CODES.UPSIDE_DOWN_CAKE: return 140000;
+            case Build.VERSION_CODES.VANILLA_ICE_CREAM: return 150000;
+            default: return 160000;
+        }
+    }
+
+    public static int getAttestVersion() {
+        switch (Build.VERSION.SDK_INT) {
+            case Build.VERSION_CODES.Q:
+            case Build.VERSION_CODES.R:
+                return 4;
+            case Build.VERSION_CODES.S:
+            case Build.VERSION_CODES.S_V2:
+                return 100;
+            case Build.VERSION_CODES.TIRAMISU:
+                return 200;
+            case Build.VERSION_CODES.UPSIDE_DOWN_CAKE:
+            case Build.VERSION_CODES.VANILLA_ICE_CREAM:
+                return 300;
+            default:
+                return 400;
+        }
+    }
+
+    public static int getKeymasterVersion() {
+        int attestVersion = getAttestVersion();
+        return attestVersion == 4 ? 41 : attestVersion;
+    }
+
+    public static int getPatchLevel(boolean isLong) {
+        TrickyStoreService.CustomPatchLevel customLevel = 
+            TrickyStoreService.getInstance().getCustomPatchLevel();
+        if (customLevel != null && customLevel.system != null) {
+            Integer parsed = parsePatchLevel(customLevel.system, isLong);
+            if (parsed != null) return parsed;
+        }
+        return convertPatchLevel(Build.VERSION.SECURITY_PATCH, isLong);
+    }
+
+    public static int getVendorPatchLevel(boolean isLong) {
+        TrickyStoreService.CustomPatchLevel customLevel = 
+            TrickyStoreService.getInstance().getCustomPatchLevel();
+        if (customLevel != null && customLevel.vendor != null) {
+            Integer parsed = parsePatchLevel(customLevel.vendor, isLong);
+            if (parsed != null) return parsed;
+        }
+        return convertPatchLevel(Build.VERSION.SECURITY_PATCH, isLong);
+    }
+
+    public static int getBootPatchLevel(boolean isLong) {
+        TrickyStoreService.CustomPatchLevel customLevel = 
+            TrickyStoreService.getInstance().getCustomPatchLevel();
+        if (customLevel != null && customLevel.boot != null) {
+            Integer parsed = parsePatchLevel(customLevel.boot, isLong);
+            if (parsed != null) return parsed;
+        }
+        return convertPatchLevel(Build.VERSION.SECURITY_PATCH, isLong);
+    }
+
+    private static Integer parsePatchLevel(String value, boolean isLong) {
+        if (value == null || value.equalsIgnoreCase("no") || value.equalsIgnoreCase("prop")) {
+            return null;
+        }
+
+        String normalized = value.replace("-", "");
+        try {
+            if (normalized.length() == 8) {
+                int year = Integer.parseInt(normalized.substring(0, 4));
+                int month = Integer.parseInt(normalized.substring(4, 6));
+                int day = Integer.parseInt(normalized.substring(6, 8));
+                return isLong ? year * 10000 + month * 100 + day : year * 100 + month;
+            } else if (normalized.length() == 6) {
+                int year = Integer.parseInt(normalized.substring(0, 4));
+                int month = Integer.parseInt(normalized.substring(4, 6));
+                return isLong ? year * 10000 + month * 100 : year * 100 + month;
+            }
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "Failed to parse patch level: " + value, e);
+        }
+        return null;
+    }
+
+    public static int convertPatchLevel(String patchString, boolean isLong) {
+        try {
+            String[] parts = patchString.split("-");
+            if (isLong && parts.length >= 3) {
+                return Integer.parseInt(parts[0]) * 10000 + 
+                       Integer.parseInt(parts[1]) * 100 + 
+                       Integer.parseInt(parts[2]);
+            } else if (parts.length >= 2) {
+                return Integer.parseInt(parts[0]) * 100 + Integer.parseInt(parts[1]);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Invalid patch level format: " + patchString, e);
+        }
+        return 202404;
+    }
+
+    public static byte[] computeModuleHash() {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            return digest.digest(new byte[0]);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to compute module hash", e);
+            return new byte[32];
+        }
+    }
+
+    private static byte[] generateRandomBytes(int length) {
+        byte[] bytes = new byte[length];
+        new SecureRandom().nextBytes(bytes);
+        return bytes;
+    }
+
+    private static byte[] hexStringToByteArray(String hex) {
+        int len = hex.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4)
+                    + Character.digit(hex.charAt(i + 1), 16));
+        }
+        return data;
+    }
+
+    public static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+}
diff --git a/core/java/android/security/trickystore/CertificateGenerator.java b/core/java/android/security/trickystore/CertificateGenerator.java
new file mode 100644
index 0000000000000..5628adb01f2f6
--- /dev/null
+++ b/core/java/android/security/trickystore/CertificateGenerator.java
@@ -0,0 +1,342 @@
+package android.security.trickystore;
+
+import android.app.ActivityThread;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.content.pm.SigningInfo;
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Boolean;
+import com.android.internal.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.internal.org.bouncycastle.asn1.ASN1EncodableVector;
+import com.android.internal.org.bouncycastle.asn1.ASN1Enumerated;
+import com.android.internal.org.bouncycastle.asn1.ASN1Integer;
+import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import com.android.internal.org.bouncycastle.asn1.ASN1OctetString;
+import com.android.internal.org.bouncycastle.asn1.DEROctetString;
+import com.android.internal.org.bouncycastle.asn1.DERSequence;
+import com.android.internal.org.bouncycastle.asn1.DERSet;
+import com.android.internal.org.bouncycastle.asn1.DERTaggedObject;
+import com.android.internal.org.bouncycastle.asn1.DERNull;
+import com.android.internal.org.bouncycastle.asn1.x500.X500Name;
+import com.android.internal.org.bouncycastle.asn1.x509.Extension;
+import com.android.internal.org.bouncycastle.asn1.x509.KeyUsage;
+import com.android.internal.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import com.android.internal.org.bouncycastle.cert.X509CertificateHolder;
+import com.android.internal.org.bouncycastle.cert.X509v3CertificateBuilder;
+import com.android.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
+import com.android.internal.org.bouncycastle.operator.ContentSigner;
+import com.android.internal.org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+
+import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.MessageDigest;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.ECGenParameterSpec;
+import java.security.spec.RSAKeyGenParameterSpec;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * @hide
+ */
+public final class CertificateGenerator {
+    private static final String TAG = "CertificateGenerator";
+    
+    public static final ASN1ObjectIdentifier ATTESTATION_OID = 
+        new ASN1ObjectIdentifier("1.3.6.1.4.1.11129.2.1.17");
+
+    private CertificateGenerator() {}
+
+    /** @hide */
+    public static class KeyGenParameters {
+        public int keySize;
+        public int algorithm;
+        public BigInteger certificateSerial;
+        public Date certificateNotBefore;
+        public Date certificateNotAfter;
+        public X500Principal certificateSubject;
+        public BigInteger rsaPublicExponent;
+        public int ecCurve;
+        public String ecCurveName;
+        public List<Integer> purpose = new ArrayList<>();
+        public List<Integer> digest = new ArrayList<>();
+        public byte[] attestationChallenge;
+        public byte[] brand;
+        public byte[] device;
+        public byte[] product;
+        public byte[] manufacturer;
+        public byte[] model;
+
+        public String getEcCurveName() {
+            if (ecCurveName != null) return ecCurveName;
+            switch (keySize) {
+                case 224: return "secp224r1";
+                case 256: return "secp256r1";
+                case 384: return "secp384r1";
+                case 521: return "secp521r1";
+                default: return "secp256r1";
+            }
+        }
+    }
+
+    public static KeyPair generateKeyPair(KeyGenParameters params) {
+        try {
+            KeyPairGenerator kpg;
+            if (params.algorithm == 3) {
+                kpg = KeyPairGenerator.getInstance("EC");
+                kpg.initialize(new ECGenParameterSpec(params.getEcCurveName()));
+            } else if (params.algorithm == 1) {
+                kpg = KeyPairGenerator.getInstance("RSA");
+                kpg.initialize(new RSAKeyGenParameterSpec(
+                    params.keySize, 
+                    params.rsaPublicExponent != null ? params.rsaPublicExponent : RSAKeyGenParameterSpec.F4
+                ));
+            } else {
+                Log.e(TAG, "Unsupported algorithm: " + params.algorithm);
+                return null;
+            }
+            return kpg.generateKeyPair();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to generate key pair", e);
+            return null;
+        }
+    }
+
+    public static List<Certificate> generateCertificateChain(
+            KeyPair keyPair,
+            KeyGenParameters params,
+            int securityLevel,
+            int uid) {
+        
+        KeyBoxManager keyboxManager = TrickyStoreService.getInstance().getKeyBoxManager();
+        String algorithm = params.algorithm == 3 ? "EC" : "RSA";
+        KeyBoxManager.KeyBox keybox = keyboxManager.getKeybox(algorithm);
+        
+        if (keybox == null) {
+            Log.e(TAG, "No keybox found for algorithm: " + algorithm);
+            return null;
+        }
+
+        try {
+            X509CertificateHolder issuerHolder = new X509CertificateHolder(
+                keybox.certificates.get(0).getEncoded());
+            X500Name issuer = issuerHolder.getSubject();
+
+            X509Certificate leaf = buildCertificate(keyPair, keybox, params, issuer, securityLevel, uid);
+
+            List<Certificate> chain = new ArrayList<>();
+            chain.add(leaf);
+            chain.addAll(keybox.certificates);
+            return chain;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to generate certificate chain", e);
+            return null;
+        }
+    }
+
+    private static X509Certificate buildCertificate(
+            KeyPair keyPair,
+            KeyBoxManager.KeyBox keybox,
+            KeyGenParameters params,
+            X500Name issuer,
+            int securityLevel,
+            int uid) throws Exception {
+
+        BigInteger serial = params.certificateSerial != null ? 
+            params.certificateSerial : BigInteger.ONE;
+        Date notBefore = params.certificateNotBefore != null ? 
+            params.certificateNotBefore : new Date();
+        Date notAfter = params.certificateNotAfter != null ? 
+            params.certificateNotAfter : 
+            ((X509Certificate) keybox.certificates.get(0)).getNotAfter();
+        X500Name subject = params.certificateSubject != null ? 
+            X500Name.getInstance(params.certificateSubject.getEncoded()) : new X500Name("CN=Android Keystore Key");
+
+        SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(
+            keyPair.getPublic().getEncoded());
+
+        X509v3CertificateBuilder builder = new X509v3CertificateBuilder(
+            issuer,
+            serial,
+            notBefore,
+            notAfter,
+            subject,
+            publicKeyInfo
+        );
+
+        builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign));
+        builder.addExtension(buildAttestExtension(params, securityLevel, uid));
+
+        String sigAlg = params.algorithm == 3 ? "SHA256withECDSA" : "SHA256withRSA";
+        JcaContentSignerBuilder signerBuilder = new JcaContentSignerBuilder(sigAlg);
+        if (params.algorithm == 3) {
+            signerBuilder.setProvider(new BouncyCastleProvider());
+        }
+        ContentSigner signer = signerBuilder.build(keybox.keyPair.getPrivate());
+
+        X509CertificateHolder holder = builder.build(signer);
+        CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+        return (X509Certificate) certFactory.generateCertificate(
+            new ByteArrayInputStream(holder.getEncoded()));
+    }
+
+    private static Extension buildAttestExtension(KeyGenParameters params, int securityLevel, int uid) {
+        try {
+            byte[] bootKey = AttestationUtils.getBootKey();
+            byte[] bootHash = AttestationUtils.getBootHash();
+
+            ASN1Encodable[] rootOfTrustElements = new ASN1Encodable[] {
+                new DEROctetString(bootKey),
+                ASN1Boolean.TRUE,
+                new ASN1Enumerated(0),
+                new DEROctetString(bootHash)
+            };
+            DERSequence rootOfTrust = new DERSequence(rootOfTrustElements);
+
+            ASN1EncodableVector teeEnforced = new ASN1EncodableVector();
+
+            ASN1Integer[] purposes = new ASN1Integer[params.purpose.size()];
+            for (int i = 0; i < params.purpose.size(); i++) {
+                purposes[i] = new ASN1Integer(params.purpose.get(i));
+            }
+            teeEnforced.add(new DERTaggedObject(true, 1, new DERSet(purposes)));
+            teeEnforced.add(new DERTaggedObject(true, 2, new ASN1Integer(params.algorithm)));
+            teeEnforced.add(new DERTaggedObject(true, 3, new ASN1Integer(params.keySize)));
+
+            ASN1Integer[] digests = new ASN1Integer[params.digest.size()];
+            for (int i = 0; i < params.digest.size(); i++) {
+                digests[i] = new ASN1Integer(params.digest.get(i));
+            }
+            teeEnforced.add(new DERTaggedObject(true, 5, new DERSet(digests)));
+
+            teeEnforced.add(new DERTaggedObject(true, 10, new ASN1Integer(params.ecCurve)));
+            teeEnforced.add(new DERTaggedObject(true, 503, DERNull.INSTANCE));
+            teeEnforced.add(new DERTaggedObject(true, 702, new ASN1Integer(0)));
+            teeEnforced.add(new DERTaggedObject(true, 704, rootOfTrust));
+            teeEnforced.add(new DERTaggedObject(true, 705, new ASN1Integer(AttestationUtils.getOsVersion())));
+            teeEnforced.add(new DERTaggedObject(true, 706, new ASN1Integer(AttestationUtils.getPatchLevel(false))));
+            teeEnforced.add(new DERTaggedObject(true, 718, new ASN1Integer(AttestationUtils.getVendorPatchLevel(true))));
+            teeEnforced.add(new DERTaggedObject(true, 719, new ASN1Integer(AttestationUtils.getBootPatchLevel(true))));
+
+            if (params.brand != null) {
+                teeEnforced.add(new DERTaggedObject(true, 710, new DEROctetString(params.brand)));
+            }
+            if (params.device != null) {
+                teeEnforced.add(new DERTaggedObject(true, 711, new DEROctetString(params.device)));
+            }
+            if (params.product != null) {
+                teeEnforced.add(new DERTaggedObject(true, 712, new DEROctetString(params.product)));
+            }
+            if (params.manufacturer != null) {
+                teeEnforced.add(new DERTaggedObject(true, 716, new DEROctetString(params.manufacturer)));
+            }
+            if (params.model != null) {
+                teeEnforced.add(new DERTaggedObject(true, 717, new DEROctetString(params.model)));
+            }
+
+            ASN1EncodableVector softwareEnforced = new ASN1EncodableVector();
+            try {
+                ASN1OctetString applicationId = createApplicationId(uid);
+                softwareEnforced.add(new DERTaggedObject(true, 709, applicationId));
+            } catch (Throwable e) {
+                 Log.w(TAG, "Failed to create application ID", e);
+            }
+            softwareEnforced.add(new DERTaggedObject(true, 701, new ASN1Integer(System.currentTimeMillis())));
+
+            ASN1Encodable[] keyDescriptionElements = new ASN1Encodable[] {
+                new ASN1Integer(AttestationUtils.getAttestVersion()),
+                new ASN1Enumerated(securityLevel),
+                new ASN1Integer(AttestationUtils.getKeymasterVersion()),
+                new ASN1Enumerated(securityLevel),
+                new DEROctetString(params.attestationChallenge != null ? params.attestationChallenge : new byte[0]),
+                new DEROctetString(new byte[0]),
+                new DERSequence(softwareEnforced),
+                new DERSequence(teeEnforced)
+            };
+
+            DERSequence keyDescription = new DERSequence(keyDescriptionElements);
+            DEROctetString keyDescriptionOctets = new DEROctetString(keyDescription.getEncoded());
+
+            return new Extension(ATTESTATION_OID, false, keyDescriptionOctets);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to build attestation extension", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Signature[] extractSignatures(PackageInfo info) {
+        SigningInfo signingInfo = info.signingInfo;
+        if (signingInfo != null) {
+            if (signingInfo.hasMultipleSigners()) {
+                return signingInfo.getApkContentsSigners();
+            }
+            return signingInfo.getSigningCertificateHistory();
+        }
+        return info.signatures;
+    }
+
+    private static DEROctetString createApplicationId(int uid) throws Throwable {
+        Context context = ActivityThread.currentApplication();
+        if (context == null) {
+            throw new IllegalStateException("createApplicationId: context not available from ActivityThread!");
+        }
+
+        PackageManager pm = context.getPackageManager();
+        if (pm == null) {
+            throw new IllegalStateException("createApplicationId: PackageManager not found!");
+        }
+
+        String[] packages = pm.getPackagesForUid(uid);
+        if (packages == null || packages.length == 0) {
+            throw new IllegalStateException("No packages found for UID: " + uid);
+        }
+
+        int size = packages.length;
+        ASN1Encodable[] packageInfoAA = new ASN1Encodable[size];
+        Set<ByteBuffer> signatures = new HashSet<>();
+        MessageDigest dg = MessageDigest.getInstance("SHA-256");
+
+        for (int i = 0; i < size; i++) {
+            String name = packages[i];
+            PackageInfo info = pm.getPackageInfo(name, PackageManager.GET_SIGNING_CERTIFICATES);
+            ASN1Encodable[] arr = new ASN1Encodable[2];
+            arr[0] = new DEROctetString(name.getBytes(StandardCharsets.UTF_8));
+            arr[1] = new ASN1Integer(info.getLongVersionCode());
+            packageInfoAA[i] = new DERSequence(arr);
+
+            Signature[] pkgSigs = extractSignatures(info);
+            if (pkgSigs != null) {
+                for (Signature s : pkgSigs) {
+                    signatures.add(ByteBuffer.wrap(dg.digest(s.toByteArray())));
+                }
+            }
+        }
+
+        ASN1Encodable[] signaturesAA = new ASN1Encodable[signatures.size()];
+        int i = 0;
+        for (ByteBuffer d : signatures) {
+            signaturesAA[i++] = new DEROctetString(d.array());
+        }
+
+        ASN1Encodable[] applicationIdAA = new ASN1Encodable[2];
+        applicationIdAA[0] = new DERSet(packageInfoAA);
+        applicationIdAA[1] = new DERSet(signaturesAA);
+
+        return new DEROctetString(new DERSequence(applicationIdAA).getEncoded());
+    }
+}
diff --git a/core/java/android/security/trickystore/CertificateHacker.java b/core/java/android/security/trickystore/CertificateHacker.java
new file mode 100644
index 0000000000000..fcd9a38b22e38
--- /dev/null
+++ b/core/java/android/security/trickystore/CertificateHacker.java
@@ -0,0 +1,311 @@
+package android.security.trickystore;
+
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Boolean;
+import com.android.internal.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.internal.org.bouncycastle.asn1.ASN1EncodableVector;
+import com.android.internal.org.bouncycastle.asn1.ASN1Enumerated;
+import com.android.internal.org.bouncycastle.asn1.ASN1Integer;
+import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.internal.org.bouncycastle.asn1.ASN1TaggedObject;
+import com.android.internal.org.bouncycastle.asn1.DEROctetString;
+import com.android.internal.org.bouncycastle.asn1.DERSequence;
+import com.android.internal.org.bouncycastle.asn1.DERTaggedObject;
+import com.android.internal.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import com.android.internal.org.bouncycastle.asn1.x509.Extension;
+import com.android.internal.org.bouncycastle.cert.X509CertificateHolder;
+import com.android.internal.org.bouncycastle.cert.X509v3CertificateBuilder;
+import com.android.internal.org.bouncycastle.crypto.digests.SHA256Digest;
+import com.android.internal.org.bouncycastle.crypto.params.ECDomainParameters;
+import com.android.internal.org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import com.android.internal.org.bouncycastle.crypto.params.RSAKeyParameters;
+import com.android.internal.org.bouncycastle.crypto.signers.ECDSASigner;
+import com.android.internal.org.bouncycastle.crypto.signers.RSADigestSigner;
+import com.android.internal.org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import com.android.internal.org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
+import com.android.internal.org.bouncycastle.jce.ECNamedCurveTable;
+import com.android.internal.org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+import com.android.internal.org.bouncycastle.jce.spec.ECParameterSpec;
+import com.android.internal.org.bouncycastle.operator.ContentSigner;
+import com.android.internal.org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.RSAPrivateCrtKey;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @hide
+ */
+public final class CertificateHacker {
+    private static final String TAG = "CertificateHacker";
+
+    private static final Map<String, String> sLeafAlgorithms = new ConcurrentHashMap<>();
+
+    private CertificateHacker() {}
+
+    public static void clearLeafAlgorithms() {
+        sLeafAlgorithms.clear();
+    }
+
+    public static Certificate[] hackCertificateChain(Certificate[] chain) {
+        if (chain == null || chain.length == 0) {
+            return chain;
+        }
+
+        try {
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+            X509Certificate leaf = (X509Certificate) certFactory.generateCertificate(
+                new ByteArrayInputStream(chain[0].getEncoded()));
+
+            byte[] extensionBytes = leaf.getExtensionValue(
+                CertificateGenerator.ATTESTATION_OID.getId());
+            if (extensionBytes == null) {
+                return chain;
+            }
+
+            X509CertificateHolder leafHolder = new X509CertificateHolder(leaf.getEncoded());
+            Extension extension = leafHolder.getExtension(CertificateGenerator.ATTESTATION_OID);
+            ASN1Sequence sequence = ASN1Sequence.getInstance(extension.getExtnValue().getOctets());
+            ASN1Encodable[] encodables = sequence.toArray();
+            ASN1Sequence teeEnforced = (ASN1Sequence) encodables[7];
+
+            ASN1EncodableVector vector = new ASN1EncodableVector();
+            ASN1Encodable originalRootOfTrust = null;
+
+            for (ASN1Encodable element : teeEnforced) {
+                ASN1TaggedObject taggedObject = (ASN1TaggedObject) element;
+                if (taggedObject.getTagNo() == 704) {
+                    originalRootOfTrust = taggedObject.getBaseObject().toASN1Primitive();
+                } else {
+                    vector.add(taggedObject);
+                }
+            }
+
+            String algorithm = leaf.getPublicKey().getAlgorithm();
+            KeyBoxManager keyboxManager = TrickyStoreService.getInstance().getKeyBoxManager();
+            KeyBoxManager.KeyBox keybox = keyboxManager.getKeybox(algorithm);
+
+            if (keybox == null) {
+                Log.e(TAG, "No keybox for algorithm: " + algorithm);
+                return chain;
+            }
+
+            List<Certificate> certificates = new ArrayList<>(keybox.certificates);
+            X509CertificateHolder issuerHolder = new X509CertificateHolder(
+                certificates.get(0).getEncoded());
+
+            X509v3CertificateBuilder builder = new X509v3CertificateBuilder(
+                issuerHolder.getSubject(),
+                leafHolder.getSerialNumber(),
+                leafHolder.getNotBefore(),
+                leafHolder.getNotAfter(),
+                leafHolder.getSubject(),
+                leafHolder.getSubjectPublicKeyInfo()
+            );
+
+            ContentSigner signer = createBCSigner(leaf.getSigAlgName(), keybox.keyPair.getPrivate());
+
+            Extension hackedExtension = hackAttestExtension(originalRootOfTrust, vector, encodables);
+            builder.addExtension(hackedExtension);
+
+            for (Object oid : leafHolder.getExtensions().getExtensionOIDs()) {
+                String oidString = oid.toString();
+                if (!oidString.equals(CertificateGenerator.ATTESTATION_OID.getId())) {
+                    builder.addExtension(leafHolder.getExtension(
+                        new ASN1ObjectIdentifier(oidString)));
+                }
+            }
+
+            X509CertificateHolder builtHolder = builder.build(signer);
+            X509Certificate hackedLeaf = (X509Certificate) certFactory.generateCertificate(
+                new ByteArrayInputStream(builtHolder.getEncoded()));
+
+            List<Certificate> result = new ArrayList<>();
+            result.add(hackedLeaf);
+            result.addAll(certificates);
+            return result.toArray(new Certificate[0]);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to hack certificate chain", e);
+            return chain;
+        }
+    }
+
+    private static ContentSigner createBCSigner(String algorithm, PrivateKey privateKey) throws Exception {
+        AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find(algorithm);
+        
+        if (privateKey instanceof BCECPrivateKey) {
+            BCECPrivateKey bcKey = (BCECPrivateKey) privateKey;
+            ECParameterSpec ecSpec = bcKey.getParameters();
+            if (ecSpec != null) {
+                ECDomainParameters domainParams = new ECDomainParameters(
+                    ecSpec.getCurve(), ecSpec.getG(), ecSpec.getN(), ecSpec.getH());
+                ECPrivateKeyParameters keyParam = new ECPrivateKeyParameters(bcKey.getD(), domainParams);
+                return new ECContentSigner(sigAlgId, keyParam);
+            } else {
+                ECNamedCurveParameterSpec namedSpec = ECNamedCurveTable.getParameterSpec("secp256r1");
+                ECDomainParameters domainParams = new ECDomainParameters(
+                    namedSpec.getCurve(), namedSpec.getG(), namedSpec.getN(), namedSpec.getH());
+                ECPrivateKeyParameters keyParam = new ECPrivateKeyParameters(bcKey.getD(), domainParams);
+                return new ECContentSigner(sigAlgId, keyParam);
+            }
+        } else if (privateKey instanceof ECPrivateKey) {
+            ECPrivateKeyParameters keyParam = (ECPrivateKeyParameters) ECUtil.generatePrivateKeyParameter(privateKey);
+            return new ECContentSigner(sigAlgId, keyParam);
+        } else if (privateKey instanceof RSAPrivateCrtKey) {
+            RSAPrivateCrtKey rsaKey = (RSAPrivateCrtKey) privateKey;
+            RSAKeyParameters keyParam = new RSAKeyParameters(true, rsaKey.getModulus(), rsaKey.getPrivateExponent());
+            return new RSAContentSigner(sigAlgId, keyParam);
+        }
+        
+        throw new IllegalArgumentException("Unsupported key type: " + privateKey.getClass());
+    }
+
+    private static class ECContentSigner implements ContentSigner {
+        private final AlgorithmIdentifier algId;
+        private final ECPrivateKeyParameters keyParam;
+        private final ByteArrayOutputStream stream;
+
+        ECContentSigner(AlgorithmIdentifier algId, ECPrivateKeyParameters keyParam) {
+            this.algId = algId;
+            this.keyParam = keyParam;
+            this.stream = new ByteArrayOutputStream();
+        }
+
+        @Override
+        public AlgorithmIdentifier getAlgorithmIdentifier() {
+            return algId;
+        }
+
+        @Override
+        public OutputStream getOutputStream() {
+            return stream;
+        }
+
+        @Override
+        public byte[] getSignature() {
+            try {
+                byte[] data = stream.toByteArray();
+                MessageDigest digest = MessageDigest.getInstance("SHA-256");
+                byte[] hash = digest.digest(data);
+                
+                ECDSASigner signer = new ECDSASigner();
+                signer.init(true, keyParam);
+                BigInteger[] sig = signer.generateSignature(hash);
+                
+                ASN1EncodableVector v = new ASN1EncodableVector();
+                v.add(new ASN1Integer(sig[0]));
+                v.add(new ASN1Integer(sig[1]));
+                return new DERSequence(v).getEncoded();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to generate ECDSA signature", e);
+            }
+        }
+    }
+
+    private static class RSAContentSigner implements ContentSigner {
+        private final AlgorithmIdentifier algId;
+        private final RSAKeyParameters keyParam;
+        private final ByteArrayOutputStream stream;
+
+        RSAContentSigner(AlgorithmIdentifier algId, RSAKeyParameters keyParam) {
+            this.algId = algId;
+            this.keyParam = keyParam;
+            this.stream = new ByteArrayOutputStream();
+        }
+
+        @Override
+        public AlgorithmIdentifier getAlgorithmIdentifier() {
+            return algId;
+        }
+
+        @Override
+        public OutputStream getOutputStream() {
+            return stream;
+        }
+
+        @Override
+        public byte[] getSignature() {
+            try {
+                byte[] data = stream.toByteArray();
+                RSADigestSigner signer = new RSADigestSigner(new SHA256Digest());
+                signer.init(true, keyParam);
+                signer.update(data, 0, data.length);
+                return signer.generateSignature();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to generate RSA signature", e);
+            }
+        }
+    }
+
+    private static Extension hackAttestExtension(
+            ASN1Encodable originalRootOfTrust,
+            ASN1EncodableVector vector,
+            ASN1Encodable[] originalEncodables) throws Exception {
+
+        byte[] bootKey = AttestationUtils.getBootKey();
+        byte[] bootHash = AttestationUtils.getBootHash();
+
+        if (bootHash == null && originalRootOfTrust instanceof ASN1Sequence) {
+            try {
+                ASN1Sequence rot = (ASN1Sequence) originalRootOfTrust;
+                ASN1Encodable hashElement = rot.getObjectAt(3);
+                if (hashElement instanceof DEROctetString) {
+                    bootHash = ((DEROctetString) hashElement).getOctets();
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "Failed to extract boot hash from original", e);
+            }
+        }
+
+        if (bootHash == null) {
+            bootHash = AttestationUtils.getBootHash();
+        }
+
+        ASN1Encodable[] rootOfTrustElements = new ASN1Encodable[] {
+            new DEROctetString(bootKey),
+            ASN1Boolean.TRUE,
+            new ASN1Enumerated(0),
+            new DEROctetString(bootHash)
+        };
+        DERSequence hackedRootOfTrust = new DERSequence(rootOfTrustElements);
+
+        vector.add(new DERTaggedObject(true, 718, 
+            new ASN1Integer(AttestationUtils.getVendorPatchLevel(true))));
+        vector.add(new DERTaggedObject(true, 719, 
+            new ASN1Integer(AttestationUtils.getBootPatchLevel(true))));
+        vector.add(new DERTaggedObject(true, 706, 
+            new ASN1Integer(AttestationUtils.getPatchLevel(false))));
+        vector.add(new DERTaggedObject(true, 705, 
+            new ASN1Integer(AttestationUtils.getOsVersion())));
+        vector.add(new DERTaggedObject(704, hackedRootOfTrust));
+
+        DERSequence hackedEnforced = new DERSequence(vector);
+        originalEncodables[7] = hackedEnforced;
+        DERSequence hackedSequence = new DERSequence(originalEncodables);
+        DEROctetString hackedOctets = new DEROctetString(hackedSequence);
+
+        return new Extension(CertificateGenerator.ATTESTATION_OID, false, hackedOctets);
+    }
+
+    public static void storeLeafAlgorithm(String alias, int uid, String algorithm) {
+        sLeafAlgorithms.put(alias + "_" + uid, algorithm);
+    }
+
+    public static String getLeafAlgorithm(String alias, int uid) {
+        return sLeafAlgorithms.remove(alias + "_" + uid);
+    }
+}
diff --git a/core/java/android/security/trickystore/KeyBoxManager.java b/core/java/android/security/trickystore/KeyBoxManager.java
new file mode 100644
index 0000000000000..b0b3f247f07fd
--- /dev/null
+++ b/core/java/android/security/trickystore/KeyBoxManager.java
@@ -0,0 +1,306 @@
+package android.security.trickystore;
+
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;
+import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import com.android.internal.org.bouncycastle.asn1.ASN1Primitive;
+import com.android.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import com.android.internal.org.bouncycastle.asn1.pkcs.RSAPrivateKey;
+import com.android.internal.org.bouncycastle.asn1.sec.ECPrivateKey;
+import com.android.internal.org.bouncycastle.asn1.x9.ECNamedCurveTable;
+import com.android.internal.org.bouncycastle.asn1.x9.X9ECParameters;
+import com.android.internal.org.bouncycastle.crypto.params.ECDomainParameters;
+import com.android.internal.org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import com.android.internal.org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import com.android.internal.org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi.EC;
+import com.android.internal.org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.RSAPrivateCrtKeySpec;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @hide
+ */
+public class KeyBoxManager {
+    private static final String TAG = "KeyBoxManager";
+
+    private final Map<String, KeyBox> mKeyboxes = new ConcurrentHashMap<>();
+    
+    private static final Pattern PEM_HEADER = Pattern.compile("-----BEGIN ([^-]+)-----");
+
+    /** @hide */
+    public static class KeyBox {
+        public final KeyPair keyPair;
+        public final List<Certificate> certificates;
+
+        public KeyBox(KeyPair keyPair, List<Certificate> certificates) {
+            this.keyPair = keyPair;
+            this.certificates = certificates;
+        }
+    }
+
+    public void clear() {
+        mKeyboxes.clear();
+        Log.i(TAG, "Keyboxes cleared");
+    }
+
+    public boolean hasKeyboxes() {
+        return !mKeyboxes.isEmpty();
+    }
+
+    public KeyBox getKeybox(String algorithm) {
+        return mKeyboxes.get(algorithm);
+    }
+
+    public void parseKeybox(String xmlContent) {
+        mKeyboxes.clear();
+        if (xmlContent == null || xmlContent.isEmpty()) {
+            return;
+        }
+
+        try {
+            xmlContent = sanitizeXml(xmlContent);
+            XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+            XmlPullParser parser = factory.newPullParser();
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+            parser.setInput(new StringReader(xmlContent));
+
+            int currentKeyIndex = -1;
+            String currentAlgorithm = null;
+            String privateKeyPem = null;
+            List<String> certificatePems = new ArrayList<>();
+            StringBuilder privateKeyBuilder = null;
+            StringBuilder certBuilder = null;
+            boolean inKey = false;
+            boolean inPrivateKey = false;
+            boolean inCertificateChain = false;
+            boolean inCertificate = false;
+
+            int eventType = parser.getEventType();
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+                String tagName = parser.getName();
+
+                switch (eventType) {
+                    case XmlPullParser.START_TAG:
+                        if ("Key".equals(tagName)) {
+                            inKey = true;
+                            currentKeyIndex++;
+                            currentAlgorithm = parser.getAttributeValue(null, "algorithm");
+                            privateKeyPem = null;
+                            certificatePems.clear();
+                            privateKeyBuilder = null;
+                            certBuilder = null;
+                        } else if ("PrivateKey".equals(tagName) && inKey) {
+                            inPrivateKey = true;
+                            privateKeyBuilder = new StringBuilder();
+                        } else if ("CertificateChain".equals(tagName) && inKey) {
+                            inCertificateChain = true;
+                        } else if ("Certificate".equals(tagName) && inCertificateChain) {
+                            inCertificate = true;
+                            certBuilder = new StringBuilder();
+                        }
+                        break;
+
+                    case XmlPullParser.TEXT:
+                        String text = parser.getText();
+                        if (text != null) {
+                            if (inPrivateKey && privateKeyBuilder != null) {
+                                privateKeyBuilder.append(text);
+                            } else if (inCertificate && certBuilder != null) {
+                                certBuilder.append(text);
+                            }
+                        }
+                        break;
+
+                    case XmlPullParser.END_TAG:
+                        if ("PrivateKey".equals(tagName)) {
+                            if (privateKeyBuilder != null) {
+                                String pem = privateKeyBuilder.toString().trim();
+                                if (!pem.isEmpty()) {
+                                    privateKeyPem = pem;
+                                }
+                                privateKeyBuilder = null;
+                            }
+                            inPrivateKey = false;
+                        } else if ("Certificate".equals(tagName)) {
+                            if (certBuilder != null) {
+                                String pem = certBuilder.toString().trim();
+                                if (!pem.isEmpty()) {
+                                    certificatePems.add(pem);
+                                }
+                                certBuilder = null;
+                            }
+                            inCertificate = false;
+                        } else if ("CertificateChain".equals(tagName)) {
+                            inCertificateChain = false;
+                        } else if ("Key".equals(tagName)) {
+                            inKey = false;
+                            if (currentAlgorithm != null && privateKeyPem != null && !certificatePems.isEmpty()) {
+                                processKeybox(currentAlgorithm, privateKeyPem, certificatePems);
+                            }
+                        }
+                        break;
+                }
+
+                eventType = parser.next();
+            }
+
+            Log.i(TAG, "Parsed " + mKeyboxes.size() + " keyboxes");
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse keybox XML", e);
+        }
+    }
+
+    private void processKeybox(String algorithm, String privateKeyPem, List<String> certificatePems) {
+        try {
+            String normalizedAlgorithm;
+            switch (algorithm.toLowerCase()) {
+                case "ec":
+                case "ecdsa":
+                    normalizedAlgorithm = "EC";
+                    break;
+                case "rsa":
+                    normalizedAlgorithm = "RSA";
+                    break;
+                default:
+                    normalizedAlgorithm = algorithm;
+            }
+
+            PrivateKey privateKey = parsePrivateKey(privateKeyPem, normalizedAlgorithm);
+            List<Certificate> certificates = new ArrayList<>();
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+
+            for (String certPem : certificatePems) {
+                byte[] certBytes = parsePemContent(certPem);
+                Certificate cert = certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
+                certificates.add(cert);
+            }
+
+            if (!certificates.isEmpty()) {
+                PublicKey publicKey = ((X509Certificate) certificates.get(0)).getPublicKey();
+                KeyPair keyPair = new KeyPair(publicKey, privateKey);
+                mKeyboxes.put(normalizedAlgorithm, new KeyBox(keyPair, certificates));
+                Log.i(TAG, "Added keybox for algorithm: " + normalizedAlgorithm);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to process keybox for algorithm: " + algorithm, e);
+        }
+    }
+
+    private PrivateKey parsePrivateKey(String pem, String algorithm) throws Exception {
+        String pemType = detectPemType(pem);
+        byte[] keyBytes = parsePemContent(pem);
+
+        if ("EC PRIVATE KEY".equals(pemType)
+                || ("EC".equals(algorithm) && pemType == null)) {
+            return parseEcPrivateKey(keyBytes, algorithm);
+        }
+
+        if ("RSA PRIVATE KEY".equals(pemType)
+                || ("RSA".equals(algorithm) && pemType == null)) {
+            return parseRsaPrivateKey(keyBytes);
+        }
+
+        if ("PRIVATE KEY".equals(pemType) || "ENCRYPTED PRIVATE KEY".equals(pemType)) {
+            PrivateKeyInfo pkInfo = PrivateKeyInfo.getInstance(keyBytes);
+            if ("RSA".equals(algorithm)) {
+                return new KeyFactorySpi().generatePrivate(pkInfo);
+            }
+            if ("EC".equals(algorithm)) {
+                return new EC().generatePrivate(pkInfo);
+            }
+            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
+            return KeyFactory.getInstance(algorithm).generatePrivate(spec);
+        }
+
+        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
+        return KeyFactory.getInstance(algorithm).generatePrivate(spec);
+    }
+
+    private PrivateKey parseEcPrivateKey(byte[] keyBytes, String algorithm) throws Exception {
+        try (ASN1InputStream asn1In = new ASN1InputStream(keyBytes)) {
+            ASN1Primitive asn1 = asn1In.readObject();
+            try {
+                ECPrivateKey ecPrivateKey = ECPrivateKey.getInstance(asn1);
+                X9ECParameters ecParams = ECNamedCurveTable.getByOID(
+                        (ASN1ObjectIdentifier) ecPrivateKey.getParameters());
+                ECDomainParameters domainParams = new ECDomainParameters(
+                        ecParams.getCurve(), ecParams.getG(), ecParams.getN(), ecParams.getH());
+                ECPrivateKeyParameters privParams = new ECPrivateKeyParameters(
+                        ecPrivateKey.getKey(), domainParams);
+                return new BCECPrivateKey(algorithm, privParams, null);
+            } catch (Exception e) {
+                PrivateKeyInfo pkInfo = PrivateKeyInfo.getInstance(asn1);
+                return new EC().generatePrivate(pkInfo);
+            }
+        }
+    }
+
+    private PrivateKey parseRsaPrivateKey(byte[] keyBytes) throws Exception {
+        try (ASN1InputStream asn1In = new ASN1InputStream(keyBytes)) {
+            ASN1Primitive asn1 = asn1In.readObject();
+            try {
+                RSAPrivateKey rsaPrivateKey = RSAPrivateKey.getInstance(asn1);
+                RSAPrivateCrtKeySpec rsaSpec = new RSAPrivateCrtKeySpec(
+                        rsaPrivateKey.getModulus(),
+                        rsaPrivateKey.getPublicExponent(),
+                        rsaPrivateKey.getPrivateExponent(),
+                        rsaPrivateKey.getPrime1(),
+                        rsaPrivateKey.getPrime2(),
+                        rsaPrivateKey.getExponent1(),
+                        rsaPrivateKey.getExponent2(),
+                        rsaPrivateKey.getCoefficient());
+                return KeyFactory.getInstance("RSA").generatePrivate(rsaSpec);
+            } catch (Exception e) {
+                PrivateKeyInfo pkInfo = PrivateKeyInfo.getInstance(asn1);
+                return new KeyFactorySpi().generatePrivate(pkInfo);
+            }
+        }
+    }
+
+    private String detectPemType(String pem) {
+        if (pem == null) return null;
+        Matcher m = PEM_HEADER.matcher(pem);
+        return m.find() ? m.group(1).trim().toUpperCase() : null;
+    }
+
+    private byte[] parsePemContent(String pem) {
+        String base64 = pem
+            .replaceAll("-----BEGIN [^-]+-----", "")
+            .replaceAll("-----END [^-]+-----", "")
+            .replaceAll("\\s", "");
+        return Base64.getDecoder().decode(base64);
+    }
+
+    private String sanitizeXml(String content) {
+        content = content.trim();
+        String[] boms = {"\uFEFF", "\uFFFE", "\u0000\uFEFF"};
+        for (String bom : boms) {
+            if (content.startsWith(bom)) {
+                content = content.substring(bom.length());
+            }
+        }
+        content = content.replaceAll("(?s)<!--.*?-->", "");
+        return content.trim();
+    }
+}
diff --git a/core/java/android/security/trickystore/TrickyStoreService.java b/core/java/android/security/trickystore/TrickyStoreService.java
new file mode 100644
index 0000000000000..fd9c3ebcf387a
--- /dev/null
+++ b/core/java/android/security/trickystore/TrickyStoreService.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.trickystore;
+
+import android.app.ActivityManager;
+import android.os.RemoteException;
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyProperties;
+import android.util.JsonReader;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @hide
+ */
+public class TrickyStoreService {
+    private static final String TAG = "TrickyStoreService";
+
+    private static TrickyStoreService sInstance;
+
+    private final Set<String> mHackPackages = ConcurrentHashMap.newKeySet();
+    private final Set<String> mGeneratePackages = ConcurrentHashMap.newKeySet();
+    private final Map<String, Mode> mPackageModes = new ConcurrentHashMap<>();
+
+    private volatile Boolean mTeeBroken = null;
+    private volatile CustomPatchLevel mCustomPatchLevel = null;
+    private volatile String mLastKeyboxFingerprint = null;
+
+    private final KeyBoxManager mKeyBoxManager;
+
+    /** @hide */
+    public enum Mode {
+        AUTO, LEAF_HACK, GENERATE
+    }
+
+    /** @hide */
+    public static class CustomPatchLevel {
+        public final String system;
+        public final String vendor;
+        public final String boot;
+        public final String all;
+
+        public CustomPatchLevel(String system, String vendor, String boot, String all) {
+            this.system = system;
+            this.vendor = vendor;
+            this.boot = boot;
+            this.all = all;
+        }
+    }
+
+    private TrickyStoreService() {
+        mKeyBoxManager = new KeyBoxManager();
+    }
+
+    public static synchronized TrickyStoreService getInstance() {
+        if (sInstance == null) {
+            sInstance = new TrickyStoreService();
+            sInstance.initialize();
+        }
+        return sInstance;
+    }
+
+    public void initialize() {
+        refreshTargets();
+        refreshKeyBox();
+        refreshPatchLevel();
+        Log.i(TAG, "TrickyStoreService initialized");
+    }
+
+    private String fetchFromAms(Fetcher fetcher) {
+        try {
+            return fetcher.fetch();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to fetch trickystore config from system_server", e);
+            return null;
+        }
+    }
+
+    private interface Fetcher {
+        String fetch() throws RemoteException;
+    }
+
+    public void refreshTargets() {
+        String content = fetchFromAms(() -> ActivityManager.getService().getSpoofTrickyStoreTarget());
+        mHackPackages.clear();
+        mGeneratePackages.clear();
+        mPackageModes.clear();
+
+        if (content == null || content.isEmpty()) {
+            return;
+        }
+
+        String trimmed = content.trim();
+        try {
+            if (trimmed.startsWith("[") || trimmed.startsWith("{")) {
+                parseTargetsJson(trimmed);
+            } else {
+                parseTargetsText(trimmed);
+            }
+            Log.i(TAG, "Updated target packages: hack=" + mHackPackages +
+                  ", generate=" + mGeneratePackages + ", modes=" + mPackageModes);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse target packages", e);
+        }
+    }
+
+    private void parseTargetsText(String content) {
+        for (String raw : content.split("\n")) {
+            String line = raw.trim();
+            if (line.isEmpty() || line.startsWith("#")) {
+                continue;
+            }
+
+            if (line.endsWith("!")) {
+                String pkg = line.substring(0, line.length() - 1).trim();
+                mGeneratePackages.add(pkg);
+                mPackageModes.put(pkg, Mode.GENERATE);
+            } else if (line.endsWith("?")) {
+                String pkg = line.substring(0, line.length() - 1).trim();
+                mHackPackages.add(pkg);
+                mPackageModes.put(pkg, Mode.LEAF_HACK);
+            } else {
+                mPackageModes.put(line, Mode.AUTO);
+            }
+        }
+    }
+
+    private void parseTargetsJson(String content) throws IOException {
+        try (JsonReader reader = new JsonReader(new StringReader(content))) {
+            reader.beginArray();
+            while (reader.hasNext()) {
+                reader.beginObject();
+                String pkg = null;
+                String modeStr = "AUTO";
+                while (reader.hasNext()) {
+                    String key = reader.nextName();
+                    if ("package".equals(key)) {
+                        pkg = reader.nextString();
+                    } else if ("mode".equals(key)) {
+                        modeStr = reader.nextString();
+                    } else {
+                        reader.skipValue();
+                    }
+                }
+                reader.endObject();
+                if (pkg == null) continue;
+                Mode mode;
+                try {
+                    mode = Mode.valueOf(modeStr.toUpperCase());
+                } catch (IllegalArgumentException e) {
+                    mode = Mode.AUTO;
+                }
+                mPackageModes.put(pkg, mode);
+                if (mode == Mode.LEAF_HACK) mHackPackages.add(pkg);
+                if (mode == Mode.GENERATE) mGeneratePackages.add(pkg);
+            }
+            reader.endArray();
+        }
+    }
+
+    public void refreshKeyBox() {
+        String raw = fetchFromAms(() -> ActivityManager.getService().getSpoofTrickyStoreKeyBox());
+        if (raw == null || raw.isEmpty()) {
+            mKeyBoxManager.clear();
+            mLastKeyboxFingerprint = null;
+            return;
+        }
+        String fingerprint = Integer.toHexString(raw.hashCode()) + ":" + raw.length();
+        if (fingerprint.equals(mLastKeyboxFingerprint)) {
+            return;
+        }
+        String xml = decodeKeybox(raw);
+        if (xml == null) {
+            Log.e(TAG, "Keybox payload not recognised as XML or base64-encoded XML");
+            return;
+        }
+        try {
+            mKeyBoxManager.parseKeybox(xml);
+            if (mKeyBoxManager.hasKeyboxes()) {
+                mLastKeyboxFingerprint = fingerprint;
+                Log.i(TAG, "Keybox updated successfully");
+            } else {
+                mLastKeyboxFingerprint = null;
+                Log.e(TAG, "Keybox parse produced no usable entries");
+            }
+        } catch (Exception e) {
+            mLastKeyboxFingerprint = null;
+            Log.e(TAG, "Failed to update keybox", e);
+        }
+    }
+
+    private String decodeKeybox(String payload) {
+        String trimmed = payload.trim();
+        if (trimmed.startsWith("<")) {
+            return trimmed;
+        }
+        try {
+            byte[] decoded = Base64.getDecoder().decode(trimmed);
+            String asXml = new String(decoded, StandardCharsets.UTF_8).trim();
+            if (asXml.startsWith("<")) {
+                return asXml;
+            }
+        } catch (IllegalArgumentException ignored) {
+        }
+        return null;
+    }
+
+    public void refreshPatchLevel() {
+        String content = fetchFromAms(() -> ActivityManager.getService().getSpoofTrickyStorePatch());
+        if (content == null || content.isEmpty()) {
+            mCustomPatchLevel = null;
+            return;
+        }
+
+        try {
+            String trimmed = content.trim();
+            if (trimmed.startsWith("{")) {
+                parsePatchJson(trimmed);
+            } else {
+                parsePatchText(trimmed);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse patch level", e);
+        }
+    }
+
+    private void parsePatchText(String content) {
+        StringBuilder filtered = new StringBuilder();
+        for (String raw : content.split("\n")) {
+            String line = raw.trim();
+            if (!line.isEmpty() && !line.startsWith("#")) {
+                filtered.append(line).append("\n");
+            }
+        }
+
+        String lines = filtered.toString().trim();
+        if (lines.isEmpty()) {
+            mCustomPatchLevel = null;
+            return;
+        }
+
+        String[] parts = lines.split("\n");
+        if (parts.length == 1 && !parts[0].contains("=")) {
+            mCustomPatchLevel = new CustomPatchLevel(parts[0], parts[0], parts[0], parts[0]);
+            return;
+        }
+
+        String system = null, vendor = null, boot = null, all = null;
+        for (String part : parts) {
+            int idx = part.indexOf('=');
+            if (idx > 0) {
+                String key = part.substring(0, idx).trim().toLowerCase();
+                String value = part.substring(idx + 1).trim();
+                switch (key) {
+                    case "system": system = value; break;
+                    case "vendor": vendor = value; break;
+                    case "boot": boot = value; break;
+                    case "all": all = value; break;
+                }
+            }
+        }
+        mCustomPatchLevel = new CustomPatchLevel(
+            system != null ? system : all,
+            vendor != null ? vendor : all,
+            boot != null ? boot : all,
+            all
+        );
+    }
+
+    private void parsePatchJson(String content) throws IOException {
+        String system = null, vendor = null, boot = null, all = null;
+        try (JsonReader reader = new JsonReader(new StringReader(content))) {
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String key = reader.nextName();
+                switch (key) {
+                    case "system": system = reader.nextString(); break;
+                    case "vendor": vendor = reader.nextString(); break;
+                    case "boot": boot = reader.nextString(); break;
+                    case "all": all = reader.nextString(); break;
+                    default: reader.skipValue(); break;
+                }
+            }
+            reader.endObject();
+        }
+        mCustomPatchLevel = new CustomPatchLevel(
+            system != null ? system : all,
+            vendor != null ? vendor : all,
+            boot != null ? boot : all,
+            all
+        );
+    }
+
+    private void ensureTeeStatus() {
+        if (mTeeBroken == null) {
+            synchronized (this) {
+                if (mTeeBroken == null) {
+                    mTeeBroken = checkTeeBroken();
+                    if (mTeeBroken) {
+                        AttestationUtils.setTeeBroken(true);
+                    }
+                }
+            }
+        }
+    }
+
+    private boolean checkTeeBroken() {
+        try {
+            String alias = "TrickyStoreTeeCheck";
+            KeyPairGenerator kpg = KeyPairGenerator.getInstance(
+                    KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
+            KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(
+                    alias, KeyProperties.PURPOSE_SIGN)
+                    .setAlgorithmParameterSpec(new ECGenParameterSpec("secp256r1"))
+                    .setDigests(KeyProperties.DIGEST_SHA256)
+                    .setAttestationChallenge(new byte[16]);
+
+            kpg.initialize(builder.build());
+            kpg.generateKeyPair();
+
+            KeyStore ks = KeyStore.getInstance("AndroidKeyStore");
+            ks.load(null);
+            ks.deleteEntry(alias);
+
+            Log.i(TAG, "TEE verification successful");
+            return false;
+        } catch (Exception e) {
+            Log.w(TAG, "TEE verification failed, TEE is broken", e);
+            return true;
+        }
+    }
+
+    public boolean needHack(int callingUid, String[] packages) {
+        if (packages == null) return false;
+        refreshTargets();
+        ensureTeeStatus();
+        for (String pkg : packages) {
+            Mode mode = mPackageModes.get(pkg);
+            if (mode == Mode.LEAF_HACK) return true;
+            if (mode == Mode.AUTO && !mTeeBroken) return true;
+        }
+        return false;
+    }
+
+    public boolean needGenerate(int callingUid, String[] packages) {
+        if (packages == null) return false;
+        refreshTargets();
+        ensureTeeStatus();
+        for (String pkg : packages) {
+            Mode mode = mPackageModes.get(pkg);
+            if (mode == Mode.GENERATE) return true;
+            if (mode == Mode.AUTO && mTeeBroken) return true;
+        }
+        return false;
+    }
+
+    public KeyBoxManager getKeyBoxManager() {
+        refreshKeyBox();
+        return mKeyBoxManager;
+    }
+
+    public CustomPatchLevel getCustomPatchLevel() {
+        refreshPatchLevel();
+        return mCustomPatchLevel;
+    }
+
+    public boolean hasKeyboxes() {
+        return mKeyBoxManager.hasKeyboxes();
+    }
+}
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 417b478e9f410..3d909e02a29fa 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -526,7 +526,7 @@ private static boolean sameCondition(ZenRule rule) {
     }
 
     private static int[] generateMinuteBuckets() {
-        final int maxHrs = 12;
+        final int maxHrs = 24;
         final int[] buckets = new int[maxHrs + 3];
         buckets[0] = 15;
         buckets[1] = 30;
diff --git a/core/java/android/speech/tts/TtsEngines.java b/core/java/android/speech/tts/TtsEngines.java
index a8aea7c1eb599..3859418de2174 100644
--- a/core/java/android/speech/tts/TtsEngines.java
+++ b/core/java/android/speech/tts/TtsEngines.java
@@ -498,7 +498,7 @@ static public String[] toOldLocaleStringFormat(Locale locale) {
      * specific preference in the list.
      */
     private static String parseEnginePrefFromList(String prefValue, String engineName) {
-        if (TextUtils.isEmpty(prefValue)) {
+        if (TextUtils.isEmpty(prefValue) || TextUtils.isEmpty(engineName)) {
             return null;
         }
 
@@ -507,7 +507,7 @@ private static String parseEnginePrefFromList(String prefValue, String engineNam
         for (String value : prefValues) {
             final int delimiter = value.indexOf(':');
             if (delimiter > 0) {
-                if (engineName.equals(value.substring(0, delimiter))) {
+                if ((value.substring(0, delimiter)).equals(engineName)) {
                     return value.substring(delimiter + 1);
                 }
             }
@@ -560,7 +560,7 @@ private String updateValueInCommaSeparatedList(String list, String key,
             for (String value : prefValues) {
                 final int delimiter = value.indexOf(':');
                 if (delimiter > 0) {
-                    if (key.equals(value.substring(0, delimiter))) {
+                    if (value.substring(0, delimiter).equals(key)) {
                         if (first) {
                             first = false;
                         } else {
diff --git a/core/java/android/util/DisplayUtils.java b/core/java/android/util/DisplayUtils.java
index cbb38a4ada31a..91562c5d3f5d9 100644
--- a/core/java/android/util/DisplayUtils.java
+++ b/core/java/android/util/DisplayUtils.java
@@ -16,8 +16,10 @@
 
 package android.util;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.view.Display;
+import android.view.DisplayInfo;
 
 import com.android.internal.R;
 
@@ -83,4 +85,20 @@ public static float getPhysicalPixelDisplaySizeRatio(
         final float heightRatio = (float) currentHeight / physicalHeight;
         return Math.min(widthRatio, heightRatio);
     }
+
+    /**
+     * Get the display size ratio for the current resolution vs the maximum supported
+     * resolution.
+     */
+    public static float getScaleFactor(Context context) {
+        DisplayInfo displayInfo = new DisplayInfo();
+        context.getDisplay().getDisplayInfo(displayInfo);
+        final Display.Mode maxDisplayMode =
+                getMaximumResolutionDisplayMode(displayInfo.supportedModes);
+        final float scaleFactor = getPhysicalPixelDisplaySizeRatio(
+                maxDisplayMode.getPhysicalWidth(), maxDisplayMode.getPhysicalHeight(),
+                displayInfo.getNaturalWidth(), displayInfo.getNaturalHeight());
+
+        return scaleFactor;
+    }
 }
diff --git a/core/java/android/util/EventLog.java b/core/java/android/util/EventLog.java
index 0dec1fabda0a6..a48c336f7b643 100644
--- a/core/java/android/util/EventLog.java
+++ b/core/java/android/util/EventLog.java
@@ -334,8 +334,6 @@ public int hashCode() {
         }
     }
 
-    // We assume that the native methods deal with any concurrency issues.
-
     /**
      * Record an event log message.
      * @param tag The event type tag code
@@ -343,7 +341,13 @@ public int hashCode() {
      * @return The number of bytes written
      */
     @RavenwoodRedirect
-    public static native int writeEvent(int tag, int value);
+    public static int writeEvent(int tag, int value) {
+        if (!Build.IS_ENG) {
+            return 0;
+        }
+
+        return nativeWriteEvent(tag, value);
+    }
 
     /**
      * Record an event log message.
@@ -352,7 +356,13 @@ public int hashCode() {
      * @return The number of bytes written
      */
     @RavenwoodRedirect
-    public static native int writeEvent(int tag, long value);
+    public static int writeEvent(int tag, long value) {
+        if (!Build.IS_ENG) {
+            return 0;
+        }
+
+        return nativeWriteEvent(tag, value);
+    }
 
     /**
      * Record an event log message.
@@ -361,7 +371,13 @@ public int hashCode() {
      * @return The number of bytes written
      */
     @RavenwoodRedirect
-    public static native int writeEvent(int tag, float value);
+    public static int writeEvent(int tag, float value) {
+        if (!Build.IS_ENG) {
+            return 0;
+        }
+
+        return nativeWriteEvent(tag, value);
+    }
 
     /**
      * Record an event log message.
@@ -370,7 +386,13 @@ public int hashCode() {
      * @return The number of bytes written
      */
     @RavenwoodRedirect
-    public static native int writeEvent(int tag, String str);
+    public static int writeEvent(int tag, String str) {
+        if (!Build.IS_ENG) {
+            return 0;
+        }
+
+        return nativeWriteEvent(tag, str);
+    }
 
     /**
      * Record an event log message.
@@ -379,7 +401,13 @@ public int hashCode() {
      * @return The number of bytes written
      */
     @RavenwoodRedirect
-    public static native int writeEvent(int tag, Object... list);
+    public static int writeEvent(int tag, Object... list) {
+        if (!Build.IS_ENG) {
+            return 0;
+        }
+
+        return nativeWriteEvent(tag, list);
+    }
 
     /**
      * Read events from the log, filtered by type.
@@ -388,8 +416,14 @@ public int hashCode() {
      * @throws IOException if something goes wrong reading events
      */
     @RavenwoodThrow
-    public static native void readEvents(int[] tags, Collection<Event> output)
-            throws IOException;
+    public static void readEvents(int[] tags, Collection<Event> output)
+            throws IOException {
+        if (!Build.IS_ENG) {
+            return;
+        }
+
+        nativeReadEvents(tags, output);
+    }
 
     /**
      * Read events from the log, filtered by type, blocking until logs are about to be overwritten.
@@ -401,7 +435,27 @@ public static native void readEvents(int[] tags, Collection<Event> output)
      */
     @SystemApi
     @RavenwoodThrow
-    public static native void readEventsOnWrapping(int[] tags, long timestamp,
+    public static void readEventsOnWrapping(int[] tags, long timestamp,
+            Collection<Event> output)
+            throws IOException {
+        if (!Build.IS_ENG) {
+            return;
+        }
+
+        nativeReadEventsOnWrapping(tags, timestamp, output);
+    }
+
+    // We assume that the native methods deal with any concurrency issues.
+
+    private static native int nativeWriteEvent(int tag, int value);
+    private static native int nativeWriteEvent(int tag, long value);
+    private static native int nativeWriteEvent(int tag, float value);
+    private static native int nativeWriteEvent(int tag, String str);
+    private static native int nativeWriteEvent(int tag, Object... list);
+
+    private static native void nativeReadEvents(int[] tags, Collection<Event> output)
+            throws IOException;
+    private static native void nativeReadEventsOnWrapping(int[] tags, long timestamp,
             Collection<Event> output)
             throws IOException;
 
diff --git a/core/java/android/util/PackageUtils.java b/core/java/android/util/PackageUtils.java
index c1ed19fef032b..4f8a1e3a7803b 100644
--- a/core/java/android/util/PackageUtils.java
+++ b/core/java/android/util/PackageUtils.java
@@ -178,8 +178,7 @@ private PackageUtils() {
      *          device, otherwise a byte array of size {@link #HIGH_RAM_BUFFER_SIZE_BYTES}
      */
     public static @NonNull byte[] createLargeFileBuffer() {
-        int bufferSize = ActivityManager.isLowRamDeviceStatic()
-                ? LOW_RAM_BUFFER_SIZE_BYTES : HIGH_RAM_BUFFER_SIZE_BYTES;
+        int bufferSize = LOW_RAM_BUFFER_SIZE_BYTES;
         return new byte[bufferSize];
     }
 
diff --git a/core/java/android/util/RecurrenceRule.java b/core/java/android/util/RecurrenceRule.java
index 9ef9c723ca278..fc373ee9c9ce4 100644
--- a/core/java/android/util/RecurrenceRule.java
+++ b/core/java/android/util/RecurrenceRule.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.net.ProtocolException;
 import java.time.Clock;
+import java.time.DayOfWeek;
 import java.time.LocalTime;
 import java.time.Period;
 import java.time.ZoneId;
@@ -80,6 +81,26 @@ public static RecurrenceRule buildRecurringMonthly(int dayOfMonth, ZoneId zone)
         return new RecurrenceRule(start, null, Period.ofMonths(1));
     }
 
+    @UnsupportedAppUsage
+    public static RecurrenceRule buildRecurringWeekly(int dayOfWeek, ZoneId zone) {
+        final ZonedDateTime now = ZonedDateTime.now(sClock).withZoneSameInstant(zone);
+        final DayOfWeek dayNow = now.getDayOfWeek();
+        final DayOfWeek dayStart = DayOfWeek.of(dayOfWeek);
+        final int minusDays = dayNow.getValue() - dayStart.getValue();
+        final ZonedDateTime start = ZonedDateTime.of(
+                now.toLocalDate().minusWeeks(1).minusDays(minusDays),
+                LocalTime.MIDNIGHT, zone);
+        return new RecurrenceRule(start, null, Period.ofWeeks(1));
+    }
+
+    @UnsupportedAppUsage
+    public static RecurrenceRule buildRecurringDaily(int hourOfDay, ZoneId zone) {
+        final ZonedDateTime now = ZonedDateTime.now(sClock).withZoneSameInstant(zone);
+        final ZonedDateTime start = ZonedDateTime.of(now.toLocalDate(),
+                LocalTime.MIDNIGHT.plusHours(hourOfDay), zone);
+        return new RecurrenceRule(start, null, Period.ofDays(1));
+    }
+
     private RecurrenceRule(Parcel source) {
         start = convertZonedDateTime(source.readString());
         end = convertZonedDateTime(source.readString());
@@ -168,6 +189,24 @@ public boolean isMonthly() {
                 && period.getDays() == 0;
     }
 
+    @UnsupportedAppUsage
+    public boolean isWeekly() {
+        return start != null
+                && period != null
+                && period.getYears() == 0
+                && period.getMonths() == 0
+                && period.getDays() == 7;
+    }
+
+    @UnsupportedAppUsage
+    public boolean isDaily() {
+        return start != null
+                && period != null
+                && period.getYears() == 0
+                && period.getMonths() == 0
+                && period.getDays() == 1;
+    }
+
     public Iterator<Range<ZonedDateTime>> cycleIterator() {
         if (period != null) {
             return new RecurringIterator();
diff --git a/core/java/android/util/TimingsTraceLog.java b/core/java/android/util/TimingsTraceLog.java
index b4f4729c82b27..9c3a02a5d3ead 100644
--- a/core/java/android/util/TimingsTraceLog.java
+++ b/core/java/android/util/TimingsTraceLog.java
@@ -37,7 +37,7 @@
 @android.ravenwood.annotation.RavenwoodKeepWholeClass
 public class TimingsTraceLog {
     // Debug boot time for every step if it's non-user build.
-    private static final boolean DEBUG_BOOT_TIME = !Build.IS_USER;
+    private static final boolean DEBUG_BOOT_TIME = false;
 
     // Maximum number of nested calls that are stored
     private static final int MAX_NESTED_CALLS = 10;
diff --git a/core/java/android/util/proto/ProtoFieldFilter.java b/core/java/android/util/proto/ProtoFieldFilter.java
index c3ae106b68f81..3a0e674ab9b68 100644
--- a/core/java/android/util/proto/ProtoFieldFilter.java
+++ b/core/java/android/util/proto/ProtoFieldFilter.java
@@ -307,7 +307,7 @@ private void skipBytes(InputStream in, long n) throws IOException {
             while (bytesRemaining > 0) {
                 int bytesToRead = (int) Math.min(bytesRemaining, mBuffer.length);
                 int bytesRead = in.read(mBuffer, 0, bytesToRead);
-                if (bytesRemaining < 0) {
+                if (bytesRead < 0) {
                     throw new IOException("EOF while skipping bytes");
                 }
                 bytesRemaining -= bytesRead;
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index 37782ac7f2f23..0352f4417b63a 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -226,6 +226,7 @@ public String toString() {
     private long mFrameIntervalNanos;
     private long mLastFrameIntervalNanos;
 
+    private boolean mEnableTraversalLast;
     private boolean mDebugPrintNextFrameTimeDelta;
     private int mFPSDivisor = 1;
     private final DisplayEventReceiver.VsyncEventData mLastVsyncEventData =
@@ -301,7 +302,8 @@ public void onWaitForBufferRelease(long durationNanos) {
      * @hide
      */
     private static final String[] CALLBACK_TRACE_TITLES = {
-            "input", "animation", "insets_animation", "traversal", "commit"
+            "input", "animation", "insets_animation", "traversal", "commit",
+            "traversal_last"
     };
 
     /**
@@ -352,7 +354,9 @@ public void onWaitForBufferRelease(long durationNanos) {
      */
     public static final int CALLBACK_COMMIT = 4;
 
-    private static final int CALLBACK_LAST = CALLBACK_COMMIT;
+    /** @hide */
+    public static final int CALLBACK_TRAVERSAL_LAST = 5;
+    private static final int CALLBACK_LAST = CALLBACK_TRAVERSAL_LAST;
 
     private Choreographer(Looper looper, int vsyncSource) {
         this(looper, vsyncSource, /* layerHandle */ 0L);
@@ -400,6 +404,14 @@ public static Choreographer getInstance() {
         return sThreadInstance.get();
     }
 
+    /** @hide */
+    public void setEnableTraversalLast(boolean enable) {
+        mEnableTraversalLast = enable;
+    }
+    /** @hide */
+    public boolean isEnableTraversalLast() {
+        return mEnableTraversalLast;
+    }
     /**
      * @hide
      * @deprecated Use vsync IDs with the regular Choreographer instead.
@@ -1163,6 +1175,9 @@ void doFrame(long frameTimeNanos, int frame,
             mFrameInfo.markPerformTraversalsStart();
             doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameIntervalNanos);
 
+            if (mEnableTraversalLast) {
+                doCallbacks(Choreographer.CALLBACK_TRAVERSAL_LAST, frameIntervalNanos);
+            }
             doCallbacks(Choreographer.CALLBACK_COMMIT, frameIntervalNanos);
         } finally {
             AnimationUtils.unlockAnimationClock();
diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java
index e3d2ad5282014..3960099bc82cb 100644
--- a/core/java/android/view/InputDevice.java
+++ b/core/java/android/view/InputDevice.java
@@ -355,6 +355,14 @@ public final class InputDevice implements Parcelable {
      */
     public static final int SOURCE_SENSOR = 0x04000000 | SOURCE_CLASS_NONE;
 
+    /**
+     * The input source is a specific virtual event sent from navigation bar.
+     *
+     * @see com.android.systemui.navigationbar.buttons.KeyButtonView#sendEvent()
+     * @hide
+     */
+    public static final int SOURCE_NAVIGATION_BAR = 0x06000000 | SOURCE_CLASS_BUTTON;
+
     /**
      * A special input source constant that is used when filtering input devices
      * to match devices that provide any type of input source.
diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java
index 746139ce695eb..4d14f841c47fb 100644
--- a/core/java/android/view/InputEventReceiver.java
+++ b/core/java/android/view/InputEventReceiver.java
@@ -227,7 +227,13 @@ public final void finishInputEvent(InputEvent event, boolean handled) {
             } else {
                 int seq = mSeqMap.valueAt(index);
                 mSeqMap.removeAt(index);
-                nativeFinishInputEvent(mReceiverPtr, seq, handled);
+                try {
+                    nativeFinishInputEvent(mReceiverPtr, seq, handled);
+                } catch (RuntimeException e) {
+                    // Just log the exception instead of crashing
+                    Log.w(TAG, "Exception in nativeFinishInputEvent: " + e.getMessage());
+                    return;
+                }
             }
         }
         event.recycleIfNeededAfterDispatch();
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index 3317ae60ec9b3..7d93ce08d32c3 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -1259,13 +1259,16 @@ public void hide(@InsetsType int types) {
 
     public void hide(@InsetsType int types, @Nullable ImeTracker.Token statsToken) {
         if ((types & ime()) != 0) {
-            ProtoLog.d(IME_INSETS_CONTROLLER, "hide(ime())");
-
-            if (statsToken == null) {
-                statsToken = ImeTracker.forLogging().onStart(ImeTracker.TYPE_HIDE,
-                        ImeTracker.ORIGIN_CLIENT,
-                        SoftInputShowHideReason.HIDE_SOFT_INPUT_BY_INSETS_API,
-                        mHost.isHandlingPointerEvent() /* fromUser */);
+            if ((mRequestedVisibleTypes & ime()) != 0
+                    || getAnimationType(ime()) == ANIMATION_TYPE_USER) {
+                ProtoLog.d(IME_INSETS_CONTROLLER, "hide(ime())");
+
+                if (statsToken == null) {
+                    statsToken = ImeTracker.forLogging().onStart(ImeTracker.TYPE_HIDE,
+                            ImeTracker.ORIGIN_CLIENT,
+                            SoftInputShowHideReason.HIDE_SOFT_INPUT_BY_INSETS_API,
+                            mHost.isHandlingPointerEvent() /* fromUser */);
+                }
             }
         }
         Trace.asyncTraceBegin(TRACE_TAG_VIEW, "IC.hideRequestFromApi", 0);
diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java
index f91ef7416a85b..b42961ffc08b9 100644
--- a/core/java/android/view/LayoutInflater.java
+++ b/core/java/android/view/LayoutInflater.java
@@ -39,6 +39,7 @@
 import android.widget.FrameLayout;
 
 import com.android.internal.R;
+import com.android.internal.util.ViewCacheManager;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -457,6 +458,35 @@ public View inflate(@LayoutRes int resource, @Nullable ViewGroup root, boolean a
                   + Integer.toHexString(resource) + ")");
         }
 
+        ViewCacheManager cache = ViewCacheManager.getInstance();
+        cache.recordLayoutRes(resource);
+        if (cache.isEnable()) {
+            View cached = cache.tryGet(resource);
+            if (cached != null) {
+                if (root != null) {
+                    try {
+                        XmlResourceParser parser = res.getLayout(resource);
+                        try {
+                            AttributeSet attrs = Xml.asAttributeSet(parser);
+                            advanceToRootNode(parser);
+                            ViewGroup.LayoutParams params = root.generateLayoutParams(attrs);
+                            if (!attachToRoot) {
+                                cached.setLayoutParams(params);
+                                return cached;
+                            }
+                            root.addView(cached, params);
+                            return root;
+                        } finally {
+                            parser.close();
+                        }
+                    } catch (Exception e) {
+                    }
+                } else {
+                    return cached;
+                }
+            }
+        }
+
         XmlResourceParser parser = res.getLayout(resource);
         try {
             return inflate(parser, root, attachToRoot);
@@ -689,67 +719,75 @@ public final View createView(@NonNull Context viewContext, @NonNull String name,
             throws ClassNotFoundException, InflateException {
         Objects.requireNonNull(viewContext);
         Objects.requireNonNull(name);
-        Constructor<? extends View> constructor = sConstructorMap.get(name);
-        if (constructor != null && !verifyClassLoader(constructor)) {
-            constructor = null;
-            sConstructorMap.remove(name);
-        }
+        String prefixedName = prefix != null ? (prefix + name) : name;
         Class<? extends View> clazz = null;
 
         try {
             Trace.traceBegin(Trace.TRACE_TAG_VIEW, name);
 
-            if (constructor == null) {
-                // Class not found in the cache, see if it's real, and try to add it
-                clazz = Class.forName(prefix != null ? (prefix + name) : name, false,
-                        mContext.getClassLoader()).asSubclass(View.class);
-
-                if (mFilter != null && clazz != null) {
-                    boolean allowed = mFilter.onLoadClass(clazz);
-                    if (!allowed) {
-                        failNotAllowed(name, prefix, viewContext, attrs);
-                    }
+            // Opportunistically create view directly instead of using reflection
+            View view = tryCreateViewDirect(prefixedName, viewContext, attrs);
+            if (view == null) {
+                Constructor<? extends View> constructor = sConstructorMap.get(name);
+                if (constructor != null && !verifyClassLoader(constructor)) {
+                    constructor = null;
+                    sConstructorMap.remove(name);
                 }
-                constructor = clazz.getConstructor(mConstructorSignature);
-                constructor.setAccessible(true);
-                sConstructorMap.put(name, constructor);
-            } else {
-                // If we have a filter, apply it to cached constructor
-                if (mFilter != null) {
-                    // Have we seen this name before?
-                    Boolean allowedState = mFilterMap.get(name);
-                    if (allowedState == null) {
-                        // New class -- remember whether it is allowed
-                        clazz = Class.forName(prefix != null ? (prefix + name) : name, false,
-                                mContext.getClassLoader()).asSubclass(View.class);
-
-                        boolean allowed = clazz != null && mFilter.onLoadClass(clazz);
-                        mFilterMap.put(name, allowed);
+
+                if (constructor == null) {
+                    // Class not found in the cache, see if it's real, and try to add it
+                    clazz = Class.forName(prefixedName, false,
+                            mContext.getClassLoader()).asSubclass(View.class);
+
+                    if (mFilter != null && clazz != null) {
+                        boolean allowed = mFilter.onLoadClass(clazz);
                         if (!allowed) {
                             failNotAllowed(name, prefix, viewContext, attrs);
                         }
-                    } else if (allowedState.equals(Boolean.FALSE)) {
-                        failNotAllowed(name, prefix, viewContext, attrs);
+                    }
+                    constructor = clazz.getConstructor(mConstructorSignature);
+                    constructor.setAccessible(true);
+                    sConstructorMap.put(name, constructor);
+                } else {
+                    // If we have a filter, apply it to cached constructor
+                    if (mFilter != null) {
+                        // Have we seen this name before?
+                        Boolean allowedState = mFilterMap.get(name);
+                        if (allowedState == null) {
+                            // New class -- remember whether it is allowed
+                            clazz = Class.forName(prefixedName, false,
+                                    mContext.getClassLoader()).asSubclass(View.class);
+
+                            boolean allowed = clazz != null && mFilter.onLoadClass(clazz);
+                            mFilterMap.put(name, allowed);
+                            if (!allowed) {
+                                failNotAllowed(name, prefix, viewContext, attrs);
+                            }
+                        } else if (allowedState.equals(Boolean.FALSE)) {
+                            failNotAllowed(name, prefix, viewContext, attrs);
+                        }
                     }
                 }
-            }
 
-            Object lastContext = mConstructorArgs[0];
-            mConstructorArgs[0] = viewContext;
-            Object[] args = mConstructorArgs;
-            args[1] = attrs;
+                Object lastContext = mConstructorArgs[0];
+                mConstructorArgs[0] = viewContext;
+                Object[] args = mConstructorArgs;
+                args[1] = attrs;
 
-            try {
-                final View view = constructor.newInstance(args);
-                if (view instanceof ViewStub) {
-                    // Use the same context when inflating ViewStub later.
-                    final ViewStub viewStub = (ViewStub) view;
-                    viewStub.setLayoutInflater(cloneInContext((Context) args[0]));
+                try {
+                    view = constructor.newInstance(args);
+                } finally {
+                    mConstructorArgs[0] = lastContext;
                 }
-                return view;
-            } finally {
-                mConstructorArgs[0] = lastContext;
             }
+
+            if (view instanceof ViewStub) {
+                // Use the same context when inflating ViewStub later.
+                final ViewStub viewStub = (ViewStub) view;
+                viewStub.setLayoutInflater(cloneInContext((Context) viewContext));
+            }
+
+            return view;
         } catch (NoSuchMethodException e) {
             final InflateException ie = new InflateException(
                     getParserStateDescription(viewContext, attrs)
@@ -1244,4 +1282,121 @@ protected void dispatchDraw(Canvas canvas) {
             }
         }
     }
+
+    // Some of the views included here are deprecated, but apps still use them.
+    @SuppressWarnings("deprecation")
+    private static View tryCreateViewDirect(String name, Context context, AttributeSet attributeSet) {
+        // This contains all the framework views used in a set of 113 real-world apps, sorted by
+        // number of occurrences. While views with only 1 occurrence are unlikely to be worth
+        // optimizing, it doesn't hurt to include them because switch-case is compiled into a table
+        // lookup after calling String#hashCode().
+        switch (name) {
+            case "android.widget.LinearLayout": // 13486 occurrences
+                return new android.widget.LinearLayout(context, attributeSet);
+            case "android.widget.View": // 6930 occurrences
+            case "android.webkit.View": // 63 occurrences
+            case "android.view.View": // 63 occurrences
+            case "android.app.View": // 62 occurrences
+                return new android.view.View(context, attributeSet);
+            case "android.widget.FrameLayout": // 6447 occurrences
+                return new android.widget.FrameLayout(context, attributeSet);
+            case "android.widget.ViewStub": // 5613 occurrences
+            case "android.view.ViewStub": // 228 occurrences
+            case "android.app.ViewStub": // 227 occurrences
+            case "android.webkit.ViewStub": // 226 occurrences
+                return new android.view.ViewStub(context, attributeSet);
+            case "android.widget.TextView": // 4722 occurrences
+                return new android.widget.TextView(context, attributeSet);
+            case "android.widget.ImageView": // 3044 occurrences
+                return new android.widget.ImageView(context, attributeSet);
+            case "android.widget.RelativeLayout": // 2665 occurrences
+                return new android.widget.RelativeLayout(context, attributeSet);
+            case "android.widget.Space": // 1694 occurrences
+                return new android.widget.Space(context, attributeSet);
+            case "android.widget.ProgressBar": // 770 occurrences
+                return new android.widget.ProgressBar(context, attributeSet);
+            case "android.widget.Button": // 382 occurrences
+                return new android.widget.Button(context, attributeSet);
+            case "android.widget.ImageButton": // 265 occurrences
+                return new android.widget.ImageButton(context, attributeSet);
+            case "android.widget.Switch": // 145 occurrences
+                return new android.widget.Switch(context, attributeSet);
+            case "android.widget.DateTimeView": // 117 occurrences
+                return new android.widget.DateTimeView(context, attributeSet);
+            case "android.widget.Toolbar": // 86 occurrences
+                return new android.widget.Toolbar(context, attributeSet);
+            case "android.widget.HorizontalScrollView": // 68 occurrences
+                return new android.widget.HorizontalScrollView(context, attributeSet);
+            case "android.widget.ScrollView": // 67 occurrences
+                return new android.widget.ScrollView(context, attributeSet);
+            case "android.widget.NotificationHeaderView": // 65 occurrences
+            case "android.webkit.NotificationHeaderView": // 65 occurrences
+            case "android.view.NotificationHeaderView": // 65 occurrences
+            case "android.app.NotificationHeaderView": // 65 occurrences
+                return new android.view.NotificationHeaderView(context, attributeSet);
+            case "android.widget.ListView": // 58 occurrences
+                return new android.widget.ListView(context, attributeSet);
+            case "android.widget.QuickContactBadge": // 50 occurrences
+                return new android.widget.QuickContactBadge(context, attributeSet);
+            case "android.widget.SeekBar": // 40 occurrences
+                return new android.widget.SeekBar(context, attributeSet);
+            case "android.widget.CheckBox": // 38 occurrences
+                return new android.widget.CheckBox(context, attributeSet);
+            case "android.widget.GridLayout": // 16 occurrences
+                return new android.widget.GridLayout(context, attributeSet);
+            case "android.widget.TableRow": // 15 occurrences
+                return new android.widget.TableRow(context, attributeSet);
+            case "android.widget.RadioGroup": // 15 occurrences
+                return new android.widget.RadioGroup(context, attributeSet);
+            case "android.widget.Chronometer": // 15 occurrences
+                return new android.widget.Chronometer(context, attributeSet);
+            case "android.widget.ViewFlipper": // 13 occurrences
+                return new android.widget.ViewFlipper(context, attributeSet);
+            case "android.widget.Spinner": // 9 occurrences
+                return new android.widget.Spinner(context, attributeSet);
+            case "android.widget.ViewSwitcher": // 8 occurrences
+                return new android.widget.ViewSwitcher(context, attributeSet);
+            case "android.widget.TextSwitcher": // 8 occurrences
+                return new android.widget.TextSwitcher(context, attributeSet);
+            case "android.widget.SurfaceView": // 8 occurrences
+            case "android.webkit.SurfaceView": // 1 occurrence
+            case "android.view.SurfaceView": // 1 occurrence
+            case "android.app.SurfaceView": // 1 occurrence
+                return new android.view.SurfaceView(context, attributeSet);
+            case "android.widget.CheckedTextView": // 8 occurrences
+                return new android.widget.CheckedTextView(context, attributeSet);
+            case "android.preference.PreferenceFrameLayout": // 8 occurrences
+                return new android.preference.PreferenceFrameLayout(context, attributeSet);
+            case "android.widget.TwoLineListItem": // 7 occurrences
+                return new android.widget.TwoLineListItem(context, attributeSet);
+            case "android.widget.TableLayout": // 5 occurrences
+                return new android.widget.TableLayout(context, attributeSet);
+            case "android.widget.EditText": // 5 occurrences
+                return new android.widget.EditText(context, attributeSet);
+            case "android.widget.TabWidget": // 3 occurrences
+                return new android.widget.TabWidget(context, attributeSet);
+            case "android.widget.TabHost": // 3 occurrences
+                return new android.widget.TabHost(context, attributeSet);
+            case "android.widget.ZoomButton": // 2 occurrences
+                return new android.widget.ZoomButton(context, attributeSet);
+            case "android.widget.TextureView": // 2 occurrences
+            case "android.webkit.TextureView": // 2 occurrences
+            case "android.app.TextureView": // 2 occurrences
+            case "android.view.TextureView": // 2 occurrences
+                return new android.view.TextureView(context, attributeSet);
+            case "android.widget.ExpandableListView": // 2 occurrences
+                return new android.widget.ExpandableListView(context, attributeSet);
+            case "android.widget.ViewAnimator": // 1 occurrence
+                return new android.widget.ViewAnimator(context, attributeSet);
+            case "android.widget.TextClock": // 1 occurrence
+                return new android.widget.TextClock(context, attributeSet);
+            case "android.widget.AutoCompleteTextView": // 1 occurrence
+                return new android.widget.AutoCompleteTextView(context, attributeSet);
+            case "android.widget.WebView": // 1 occurrence
+            case "android.webkit.WebView": // 1 occurrence
+                return new android.webkit.WebView(context, attributeSet);
+        }
+
+        return null;
+    }
 }
diff --git a/core/java/android/view/SurfaceControlViewHost.java b/core/java/android/view/SurfaceControlViewHost.java
index c26506eafe998..3242716bd8b9c 100644
--- a/core/java/android/view/SurfaceControlViewHost.java
+++ b/core/java/android/view/SurfaceControlViewHost.java
@@ -511,8 +511,10 @@ public void setView(@NonNull View view, @NonNull WindowManager.LayoutParams attr
         attrs.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
         addWindowToken(attrs);
         view.setLayoutParams(attrs);
-        mViewRoot.setView(view, attrs, null);
-        mViewRoot.setBackKeyCallbackForWindowlessWindow(mWm::forwardBackKeyToParent);
+        if (mViewRoot.mDisplay != null) {
+            mViewRoot.setView(view, attrs, null);
+            mViewRoot.setBackKeyCallbackForWindowlessWindow(mWm::forwardBackKeyToParent);
+        }
     }
 
     /**
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 49a7da2d88ed8..c3da50d5a1493 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -52,6 +52,7 @@
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.AttributeSet;
@@ -953,7 +954,9 @@ public boolean setZOrderedOnTop(boolean onTop, boolean allowDynamicChange) {
      * @param isSecure True if the surface view is secure.
      */
     public void setSecure(boolean isSecure) {
-        if (isSecure) {
+        boolean ignoreSecure = Settings.Global.getInt(getContext().getContentResolver(),
+                Settings.Global.WINDOW_IGNORE_SECURE, 0) == 1;
+        if (isSecure && !ignoreSecure) {
             mSurfaceFlags |= SurfaceControl.SECURE;
         } else {
             mSurfaceFlags &= ~SurfaceControl.SECURE;
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index c3f4071aa82ea..7c87a40fd5a4a 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -158,6 +158,18 @@ public final class ThreadedRenderer extends HardwareRenderer {
      */
     public static final String OVERDRAW_PROPERTY_SHOW = "show";
 
+    /**
+     * Defines the rendering pipeline to be used by the ThreadedRenderer.
+     *
+     * Possible values:
+     * "opengl", will use the existing OpenGL renderer
+     * "skiagl", will use Skia's OpenGL renderer
+     * "skiavk", will use Skia's Vulkan renderer
+     *
+     * @hide
+     */
+    public static final String DEBUG_RENDERER_PROPERTY = "debug.hwui.renderer";
+
     /**
      * Turn on to debug non-rectangular clip operations.
      *
diff --git a/core/java/android/view/ViewBackgroundThread.java b/core/java/android/view/ViewBackgroundThread.java
new file mode 100644
index 0000000000000..bf7a0ae303e3e
--- /dev/null
+++ b/core/java/android/view/ViewBackgroundThread.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.view;
+
+import android.os.Handler;
+import android.os.HandlerExecutor;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+
+import java.util.concurrent.Executor;
+
+/**
+ * @hide
+ */
+public final class ViewBackgroundThread extends HandlerThread {
+    private static final long SLOW_DELIVERY_THRESHOLD_MS = 30000;
+    private static final long SLOW_DISPATCH_THRESHOLD_MS = 10000;
+    private static volatile Handler sHandler;
+    private static HandlerExecutor sHandlerExecutor;
+    private static volatile ViewBackgroundThread sInstance;
+
+    private ViewBackgroundThread() {
+        super("view.bg", Process.THREAD_PRIORITY_BACKGROUND);
+    }
+
+    private static void ensureThreadLocked() {
+        if (sInstance == null) {
+            sInstance = new ViewBackgroundThread();
+            sInstance.start();
+        }
+        if (sHandler == null) {
+            Looper looper = sInstance.getLooper();
+            looper.setSlowLogThresholdMs(SLOW_DISPATCH_THRESHOLD_MS,
+                    SLOW_DELIVERY_THRESHOLD_MS);
+            sHandler = new Handler(sInstance.getLooper());
+            sHandlerExecutor = new HandlerExecutor(sHandler);
+        }
+    }
+
+    public static void init() {
+        synchronized (ViewBackgroundThread.class) {
+            if (sInstance == null) {
+                sInstance = new ViewBackgroundThread();
+                sInstance.start();
+            }
+        }
+    }
+
+    public static ViewBackgroundThread get() {
+        synchronized (ViewBackgroundThread.class) {
+            ensureThreadLocked();
+            return sInstance;
+        }
+    }
+
+    public static Handler getHandler() {
+        synchronized (ViewBackgroundThread.class) {
+            ensureThreadLocked();
+            return sHandler;
+        }
+    }
+
+    public static Executor getExecutor() {
+        synchronized (ViewBackgroundThread.class) {
+            ensureThreadLocked();
+            return sHandlerExecutor;
+        }
+    }
+}
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index f070d87ef354c..afd7abfd7fe4f 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -267,7 +267,7 @@ public class ViewConfiguration {
      * The coefficient of friction applied to flings/scrolls.
      */
     @UnsupportedAppUsage
-    private static final float SCROLL_FRICTION = 0.015f;
+    private static final float SCROLL_FRICTION = 0.012f;
 
     /**
      * Max distance in dips to overscroll for edge effects
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index fa1c190eb4e2b..e47bc28382956 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -297,6 +297,7 @@
 import com.android.internal.policy.PhoneFallbackEventHandler;
 import com.android.internal.protolog.ProtoLog;
 import com.android.internal.util.FastPrintWriter;
+import com.android.internal.util.ViewCacheManager;
 import com.android.internal.view.BaseSurfaceHolder;
 import com.android.internal.view.RootViewSurfaceTaker;
 import com.android.internal.view.SurfaceCallbackHelper;
@@ -642,6 +643,7 @@ default void onConfigurationChanged(@NonNull Configuration overrideConfig,
     private boolean mPendingDragResizing;
     private boolean mDragResizing;
     private boolean mInvalidateRootRequested;
+    private boolean mFirstFrameDrawn = true;
     private int mCanvasOffsetX;
     private int mCanvasOffsetY;
     CompatibilityInfo.Translator mTranslator;
@@ -723,6 +725,9 @@ default void onConfigurationChanged(@NonNull Configuration overrideConfig,
     public boolean mTraversalScheduled;
     int mTraversalBarrier;
     boolean mWillDrawSoon;
+    private boolean mIsNeedDrawLast = false;
+    private boolean mResident = false;
+    private boolean mHideByCache = false;
     /** Set to true while in performTraversals for detecting when die(true) is called from internal
      * callbacks such as onMeasure, onPreDraw, onDraw and deferring doDie() until later. */
     boolean mIsInTraversal;
@@ -816,7 +821,6 @@ public static final class NoPreloadHolder {
      */
     private Transaction mPendingTransaction = new Transaction();
 
-
     boolean mIsDrawing;
     int mLastSystemUiVisibility;
     int mClientWindowLayoutFlags;
@@ -1074,7 +1078,6 @@ public HandwritingInitiator getHandwritingInitiator() {
      */
     private SurfaceSyncGroup mActiveSurfaceSyncGroup;
 
-
     private final Object mPreviousSyncSafeguardLock = new Object();
 
     /**
@@ -1266,7 +1269,12 @@ public void onCornerRadiiChanged(float[] cornerRadii) {
 
     private static boolean sToolkitEnableInvalidateCheckThreadFlagValue =
             Flags.enableInvalidateCheckThread();
-    private static final boolean sEnableVrr = ViewProperties.vrr_enabled().orElse(true);
+    // Disable VRR feature to meet power expectations.
+    // VRR wakes up the idle device after 750ms timeout. This bounds Display and GPU to
+    // wake up as well, leading to higher power consumption during idling.
+    // Disable VRR to avoid this extra wakeup call as it can cause power regression.
+    // Google bug: https://partnerissuetracker.corp.google.com/u/0/issues/409971466
+    private static final boolean sEnableVrr = false;
     private static final boolean sToolkitInitialTouchBoostFlagValue = toolkitInitialTouchBoost();
     private static boolean sToolkitFrameRateDebugFlagValue =  toolkitFrameRateDebug();
 
@@ -1553,8 +1561,12 @@ public void setView(View view, WindowManager.LayoutParams attrs, View panelParen
                     attrs.setSurfaceInsets(view, false /*manual*/, true /*preservePrevious*/);
                 }
 
-                CompatibilityInfo compatibilityInfo =
-                        mDisplay.getDisplayAdjustments().getCompatibilityInfo();
+                CompatibilityInfo compatibilityInfo;
+                if (mDisplay != null) {
+                    compatibilityInfo = mDisplay.getDisplayAdjustments().getCompatibilityInfo();
+                } else {
+                    compatibilityInfo = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
+                }
                 mTranslator = compatibilityInfo.getTranslator();
 
                 // If the application owns the surface, don't enable hardware acceleration
@@ -1708,9 +1720,13 @@ && hasSystemApplicationOverlayAppOp()) {
                                     + mWindow + " -- another window of type "
                                     + mWindowAttributes.type + " already exists");
                         case WindowManagerGlobal.ADD_PERMISSION_DENIED:
-                            throw new WindowManager.BadTokenException("Unable to add window "
-                                    + mWindow + " -- permission denied for window type "
-                                    + mWindowAttributes.type);
+                            if (com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+                                return;
+                            } else {
+                                throw new WindowManager.BadTokenException("Unable to add window "
+                                        + mWindow + " -- permission denied for window type "
+                                        + mWindowAttributes.type);
+                            }
                         case WindowManagerGlobal.ADD_INVALID_DISPLAY:
                             throw new WindowManager.InvalidDisplayException("Unable to add window "
                                     + mWindow + " -- the specified display can not be found");
@@ -1818,7 +1834,6 @@ private void registerListeners() {
         mAccessibilityManager.addHighContrastTextStateChangeListener(
                 mExecutor, mHighContrastTextManager);
 
-
         long eventsToBeRegistered =
                 (mIsSubscribeGranularDisplayEventsEnabled)
                 ? DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_ADDED
@@ -2368,6 +2383,20 @@ private void handleResized(ClientWindowFrames frames, boolean reportDraw,
             return;
         }
 
+        if (reportDraw && forceLayout && seqId > mSyncSeqId) {
+            final boolean noSizeChange = !frameChanged && !attachedFrameChanged
+                    && !dragResizingChanged && !compatScaleChanged;
+            final boolean noConfigOrDisplayChange = !configChanged && !displayChanged;
+            if (noSizeChange && noConfigOrDisplayChange
+                    && mBasePackageName != null
+                    && mBasePackageName.startsWith("com.android.launcher")) {
+                mSyncSeqId = seqId;
+                mLastSyncSeqId = mSyncSeqId;
+                reportNextDraw("resized");
+                requestLayout();
+                return;
+            }
+        }
         mPendingDragResizing = dragResizing;
         mTmpFrames.compatScale = compatScale;
         mInvCompatScale = 1f / compatScale;
@@ -2769,7 +2798,6 @@ void setWindowStopped(boolean stopped) {
         logColorMode(mCurrentColorMode, true);
     }
 
-
     /** Register callbacks to be notified when the ViewRootImpl surface changes. */
     public interface SurfaceChangedCallback {
         void surfaceCreated(Transaction t);
@@ -3104,8 +3132,13 @@ void scheduleTraversals() {
             // the scheduled traversals have occurred unless the message is
             // specifically "asynchronous" - see Message#setAsynchronous
             mTraversalBarrier = mQueue.postSyncBarrier();
-            mChoreographer.postCallback(
-                    Choreographer.CALLBACK_TRAVERSAL, mTraversalRunnable, null);
+            if (mIsNeedDrawLast && mChoreographer.isEnableTraversalLast()) {
+                mChoreographer.postCallback(
+                        Choreographer.CALLBACK_TRAVERSAL_LAST, mTraversalRunnable, null);
+            } else {
+                mChoreographer.postCallback(
+                        Choreographer.CALLBACK_TRAVERSAL, mTraversalRunnable, null);
+            }
             notifyRendererOfFramePending();
             pokeDrawLockIfNeeded();
         }
@@ -3115,8 +3148,13 @@ void unscheduleTraversals() {
         if (mTraversalScheduled) {
             mTraversalScheduled = false;
             mQueue.removeSyncBarrier(mTraversalBarrier);
-            mChoreographer.removeCallbacks(
-                    Choreographer.CALLBACK_TRAVERSAL, mTraversalRunnable, null);
+            if (mIsNeedDrawLast && mChoreographer.isEnableTraversalLast()) {
+                mChoreographer.removeCallbacks(
+                        Choreographer.CALLBACK_TRAVERSAL_LAST, mTraversalRunnable, null);
+            } else {
+                mChoreographer.removeCallbacks(
+                        Choreographer.CALLBACK_TRAVERSAL, mTraversalRunnable, null);
+            }
         }
     }
 
@@ -3125,9 +3163,54 @@ void doTraversal() {
             mTraversalScheduled = false;
             mQueue.removeSyncBarrier(mTraversalBarrier);
             performTraversals();
+            if (mFirstFrameDrawn) {
+                ViewCacheManager.getInstance().onTraversalEnd(this);
+                mFirstFrameDrawn = false;
+            }
         }
     }
 
+    public void setIsNeedDrawLast(boolean isNeed) {
+        mIsNeedDrawLast = isNeed;
+    }
+    public boolean isNeedDrawLast() {
+        return mIsNeedDrawLast;
+    }
+    public void setResident(boolean resident) {
+        mResident = resident;
+    }
+    public boolean isResident() {
+        return mResident;
+    }
+    public boolean setHideByCache(boolean hideByCache) {
+        if (!mResident) {
+            return false;
+        }
+        if (hideByCache && mView != null && mView.getContext() instanceof android.app.Activity
+                && ((android.app.Activity) mView.getContext()).isFinishing()) {
+            return false;
+        }
+        if (mHideByCache == hideByCache) {
+            return hideByCache;
+        }
+        mHideByCache = hideByCache;
+        final ThreadedRenderer renderer = mAttachInfo.mThreadedRenderer;
+        if (!hideByCache) {
+            mForceNextWindowRelayout = true;
+            mReportNextDraw = true;
+            mLastReportNextDrawReason = "rebuiltByCache";
+            scheduleTraversals();
+        } else if (renderer != null) {
+            renderer.setStopped(true);
+        }
+        if (!hideByCache && renderer != null) {
+            renderer.allocateBuffers();
+        }
+        return hideByCache;
+    }
+    public boolean isHideByCache() {
+        return mHideByCache;
+    }
     private void applyKeepScreenOnFlag(WindowManager.LayoutParams params) {
         // Update window's global keep screen on flag: if a view has requested
         // that the screen be kept on, then it is always set; otherwise, it is
@@ -6760,7 +6843,9 @@ private void performConfigurationChange(@NonNull MergedConfiguration mergedConfi
                         + ", globalConfig: " + globalConfig
                         + ", overrideConfig: " + overrideConfig);
 
-        final CompatibilityInfo ci = mDisplay.getDisplayAdjustments().getCompatibilityInfo();
+        final CompatibilityInfo ci = mDisplay != null
+                ? mDisplay.getDisplayAdjustments().getCompatibilityInfo()
+                : CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
         if (!ci.equals(CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO)) {
             globalConfig = new Configuration(globalConfig);
             overrideConfig = new Configuration(overrideConfig);
@@ -8011,6 +8096,11 @@ private int processMotionEvent(QueuedInputEvent q) {
         private int processPointerEvent(QueuedInputEvent q) {
             final MotionEvent event = (MotionEvent)q.mEvent;
 
+            if (event.getPointerCount() == 3 && isThreeFingersSwipeActive()) {
+                event.setAction(MotionEvent.ACTION_CANCEL);
+                Log.d(mTag, "canceling motionEvent because of threeGesture detecting");
+            }
+
             // Translate the pointer event for compatibility, if needed.
             if (mTranslator != null) {
                 mTranslator.translateEventInScreenToAppWindow(event);
@@ -8472,7 +8562,6 @@ public boolean isHandlingPointerEvent() {
         return mAttachInfo.mHandlingPointerEvent;
     }
 
-
     /**
      * If there is pointer that is showing a PointerIcon in this window, refresh the icon for that
      * pointer. This will resolve the PointerIcon through the view hierarchy.
@@ -11296,7 +11385,6 @@ public boolean requestSendAccessibilityEvent(View child, AccessibilityEvent even
                 }
             } break;
 
-
             case AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED: {
                 handleWindowContentChangedEvent(event);
             } break;
@@ -13265,7 +13353,6 @@ public void setChildBoundingInsets(@NonNull Rect insets) {
         scheduleTraversals();
     }
 
-
     private void logAndTrace(String msg) {
         if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
             Trace.instant(Trace.TRACE_TAG_VIEW, mTag + "-" + msg);
@@ -13314,7 +13401,6 @@ private void setCategoryFromCategoryCounts() {
                     mFrameRateCategoryHighCount = FRAME_RATE_CATEGORY_COUNT;
         }
 
-
         if (mFrameRateCategoryHighCount > 0) {
             mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_HIGH;
         } else if (mFrameRateCategoryHighHintCount > 0) {
@@ -13824,4 +13910,13 @@ private void preInitBufferAllocator() {
     public Choreographer getChoreographer() {
         return mChoreographer;
     }
+
+    private boolean isThreeFingersSwipeActive() {
+        try {
+            return ActivityManager.getService().isThreeFingersSwipeActive();
+        } catch (RemoteException e) {
+            Log.e(mTag, "isThreeFingersSwipeActive exception", e);
+            return false;
+        }
+    }
 }
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index e849926e9375e..fc2c33b439ec5 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -20,6 +20,7 @@
 import static android.Manifest.permission.HIDE_OVERLAY_WINDOWS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
 import android.annotation.ColorInt;
@@ -52,6 +53,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.provider.Settings;
 import android.transition.Scene;
 import android.transition.Transition;
 import android.transition.TransitionManager;
@@ -1364,6 +1366,10 @@ public void clearFlags(int flags) {
      * @see #clearFlags
      */
     public void setFlags(int flags, int mask) {
+        if ((mask & FLAG_SECURE) != 0 && Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.WINDOW_IGNORE_SECURE, 0) == 1) {
+            mask &= ~FLAG_SECURE;
+        }
         final WindowManager.LayoutParams attrs = getAttributes();
         attrs.flags = (attrs.flags&~mask) | (flags&mask);
         mForcedWindowFlags |= mask;
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index a64e9fa56993b..e563d1781b45a 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -40,6 +40,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.provider.Settings;
 import android.util.AndroidRuntimeException;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -480,6 +481,14 @@ public void addView(View view, ViewGroup.LayoutParams params,
                         windowlessSession, new WindowlessWindowLayout());
             }
 
+            boolean ignoreSecure = Settings.Global.getInt(
+                    view.getContext().getContentResolver(),
+                    Settings.Global.WINDOW_IGNORE_SECURE, 0) == 1;
+
+            if (ignoreSecure) {
+                wparams.flags &= ~WindowManager.LayoutParams.FLAG_SECURE;
+            }
+
             view.setLayoutParams(wparams);
 
             mViews.add(view);
@@ -510,6 +519,14 @@ public void updateViewLayout(View view, ViewGroup.LayoutParams params) {
             throw new IllegalArgumentException("Params must be WindowManager.LayoutParams");
         }
 
+        boolean ignoreSecure = Settings.Global.getInt(
+                view.getContext().getContentResolver(),
+                Settings.Global.WINDOW_IGNORE_SECURE, 0) == 1;
+
+        if (ignoreSecure) {
+            wparams.flags &= ~WindowManager.LayoutParams.FLAG_SECURE;
+        }
+
         view.setLayoutParams(wparams);
 
         synchronized (mLock) {
diff --git a/core/java/android/view/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java
index dbb68372ab985..19463738dac82 100644
--- a/core/java/android/view/animation/AnimationUtils.java
+++ b/core/java/android/view/animation/AnimationUtils.java
@@ -30,13 +30,17 @@
 import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.ravenwood.annotation.RavenwoodIgnore;
 import android.ravenwood.annotation.RavenwoodKeepPartialClass;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.util.TimeUtils;
 import android.util.Xml;
 import android.view.InflateException;
 
+import com.android.internal.R;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -56,6 +60,10 @@ public class AnimationUtils {
      */
     private static final int TOGETHER = 0;
     private static final int SEQUENTIALLY = 1;
+    
+    /** @hide **/
+    public static final boolean sPerfAnimEnabled = SystemProperties.getBoolean(
+            "persist.sys.activity_anim_perf_override", false);
 
     private static boolean sExpectedPresentationTimeFlagValue;
     static {
@@ -109,9 +117,7 @@ public static void lockAnimationClock(long vsyncMillis, long expectedPresentatio
         AnimationState state = sAnimationState.get();
         state.animationClockLocked = true;
         state.currentVsyncTimeMillis = vsyncMillis;
-        if (!sExpectedPresentationTimeFlagValue) {
-            state.mExpectedPresentationTimeNanos = expectedPresentationTimeNanos;
-        }
+        state.mExpectedPresentationTimeNanos = expectedPresentationTimeNanos;
     }
 
     /**
@@ -158,7 +164,9 @@ public static void lockAnimationClock(long vsyncMillis) {
     @TestApi
     @RavenwoodIgnore
     public static void unlockAnimationClock() {
-        sAnimationState.get().animationClockLocked = false;
+        AnimationState state = sAnimationState.get();
+        state.animationClockLocked = false;
+        state.mExpectedPresentationTimeNanos = 0L;
     }
 
     /**
@@ -193,11 +201,13 @@ public static long currentAnimationTimeMillis() {
     @FlaggedApi(FLAG_EXPECTED_PRESENTATION_TIME_READ_ONLY)
     public static long getExpectedPresentationTimeNanos() {
         if (!sExpectedPresentationTimeFlagValue) {
-            return SystemClock.uptimeMillis() * TimeUtils.NANOS_PER_MS;
+            return System.nanoTime();
         }
 
         AnimationState state = sAnimationState.get();
-        return state.mExpectedPresentationTimeNanos;
+        return (state.mExpectedPresentationTimeNanos != 0L)
+                ? state.mExpectedPresentationTimeNanos
+                : System.nanoTime();
     }
 
     /**
@@ -224,6 +234,21 @@ public static long getExpectedPresentationTimeMillis() {
     public static Animation loadAnimation(Context context, @AnimRes int id)
             throws NotFoundException {
 
+        if (sPerfAnimEnabled) {
+            switch (id) {
+                case R.anim.activity_open_enter:
+                    return ActivityAnimations.getOpenEnter();
+                case R.anim.activity_open_exit:
+                    return ActivityAnimations.getOpenExit();
+                case R.anim.activity_close_enter:
+                    return ActivityAnimations.getCloseEnter();
+                case R.anim.activity_close_exit:
+                    return ActivityAnimations.getCloseExit();
+                case R.anim.app_starting_exit:
+                    return ActivityAnimations.getAppStartingExit();
+            }
+        }
+
         XmlResourceParser parser = null;
         try {
             parser = context.getResources().getAnimation(id);
@@ -504,4 +529,159 @@ private static Interpolator createInterpolatorFromXml(
         }
         return interpolator;
     }
+
+    /** @hide */
+    public final class ActivityAnimations {
+
+        private static Animation sOpenEnter;
+        private static Animation sOpenExit;
+        private static Animation sCloseEnter;
+        private static Animation sCloseExit;
+        private static Animation sAppStartingExit;
+
+        private static SpringInterpolator sSpatialSpec;
+        private static SpringInterpolator sEffectsSpec;
+
+        private static final float DISTANCE = 0.333f;
+        private static final long APP_STARTING_EXIT_DURATION_MS = 150L;
+
+        private ActivityAnimations() {}
+
+        /** @hide */
+        public static void preload() {
+            sSpatialSpec = new SpringInterpolator(0.8f, 380f);
+            sEffectsSpec = new SpringInterpolator(1.0f, 3800f);
+            sOpenEnter = new ActivityAnimFactory()
+                    .fromX(1.0f)
+                    .toX(0.0f)
+                    .build();
+            sOpenExit = new ActivityAnimFactory()
+                    .fromX(0.0f)
+                    .toX(-DISTANCE)
+                    .build();
+            sCloseEnter = new ActivityAnimFactory()
+                        .fromX(-DISTANCE)
+                        .toX(0.0f)
+                        .build();
+            sCloseExit = new ActivityAnimFactory()
+                        .fromX(0.0f)
+                        .toX(1.0f)
+                        .build();
+            sAppStartingExit = buildAppStartingExit();
+        }
+
+        private static Animation buildAppStartingExit() {
+            Animation animation = new AlphaAnimation(1.0f, 0.0f);
+            animation.setDuration(APP_STARTING_EXIT_DURATION_MS);
+            animation.setInterpolator(new LinearInterpolator());
+            return animation;
+        }
+
+        private static class ActivityAnimFactory {
+            private float fromX = 0f, toX = 0f;
+
+            public ActivityAnimFactory fromX(float ratio) {
+                this.fromX = ratio;
+                return this;
+            }
+
+            public ActivityAnimFactory toX(float ratio) {
+                this.toX = ratio;
+                return this;
+            }
+
+            public Animation build() {
+                AnimationSet animationSet = new AnimationSet(false);
+                TranslateAnimation slide = new TranslateAnimation(
+                        Animation.RELATIVE_TO_SELF, fromX,
+                        Animation.RELATIVE_TO_SELF, toX,
+                        Animation.RELATIVE_TO_SELF, 0f,
+                        Animation.RELATIVE_TO_SELF, 0f
+                );
+                slide.setDuration(sSpatialSpec.getDurationMs());
+                slide.setInterpolator(sSpatialSpec);
+                animationSet.addAnimation(slide);
+                return animationSet;
+            }
+        }
+
+        /** @hide */
+        public static Animation getOpenEnter() {
+            return sOpenEnter;
+        }
+
+        /** @hide */
+        public static Animation getOpenExit() {
+            return sOpenExit;
+        }
+
+        /** @hide */
+        public static Animation getCloseEnter() {
+            return sCloseEnter;
+        }
+
+        /** @hide */
+        public static Animation getCloseExit() {
+            return sCloseExit;
+        }
+
+        /** @hide */
+        public static Animation getAppStartingExit() {
+            return sAppStartingExit;
+        }
+    }
+
+    /** @hide */
+    public static final class SpringInterpolator implements Interpolator {
+        private final float mDampingRatio;
+        private final float mOmega0;
+        private final long mDurationMs;
+        private final float mDurationSec;
+        private final float mEndOutput;
+        private final float mEndGap;
+
+        public SpringInterpolator(float dampingRatio, float stiffness) {
+            mDampingRatio = dampingRatio;
+            mOmega0 = (float) Math.sqrt(stiffness);
+            final float settleSec;
+            if (dampingRatio >= 1.0f) {
+                settleSec = 9.23f / mOmega0;
+            } else {
+                settleSec = 6.91f / (dampingRatio * mOmega0);
+            }
+            mDurationMs = Math.max(50L, (long) (settleSec * 1000f));
+            mDurationSec = mDurationMs / 1000f;
+            mEndOutput = rawSpring(mDurationSec);
+            mEndGap = 1.0f - mEndOutput;
+        }
+
+        public long getDurationMs() {
+            return mDurationMs;
+        }
+
+        private float rawSpring(float t) {
+            final float zeta = mDampingRatio;
+            final float w0 = mOmega0;
+            if (zeta < 1.0f) {
+                final float wd = w0 * (float) Math.sqrt(1.0f - zeta * zeta);
+                final float env = (float) Math.exp(-zeta * w0 * t);
+                return 1.0f - env * ((float) Math.cos(wd * t)
+                        + (zeta * w0 / wd) * (float) Math.sin(wd * t));
+            } else if (zeta > 1.0f) {
+                final float d = (float) Math.sqrt(zeta * zeta - 1.0f);
+                final float r1 = -w0 * (zeta - d);
+                final float r2 = -w0 * (zeta + d);
+                return 1.0f - (r2 * (float) Math.exp(r1 * t)
+                        - r1 * (float) Math.exp(r2 * t)) / (r2 - r1);
+            } else {
+                final float env = (float) Math.exp(-w0 * t);
+                return 1.0f - env * (1.0f + w0 * t);
+            }
+        }
+
+        @Override
+        public float getInterpolation(float input) {
+            return rawSpring(input * mDurationSec) + mEndGap * input;
+        }
+    }
 }
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 61ade5fdad8b2..49c1c2f3535db 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -713,6 +713,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
     private int mMinimumVelocity;
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 124051740)
     private int mMaximumVelocity;
+    private int mDecacheThreshold;
     private float mVelocityScale = 1.0f;
 
     final boolean[] mIsScrap = new boolean[1];
@@ -1029,6 +1030,7 @@ private void initAbsListView() {
         mVerticalScrollFactor = configuration.getScaledVerticalScrollFactor();
         mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
         mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+        mDecacheThreshold = mMaximumVelocity / 2;
         mOverscrollDistance = configuration.getScaledOverscrollDistance();
         mOverflingDistance = configuration.getScaledOverflingDistance();
 
@@ -4278,6 +4280,10 @@ private void onTouchUp(MotionEvent ev) {
                                     }
                                     mSelector.setHotspot(x, ev.getY());
                                 }
+                                if (!mDataChanged && !mIsDetaching
+                                        && isAttachedToWindow()) {
+                                    performClick.run();
+                                }
                                 if (mTouchModeReset != null) {
                                     removeCallbacks(mTouchModeReset);
                                 }
@@ -4288,10 +4294,6 @@ public void run() {
                                         mTouchMode = TOUCH_MODE_REST;
                                         child.setPressed(false);
                                         setPressed(false);
-                                        if (!mDataChanged && !mIsDetaching
-                                                && isAttachedToWindow()) {
-                                            performClick.run();
-                                        }
                                     }
                                 };
                                 postDelayed(mTouchModeReset,
@@ -4997,7 +4999,7 @@ public void run() {
                     // Keep the fling alive a little longer
                     postDelayed(this, FLYWHEEL_TIMEOUT);
                 } else {
-                    endFling();
+                    endFling(false); // Don't disable the scrolling cache right after it was enabled
                     mTouchMode = TOUCH_MODE_SCROLL;
                     reportScrollStateChange(OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
                 }
@@ -5017,6 +5019,11 @@ float getSplineFlingDistance(int velocity) {
         // Use AbsListView#fling(int) instead
         @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
         void start(int initialVelocity) {
+            if (Math.abs(initialVelocity) > mDecacheThreshold) {
+                // For long flings, scrolling cache causes stutter, so don't use it
+                clearScrollingCache();
+            }
+
             int initialY = initialVelocity < 0 ? Integer.MAX_VALUE : 0;
             mLastFlingY = initialY;
             mScroller.setInterpolator(null);
@@ -5097,6 +5104,10 @@ void startScroll(int distance, int duration, boolean linear,
         // To interrupt a fling early you should use smoothScrollBy(0,0) instead
         @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
         void endFling() {
+            endFling(true);
+        }
+
+        void endFling(boolean clearCache) {
             mTouchMode = TOUCH_MODE_REST;
 
             removeCallbacks(this);
@@ -5105,7 +5116,8 @@ void endFling() {
             if (!mSuppressIdleStateChangeCall) {
                 reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
             }
-            clearScrollingCache();
+            if (clearCache)
+                clearScrollingCache();
             mScroller.abortAnimation();
 
             if (mFlingStrictSpan != null) {
diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java
index ca9cd66188aad..8eaebde4a40ea 100644
--- a/core/java/android/widget/DateTimeView.java
+++ b/core/java/android/widget/DateTimeView.java
@@ -165,10 +165,6 @@ void update() {
         if (mLocalTime == null || getVisibility() == GONE) {
             return;
         }
-        if (mShowRelativeTime) {
-            updateRelativeTime();
-            return;
-        }
 
         int display;
         ZoneId zoneId = ZoneId.systemDefault();
@@ -476,6 +472,13 @@ void updateAll() {
                 final int count = mAttachedViews.size();
                 for (int i = 0; i < count; i++) {
                     DateTimeView view = mAttachedViews.get(i);
+                    if (view.mShowRelativeTime) {
+                        // Every minute, the status bar only needs to execute this function once
+                        // to update the display
+                        view.post(() -> view.updateRelativeTime());
+                        return;
+                    }
+
                     view.post(() -> view.clearFormatAndUpdate());
                 }
             }
diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java
index c110ab9560303..9a7c1bf61cbd6 100644
--- a/core/java/android/widget/EdgeEffect.java
+++ b/core/java/android/widget/EdgeEffect.java
@@ -26,6 +26,7 @@
 import android.compat.annotation.EnabledSince;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.BlendMode;
 import android.graphics.Canvas;
@@ -35,6 +36,7 @@
 import android.graphics.Rect;
 import android.graphics.RenderNode;
 import android.os.Build;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
@@ -43,6 +45,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import com.android.internal.util.matrixx.VibrationUtils;
+
 /**
  * This class performs the graphical effect used at the edges of scrollable widgets
  * when the user scrolls beyond the content bounds in 2D space.
@@ -218,6 +222,10 @@ public class EdgeEffect {
     private float mDisplacement = 0.5f;
     private float mTargetDisplacement = 0.5f;
 
+    private boolean callerHasVibratePermission;
+    private int vibrateIntensity;
+    private Context mContext;
+
     /**
      * Current edge effect type, consumers should always query
      * {@link #getCurrentEdgeEffectBehavior()} instead of this parameter
@@ -233,6 +241,8 @@ public class EdgeEffect {
      */
     public EdgeEffect(Context context) {
         this(context, null);
+        mContext = context;
+        updateCallerAndVibIntensity();
     }
 
     /**
@@ -241,6 +251,7 @@ public EdgeEffect(Context context) {
      * @param attrs The attributes of the XML tag that is inflating the view
      */
     public EdgeEffect(@NonNull Context context, @Nullable AttributeSet attrs) {
+        mContext = context;
         final TypedArray a = context.obtainStyledAttributes(
                 attrs, com.android.internal.R.styleable.EdgeEffect);
         final int themeColor = a.getColor(
@@ -253,6 +264,14 @@ public EdgeEffect(@NonNull Context context, @Nullable AttributeSet attrs) {
         mPaint.setColor((themeColor & 0xffffff) | 0x33000000);
         mPaint.setStyle(Paint.Style.FILL);
         mPaint.setBlendMode(DEFAULT_BLEND_MODE);
+        updateCallerAndVibIntensity();
+    }
+
+    private void updateCallerAndVibIntensity() {
+        callerHasVibratePermission = mContext.checkCallingOrSelfPermission(
+                    android.Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED;
+        vibrateIntensity = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.EDGE_SCROLLING_HAPTICS_INTENSITY, 1);
     }
 
     @EdgeEffectType
@@ -497,6 +516,9 @@ public void onAbsorb(int velocity) {
             mState = STATE_RECEDE;
             mVelocity = velocity * ON_ABSORB_VELOCITY_ADJUSTMENT;
             mStartTime = AnimationUtils.currentAnimationTimeMillis();
+            if (callerHasVibratePermission) {
+                VibrationUtils.triggerVibration(mContext, vibrateIntensity);
+            }
         } else if (edgeEffectBehavior == TYPE_GLOW) {
             mState = STATE_ABSORB;
             mVelocity = 0;
@@ -521,6 +543,9 @@ public void onAbsorb(int velocity) {
                     mGlowAlphaStart,
                     Math.min(velocity * VELOCITY_GLOW_FACTOR * .00001f, MAX_ALPHA));
             mTargetDisplacement = 0.5f;
+            if (callerHasVibratePermission) {
+                VibrationUtils.triggerVibration(mContext, vibrateIntensity);
+            }
         } else {
             finish();
         }
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 1ff8952b07729..fe3ab0f81859b 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -272,8 +272,8 @@ public ListView(Context context, AttributeSet attrs, int defStyleAttr, int defSt
             }
         }
 
-        mHeaderDividersEnabled = a.getBoolean(R.styleable.ListView_headerDividersEnabled, true);
-        mFooterDividersEnabled = a.getBoolean(R.styleable.ListView_footerDividersEnabled, true);
+        mHeaderDividersEnabled = a.getBoolean(R.styleable.ListView_headerDividersEnabled, false);
+        mFooterDividersEnabled = a.getBoolean(R.styleable.ListView_footerDividersEnabled, false);
 
         a.recycle();
 
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index d54addbbcb8d0..376707deaa721 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1531,6 +1531,7 @@ private PopupBackgroundView createBackgroundView(View contentView) {
         final PopupBackgroundView.LayoutParams listParams = new PopupBackgroundView.LayoutParams(
                 MATCH_PARENT, height);
         backgroundView.addView(contentView, listParams);
+        backgroundView.setClipToOutline(true);
 
         return backgroundView;
     }
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 0589afd1185e7..0dbbdc8d43e4b 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -873,6 +873,7 @@ private void applyErrorDrawableIfNeeded(int layoutDirection) {
     // more bold.
     private int mFontWeightAdjustment;
     private Typeface mOriginalTypeface;
+    private String mFontFamily;
 
     // True if setKeyListener() has been explicitly called
     private boolean mListenerChanged = false;
@@ -4388,6 +4389,7 @@ private void readTextAppearance(Context context, TypedArray appearance,
                     attributes.mTypefaceIndex = appearance.getInt(attr, attributes.mTypefaceIndex);
                     if (attributes.mTypefaceIndex != -1 && !attributes.mFontFamilyExplicit) {
                         attributes.mFontFamily = null;
+                        mFontFamily = null;
                     }
                     break;
                 case com.android.internal.R.styleable.TextAppearance_fontFamily:
@@ -4400,6 +4402,7 @@ private void readTextAppearance(Context context, TypedArray appearance,
                     }
                     if (attributes.mFontTypeface == null) {
                         attributes.mFontFamily = appearance.getString(attr);
+                        mFontFamily = attributes.mFontFamily;
                     }
                     attributes.mFontFamilyExplicit = true;
                     break;
@@ -4495,6 +4498,7 @@ private void applyTextAppearance(TextAppearanceAttributes attributes) {
 
         if (attributes.mTypefaceIndex != -1 && !attributes.mFontFamilyExplicit) {
             attributes.mFontFamily = null;
+            mFontFamily = null;
         }
         setTypefaceFromAttrs(attributes.mFontTypeface, attributes.mFontFamily,
                 attributes.mTypefaceIndex, attributes.mTextStyle, attributes.mFontWeight);
@@ -4528,6 +4532,10 @@ private void applyTextAppearance(TextAppearanceAttributes attributes) {
             setFontVariationSettings(attributes.mFontVariationSettings);
         }
 
+        if (Typeface.getFontName().equals("inter")) {
+            setFontFeatureSettings("'ss01'");
+        }
+
         if (attributes.mHasLineBreakStyle || attributes.mHasLineBreakWordStyle) {
             updateLineBreakConfigFromTextAppearance(attributes.mHasLineBreakStyle,
                     attributes.mHasLineBreakWordStyle, attributes.mLineBreakStyle,
@@ -4669,6 +4677,13 @@ protected void onConfigurationChanged(Configuration newConfig) {
                 invalidate();
             }
         }
+        
+        if (!TextUtils.equals(mFontFamily, Typeface.getFontName())) {
+            Typeface tf = Typeface.getOverrideTypeface(mFontFamily);
+            setTypeface(tf);
+            mFontFamily = Typeface.getFontName();
+        }
+
         if (mFontWeightAdjustment != newConfig.fontWeightAdjustment) {
             mFontWeightAdjustment = newConfig.fontWeightAdjustment;
             setTypeface(getTypeface());
diff --git a/core/java/android/widget/ToastPresenter.java b/core/java/android/widget/ToastPresenter.java
index 6963237fc19be..9a967b18d5117 100644
--- a/core/java/android/widget/ToastPresenter.java
+++ b/core/java/android/widget/ToastPresenter.java
@@ -22,8 +22,10 @@
 import android.app.INotificationManager;
 import android.app.ITransientNotificationCallback;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 import android.os.IBinder;
@@ -68,6 +70,7 @@ public static View getTextToastView(Context context, CharSequence text) {
         View view = LayoutInflater.from(context).inflate(TEXT_TOAST_LAYOUT, null);
         TextView textView = view.findViewById(com.android.internal.R.id.message);
         textView.setText(text);
+        textView.setSelected(true);
         return view;
     }
 
@@ -82,6 +85,7 @@ public static View getTextToastViewWithIcon(Context context, CharSequence text,
         View view = LayoutInflater.from(context).inflate(TEXT_TOAST_LAYOUT_WITH_ICON, null);
         TextView textView = view.findViewById(com.android.internal.R.id.message);
         textView.setText(text);
+        textView.setSelected(true);
         ImageView imageView = view.findViewById(com.android.internal.R.id.icon);
         if (imageView != null) {
             imageView.setImageDrawable(icon);
@@ -251,6 +255,22 @@ public void show(View view, IBinder token, IBinder windowToken, int duration, in
 
         adjustLayoutParams(mParams, windowToken, duration, gravity, xOffset, yOffset,
                 horizontalMargin, verticalMargin, removeWindowAnimations);
+
+        ImageView appIcon = (ImageView) mView.findViewById(android.R.id.icon);
+        if (appIcon != null) {
+            Context context = mContext.get();
+            if (context != null) {
+                PackageManager pm = context.getPackageManager();
+                Drawable icon = null;
+                try {
+                    icon = pm.getApplicationIcon(mPackageName);
+                } catch (PackageManager.NameNotFoundException e) {
+                    // nothing to do
+                }
+                appIcon.setImageDrawable(icon);
+            }
+        }
+
         addToastView();
         trySendAccessibilityEvent(mView, mPackageName);
         if (callback != null) {
diff --git a/core/java/android/window/WindowContext.java b/core/java/android/window/WindowContext.java
index 806ad2172a5fe..685270f9f018b 100644
--- a/core/java/android/window/WindowContext.java
+++ b/core/java/android/window/WindowContext.java
@@ -23,6 +23,7 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UiContext;
+import android.app.ActivityThread;
 import android.content.ComponentCallbacks;
 import android.content.ComponentCallbacksController;
 import android.content.Context;
@@ -142,7 +143,7 @@ public Object getSystemService(String name) {
     @Override
     protected void finalize() throws Throwable {
         try {
-            release();
+            getMainThreadHandler().post(this::release);
         } finally {
             super.finalize();
         }
diff --git a/core/java/com/android/internal/app/HiddenNotificationInfo.aidl b/core/java/com/android/internal/app/HiddenNotificationInfo.aidl
new file mode 100644
index 0000000000000..7965bff3eb66c
--- /dev/null
+++ b/core/java/com/android/internal/app/HiddenNotificationInfo.aidl
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+parcelable HiddenNotificationInfo;
diff --git a/core/java/com/android/internal/app/HiddenNotificationInfo.java b/core/java/com/android/internal/app/HiddenNotificationInfo.java
new file mode 100644
index 0000000000000..58a5afd0153e5
--- /dev/null
+++ b/core/java/com/android/internal/app/HiddenNotificationInfo.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * @hide
+ */
+public class HiddenNotificationInfo implements Parcelable {
+    public final String key;
+    public final String packageName;
+    public final Icon appIcon;
+    public final CharSequence title;
+    public final CharSequence text;
+    public final PendingIntent contentIntent;
+    public final long postTime;
+    public final int userId;
+
+    public HiddenNotificationInfo(
+            String key,
+            String packageName,
+            Icon appIcon,
+            CharSequence title,
+            CharSequence text,
+            PendingIntent contentIntent,
+            long postTime,
+            int userId) {
+        this.key = key;
+        this.packageName = packageName;
+        this.appIcon = appIcon;
+        this.title = title;
+        this.text = text;
+        this.contentIntent = contentIntent;
+        this.postTime = postTime;
+        this.userId = userId;
+    }
+
+    protected HiddenNotificationInfo(Parcel in) {
+        key = in.readString();
+        packageName = in.readString();
+        appIcon = in.readParcelable(Icon.class.getClassLoader(), Icon.class);
+        title = in.readCharSequence();
+        text = in.readCharSequence();
+        contentIntent = in.readParcelable(PendingIntent.class.getClassLoader(), PendingIntent.class);
+        postTime = in.readLong();
+        userId = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(key);
+        dest.writeString(packageName);
+        dest.writeParcelable(appIcon, flags);
+        dest.writeCharSequence(title);
+        dest.writeCharSequence(text);
+        dest.writeParcelable(contentIntent, flags);
+        dest.writeLong(postTime);
+        dest.writeInt(userId);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<HiddenNotificationInfo> CREATOR = new Creator<HiddenNotificationInfo>() {
+        @Override
+        public HiddenNotificationInfo createFromParcel(Parcel in) {
+            return new HiddenNotificationInfo(in);
+        }
+
+        @Override
+        public HiddenNotificationInfo[] newArray(int size) {
+            return new HiddenNotificationInfo[size];
+        }
+    };
+}
diff --git a/core/java/com/android/internal/app/IAppLockStateListener.aidl b/core/java/com/android/internal/app/IAppLockStateListener.aidl
new file mode 100644
index 0000000000000..3008571018a50
--- /dev/null
+++ b/core/java/com/android/internal/app/IAppLockStateListener.aidl
@@ -0,0 +1,8 @@
+package com.android.internal.app;
+
+/**
+ * @hide
+ */
+oneway interface IAppLockStateListener {
+    void onAppLockStateChanged(String packageName, boolean locked);
+}
diff --git a/core/java/com/android/internal/app/IAppSessionListener.aidl b/core/java/com/android/internal/app/IAppSessionListener.aidl
new file mode 100644
index 0000000000000..228478a8909f4
--- /dev/null
+++ b/core/java/com/android/internal/app/IAppSessionListener.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+oneway interface IAppSessionListener {
+    void onAppUnlocked(String packageName, int userId);
+    void onAppLocked(String packageName, int userId);
+}
diff --git a/core/java/com/android/internal/app/IAxSandboxManager.aidl b/core/java/com/android/internal/app/IAxSandboxManager.aidl
new file mode 100644
index 0000000000000..ae75ec695c237
--- /dev/null
+++ b/core/java/com/android/internal/app/IAxSandboxManager.aidl
@@ -0,0 +1,56 @@
+package com.android.internal.app;
+
+import com.android.internal.app.IAppLockStateListener;
+import com.android.internal.app.IAppSessionListener;
+import com.android.internal.app.IHiddenNotificationListener;
+import com.android.internal.app.HiddenNotificationInfo;
+
+/**
+ * @hide
+ */
+interface IAxSandboxManager {
+    int getAppLockState(String packageName);
+    boolean isPackageHidden(String packageName);
+
+    void addLockedApp(String packageName);
+    void removeLockedApp(String packageName);
+    void setPackageHidden(String packageName, boolean hidden);
+
+    List<String> getLockedPackages();
+    List<String> getHiddenPackages();
+    List<String> getLockablePackages();
+
+    boolean isPackageLockable(String packageName);
+
+    void unlockApp(String packageName, int userId);
+    void promptUnlock(String packageName, int userId);
+
+    void registerAppLockStateListener(IAppLockStateListener listener);
+    void unregisterAppLockStateListener(IAppLockStateListener listener);
+    void registerAppSessionListener(IAppSessionListener listener);
+    void unregisterAppSessionListener(IAppSessionListener listener);
+    void registerHiddenNotificationListener(IHiddenNotificationListener listener);
+    void unregisterHiddenNotificationListener(IHiddenNotificationListener listener);
+
+    List<HiddenNotificationInfo> getHiddenNotifications();
+    void onHiddenNotificationPosted(in HiddenNotificationInfo info);
+    void onHiddenNotificationRemoved(String key);
+
+    boolean isPackageSandboxed(String packageName);
+    void addSandboxedPackage(String packageName);
+    void removeSandboxedPackage(String packageName);
+    List<String> getSandboxedPackages();
+
+    void setRestrictedGids(String packageName, in int[] gids);
+    int[] getRestrictedGids(String packageName);
+
+    boolean isSpoofSettingEnabled(String packageName, String settingKey);
+    void setSpoofSettingEnabled(String packageName, String settingKey, boolean enabled);
+    List<String> getEnabledSpoofSettings(String packageName);
+
+    boolean isSandboxDataIsolationEnabled(String packageName);
+    void setSandboxDataIsolationEnabled(String packageName, boolean enabled);
+
+    String getSpoofedSetting(String callingPackage, String settingName);
+    String getFileVaultPath();
+}
diff --git a/core/java/com/android/internal/app/IGameSpaceCallback.aidl b/core/java/com/android/internal/app/IGameSpaceCallback.aidl
new file mode 100644
index 0000000000000..42b885ac1eb63
--- /dev/null
+++ b/core/java/com/android/internal/app/IGameSpaceCallback.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+oneway interface IGameSpaceCallback {
+    void onGameStart(String packageName);
+    void onGameLeave();
+}
diff --git a/core/java/com/android/internal/app/IGameSpaceService.aidl b/core/java/com/android/internal/app/IGameSpaceService.aidl
new file mode 100644
index 0000000000000..691caea94f066
--- /dev/null
+++ b/core/java/com/android/internal/app/IGameSpaceService.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+import com.android.internal.app.IGameSpaceCallback;
+
+interface IGameSpaceService {
+    void registerCallback(IGameSpaceCallback callback);
+    void unregisterCallback(IGameSpaceCallback callback);
+}
diff --git a/core/java/com/android/internal/app/IHiddenNotificationListener.aidl b/core/java/com/android/internal/app/IHiddenNotificationListener.aidl
new file mode 100644
index 0000000000000..8eb2659bfac31
--- /dev/null
+++ b/core/java/com/android/internal/app/IHiddenNotificationListener.aidl
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.app;
+
+import com.android.internal.app.HiddenNotificationInfo;
+
+/**
+ * @hide
+ */
+oneway interface IHiddenNotificationListener {
+    void onHiddenNotificationPosted(in HiddenNotificationInfo info);
+    void onHiddenNotificationRemoved(String key);
+}
diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java
index 65372be175821..a3fae32418ce1 100644
--- a/core/java/com/android/internal/app/LocalePicker.java
+++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -155,8 +155,8 @@ public static List<LocaleInfo> getAllAssetLocales(Context context, boolean isInD
                     || l.getLanguage().isEmpty() || l.getCountry().isEmpty()) {
                 continue;
             }
-            // Don't show the pseudolocales unless we're in developer mode. http://b/17190407.
-            if (!isInDeveloperMode && LocaleList.isPseudoLocale(l)) {
+            // Don't show the pseudolocales
+            if (LocaleList.isPseudoLocale(l)) {
                 continue;
             }
 
diff --git a/core/java/com/android/internal/app/LocaleStore.java b/core/java/com/android/internal/app/LocaleStore.java
index ceecf787901e4..a76d4ad7cbc31 100644
--- a/core/java/com/android/internal/app/LocaleStore.java
+++ b/core/java/com/android/internal/app/LocaleStore.java
@@ -31,6 +31,7 @@
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -603,7 +604,8 @@ private static Set<LocaleInfo> getTierLocales(
         boolean hasTargetParent = parent != null;
         String parentId = hasTargetParent ? parent.getId() : null;
         HashSet<LocaleInfo> result = new HashSet<>();
-        for (LocaleStore.LocaleInfo li : supportedLocaleInfos.values()) {
+        Collection<LocaleInfo> currentLocaleInfos = new ArrayList<>(supportedLocaleInfos.values());
+        for (LocaleStore.LocaleInfo li : currentLocaleInfos) {
             if (isShallIgnore(ignorables, li, translatedOnly)) {
                 continue;
             }
diff --git a/core/java/com/android/internal/app/SuspendedAppActivity.java b/core/java/com/android/internal/app/SuspendedAppActivity.java
index 9d5704141c93a..cf97d9885a2c0 100644
--- a/core/java/com/android/internal/app/SuspendedAppActivity.java
+++ b/core/java/com/android/internal/app/SuspendedAppActivity.java
@@ -317,7 +317,7 @@ public void onClick(DialogInterface dialog, int which) {
                         try {
                             final String[] errored = ipm.setPackagesSuspendedAsUser(
                                     new String[]{mSuspendedPackage}, false, null, null, null, 0,
-                                    mSuspendingPackage, mUserId /* suspendingUserId */,
+                                    mSuspendingPackage, mSuspendingUserId /* suspendingUserId */,
                                     mUserId /* targetUserId */);
                             if (ArrayUtils.contains(errored, mSuspendedPackage)) {
                                 Slog.e(TAG, "Could not unsuspend " + mSuspendedPackage);
diff --git a/core/java/com/android/internal/content/F2fsUtils.java b/core/java/com/android/internal/content/F2fsUtils.java
index 27f1b308ed9c3..afa8d7773b0b4 100644
--- a/core/java/com/android/internal/content/F2fsUtils.java
+++ b/core/java/com/android/internal/content/F2fsUtils.java
@@ -266,7 +266,10 @@ private static List<File> getFilesRecursive(@NonNull File path) {
         final ArrayList<File> files = new ArrayList<>();
         for (File f : allFiles) {
             if (f.isDirectory()) {
-                files.addAll(getFilesRecursive(f));
+                List<File> inner = getFilesRecursive(f);
+                if (inner != null) {
+                    files.addAll(inner);
+                }
             } else if (f.isFile()) {
                 files.add(f);
             }
diff --git a/core/java/com/android/internal/graphics/ColorUtils.java b/core/java/com/android/internal/graphics/ColorUtils.java
index f210741e070bd..2a38f3098dcc5 100644
--- a/core/java/com/android/internal/graphics/ColorUtils.java
+++ b/core/java/com/android/internal/graphics/ColorUtils.java
@@ -22,6 +22,7 @@
 import android.annotation.NonNull;
 import android.graphics.Color;
 import android.ravenwood.annotation.RavenwoodKeepWholeClass;
+import android.util.Log;
 import com.android.internal.graphics.cam.Cam;
 
 /**
@@ -32,6 +33,8 @@
 @RavenwoodKeepWholeClass
 public final class ColorUtils {
 
+    private static final String TAG = "ColorUtils";
+
     private static final double XYZ_WHITE_REFERENCE_X = 95.047;
     private static final double XYZ_WHITE_REFERENCE_Y = 100;
     private static final double XYZ_WHITE_REFERENCE_Z = 108.883;
@@ -96,8 +99,10 @@ public static double calculateLuminance(@ColorInt int color) {
      */
     public static double calculateContrast(@ColorInt int foreground, @ColorInt int background) {
         if (Color.alpha(background) != 255) {
-            throw new IllegalArgumentException("background can not be translucent: #"
-                    + Integer.toHexString(background));
+            Log.w(TAG, String.format(
+                    "Background should not be translucent: #%s",
+                    Integer.toHexString(background)));
+            background = setAlphaComponent(background, 255);
         }
         if (Color.alpha(foreground) < 255) {
             // If the foreground is translucent, composite the foreground over the background
@@ -149,8 +154,10 @@ public static int calculateMinimumBackgroundAlpha(@ColorInt int foreground,
     public static int calculateMinimumAlpha(@ColorInt int foreground, @ColorInt int background,
             float minContrastRatio) {
         if (Color.alpha(background) != 255) {
-            throw new IllegalArgumentException("background can not be translucent: #"
-                    + Integer.toHexString(background));
+            Log.w(TAG, String.format(
+                    "Background should not be translucent: #%s",
+                    Integer.toHexString(background)));
+            background = setAlphaComponent(background, 255);
         }
 
         ContrastCalculator contrastCalculator = (fg, bg, alpha) -> {
diff --git a/core/java/com/android/internal/graphics/fonts/IFontManager.aidl b/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
index 512ace6145c6e..82b2c8256e4ff 100644
--- a/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
+++ b/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
@@ -32,4 +32,6 @@ interface IFontManager {
     FontConfig getFontConfig();
 
     int updateFontFamily(in List<FontUpdateRequest> request, int baseVersion);
+    
+    void clearUpdates();
 }
diff --git a/core/java/com/android/internal/notification/SystemNotificationChannels.java b/core/java/com/android/internal/notification/SystemNotificationChannels.java
index 972c2ea403e07..d048e2d3bb9fe 100644
--- a/core/java/com/android/internal/notification/SystemNotificationChannels.java
+++ b/core/java/com/android/internal/notification/SystemNotificationChannels.java
@@ -71,6 +71,7 @@ public class SystemNotificationChannels {
     public static final String ACCESSIBILITY_HEARING_DEVICE = "ACCESSIBILITY_HEARING_DEVICE";
     public static final String ACCESSIBILITY_SECURITY_POLICY = "ACCESSIBILITY_SECURITY_POLICY";
     public static final String ABUSIVE_BACKGROUND_APPS = "ABUSIVE_BACKGROUND_APPS";
+    public static String SLEEP = "SLEEP";
 
     @VisibleForTesting
     static final String OBSOLETE_DO_NOT_DISTURB = "DO_NOT_DISTURB";
@@ -110,8 +111,8 @@ public static void createAll(Context context) {
         final NotificationChannel developerImportant = new NotificationChannel(
                 DEVELOPER_IMPORTANT,
                 context.getString(R.string.notification_channel_developer_important),
-                NotificationManager.IMPORTANCE_HIGH);
-        developer.setBlockable(true);
+                NotificationManager.IMPORTANCE_MIN);
+        developerImportant.setBlockable(true);
         channelsList.add(developerImportant);
 
         final NotificationChannel updates = new NotificationChannel(
@@ -145,6 +146,7 @@ public static void createAll(Context context) {
                 VPN,
                 context.getString(R.string.notification_channel_vpn),
                 NotificationManager.IMPORTANCE_LOW);
+        vpn.setBlockable(true);
         channelsList.add(vpn);
 
         final NotificationChannel time = new NotificationChannel(
@@ -204,6 +206,11 @@ public static void createAll(Context context) {
                 .build());
         channelsList.add(systemChanges);
 
+        NotificationChannel sleepModeChanges = new NotificationChannel(SLEEP,
+                context.getString(R.string.notification_channel_sleep),
+                NotificationManager.IMPORTANCE_LOW);
+        channelsList.add(sleepModeChanges);
+
         final NotificationChannel newFeaturePrompt = new NotificationChannel(
                 ACCESSIBILITY_MAGNIFICATION,
                 context.getString(R.string.notification_channel_accessibility_magnification),
diff --git a/core/java/com/android/internal/os/KernelCpuUidTimeReader.java b/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
index 21e0dc59db01d..b0b9c2cfddb4a 100644
--- a/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
+++ b/core/java/com/android/internal/os/KernelCpuUidTimeReader.java
@@ -452,7 +452,7 @@ private void processUidDelta(@Nullable Callback<long[]> cb) {
                 // Unit is 10ms.
                 mDeltaTimes[i] = mCurTimes[i] - lastTimes[i];
                 if (mDeltaTimes[i] < 0) {
-                    Slog.e(mTag, "Negative delta from freq time for uid: " + uid
+                    if (DEBUG) Slog.e(mTag, "Negative delta from freq time for uid: " + uid
                             + ", delta: " + mDeltaTimes[i]);
                     return;
                 }
@@ -628,7 +628,7 @@ private void processUidDelta(@Nullable Callback<Long> cb) {
                         cb.onUidCpuTime(uid, delta);
                     }
                 } else if (delta < 0) {
-                    Slog.e(mTag, "Negative delta from active time for uid: " + uid
+                    if (DEBUG) Slog.e(mTag, "Negative delta from active time for uid: " + uid
                             + ", delta: " + delta);
                 }
             }
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 6cabd504af676..665d44b0e754a 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -162,8 +162,11 @@ public void uncaughtException(Thread t, Throwable e) {
                 }
 
                 // Bring up crash dialog, wait for it to be dismissed
-                ActivityManager.getService().handleApplicationCrash(
-                        mApplicationObject, new ApplicationErrorReport.ParcelableCrashInfo(e));
+                final IActivityManager am = ActivityManager.getService();
+                if (am != null) {
+                    am.handleApplicationCrash(
+                            mApplicationObject, new ApplicationErrorReport.ParcelableCrashInfo(e));
+                }
             } catch (Throwable t2) {
                 if (t2 instanceof DeadObjectException) {
                     // System process is dead; ignore
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index 168e4e5b347cd..43e2e6a92ce27 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -852,6 +852,7 @@ private static Runnable childMain(@Nullable ZygoteCommandBuffer argBuffer,
                         throw new RuntimeException(ex);
                     }
                 }
+                IoUtils.closeQuietly(sessionSocket);
             }
 
             if (writePipe != null) {
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index e90b277f5eef0..53c03fbb6d66f 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -91,7 +91,7 @@ public class ZygoteInit {
 
     private static final String TAG = "Zygote";
 
-    private static final boolean LOGGING_DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final boolean LOGGING_DEBUG = false;
 
     private static final String PROPERTY_DISABLE_GRAPHICS_DRIVER_PRELOADING =
             "ro.zygote.disable_gl_preload";
diff --git a/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java b/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java
index 7503fb1f99133..7f744b148f187 100644
--- a/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java
+++ b/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java
@@ -264,7 +264,7 @@ private Boolean getFlagValueFromNewStorage(String flagPackageAndName) {
             try {
                 return AconfigPackage.load(p);
             } catch (Exception e) {
-                Slog.e(LOG_TAG, "Failed to load aconfig package " + p, e);
+                //Slog.e(LOG_TAG, "Failed to load aconfig package " + p, e);
                 return null;
             }
         });
diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
index 2903ca3ffd6e2..91c6781bc95c2 100644
--- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
@@ -3000,9 +3000,8 @@ private static boolean hasDomainURLs(ParsingPackage pkg) {
      * ratio set.
      */
     private static void setMaxAspectRatio(ParsingPackage pkg) {
-        // Default to (1.86) 16.7:9 aspect ratio for pre-O apps and unset for O and greater.
-        // NOTE: 16.7:9 was the max aspect ratio Android devices can support pre-O per the CDD.
-        float maxAspectRatio = pkg.getTargetSdkVersion() < O ? DEFAULT_PRE_O_MAX_ASPECT_RATIO : 0;
+        // Start at an unlimited aspect ratio unless we get a more restrictive one
+        float maxAspectRatio = 0;
 
         float packageMaxAspectRatio = pkg.getMaxAspectRatio();
         if (packageMaxAspectRatio != 0) {
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 7cb7035f07353..92a01b06efb9e 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -34,6 +34,7 @@
 import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
 import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EDGE_TO_EDGE_ENFORCED;
 import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS;
 import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
@@ -2731,6 +2732,16 @@ protected ViewGroup generateLayout(DecorView decor) {
             params.layoutInDisplayCutoutMode = mode;
         }
 
+        if (ActivityManager.isSystemReady()) {
+            try {
+                String packageName = context.getBasePackageName();
+                if (ActivityManager.getService().shouldForceCutoutFullscreen(packageName)){
+                    params.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                }
+            } catch (RemoteException e) {
+            }
+        }
+
         if (mAlwaysReadCloseOnTouchAttr || getContext().getApplicationInfo().targetSdkVersion
                 >= android.os.Build.VERSION_CODES.HONEYCOMB) {
             if (a.getBoolean(
diff --git a/core/java/com/android/internal/policy/ScreenDecorationsUtils.java b/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
index b23515aa51f33..2d358433c6b7f 100644
--- a/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
+++ b/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
@@ -41,6 +41,10 @@ public class ScreenDecorationsUtils {
      * If the associated display is not internal, will return 0.
      */
     public static float getWindowCornerRadius(Context context) {
+        String callingPackage = context.getPackageManager().getNameForUid(android.os.Binder.getCallingUid());
+        if ("com.google.android.apps.nexuslauncher".equals(callingPackage)) {
+            return 32f;
+        }
         final Resources resources = context.getResources();
         if (!supportsRoundedCornersOnWindows(resources)) {
             return 0f;
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 0bca6c2efaa24..c0713dd1d16b8 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -413,4 +413,6 @@ oneway interface IStatusBar
     * @param displayId the id of the current display.
     */
     void moveFocusedTaskToDesktop(int displayId);
+
+    void restartSystemUI();
 }
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index b54bfaa28745e..aa40e92d74b72 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -249,4 +249,11 @@ interface IStatusBarService
      * Starts the default assistant app.
      */
     void startAssist(in Bundle args);
+
+    /**
+     * Toggle recent apps.
+     */
+    void toggleRecentApps();
+
+    void restartSystemUI();
 }
diff --git a/core/java/com/android/internal/util/ContrastColorUtil.java b/core/java/com/android/internal/util/ContrastColorUtil.java
index 5f6ba7d555729..b136f4e64b653 100644
--- a/core/java/com/android/internal/util/ContrastColorUtil.java
+++ b/core/java/com/android/internal/util/ContrastColorUtil.java
@@ -819,8 +819,10 @@ public static double calculateLuminance(@ColorInt int color) {
          */
         public static double calculateContrast(@ColorInt int foreground, @ColorInt int background) {
             if (Color.alpha(background) != 255) {
-                Log.wtf(TAG, "background can not be translucent: #"
-                        + Integer.toHexString(background));
+                Log.w(TAG, String.format(
+                        "Background should not be translucent: #%s",
+                        Integer.toHexString(background)));
+                background = setAlphaComponent(background, 255);
             }
             if (Color.alpha(foreground) < 255) {
                 // If the foreground is translucent, composite the foreground over the background
diff --git a/core/java/com/android/internal/util/FileRotator.java b/core/java/com/android/internal/util/FileRotator.java
index bcad6fc85ca92..22014a411e49c 100644
--- a/core/java/com/android/internal/util/FileRotator.java
+++ b/core/java/com/android/internal/util/FileRotator.java
@@ -334,7 +334,15 @@ private String getActiveName(long currentTimeMillis) {
         long oldestActiveStart = Long.MAX_VALUE;
 
         final FileInfo info = new FileInfo(mPrefix);
-        for (String name : mBasePath.list()) {
+        String[] baseFiles = mBasePath.list();
+        if (baseFiles == null) {
+            // no file in the path and create one starting now
+            info.startMillis = currentTimeMillis;
+            info.endMillis = Long.MAX_VALUE;
+            return info.build();
+        }
+
+        for (String name : baseFiles) {
             if (!info.parse(name)) continue;
 
             // pick the oldest active file which covers current time
diff --git a/core/java/com/android/internal/util/PastyException.java b/core/java/com/android/internal/util/PastyException.java
new file mode 100644
index 0000000000000..e956bb20dfc08
--- /dev/null
+++ b/core/java/com/android/internal/util/PastyException.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util;
+
+public class PastyException extends Exception {
+
+    private static final long serialVersionUID = 666L;
+
+	public PastyException(String message) {
+        super(message);
+    }
+}
diff --git a/core/java/com/android/internal/util/PastyUtils.java b/core/java/com/android/internal/util/PastyUtils.java
new file mode 100644
index 0000000000000..513f216514e10
--- /dev/null
+++ b/core/java/com/android/internal/util/PastyUtils.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util;
+
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.JsonReader;
+
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.URL;
+
+import javax.net.ssl.HttpsURLConnection;
+
+/**
+ * Helper functions for uploading to Pasty
+ */
+public final class PastyUtils {
+    private static final String TAG = "PastyUtils";
+    private static final String BASE_URL = "https://paste.projectmatrixx.com";
+    private static final String API_URL = String.format("%s/documents", BASE_URL);
+    private static Handler handler;
+
+    private PastyUtils() {
+    }
+
+    /**
+     * Uploads {@code content} to Pasty
+     *
+     * @param content the content to upload to Pasty
+     * @param callback the callback to call on success / failure
+     */
+    public static void upload(String content, UploadResultCallback callback) {
+        getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    HttpsURLConnection urlConnection = (HttpsURLConnection) new URL(API_URL).openConnection();
+                    try {
+                        urlConnection.setRequestProperty("Content-Type", "text/plain");
+                        urlConnection.setRequestProperty("Accept-Charset", "UTF-8");
+                        urlConnection.setDoOutput(true);
+
+                        try (OutputStream output = urlConnection.getOutputStream()) {
+                            output.write(content.getBytes("UTF-8"));
+                        }
+                        String key = "";
+                        try (JsonReader reader = new JsonReader(
+                                new InputStreamReader(urlConnection.getInputStream(), "UTF-8"))) {
+                            reader.beginObject();
+                            while (reader.hasNext()) {
+                                String name = reader.nextName();
+                                if (name.equals("key")) {
+                                    key = reader.nextString();
+                                    break;
+                                } else {
+                                    reader.skipValue();
+                                }
+                            }
+                            reader.endObject();
+                        }
+                        if (!key.isEmpty()) {
+                            callback.onSuccess(getUrl(key));
+                        } else {
+                            String msg = "Failed to upload to Pasty: No key retrieved";
+                            callback.onFail(msg, new PastyException(msg));
+                        }
+                    } finally {
+                        urlConnection.disconnect();
+                    }
+                } catch (Exception e) {
+                    callback.onFail("Failed to upload to Pasty", e);
+                }
+            }
+        });
+    }
+
+    /**
+     * Get the view URL from a key
+     */
+    private static String getUrl(String key) {
+        return String.format("%s/%s", BASE_URL, key);
+    }
+
+    private static Handler getHandler() {
+        if (handler == null) {
+            HandlerThread handlerThread = new HandlerThread("PastyThread");
+            if (!handlerThread.isAlive())
+                handlerThread.start();
+            handler = new Handler(handlerThread.getLooper());
+        }
+        return handler;
+    }
+
+    public interface UploadResultCallback {
+        void onSuccess(String url);
+
+        void onFail(String message, Exception e);
+    }
+}
diff --git a/core/java/com/android/internal/util/ViewCacheData.java b/core/java/com/android/internal/util/ViewCacheData.java
new file mode 100644
index 0000000000000..5c916963450de
--- /dev/null
+++ b/core/java/com/android/internal/util/ViewCacheData.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.util;
+
+import android.app.ActivityThread;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ViewCacheData {
+    private static final String FILE_NAME = "view-cache-data";
+    private static final String KEY_DEPEND_UI = "depend_ui";
+
+    private final SharedPreferences mPrefs;
+    private final Map<String, String> mCachedData = new HashMap<>();
+    private StringBuilder mPendingBuilder = new StringBuilder();
+    private String mPendingActivity;
+    private boolean mDirty;
+    private final List<Integer> mDependUiList = new ArrayList<>();
+
+    public ViewCacheData(Context context) {
+        mPrefs = context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE);
+        load();
+    }
+
+    private void load() {
+        Map<String, ?> all = mPrefs.getAll();
+        for (Map.Entry<String, ?> e : all.entrySet()) {
+            String val = (String) e.getValue();
+            if (val != null) {
+                String key = e.getKey();
+                if (KEY_DEPEND_UI.equals(key)) {
+                    parseDependUi(val);
+                } else {
+                    mCachedData.put(key, val);
+                }
+            }
+        }
+    }
+
+    private void parseDependUi(String val) {
+        for (String s : val.split("/")) {
+            try {
+                mDependUiList.add(Integer.parseInt(s));
+            } catch (NumberFormatException ignored) {
+            }
+        }
+    }
+
+    public synchronized List<Integer> getLayoutsForActivity(String activityName) {
+        String val = mCachedData.get(activityName);
+        if (val == null) return null;
+        List<Integer> ids = new ArrayList<>();
+        for (String s : val.split("/")) {
+            try {
+                ids.add(Integer.parseInt(s));
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        return ids;
+    }
+
+    public synchronized boolean isValid(int layoutId) {
+        return !mDependUiList.contains(layoutId);
+    }
+
+    public synchronized void recordDependUi(int layoutId) {
+        if (!mDependUiList.contains(layoutId)) {
+            mDependUiList.add(layoutId);
+            String current = mDependUiList.isEmpty() ? "" : joinIds(mDependUiList);
+            mPrefs.edit().putString(KEY_DEPEND_UI, current).apply();
+        }
+    }
+
+    public synchronized void record(int layoutId) {
+        if (mPendingActivity == null) {
+            mPendingActivity = resolveProcessName();
+        }
+        if (mPendingBuilder.length() > 0) {
+            mPendingBuilder.append("/");
+        }
+        mPendingBuilder.append(layoutId);
+        mDirty = true;
+    }
+
+    public synchronized void sync() {
+        if (!mDirty || mPendingActivity == null) return;
+        String current = mPendingBuilder.toString();
+        String old = mCachedData.get(mPendingActivity);
+        if (!current.equals(old)) {
+            mCachedData.put(mPendingActivity, current);
+            mPrefs.edit().putString(mPendingActivity, current).apply();
+        }
+        mPendingBuilder.setLength(0);
+        mPendingActivity = null;
+        mDirty = false;
+    }
+
+    private static String resolveProcessName() {
+        try {
+            ActivityThread at = ActivityThread.currentActivityThread();
+            return at != null ? at.getProcessName() : null;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static String joinIds(List<Integer> ids) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < ids.size(); i++) {
+            if (i > 0) sb.append("/");
+            sb.append(ids.get(i));
+        }
+        return sb.toString();
+    }
+}
diff --git a/core/java/com/android/internal/util/ViewCacheManager.java b/core/java/com/android/internal/util/ViewCacheManager.java
new file mode 100644
index 0000000000000..df2863c6b8ea6
--- /dev/null
+++ b/core/java/com/android/internal/util/ViewCacheManager.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.util;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.SystemProperties;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewRootImpl;
+import android.view.ViewBackgroundThread;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ViewCacheManager {
+    private static final String TAG = "ViewCacheManager";
+    private static final boolean ENABLED = SystemProperties.getBoolean(
+            "persist.sys.perf.view_cache", true);
+    private static volatile ViewCacheManager sInstance;
+
+    private final SparseArray<List<View>> mViewCache = new SparseArray<>();
+    private final Object mLock = new Object();
+    private ViewCacheData mData;
+    private boolean mActive;
+    private String mCurrentActivity;
+
+    public static ViewCacheManager getInstance() {
+        if (sInstance == null) {
+            sInstance = new ViewCacheManager();
+        }
+        return sInstance;
+    }
+
+    public boolean isEnable() {
+        return ENABLED && mActive;
+    }
+
+    public void onActivityAttached(Context context, ComponentName component) {
+        if (!ENABLED || component == null) return;
+        mActive = false;
+        mCurrentActivity = component.getClassName();
+        synchronized (mLock) {
+            mViewCache.clear();
+        }
+        if (mData == null) {
+            mData = new ViewCacheData(context);
+        }
+        List<Integer> layoutIds = mData.getLayoutsForActivity(mCurrentActivity);
+        if (layoutIds == null || layoutIds.isEmpty()) return;
+        mActive = true;
+        ViewBackgroundThread.getHandler().post(() -> {
+            preInflateLayouts(context, layoutIds);
+        });
+    }
+
+    private void preInflateLayouts(Context context, List<Integer> layoutIds) {
+        LayoutInflater inflater = LayoutInflater.from(context)
+                .cloneInContext(context);
+        for (int id : layoutIds) {
+            if (Thread.interrupted()) break;
+            if (mData != null && !mData.isValid(id)) continue;
+            try {
+                View view = inflater.inflate(id, null, false);
+                if (view != null) {
+                    put(id, view);
+                }
+            } catch (Exception e) {
+                if (mData != null) {
+                    mData.recordDependUi(id);
+                }
+            }
+        }
+    }
+
+    public View tryGet(int layoutId) {
+        if (!ENABLED) return null;
+        synchronized (mLock) {
+            List<View> entries = mViewCache.get(layoutId);
+            if (entries != null && !entries.isEmpty()) {
+                return entries.remove(0);
+            }
+        }
+        return null;
+    }
+
+    public void put(int layoutId, View view) {
+        synchronized (mLock) {
+            List<View> entries = mViewCache.get(layoutId);
+            if (entries == null) {
+                entries = new ArrayList<>();
+                mViewCache.put(layoutId, entries);
+            }
+            entries.add(view);
+        }
+    }
+
+    public void recordLayoutRes(int resource) {
+        if (mData != null) {
+            mData.record(resource);
+        }
+    }
+
+    public void onTraversalEnd(ViewRootImpl vri) {
+        if (mData != null) {
+            mData.sync();
+        }
+        mActive = false;
+        mCurrentActivity = null;
+        synchronized (mLock) {
+            mViewCache.clear();
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/DeviceConfigUtils.java b/core/java/com/android/internal/util/matrixx/DeviceConfigUtils.java
new file mode 100644
index 0000000000000..d849a423d9314
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/DeviceConfigUtils.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 The Pixel Experience Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.content.res.Resources;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.android.internal.util.ArrayUtils;
+
+/**
+ * @hide
+ */
+public final class DeviceConfigUtils {
+
+    private static final String TAG = DeviceConfigUtils.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static Boolean sEnableDeviceConfigUtils =
+            SystemProperties.getBoolean("persist.sys.dchooks.enable", true);
+
+    private static String[] getDeviceConfigsOverride() {
+        String[] globalDeviceConfigs =
+            Resources.getSystem().getStringArray(com.android.internal.R.array.global_device_configs_override);
+        String[] deviceConfigs =
+            Resources.getSystem().getStringArray(com.android.internal.R.array.device_configs_override);
+        String[] allDeviceConfigs = Arrays.copyOf(globalDeviceConfigs, globalDeviceConfigs.length + deviceConfigs.length);
+        System.arraycopy(deviceConfigs, 0, allDeviceConfigs, globalDeviceConfigs.length, deviceConfigs.length);
+        return allDeviceConfigs;
+    }
+
+    public static boolean shouldDenyDeviceConfigControl(String namespace, String property) {
+        if (!sEnableDeviceConfigUtils) return false;
+
+        if (DEBUG) Log.d(TAG, "shouldAllowDeviceConfigControl, namespace=" + namespace + ", property=" + property);
+        for (String p : getDeviceConfigsOverride()) {
+            String[] kv = p.split("=");
+            String fullKey = kv[0];
+            String[] nsKey = fullKey.split("/");
+            if (nsKey[0] == namespace && nsKey[1] == property){
+                logd("shouldAllowDeviceConfigControl, deny, namespace=" + namespace + ", property=" + property);
+                return true;
+            }
+        }
+        logd("shouldAllowDeviceConfigControl, allow, namespace=" + namespace + ", property=" + property);
+        return false;
+    }
+
+    public static void setDefaultProperties(String filterNamespace, String filterProperty) {
+        if (!sEnableDeviceConfigUtils) return;
+
+        logd("setDefaultProperties");
+        for (String p : getDeviceConfigsOverride()) {
+            String[] kv = p.split("=");
+            String fullKey = kv[0];
+            String[] nsKey = fullKey.split("/");
+
+            String namespace = nsKey[0];
+            String key = nsKey[1];
+
+            if (filterNamespace != null && filterNamespace == namespace){
+                continue;
+            }
+
+            if (filterProperty != null && filterProperty == key){
+                continue;
+            }
+
+            String value = "";
+            if (kv.length > 1) {
+                value = kv[1];
+            }
+            Settings.Config.putString(namespace, key, value, false);
+        }
+    }
+
+    private static void logd(String msg) {
+        if (DEBUG) Log.d(TAG, msg);
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/DisplayRefreshRateHelper.java b/core/java/com/android/internal/util/matrixx/DisplayRefreshRateHelper.java
new file mode 100644
index 0000000000000..07a92ef33f892
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/DisplayRefreshRateHelper.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2022-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.internal.util.matrixx;
+
+import static android.provider.Settings.System.MIN_REFRESH_RATE;
+import static android.provider.Settings.System.PEAK_REFRESH_RATE;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.view.Display;
+
+import com.android.internal.R;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+
+/** @hide */
+public class DisplayRefreshRateHelper {
+
+    private static final float DEFAULT_REFRESH_RATE = 60f;
+
+    private static DisplayRefreshRateHelper sInstance = null;
+
+    private final ArrayList<Integer> mRefreshRateList = new ArrayList<>();
+    private final Context mContext;
+
+    public static DisplayRefreshRateHelper getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new DisplayRefreshRateHelper(context);
+        }
+        return sInstance;
+    }
+
+    private DisplayRefreshRateHelper(Context context) {
+        mContext = context;
+        initialize();
+    }
+
+    private void initialize() {
+        final Display.Mode mode = mContext.getDisplay().getMode();
+        final Display.Mode[] modes = mContext.getDisplay().getSupportedModes();
+        for (Display.Mode m : modes) {
+            if (m.getPhysicalWidth() == mode.getPhysicalWidth() &&
+                    m.getPhysicalHeight() == mode.getPhysicalHeight()) {
+                mRefreshRateList.add((int) m.getRefreshRate());
+            }
+        }
+        mRefreshRateList.sort(Comparator.naturalOrder());
+    }
+
+    public ArrayList<Integer> getSupportedRefreshRateList() {
+        return mRefreshRateList;
+    }
+
+    public int getMinimumRefreshRate() {
+        final int refreshRate = mContext.getResources().getInteger(
+                R.integer.config_defaultRefreshRate);
+        final float defaultRefreshRate = refreshRate != 0 ? (float) refreshRate : DEFAULT_REFRESH_RATE;
+        final int ret = (int) Settings.System.getFloatForUser(mContext.getContentResolver(),
+                MIN_REFRESH_RATE, defaultRefreshRate, UserHandle.USER_SYSTEM);
+        if (mRefreshRateList.size() != 0 && !mRefreshRateList.contains(ret)) {
+            return mRefreshRateList.get(mRefreshRateList.size() - 1);
+        }
+        return ret;
+    }
+
+    public int getPeakRefreshRate() {
+        final int refreshRate = mContext.getResources().getInteger(
+                R.integer.config_defaultPeakRefreshRate);
+        final float defaultPeakRefreshRate = refreshRate != 0 ? (float) refreshRate : DEFAULT_REFRESH_RATE;
+        final int ret = (int) Settings.System.getFloatForUser(mContext.getContentResolver(),
+                PEAK_REFRESH_RATE, defaultPeakRefreshRate, UserHandle.USER_SYSTEM);
+        if (mRefreshRateList.size() != 0 && !mRefreshRateList.contains(ret)) {
+            return mRefreshRateList.get(mRefreshRateList.size() - 1);
+        }
+        return ret;
+    }
+
+    public ArrayList<Integer> getRefreshRate() {
+        final ArrayList<Integer> ret = new ArrayList<>();
+        ret.add(getMinimumRefreshRate());
+        ret.add(getPeakRefreshRate());
+        return ret;
+    }
+
+    public void setMinimumRefreshRate(int refreshRate) {
+        Settings.System.putFloatForUser(mContext.getContentResolver(),
+                MIN_REFRESH_RATE, (float) refreshRate, UserHandle.USER_SYSTEM);
+    }
+
+    public void setPeakRefreshRate(int refreshRate) {
+        Settings.System.putFloatForUser(mContext.getContentResolver(),
+                PEAK_REFRESH_RATE, (float) refreshRate, UserHandle.USER_SYSTEM);
+    }
+
+    public void setRefreshRate(int minRefreshRate, int peakRefreshRate) {
+        setMinimumRefreshRate(minRefreshRate);
+        setPeakRefreshRate(peakRefreshRate);
+    }
+
+    public boolean isRefreshRateValid(int refreshRate) {
+        return mRefreshRateList.contains(refreshRate);
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/FontController.java b/core/java/com/android/internal/util/matrixx/FontController.java
new file mode 100644
index 0000000000000..b3088ad6a5c13
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/FontController.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.internal.util.matrixx;
+
+import android.app.ActivityThread;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.os.SystemProperties;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.LruCache;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class FontController {
+
+    private static final String TAG = "FontController";
+
+    private static FontController sInstance;
+
+    public static final String GSF_FONT = "google-sans-flex";
+    public static final String PROP_DEFAULT_FONT = "persist.sys.ax_default_font";
+    public static final String PROP_OVERLAY_FONTS = "persist.sys.ax_overlay_fonts";
+    private static final String SEPARATOR = ":";
+
+    private volatile String[] mFontConfig;
+    private volatile String mRawProp;
+
+    private static final int IDX_BODY = 0;
+    private static final int IDX_BODY_MEDIUM = 1;
+    private static final int IDX_HEADLINE = 2;
+    private static final int IDX_HEADLINE_MEDIUM = 3;
+    private static final int FIELD_COUNT = 4;
+
+    private final LruCache<String, Typeface> mCache = new LruCache<>(30);
+
+    private static final Set<String> EXCLUDED_APPS = new HashSet<>(Arrays.asList(
+            "it.subito",
+            "tv.arte.plus7",
+            "com.google.android.gm"
+    ));
+
+    private static final Set<String> WHITELIST_FONTS = new HashSet<>(Arrays.asList(
+            "serif",
+            "monospace",
+            "cursive",
+            "NotoSansSC",
+            "NotoSansTC",
+            "NotoSansJP",
+            "NotoSansKR",
+            "NotoColorEmoji",
+            "NotoColorEmojiFlags",
+            "NotoSansMono",
+            "RobotoMono",
+            "DroidSansMono",
+            "CutiveMono",
+            "CarroisGothicSC",
+            "source-code-pro",
+            "gs-clock",
+            "google-sans-flex-clock"
+    ));
+
+    private static final String[][] WEIGHT_KEYWORDS = {
+            {"thin", "100"},
+            {"extralight", "200"},
+            {"light", "300"},
+            {"semibold", "600"},
+            {"extrabold", "800"},
+            {"bold", "700"},
+            {"medium", "500"},
+            {"black", "900"},
+    };
+
+    private static final Map<String, Integer> VARIABLE_WEIGHT_MAP = new ArrayMap<>();
+    static {
+        VARIABLE_WEIGHT_MAP.put("variable-display-large", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-display-medium", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-display-small", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-large", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-medium", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-small", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-title-large", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-title-medium", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-title-small", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-label-large", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-label-medium", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-label-small", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-body-large", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-body-medium", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-body-small", 400);
+        VARIABLE_WEIGHT_MAP.put("variable-display-large-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-display-medium-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-display-small-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-large-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-medium-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-headline-small-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-title-large-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-title-medium-emphasized", 600);
+        VARIABLE_WEIGHT_MAP.put("variable-title-small-emphasized", 600);
+        VARIABLE_WEIGHT_MAP.put("variable-label-large-emphasized", 600);
+        VARIABLE_WEIGHT_MAP.put("variable-label-medium-emphasized", 600);
+        VARIABLE_WEIGHT_MAP.put("variable-label-small-emphasized", 600);
+        VARIABLE_WEIGHT_MAP.put("variable-body-large-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-body-medium-emphasized", 500);
+        VARIABLE_WEIGHT_MAP.put("variable-body-small-emphasized", 500);
+    }
+
+    public static FontController get() {
+        if (sInstance == null) {
+            sInstance = new FontController();
+        }
+        return sInstance;
+    }
+
+    private FontController() {}
+
+    public static String getBodyFont() {
+        return get().resolveConfig()[IDX_BODY];
+    }
+
+    public static String getBodyFontMedium() {
+        return get().resolveConfig()[IDX_BODY_MEDIUM];
+    }
+
+    public static String getHeadlineFont() {
+        return get().resolveConfig()[IDX_HEADLINE];
+    }
+
+    public static String getHeadlineFontMedium() {
+        return get().resolveConfig()[IDX_HEADLINE_MEDIUM];
+    }
+
+    public static boolean isCustomFontActive() {
+        return !GSF_FONT.equals(getBodyFont());
+    }
+
+    public static boolean isExcludedApp() {
+        String pkg = getCurrentPackageName();
+        return pkg != null && EXCLUDED_APPS.contains(pkg);
+    }
+
+    public static boolean isFontWhitelisted(String familyName) {
+        if (familyName == null) return false;
+        for (String wl : WHITELIST_FONTS) {
+            if (familyName.contains(wl)) return true;
+        }
+        return false;
+    }
+
+    public static Typeface getOverrideTypeface(String familyName) {
+        if (familyName == null) return null;
+        if (isExcludedApp()) return null;
+        if (isFontWhitelisted(familyName)) return null;
+        if (!isCustomFontActive()) return null;
+
+        FontController fc = get();
+        String[] config = fc.resolveConfig();
+
+        if (familyName.equals(config[IDX_HEADLINE])) {
+            return Typeface.getSystemDefaultTypeface(config[IDX_HEADLINE]);
+        }
+        if (familyName.equals(config[IDX_HEADLINE_MEDIUM])) {
+            return Typeface.getSystemDefaultTypeface(config[IDX_HEADLINE_MEDIUM]);
+        }
+        if (familyName.equals(config[IDX_BODY_MEDIUM])) {
+            return Typeface.getSystemDefaultTypeface(config[IDX_BODY_MEDIUM]);
+        }
+
+        boolean isVariable = familyName.startsWith("variable-");
+        int weight = resolveWeight(familyName);
+        boolean isItalic = familyName.contains("italic");
+
+        int weightAdjustment = getFontWeightAdjustment();
+        if (weightAdjustment != 0) {
+            weight = Math.min(1000, Math.max(100, weight + weightAdjustment));
+        }
+        
+        Typeface base = resolveBase(config, familyName, isVariable, weight);
+
+        if (weight == 400 && !isItalic && base == Typeface.DEFAULT) {
+            return Typeface.DEFAULT;
+        }
+
+        Typeface cached = fc.mCache.get(familyName);
+        if (cached != null) return cached;
+
+        Typeface result = Typeface.create(base, weight, isItalic);
+        fc.mCache.put(familyName, result);
+        return result;
+    }
+
+    private static Typeface resolveBase(String[] config, String name,
+            boolean isVariable, int weight) {
+        if (!isVariable) return Typeface.DEFAULT;
+
+        boolean isHeadlineRole = name.startsWith("variable-headline");
+        boolean isMediumWeight = weight >= 500;
+
+        String baseName;
+        if (isHeadlineRole) {
+            baseName = isMediumWeight ? config[IDX_HEADLINE_MEDIUM] : config[IDX_HEADLINE];
+        } else {
+            baseName = isMediumWeight ? config[IDX_BODY_MEDIUM] : config[IDX_BODY];
+        }
+
+        Typeface base = Typeface.getSystemDefaultTypeface(baseName);
+        return base != null ? base : Typeface.DEFAULT;
+    }
+
+    private static int resolveWeight(String name) {
+        if (name.startsWith("variable-")) {
+            Integer exact = VARIABLE_WEIGHT_MAP.get(name);
+            if (exact != null) return exact;
+            return name.endsWith("-emphasized") ? 500 : 400;
+        }
+
+        for (String[] entry : WEIGHT_KEYWORDS) {
+            if (name.contains(entry[0])) return Integer.parseInt(entry[1]);
+        }
+        return 400;
+    }
+
+    private static int getFontWeightAdjustment() {
+        try {
+            ActivityThread at = ActivityThread.currentActivityThread();
+            if (at == null) return 0;
+            Resources res = at.getApplication().getResources();
+            if (res == null) return 0;
+            Configuration cfg = res.getConfiguration();
+            return cfg != null ? cfg.fontWeightAdjustment : 0;
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    public static void clearCaches() {
+        get().mCache.evictAll();
+    }
+
+    private String[] resolveConfig() {
+        String defaultFont = SystemProperties.get(PROP_DEFAULT_FONT, GSF_FONT);
+        String raw = SystemProperties.get(PROP_OVERLAY_FONTS, "");
+
+        if (raw.equals(mRawProp) && mFontConfig != null) {
+            return mFontConfig;
+        }
+
+        String[] config;
+        if (raw.isEmpty()) {
+            config = new String[] { defaultFont, defaultFont, defaultFont, defaultFont };
+        } else {
+            String[] parts = raw.split(SEPARATOR, -1);
+            config = new String[FIELD_COUNT];
+            for (int i = 0; i < FIELD_COUNT; i++) {
+                config[i] = (i < parts.length && !parts[i].isEmpty())
+                        ? parts[i] : defaultFont;
+            }
+        }
+
+        mRawProp = raw;
+        mFontConfig = config;
+        logger("Font config: body=" + config[IDX_BODY]
+                + " bodyMed=" + config[IDX_BODY_MEDIUM]
+                + " headline=" + config[IDX_HEADLINE]
+                + " headlineMed=" + config[IDX_HEADLINE_MEDIUM]);
+        return config;
+    }
+
+    private static String getCurrentPackageName() {
+        try {
+            return ActivityThread.currentPackageName();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static void logger(String msg) {
+        if (SystemProperties.getBoolean("persist.sys.ax_font_debug", false)) {
+            Log.d(TAG, msg);
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/FullscreenTaskStackChangeListener.java b/core/java/com/android/internal/util/matrixx/FullscreenTaskStackChangeListener.java
new file mode 100644
index 0000000000000..45de911a89d9b
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/FullscreenTaskStackChangeListener.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.internal.util.matrixx;
+
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+
+import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
+import android.app.IActivityTaskManager;
+import android.app.TaskStackListener;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Log;
+
+/**
+ * TaskStackListener that ignores freeform / mini-window focuses change
+ *
+ * @hide
+ */
+public abstract class FullscreenTaskStackChangeListener extends TaskStackListener {
+
+    private static final String DEFAULT_TAG = "FullscreenTaskStackChangeListener";
+
+    private final ActivityManager mActivityManager;
+    private final ActivityTaskManager mActivityTaskManager;
+    private final IActivityTaskManager mIActivityTaskManager;
+
+    private final boolean mObserveActivityChange;
+
+    private boolean mDebug = false;
+    private String mDebugTag = DEFAULT_TAG;
+
+    private boolean mListening = false;
+
+    private String mTopPackage = "";
+    private String mTopActivity = "";
+    private int mTopTaskId = INVALID_TASK_ID;
+
+    public FullscreenTaskStackChangeListener(Context context) {
+        this(context, false);
+    }
+
+    public FullscreenTaskStackChangeListener(Context context, boolean observeActivity) {
+        mActivityManager = context.getSystemService(ActivityManager.class);
+        mActivityTaskManager = ActivityTaskManager.getInstance();
+        mIActivityTaskManager = ActivityTaskManager.getService();
+        mObserveActivityChange = observeActivity;
+    }
+
+    public void setDebug(boolean debug) {
+        mDebug = debug;
+    }
+
+    public void setDebugTag(String tag) {
+        mDebugTag = tag;
+    }
+
+    public void setListening(boolean listening) {
+        if (mListening != listening) {
+            if (listening) {
+                mActivityTaskManager.registerTaskStackListener(this);
+                mListening = true;
+            } else {
+                mActivityTaskManager.unregisterTaskStackListener(this);
+                mListening = false;
+            }
+        }
+    }
+
+    private void handleChange(String newPackageName, String newActivityName, int newTaskId) {
+        if (mTopPackage.equals(newPackageName) && mTopActivity.equals(newActivityName)) {
+            return;
+        }
+        mTopActivity = newActivityName;
+        if (!mObserveActivityChange && mTopPackage.equals(newPackageName)) {
+            return;
+        }
+        mTopPackage = newPackageName;
+        mTopTaskId = newTaskId;
+        if (mDebug) {
+            Log.d(mDebugTag, "Change: mTopPackage=" + mTopPackage
+                    + ", mTopActivity=" + mTopActivity
+                    + ", mTopTaskId=" + mTopTaskId);
+        }
+        onFullscreenTaskChanged(mTopPackage, mTopActivity, mTopTaskId);
+    }
+
+    @Override
+    public void onTaskStackChanged() {
+        forceCheck();
+    }
+
+    @Override
+    public void onTaskFocusChanged(int taskId, boolean focused) {
+        if (focused) {
+            forceCheck();
+        }
+    }
+
+    public void forceCheck() {
+        try {
+            final ActivityTaskManager.RootTaskInfo info = mIActivityTaskManager.getFocusedRootTaskInfo();
+            if (info == null) {
+                return;
+            }
+            if (info.getWindowingMode() == WINDOWING_MODE_FREEFORM) {
+                return;
+            }
+            final ComponentName topActivity = info.topActivity;
+            if (topActivity == null) {
+                return;
+            }
+            handleChange(topActivity.getPackageName(), topActivity.getClassName(), info.taskId);
+        } catch (RemoteException e) {}
+    }
+
+    public String getTopPackageName() {
+        return mTopPackage;
+    }
+
+    public String getTopActivityName() {
+        return mTopActivity;
+    }
+
+    public int getTopTaskId() {
+        return mTopTaskId;
+    }
+
+    public abstract void onFullscreenTaskChanged(
+            String packageName, String activityName, int taskId);
+}
diff --git a/core/java/com/android/internal/util/matrixx/OmniJawsClient.java b/core/java/com/android/internal/util/matrixx/OmniJawsClient.java
new file mode 100644
index 0000000000000..8ad343fb6df0a
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/OmniJawsClient.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2021 The OmniROM project
+ * Copyright (C) 2022-2025 crDroid Android project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.lang.ref.WeakReference;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+public class OmniJawsClient {
+
+    private static final String TAG = "OmniJawsClient";
+    private static final boolean DEBUG = false;
+
+    public static final String SERVICE_PACKAGE = "org.omnirom.omnijaws";
+    public static final Uri WEATHER_URI = Uri.parse("content://org.omnirom.omnijaws.provider/weather");
+    public static final Uri SETTINGS_URI = Uri.parse("content://org.omnirom.omnijaws.provider/settings");
+    public static final Uri HOURLY_URI = Uri.parse("content://org.omnirom.omnijaws.provider/hourly");
+    public static final String WEATHER_UPDATE = SERVICE_PACKAGE + ".WEATHER_UPDATE";
+    public static final String WEATHER_ERROR = SERVICE_PACKAGE + ".WEATHER_ERROR";
+
+    private static final String ICON_PACKAGE_DEFAULT = "org.omnirom.omnijaws";
+    private static final String ICON_PREFIX_DEFAULT = "google_new_light";
+    private static final String EXTRA_ERROR = "error";
+    public static final int EXTRA_ERROR_NETWORK = 0;
+    public static final int EXTRA_ERROR_LOCATION = 1;
+    public static final int EXTRA_ERROR_DISABLED = 2;
+
+    public static final String[] WEATHER_PROJECTION = {
+            "city", "wind_speed", "wind_direction", "condition_code", "temperature",
+            "humidity", "condition", "forecast_low", "forecast_high", "forecast_condition",
+            "forecast_condition_code", "time_stamp", "forecast_date", "pin_wheel",
+            "feels_like", "pressure", "uvi", "visibility", "dew_point", "sunrise", "sunset"
+    };
+
+    public static final String[] SETTINGS_PROJECTION = {
+            "enabled", "units", "provider", "setup", "icon_pack"
+    };
+
+    private static final DecimalFormat sNoDigitsFormat = new DecimalFormat("0");
+
+    private static OmniJawsClient sInstance;
+
+    private WeatherInfo mCachedInfo;
+    private Resources mRes;
+    private String mPackageName;
+    private String mIconPrefix;
+    private String mSettingIconPackage;
+    private boolean mMetric;
+
+    private final List<WeakReference<OmniJawsObserver>> mObservers = new ArrayList<>();
+    private WeatherUpdateReceiver mReceiver;
+    private boolean mWeatherReceiverRegistered = false;
+
+    public static OmniJawsClient get() {
+        if (sInstance == null) {
+            synchronized (OmniJawsClient.class) {
+                if (sInstance == null) {
+                    sInstance = new OmniJawsClient();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public interface OmniJawsObserver {
+        void weatherUpdated();
+        void weatherError(int errorReason);
+        default void updateSettings() {}
+    }
+
+    private class WeatherUpdateReceiver extends BroadcastReceiver {
+        @Override public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            pruneDeadObservers();
+            for (WeakReference<OmniJawsObserver> ref : mObservers) {
+                OmniJawsObserver obs = ref.get();
+                if (obs == null) continue;
+                if (WEATHER_UPDATE.equals(action)) {
+                    obs.weatherUpdated();
+                } else if (WEATHER_ERROR.equals(action)) {
+                    obs.weatherError(intent.getIntExtra(EXTRA_ERROR, 0));
+                }
+            }
+        }
+    }
+
+    public Intent getSettingsIntent() {
+        return new Intent(Intent.ACTION_MAIN)
+                .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".SettingsActivity");
+    }
+
+    public Intent getWeatherActivityIntent(Context context) {
+        if (isOmniJawsEnabled(context)) {
+            return new Intent(Intent.ACTION_MAIN)
+                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherActivity");
+        }
+        return getSettingsIntent();
+    }
+
+    public WeatherInfo getWeatherInfo() {
+        return mCachedInfo;
+    }
+
+    public void queryWeather(Context context) {
+        if (!isOmniJawsEnabled(context)) {
+            Log.w(TAG, "queryWeather while disabled");
+            mCachedInfo = null;
+            return;
+        }
+
+        try (Cursor weatherCursor = context.getContentResolver().query(
+                WEATHER_URI, WEATHER_PROJECTION, null, null, null)) {
+
+            if (weatherCursor != null && weatherCursor.getCount() > 0) {
+                mCachedInfo = new WeatherInfo();
+                List<DayForecast> forecasts = new ArrayList<>();
+
+                for (int i = 0; i < weatherCursor.getCount(); i++) {
+                    weatherCursor.moveToPosition(i);
+                    if (i == 0) {
+                        mCachedInfo.city = weatherCursor.getString(0);
+                        mCachedInfo.windSpeed = getFormattedValue(weatherCursor.getFloat(1));
+                        mCachedInfo.windDirection = weatherCursor.getInt(2) + "\u00b0";
+                        mCachedInfo.conditionCode = weatherCursor.getInt(3);
+                        mCachedInfo.temp = getFormattedValue(weatherCursor.getFloat(4));
+                        mCachedInfo.humidity = weatherCursor.getString(5);
+                        mCachedInfo.condition = weatherCursor.getString(6);
+                        mCachedInfo.timeStamp = Long.parseLong(weatherCursor.getString(11));
+                        mCachedInfo.pinWheel = weatherCursor.getString(13);
+
+                        int colFeelsLike = weatherCursor.getColumnIndex("feels_like");
+                        if (colFeelsLike != -1) mCachedInfo.feelsLike = weatherCursor.getFloat(colFeelsLike);
+                        int colPressure = weatherCursor.getColumnIndex("pressure");
+                        if (colPressure != -1) mCachedInfo.pressure = weatherCursor.getFloat(colPressure);
+                        int colUvi = weatherCursor.getColumnIndex("uvi");
+                        if (colUvi != -1) mCachedInfo.uvi = weatherCursor.getFloat(colUvi);
+                        int colVisibility = weatherCursor.getColumnIndex("visibility");
+                        if (colVisibility != -1) mCachedInfo.visibility = weatherCursor.getFloat(colVisibility);
+                        int colDewPoint = weatherCursor.getColumnIndex("dew_point");
+                        if (colDewPoint != -1) mCachedInfo.dewPoint = weatherCursor.getFloat(colDewPoint);
+                        int colSunrise = weatherCursor.getColumnIndex("sunrise");
+                        if (colSunrise != -1) mCachedInfo.sunrise = weatherCursor.getLong(colSunrise);
+                        int colSunset = weatherCursor.getColumnIndex("sunset");
+                        if (colSunset != -1) mCachedInfo.sunset = weatherCursor.getLong(colSunset);
+                    } else {
+                        DayForecast day = new DayForecast();
+                        day.low = getFormattedValue(weatherCursor.getFloat(7));
+                        day.high = getFormattedValue(weatherCursor.getFloat(8));
+                        day.condition = weatherCursor.getString(9);
+                        day.conditionCode = weatherCursor.getInt(10);
+                        day.date = weatherCursor.getString(12);
+                        forecasts.add(day);
+                    }
+                }
+                mCachedInfo.forecasts = forecasts;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "queryWeather: weather", e);
+        }
+
+        try (Cursor settingsCursor = context.getContentResolver().query(
+                SETTINGS_URI, SETTINGS_PROJECTION, null, null, null)) {
+
+            if (settingsCursor != null && settingsCursor.moveToFirst()) {
+                mMetric = settingsCursor.getInt(1) == 0;
+                if (mCachedInfo != null) {
+                    mCachedInfo.tempUnits = getTemperatureUnit();
+                    mCachedInfo.windUnits = getWindUnit();
+                    mCachedInfo.provider = settingsCursor.getString(2);
+                    mCachedInfo.iconPack = settingsCursor.getString(4);
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "queryWeather: settings", e);
+        }
+
+        if (mCachedInfo != null) {
+            try (Cursor hourlyCursor = context.getContentResolver().query(
+                    HOURLY_URI, null, null, null, null)) {
+                if (hourlyCursor != null && hourlyCursor.getCount() > 0) {
+                    List<HourlyForecast> hourly = new ArrayList<>();
+                    while (hourlyCursor.moveToNext()) {
+                        HourlyForecast h = new HourlyForecast();
+                        h.temperature = hourlyCursor.getFloat(hourlyCursor.getColumnIndex("hourly_temperature"));
+                        h.conditionCode = hourlyCursor.getInt(hourlyCursor.getColumnIndex("hourly_condition_code"));
+                        h.condition = hourlyCursor.getString(hourlyCursor.getColumnIndex("hourly_condition"));
+                        h.timestamp = hourlyCursor.getLong(hourlyCursor.getColumnIndex("hourly_timestamp"));
+                        h.humidity = hourlyCursor.getFloat(hourlyCursor.getColumnIndex("hourly_humidity"));
+                        h.windSpeed = hourlyCursor.getFloat(hourlyCursor.getColumnIndex("hourly_wind_speed"));
+                        hourly.add(h);
+                    }
+                    mCachedInfo.hourlyForecasts = hourly;
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "queryWeather: hourly", e);
+            }
+        }
+
+        updateSettings(context);
+    }
+
+    private void updateSettings(Context context) {
+        String iconPack = (mCachedInfo != null) ? mCachedInfo.iconPack : null;
+        if (iconPack == null || TextUtils.isEmpty(iconPack)) {
+            loadDefaultIconsPackage(context);
+        } else if (!iconPack.equals(mSettingIconPackage)) {
+            mSettingIconPackage = iconPack;
+            loadCustomIconPackage(context);
+        }
+    }
+
+    private void loadDefaultIconsPackage(Context context) {
+        mPackageName = ICON_PACKAGE_DEFAULT;
+        mIconPrefix = ICON_PREFIX_DEFAULT;
+        mSettingIconPackage = mPackageName + "." + mIconPrefix;
+        try {
+            mRes = context.getPackageManager().getResourcesForApplication(mPackageName);
+        } catch (Exception e) {
+            Log.w(TAG, "No default icon package found");
+            mRes = null;
+        }
+    }
+
+    private void loadCustomIconPackage(Context context) {
+        int idx = mSettingIconPackage.lastIndexOf(".");
+        if (idx == -1) {
+            loadDefaultIconsPackage(context);
+            return;
+        }
+        mPackageName = mSettingIconPackage.substring(0, idx);
+        mIconPrefix = mSettingIconPackage.substring(idx + 1);
+        try {
+            mRes = context.getPackageManager().getResourcesForApplication(mPackageName);
+        } catch (Exception e) {
+            Log.w(TAG, "Icon pack loading failed, fallback to default");
+            loadDefaultIconsPackage(context);
+        }
+    }
+
+    private static String getFormattedValue(float value) {
+        if (Float.isNaN(value)) return "-";
+        String result = sNoDigitsFormat.format(value);
+        return result.equals("-0") ? "0" : result;
+    }
+
+    public boolean isOmniJawsServiceInstalled(Context context) {
+        return isAvailableApp(context, SERVICE_PACKAGE);
+    }
+
+    public boolean isOmniJawsEnabled(Context context) {
+        if (!isOmniJawsServiceInstalled(context)) return false;
+
+        try (Cursor c = context.getContentResolver().query(
+                SETTINGS_URI, SETTINGS_PROJECTION, null, null, null)) {
+            return c != null && c.moveToFirst() && c.getInt(0) == 1;
+        } catch (Exception e) {
+            Log.e(TAG, "isOmniJawsEnabled", e);
+            return false;
+        }
+    }
+
+    private boolean isAvailableApp(Context context, String pkg) {
+        try {
+            PackageManager pm = context.getPackageManager();
+            pm.getPackageInfo(pkg, PackageManager.GET_ACTIVITIES);
+            int state = pm.getApplicationEnabledSetting(pkg);
+            return state != PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+                    && state != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
+        } catch (NameNotFoundException | IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+    public void addObserver(Context context, OmniJawsObserver observer) {
+        if (observer == null) return;
+        removeObserver(context, observer);
+        mObservers.add(new WeakReference<>(observer));
+        registerReceiverIfNeeded(context);
+    }
+
+    public void removeObserver(Context context, OmniJawsObserver observer) {
+        if (observer == null) return;
+        Iterator<WeakReference<OmniJawsObserver>> it = mObservers.iterator();
+        while (it.hasNext()) {
+            OmniJawsObserver o = it.next().get();
+            if (o == null || o == observer) {
+                it.remove();
+            }
+        }
+        if (mObservers.isEmpty()) {
+            unregisterReceiver(context);
+        }
+    }
+
+    private void pruneDeadObservers() {
+        try {
+            mObservers.removeIf(ref -> ref.get() == null);
+        } catch (Exception e) {
+            Log.w(TAG, "Exception occured while pruning, ignoring");
+        }
+    }
+
+    private void registerReceiverIfNeeded(Context context) {
+        if (!mWeatherReceiverRegistered && !mObservers.isEmpty()) {
+            if (mReceiver != null) {
+                try {
+                    context.unregisterReceiver(mReceiver);
+                } catch (Exception ignored) {}
+            }
+            mReceiver = new WeatherUpdateReceiver();
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(WEATHER_UPDATE);
+            filter.addAction(WEATHER_ERROR);
+            context.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
+            mWeatherReceiverRegistered = true;
+        }
+    }
+
+    private void unregisterReceiver(Context context) {
+        if (mWeatherReceiverRegistered && mReceiver != null) {
+            try {
+                context.unregisterReceiver(mReceiver);
+            } catch (Exception ignored) {}
+            mWeatherReceiverRegistered = false;
+        }
+    }
+
+    private String getTemperatureUnit() {
+        return mMetric ? "\u00b0C" : "\u00b0F";
+    }
+
+    private String getWindUnit() {
+        return mMetric ? "km/h" : "mph";
+    }
+
+    public Drawable getWeatherConditionImage(Context context, int conditionCode) {
+        if (mRes == null) {
+            loadDefaultIconsPackage(context);
+        }
+        try {
+            int resId = mRes.getIdentifier(mIconPrefix + "_" + conditionCode, "drawable", mPackageName);
+            Drawable d = mRes.getDrawable(resId, null);
+            return d != null ? d : getDefaultConditionImage(context);
+        } catch (Exception e) {
+            Log.e(TAG, "getWeatherConditionImage", e);
+            return getDefaultConditionImage(context);
+        }
+    }
+
+    private Drawable getDefaultConditionImage(Context context) {
+        try {
+            Resources res = context.getPackageManager().getResourcesForApplication(ICON_PACKAGE_DEFAULT);
+            int resId = res.getIdentifier(ICON_PREFIX_DEFAULT + "_na", "drawable", ICON_PACKAGE_DEFAULT);
+            Drawable d = res.getDrawable(resId, null);
+            return d != null ? d : new ColorDrawable(Color.RED);
+        } catch (Exception e) {
+            return new ColorDrawable(Color.RED);
+        }
+    }
+
+    public Drawable getResOmni(Context context, String iconOmni) {
+        if (mRes == null) loadDefaultIconsPackage(context);
+        try {
+            int resId = mRes.getIdentifier(iconOmni, "drawable", mPackageName);
+            Drawable d = mRes.getDrawable(resId, null);
+            return d != null ? d : new ColorDrawable(Color.RED);
+        } catch (Exception e) {
+            Log.e(TAG, "getResOmni", e);
+            return new ColorDrawable(Color.RED);
+        }
+    }
+
+    public static class WeatherInfo {
+        public String city;
+        public String windSpeed;
+        public String windDirection;
+        public int conditionCode;
+        public String temp;
+        public String humidity;
+        public String condition;
+        public Long timeStamp;
+        public List<DayForecast> forecasts;
+        public String tempUnits;
+        public String windUnits;
+        public String provider;
+        public String pinWheel;
+        public String iconPack;
+
+        public float feelsLike = Float.NaN;
+        public float pressure = Float.NaN;
+        public float uvi = Float.NaN;
+        public float visibility = Float.NaN;
+        public float dewPoint = Float.NaN;
+        public long sunrise;
+        public long sunset;
+        public List<HourlyForecast> hourlyForecasts;
+
+        public String getLastUpdateTime() {
+            return new SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(new Date(timeStamp));
+        }
+
+        @Override
+        public String toString() {
+            return city + " @ " + new Date(timeStamp) + " | " + condition + " | " + temp;
+        }
+    }
+
+    public static class DayForecast {
+        public String low;
+        public String high;
+        public int conditionCode;
+        public String condition;
+        public String date;
+
+        @Override
+        public String toString() {
+            return "[" + date + " - " + low + "/" + high + " - " + condition + "]";
+        }
+    }
+
+    public static class HourlyForecast {
+        public float temperature;
+        public int conditionCode;
+        public String condition;
+        public long timestamp;
+        public float humidity;
+        public float windSpeed;
+
+        @Override
+        public String toString() {
+            return "[" + new Date(timestamp) + " - " + temperature + " - " + condition + "]";
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/OnTheGoUtils.java b/core/java/com/android/internal/util/matrixx/OnTheGoUtils.java
new file mode 100644
index 0000000000000..0263b880a74d0
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/OnTheGoUtils.java
@@ -0,0 +1,106 @@
+/*
+* <!--
+*    Copyright (C) 2014 The NamelessROM Project
+*
+*    This program is free software: you can redistribute it and/or modify
+*    it under the terms of the GNU General Public License as published by
+*    the Free Software Foundation, either version 3 of the License, or
+*    (at your option) any later version.
+*
+*    This program is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU General Public License for more details.
+*
+*    You should have received a copy of the GNU General Public License
+*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* -->
+*/
+
+package com.android.internal.util.matrixx;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+import java.util.List;
+
+public class OnTheGoUtils {
+
+    private static final String TAG = "OnTheGoUtils";
+
+    /**
+     * Checks if a specific package is installed.
+     *
+     * @param context     The context to retrieve the package manager
+     * @param packageName The name of the package
+     * @return Whether the package is installed or not.
+     */
+    public static boolean isPackageInstalled(Context context, String packageName) {
+        PackageManager pm = context.getPackageManager();
+        try {
+            if (pm != null) {
+                List<ApplicationInfo> packages = pm.getInstalledApplications(0);
+                for (ApplicationInfo packageInfo : packages) {
+                    if (packageInfo.packageName.equals(packageName)) {
+                        return true;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error: " + e.getMessage());
+        }
+        return false;
+    }
+
+    /**
+     * Checks if a specific service is running.
+     *
+     * @param context     The context to retrieve the activity manager
+     * @param serviceName The name of the service
+     * @return Whether the service is running or not
+     */
+    public static boolean isServiceRunning(Context context, String serviceName) {
+        ActivityManager activityManager = (ActivityManager) context
+                .getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningServiceInfo> services = activityManager
+                .getRunningServices(Integer.MAX_VALUE);
+
+        if (services != null) {
+            for (ActivityManager.RunningServiceInfo info : services) {
+                if (info.service != null) {
+                    if (info.service.getClassName() != null && info.service.getClassName()
+                            .equalsIgnoreCase(serviceName)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if system has a camera.
+     *
+     * @param context
+     * @return
+     */
+    public static boolean hasCamera(final Context context) {
+        final PackageManager pm = context.getPackageManager();
+        return pm != null && pm.hasSystemFeature(PackageManager.FEATURE_CAMERA);
+    }
+
+    /**
+     * Check if system has a front camera.
+     *
+     * @param context
+     * @return
+     */
+    public static boolean hasFrontCamera(final Context context) {
+        final PackageManager pm = context.getPackageManager();
+        return pm != null && pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT);
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/PixelPropsUtils.java b/core/java/com/android/internal/util/matrixx/PixelPropsUtils.java
new file mode 100644
index 0000000000000..666e9fe0426cd
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/PixelPropsUtils.java
@@ -0,0 +1,558 @@
+/*
+ * Copyright (C) 2020 The Pixel Experience Project
+ *               2022 StatiXOS
+ *               2021-2022 crDroid Android Project
+ * SPDX-FileCopyrightText: Evolution X
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.app.ActivityTaskManager;
+import android.app.ActivityThread;
+import android.app.Application;
+import android.app.TaskStackListener;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Binder;
+import android.os.Build;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.internal.R;
+import com.android.internal.util.matrixx.Utils;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+/**
+ * @hide
+ */
+public final class PixelPropsUtils {
+
+    private static final String PACKAGE_ARCORE = "com.google.ar.core";
+    private static final String PACKAGE_GMS = "com.google.android.gms";
+    private static final String PACKAGE_NEXUS_LAUNCHER = "com.google.android.apps.nexuslauncher";
+    private static final String PACKAGE_PHOTOS = "com.google.android.apps.photos";
+    private static final String PACKAGE_SI = "com.google.android.settings.intelligence";
+    private static final String PACKAGE_SNAPCHAT = "com.snapchat.android";
+
+    private static final String TAG = PixelPropsUtils.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final String sDeviceFingerprint =
+            SystemProperties.get("ro.product.fingerprint", Build.FINGERPRINT);
+
+    private static final Map<String, Object> sPixelXLProps = Map.of(
+            "BRAND", "google",
+            "MANUFACTURER", "Google",
+            "DEVICE", "marlin",
+            "PRODUCT", "marlin",
+            "HARDWARE", "marlin",
+            "ID", "QP1A.191005.007.A3",
+            "MODEL", "Pixel XL",
+            "FINGERPRINT", "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys"
+    );
+
+    private static final Map<String, Object> propsToChangeGeneric;
+    private static final Map<String, Object> propsToChangeRecentPixel;
+    private static final Map<String, Object> propsToChangePixelTablet;
+    private static final Map<String, ArrayList<String>> propsToKeep;
+
+    private static volatile Set<String> mLauncherPkgs;
+    private static volatile Set<String> mExemptedUidPkgs;
+
+    // Tensor devices: Pixel 6 and above
+    private static final Pattern TENSOR_PIXEL_PATTERN =
+            Pattern.compile("^Pixel (([6-9]|[1-9][0-9])[a-zA-Z ]*)$");
+
+    // Mainline (first-party SoC) devices: Pixel 8 and above
+    private static final Pattern MAINLINE_PIXEL_PATTERN =
+            Pattern.compile("^Pixel (([89]|[1-9][0-9])([a-zA-Z].*)?)$");
+
+    // Any supported Pixel: Pixel 3 and above (covers full GMS support window + current)
+    private static final Pattern SUPPORTED_PIXEL_PATTERN =
+            Pattern.compile("^Pixel ([3-9]|[1-9][0-9])([a-zA-Z ].*)?$");
+
+    // Packages to Spoof as the most recent Pixel device
+    private static final Set<String> packagesToChangeRecentPixel = new HashSet<>(Arrays.asList(
+            "com.amazon.avod.thirdpartyclient",
+            "com.android.chrome",
+            "com.breel.wallpapers20",
+            "com.disney.disneyplus",
+            "com.google.android.aicore",
+            "com.google.android.apps.accessibility.magnifier",
+            "com.google.android.apps.aiwallpapers",
+            "com.google.android.apps.bard",
+            "com.google.android.apps.customization.pixel",
+            "com.google.android.apps.emojiwallpaper",
+            "com.google.android.apps.pixel.agent",
+            "com.google.android.apps.pixel.creativeassistant",
+            "com.google.android.apps.pixel.nowplaying",
+            "com.google.android.apps.pixel.psi",
+            "com.google.android.apps.pixel.subzero",
+            "com.google.android.apps.pixel.support",
+            "com.google.android.apps.privacy.wildlife",
+            "com.google.android.apps.subscriptions.red",
+            "com.google.android.apps.wallpaper",
+            "com.google.android.apps.wallpaper.pixel",
+            "com.google.android.apps.weather",
+            "com.google.android.googlequicksearchbox",
+            "com.google.android.pcs",
+            "com.google.android.wallpaper.effects",
+            "com.google.pixel.livewallpaper",
+            "com.microsoft.android.smsorganizer",
+            "com.nhs.online.nhsonline",
+            "com.nothing.smartcenter",
+            "com.realme.link",
+            "in.startv.hotstar",
+            "jp.id_credit_sp2.android"
+    ));
+
+    private static final Set<String> customGoogleCameraPackages = new HashSet<>(Arrays.asList(
+            "com.google.android.MTCL83",
+            "com.google.android.UltraCVM",
+            "com.google.android.apps.cameralite"
+    ));
+
+    private static volatile boolean sIsExcluded;
+    private static volatile String sProcessName;
+
+    private static final boolean sIsCustomForkBuild = detectCustomFork();
+    private static final boolean sIsMainlineDevice = detectMainlinePixelDevice();
+
+    // Cached spoof settings — refreshed by ContentObserver, avoids per-call Settings reads
+    private static volatile boolean sPhotosSpoofEnabled = true;
+    private static volatile boolean sSnapchatSpoofEnabled = false;
+    private static volatile boolean sPixelPropsSpoofEnabled = true;
+    private static volatile boolean sInitialized = false;
+
+    private static boolean detectCustomFork() {
+        char[] k = new char[]{'d','e','v','o','l','u','t','i','o','n'};
+        String needle = new String(k);
+
+        String[] props = {
+            SystemProperties.get("ro.build.display.id", ""),
+            SystemProperties.get("ro.modversion", ""),
+            SystemProperties.get("ro.evolution.version", ""),
+            SystemProperties.get("ro.build.flavor", "")
+        };
+
+        for (String p : props) {
+            if (p != null && p.toLowerCase().contains(needle)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isCustomForkBuild() {
+        return sIsCustomForkBuild;
+    }
+
+    static {
+        propsToKeep = new HashMap<>();
+        propsToKeep.put(PACKAGE_SI, new ArrayList<>(Collections.singletonList("FINGERPRINT")));
+        propsToChangeGeneric = new HashMap<>();
+        propsToChangeGeneric.put("TYPE", "user");
+        propsToChangeGeneric.put("TAGS", "release-keys");
+        propsToChangeRecentPixel = new HashMap<>();
+        propsToChangeRecentPixel.put("BRAND", "google");
+        propsToChangeRecentPixel.put("BOARD", "mustang");
+        propsToChangeRecentPixel.put("MANUFACTURER", "Google");
+        propsToChangeRecentPixel.put("DEVICE", "mustang");
+        propsToChangeRecentPixel.put("PRODUCT", "mustang");
+        propsToChangeRecentPixel.put("HARDWARE", "mustang");
+        propsToChangeRecentPixel.put("MODEL", "Pixel 10 Pro XL");
+        propsToChangeRecentPixel.put("ID", "CP1A.260505.005");
+        propsToChangeRecentPixel.put("FINGERPRINT", "google/mustang/mustang:16/CP1A.260505.005/15081906:user/release-keys");
+        propsToChangePixelTablet = new HashMap<>();
+        propsToChangePixelTablet.put("BRAND", "google");
+        propsToChangePixelTablet.put("BOARD", "tangorpro");
+        propsToChangePixelTablet.put("MANUFACTURER", "Google");
+        propsToChangePixelTablet.put("DEVICE", "tangorpro");
+        propsToChangePixelTablet.put("PRODUCT", "tangorpro");
+        propsToChangePixelTablet.put("HARDWARE", "tangorpro");
+        propsToChangePixelTablet.put("MODEL", "Pixel Tablet");
+        propsToChangePixelTablet.put("ID", "CP1A.260505.005");
+        propsToChangePixelTablet.put("FINGERPRINT", "google/tangorpro/tangorpro:16/CP1A.260505.005/15081906:user/release-keys");
+    }
+
+    public static String getBuildID(String fingerprint) {
+        Pattern pattern = Pattern.compile("([A-Za-z0-9]+\\.\\d+\\.\\d+\\.\\w+)");
+        Matcher matcher = pattern.matcher(fingerprint);
+
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return "";
+    }
+
+    public static String getDeviceName(String fingerprint) {
+        String[] parts = fingerprint.split("/");
+        if (parts.length >= 2) {
+            return parts[1];
+        }
+        return "";
+    }
+
+    public static void init(Context context) {
+        if (sInitialized || Process.isIsolated() || context == null) return;
+        sInitialized = true;
+        registerSpoofSettingsObserver(context);
+    }
+
+    private static void registerSpoofSettingsObserver(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        final Runnable refresh = () -> {
+            try {
+                sPhotosSpoofEnabled = Settings.Secure.getInt(
+                        cr, Settings.Secure.PI_PHOTOS_SPOOF, 1) == 1;
+                sSnapchatSpoofEnabled = Settings.Secure.getInt(
+                        cr, Settings.Secure.PI_SNAPCHAT_SPOOF, 0) == 1;
+                sPixelPropsSpoofEnabled = Settings.Secure.getInt(
+                        cr, Settings.Secure.PI_PP_SPOOF, 1) == 1;
+            } catch (Throwable t) {
+                // Settings provider not ready yet; cache stays at safe defaults
+            }
+        };
+        try {
+            final android.database.ContentObserver observer =
+                    new android.database.ContentObserver(null) {
+                @Override
+                public void onChange(boolean selfChange) { refresh.run(); }
+            };
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.PI_PHOTOS_SPOOF), false, observer);
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.PI_SNAPCHAT_SPOOF), false, observer);
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.PI_PP_SPOOF), false, observer);
+        } catch (Throwable t) {
+            // Observer registration failed; cached defaults remain
+        }
+        refresh.run();
+    }
+
+    private static boolean isGoogleCameraPackage(String packageName) {
+        return packageName.contains("GoogleCamera")
+                || customGoogleCameraPackages.contains(packageName);
+    }
+
+    private static void applyAppSpecificProps(String packageName) {
+        if (packageName.equals(PACKAGE_PHOTOS)) {
+            if (sPhotosSpoofEnabled) {
+                sPixelXLProps.forEach(PixelPropsUtils::setPropValue);
+            }
+            return;
+        }
+
+        if (packageName.equals(PACKAGE_SNAPCHAT)) {
+            if (sSnapchatSpoofEnabled) {
+                sPixelXLProps.forEach(PixelPropsUtils::setPropValue);
+            }
+        }
+    }
+
+    public static void setProps(Context context) {
+        if (sIsCustomForkBuild) {
+            if (DEBUG) Log.d(TAG, "Custom fork detected → disabling prop spoofing");
+            return;
+        }
+
+        if (Process.isIsolated()) {
+            if (DEBUG) Log.d(TAG, "Skipping setProps in isolated process");
+            return;
+        }
+
+        final String packageName = context.getPackageName();
+        final String processName = Application.getProcessName();
+        if (packageName == null || processName == null || packageName.isEmpty()) {
+            return;
+        }
+
+        sProcessName = processName;
+
+        init(context);
+
+        Map<String, Object> propsToChange = new HashMap<>();
+
+        propsToChangeGeneric.forEach((k, v) -> setPropValue(k, v));
+
+        sIsExcluded = isGoogleCameraPackage(packageName);
+
+        if (!sIsExcluded
+                && packagesToChangeRecentPixel.contains(packageName)
+                && !sIsMainlineDevice
+                && sPixelPropsSpoofEnabled) {
+
+            if (isDeviceTablet(context)) {
+                propsToChange.putAll(propsToChangePixelTablet);
+            } else {
+                propsToChange.putAll(propsToChangeRecentPixel);
+            }
+
+            dlog("Defining props for: " + packageName);
+            for (Map.Entry<String, Object> prop : propsToChange.entrySet()) {
+                String key = prop.getKey();
+                Object value = prop.getValue();
+                if (propsToKeep.containsKey(packageName) && propsToKeep.get(packageName).contains(key)) {
+                    dlog("Not defining " + key + " prop for: " + packageName);
+                    continue;
+                }
+                dlog("Defining " + key + " prop for: " + packageName);
+                setPropValue(key, value);
+            }
+        }
+
+        // Set proper indexing fingerprint
+        if (packageName.equals(PACKAGE_SI)) {
+            setPropValue("FINGERPRINT", String.valueOf(Build.TIME));
+            return;
+        }
+        if (packageName.equals(PACKAGE_ARCORE)) {
+            setPropValue("FINGERPRINT", sDeviceFingerprint);
+            return;
+        }
+        applyAppSpecificProps(packageName);
+    }
+
+    private static boolean isDeviceTablet(Context context) {
+        if (context == null) {
+            return false;
+        }
+        Configuration config = context.getResources().getConfiguration();
+        if (config == null) return false;
+        return config.smallestScreenWidthDp >= 600;
+    }
+
+    public static void setPropValue(String key, Object value) {
+        try {
+            Field field = getBuildClassField(key);
+            if (field != null) {
+                field.setAccessible(true);
+                if (field.getType() == int.class) {
+                    if (value instanceof String) {
+                        field.set(null, Integer.parseInt((String) value));
+                    } else if (value instanceof Integer) {
+                        field.set(null, (Integer) value);
+                    }
+                } else if (field.getType() == long.class) {
+                    if (value instanceof String) {
+                        field.set(null, Long.parseLong((String) value));
+                    } else if (value instanceof Long) {
+                        field.set(null, (Long) value);
+                    }
+                } else {
+                    field.set(null, value.toString());
+                }
+                field.setAccessible(false);
+                dlog("Set prop " + key + " to " + value);
+            } else {
+                Log.e(TAG, "Field " + key + " not found in Build or Build.VERSION classes");
+            }
+        } catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) {
+            Log.e(TAG, "Failed to set prop " + key, e);
+        }
+    }
+
+    private static Field getBuildClassField(String key) throws NoSuchFieldException {
+        try {
+            Field field = Build.class.getDeclaredField(key);
+            dlog("Field " + key + " found in Build.class");
+            return field;
+        } catch (NoSuchFieldException e) {
+            Field field = Build.VERSION.class.getDeclaredField(key);
+            dlog("Field " + key + " found in Build.VERSION.class");
+            return field;
+        }
+    }
+
+    private static String[] getStringArrayResSafely(int resId) {
+        String[] strArr = Resources.getSystem().getStringArray(resId);
+        if (strArr == null) strArr = new String[0];
+        return strArr;
+    }
+
+    public static boolean isPackageGoogle(String pkg) {
+        return pkg != null && pkg.toLowerCase().contains("google");
+    }
+
+    private static Set<String> getLauncherPkgs() {
+        synchronized (PixelPropsUtils.class) {
+            if (mLauncherPkgs == null || mLauncherPkgs.isEmpty()) {
+                mLauncherPkgs =
+                        new HashSet<>(
+                                Arrays.asList(
+                                        getStringArrayResSafely(R.array.config_launcherPackages)));
+            }
+            return mLauncherPkgs;
+        }
+    }
+
+    private static Set<String> getExemptedUidPkgs() {
+        synchronized (PixelPropsUtils.class) {
+            if (mExemptedUidPkgs == null || mExemptedUidPkgs.isEmpty()) {
+                mExemptedUidPkgs = new HashSet<>();
+                mExemptedUidPkgs.add(PACKAGE_GMS);
+                mExemptedUidPkgs.addAll(getLauncherPkgs());
+            }
+            return mExemptedUidPkgs;
+        }
+    }
+
+    public static boolean isNexusLauncher(Context context) {
+        try {
+            return PACKAGE_NEXUS_LAUNCHER.equals(
+                    context.getPackageManager().getNameForUid(android.os.Binder.getCallingUid()));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public static boolean isSystemLauncher(Context context) {
+        try {
+            return isSystemLauncherInternal(
+                    context.getPackageManager().getNameForUid(android.os.Binder.getCallingUid()));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public static boolean isSystemLauncher(int callingUid) {
+        try {
+            return isSystemLauncherInternal(
+                    ActivityThread.getPackageManager().getNameForUid(callingUid));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public static boolean isSystemLauncherInternal(String callerPackage) {
+        return getLauncherPkgs().contains(callerPackage);
+    }
+
+    public static boolean shouldBypassTaskPermission(int callingUid) {
+        for (String pkg : getExemptedUidPkgs()) {
+            try {
+                ApplicationInfo appInfo =
+                        ActivityThread.getPackageManager()
+                                .getApplicationInfo(pkg, 0, UserHandle.getUserId(callingUid));
+                if (appInfo.uid == callingUid) {
+                    return true;
+                }
+            } catch (Exception e) {
+                dlog("shouldBypassTaskPermission: failed to get appInfo for uid " + callingUid + ": " + e.getMessage());
+            }
+        }
+        return false;
+    }
+
+    public static boolean shouldBypassManageActivityTaskPermission(Context context) {
+        final int callingUid = Binder.getCallingUid();
+        return isSystemLauncher(callingUid)
+                || isPackageGoogle(context.getPackageManager().getNameForUid(callingUid));
+    }
+
+    public static boolean shouldBypassMonitorInputPermission(Context context) {
+        final int callingUid = Binder.getCallingUid();
+        return shouldBypassTaskPermission(callingUid)
+                || isPackageGoogle(context.getPackageManager().getNameForUid(callingUid));
+    }
+
+    // Whitelist of package names to bypass FGS type validation
+    public static boolean shouldBypassFGSValidation(String packageName) {
+        if (Arrays.asList(getStringArrayResSafely(R.array.config_fgsTypeValidationBypassPackages))
+                .contains(packageName)) {
+            dlog("shouldBypassFGSValidation: "
+                    + "Bypassing FGS type validation for whitelisted app: "
+                    + packageName);
+            return true;
+        }
+        return false;
+    }
+
+    // Whitelist of package names to bypass alarm manager validation
+    public static boolean shouldBypassAlarmManagerValidation(String packageName) {
+        if (Arrays.asList(
+                        getStringArrayResSafely(
+                                R.array.config_alarmManagerValidationBypassPackages))
+                .contains(packageName)) {
+            dlog("shouldBypassAlarmManagerValidation: "
+                    + "Bypassing alarm manager validation for whitelisted app: "
+                    + packageName);
+            return true;
+        }
+        return false;
+    }
+
+    // Whitelist of package names to bypass broadcast receiver validation
+    public static boolean shouldBypassBroadcastReceiverValidation(String packageName) {
+        if (Arrays.asList(
+                        getStringArrayResSafely(
+                                R.array.config_broadcastReceiverValidationBypassPackages))
+                .contains(packageName)) {
+            dlog("shouldBypassBroadcastReceiverValidation: "
+                    + "Bypassing broadcast receiver validation for whitelisted app: "
+                    + packageName);
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean detectMainlinePixelDevice() {
+        String model = SystemProperties.get("ro.product.model", "").trim();
+        boolean isPixelSoC = "Google".equalsIgnoreCase(
+                SystemProperties.get("ro.soc.manufacturer"));
+        return isPixelSoC && MAINLINE_PIXEL_PATTERN.matcher(model).matches();
+    }
+
+    public static boolean isMainlinePixelDevice() {
+        return sIsMainlineDevice;
+    }
+
+    public static boolean isTensorPixelDevice() {
+        String model = SystemProperties.get("ro.product.model", "").trim();
+        // Tensor devices are always Google SoC
+        boolean isPixelSoC = "Google".equalsIgnoreCase(
+                SystemProperties.get("ro.soc.manufacturer"));
+        return isPixelSoC && TENSOR_PIXEL_PATTERN.matcher(model).matches();
+    }
+
+    public static boolean isSupportedPixelDevice() {
+        String model = SystemProperties.get("ro.product.model", "").trim();
+        return SUPPORTED_PIXEL_PATTERN.matcher(model).matches();
+    }
+
+    public static void dlog(String msg) {
+        if (DEBUG) Log.d(TAG, "[" + sProcessName + "] " + msg);
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/SystemRestartUtils.java b/core/java/com/android/internal/util/matrixx/SystemRestartUtils.java
new file mode 100644
index 0000000000000..b9b7cdc9a0632
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/SystemRestartUtils.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2023 Rising OS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.app.AlertDialog;
+import android.app.IActivityManager;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+
+import com.android.internal.R;
+import com.android.internal.statusbar.IStatusBarService;
+
+import java.lang.ref.WeakReference;
+
+import java.util.List;
+
+public class SystemRestartUtils {
+
+    private static final int RESTART_TIMEOUT = 1000;
+
+    public static void showSystemRestartDialog(Context context) {
+        new AlertDialog.Builder(context)
+                .setTitle(R.string.system_restart_title)
+                .setMessage(R.string.system_restart_message)
+                .setPositiveButton(R.string.ok, (dialog, id) -> {
+                    Handler handler = new Handler();
+                    handler.postDelayed(() -> restartSystem(context), RESTART_TIMEOUT);
+                })
+                .setNegativeButton(R.string.cancel, null)
+                .show();
+    }
+
+    public static void powerOffSystem(Context context) {
+        new PowerOffSystemTask(context).execute();
+    }
+
+    private static class PowerOffSystemTask extends AsyncTask<Void, Void, Void> {
+        private final WeakReference<Context> mContext;
+
+        PowerOffSystemTask(Context context) {
+            mContext = new WeakReference<>(context);
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            try {
+                IStatusBarService mBarService = IStatusBarService.Stub.asInterface(
+                        ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+                if (mBarService != null) {
+                    try {
+                        Thread.sleep(RESTART_TIMEOUT);
+                        mBarService.shutdown();
+                    } catch (RemoteException | InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static void restartSystem(Context context) {
+        new RestartSystemTask(context).execute();
+    }
+
+    private static class RestartSystemTask extends AsyncTask<Void, Void, Void> {
+        private final WeakReference<Context> mContext;
+
+        RestartSystemTask(Context context) {
+            mContext = new WeakReference<>(context);
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            try {
+                IStatusBarService mBarService = IStatusBarService.Stub.asInterface(
+                        ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+                if (mBarService != null) {
+                    try {
+                        Thread.sleep(RESTART_TIMEOUT);
+                        mBarService.reboot(false, null);
+                    } catch (RemoteException | InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    private static void showRestartDialog(Context context, int title, int message, Runnable action) {
+        new AlertDialog.Builder(context)
+                .setTitle(title)
+                .setMessage(message)
+                .setPositiveButton(R.string.ok, (dialog, id) -> {
+                    Handler handler = new Handler();
+                    handler.postDelayed(action, RESTART_TIMEOUT);
+                })
+                .setNegativeButton(R.string.cancel, null)
+                .show();
+    }
+
+    public static void restartProcess(Context context, String processName) {
+        new RestartTask(context, processName).execute();
+    }
+
+    private static class RestartTask extends AsyncTask<Void, Void, Void> {
+        private final WeakReference<Context> mContext;
+        private final String mPackageName;
+
+        RestartTask(Context context, String packageName) {
+            mContext = new WeakReference<>(context);
+            mPackageName = packageName;
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            try {
+                ActivityManager am = (ActivityManager) mContext.get().getSystemService(Context.ACTIVITY_SERVICE);
+                if (am != null) {
+                    List<ActivityManager.RunningAppProcessInfo> runningProcesses = am.getRunningAppProcesses();
+                    for (ActivityManager.RunningAppProcessInfo appProcess : runningProcesses) {
+                        if (appProcess.pkgList != null) {
+                            for (String pkg : appProcess.pkgList) {
+                                if (pkg.equals(mPackageName)) {
+                                    Process.killProcess(appProcess.pid);
+                                    return null;
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {}
+            return null;
+        }
+    }
+
+    public static void showSettingsRestartDialog(Context context) {
+        showRestartDialog(context, R.string.settings_restart_title, R.string.settings_restart_message, () -> restartProcess(context, "com.android.settings"));
+    }
+
+    public static void showSystemUIRestartDialog(Context context) {
+        showRestartDialog(context, R.string.systemui_restart_title, R.string.systemui_restart_message, () -> restartProcess(context, "com.android.systemui"));
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/ThemeUtils.java b/core/java/com/android/internal/util/matrixx/ThemeUtils.java
new file mode 100644
index 0000000000000..c63fa64f66eb5
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/ThemeUtils.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright (C) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import static android.os.UserHandle.USER_SYSTEM;
+
+import android.util.PathParser;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ProviderInfo;
+import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
+import android.content.res.Configuration;
+import android.database.Cursor;
+import android.graphics.Typeface;
+import android.graphics.Path;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.PathShape;
+import android.net.Uri;
+import android.os.BatteryManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class ThemeUtils {
+
+    public static final String TAG = "ThemeUtils";
+
+    public static final String FONT_KEY = "android.theme.customization.font";
+    public static final String ICON_SHAPE_KEY= "android.theme.customization.adaptive_icon_shape";
+
+    public static final Comparator<OverlayInfo> OVERLAY_INFO_COMPARATOR =
+            Comparator.comparingInt(a -> a.priority);
+
+    private static ThemeUtils instance;
+
+    private Context mContext;
+    private IOverlayManager mOverlayManager;
+    private PackageManager pm;
+    private Resources overlayRes;
+
+    public ThemeUtils(Context context) {
+        mContext = context;
+        mOverlayManager = IOverlayManager.Stub
+                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
+        pm = context.getPackageManager();
+    }
+
+    public static ThemeUtils getInstance(Context context) {
+        if (instance == null) {
+            synchronized (ThemeUtils.class) {
+                if (instance == null) {
+                    instance = new ThemeUtils(context);
+                }
+            }
+        }
+        return instance;
+    }
+
+    public void setOverlayEnabled(String category, String packageName, String target) {
+        final String currentPackageName = getOverlayInfos(category, target).stream()
+                .filter(info -> info.isEnabled())
+                .map(info -> info.packageName)
+                .findFirst()
+                .orElse(null);
+
+        try {
+            if (target.equals(packageName)) {
+                if (currentPackageName != null) {
+                    mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM);
+                }
+            } else {
+                mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM);
+            }
+
+            writeSettings(category, packageName, target.equals(packageName));
+
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException while setting overlay: " + e.getMessage(), e);
+        }
+    }
+
+    public void writeSettings(String category, String packageName, boolean disable) {
+        final String overlayPackageJson = Settings.Secure.getStringForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, UserHandle.USER_CURRENT);
+        JSONObject object;
+        try {
+            if (overlayPackageJson == null) {
+                object = new JSONObject();
+            } else {
+                object = new JSONObject(overlayPackageJson);
+            }
+            if (disable) {
+                if (object.has(category)) object.remove(category);
+            } else {
+                object.put(category, packageName);
+            }
+            Settings.Secure.putStringForUser(mContext.getContentResolver(),
+                    Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                    object.toString(), UserHandle.USER_CURRENT);
+        } catch (JSONException e) {
+            Log.e(TAG, "Failed to parse THEME_CUSTOMIZATION_OVERLAY_PACKAGES.", e);
+        }
+    }
+
+    public List<String> getOverlayPackagesForCategory(String category) {
+        return getOverlayPackagesForCategory(category, "android");
+    }
+
+    public List<String> getOverlayPackagesForCategory(String category, String target) {
+        List<String> overlays = new ArrayList<>();
+        List<String> mPkgs = new ArrayList<>();
+        overlays.add(target);
+        for (OverlayInfo info : getOverlayInfos(category, target)) {
+            if (category.equals(info.getCategory())) {
+                mPkgs.add(info.getPackageName());
+            }
+        }
+        Collections.sort(mPkgs);
+        overlays.addAll(mPkgs);
+        return overlays;
+    }
+
+    public List<OverlayInfo> getOverlayInfos(String category) {
+        return getOverlayInfos(category, "android");
+    }
+
+    public List<OverlayInfo> getOverlayInfos(String category, String target) {
+        final List<OverlayInfo> filteredInfos = new ArrayList<>();
+        try {
+            List<OverlayInfo> overlayInfos = mOverlayManager
+                    .getOverlayInfosForTarget(target, USER_SYSTEM);
+            for (OverlayInfo overlayInfo : overlayInfos) {
+                if (category.equals(overlayInfo.category)) {
+                    filteredInfos.add(overlayInfo);
+                }
+            }
+        } catch (RemoteException re) {
+            Log.e(TAG, "RemoteException while getting overlay info: " + re.getMessage(), re);
+        }
+        filteredInfos.sort(OVERLAY_INFO_COMPARATOR);
+        return filteredInfos;
+    }
+
+    public List<Typeface> getFonts() {
+        final List<Typeface> fontlist = new ArrayList<>();
+                for (String overlayPackage : getOverlayPackagesForCategory(FONT_KEY)) {
+            Resources overlayRes = null;
+            try {
+                overlayRes = overlayPackage.equals("android") ? Resources.getSystem()
+                        : pm.getResourcesForApplication(overlayPackage);
+                if (overlayRes != null) {
+                    int fontId = overlayRes.getIdentifier("config_bodyFontFamily", "string", overlayPackage);
+                    if (fontId != 0) {
+                        String fontName = overlayRes.getString(fontId);
+                        fontlist.add(Typeface.create(fontName, Typeface.NORMAL));
+                    }
+                }
+            } catch (NameNotFoundException | NotFoundException e) {
+                Log.e(TAG, "Error fetching fonts for package: " + overlayPackage, e);
+            }
+        }
+        return fontlist;
+    }
+
+    public List<ShapeDrawable> getShapeDrawables() {
+        final List<ShapeDrawable> shapelist = new ArrayList<>();
+            for (String overlayPackage : getOverlayPackagesForCategory(ICON_SHAPE_KEY)) {
+                    shapelist.add(createShapeDrawable(overlayPackage));
+            }
+        return shapelist;
+    }
+
+    public ShapeDrawable createShapeDrawable(String overlayPackage) {
+        try {
+            if (overlayPackage.equals("android")) {
+                overlayRes = Resources.getSystem();
+            } else {
+                if (overlayPackage.equals("default")) overlayPackage = "android";
+                overlayRes = pm.getResourcesForApplication(overlayPackage);
+            }
+        } catch (NameNotFoundException | NotFoundException e) {
+            // Do nothing
+        }
+        if (overlayRes == null) {
+            Log.e(TAG, "Resources not found for package: " + overlayPackage);
+            return null;
+        }
+        final String shape = overlayRes.getString(
+            overlayRes.getIdentifier("config_icon_mask",
+            "string", overlayPackage));
+        Path path = TextUtils.isEmpty(shape) ? null : PathParser.createPathFromPathData(shape);
+        PathShape pathShape = new PathShape(path, 100f, 100f);
+        ShapeDrawable shapeDrawable = new ShapeDrawable(pathShape);
+        int mThumbSize = (int) (mContext.getResources().getDisplayMetrics().density * 72);
+        shapeDrawable.setIntrinsicHeight(mThumbSize);
+        shapeDrawable.setIntrinsicWidth(mThumbSize);
+        return shapeDrawable;
+    }
+
+    public boolean isOverlayEnabled(String overlayPackage) {
+        try {
+            OverlayInfo info = mOverlayManager.getOverlayInfo(overlayPackage, USER_SYSTEM);
+            return info == null ? false : info.isEnabled();
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException while checking if overlay is enabled: " + e.getMessage(), e);
+        }
+        return false;
+    }
+
+    public boolean isDefaultOverlay(String category) {
+        return getOverlayPackagesForCategory(category).stream()
+               .noneMatch(pkg -> isOverlayEnabled(pkg));
+    }
+
+    public static String batteryTemperature(Context context, Boolean ForC) {
+        Intent intent = context.registerReceiver(null, new IntentFilter(
+                Intent.ACTION_BATTERY_CHANGED));
+        float  temp = ((float) (intent != null ? intent.getIntExtra(
+                BatteryManager.EXTRA_TEMPERATURE, 0) : 0)) / 10;
+        // Round up to nearest number
+        int c = (int) ((temp) + 0.5f);
+        float n = temp + 0.5f;
+        // Use boolean to determine celsius or fahrenheit
+        return String.valueOf((n - c) % 2 == 0 ? (int) temp :
+                ForC ? c * 9/5 + 32 + "°F" :c + "°C");
+    }
+
+    public static String getCPUTemp(Context context) {
+        String value = null;
+        String cpuTempPath = context.getResources().getString(
+                com.android.internal.R.string.config_cpu_temp_path);
+        
+        if (fileExists(cpuTempPath)) {
+            value = readOneLine(cpuTempPath);
+        }
+        
+        if (value == null || value.isEmpty()) {
+            return "N/A";
+        }
+        
+        try {
+            int cpuTempMultiplier = context.getResources().getInteger(
+                    com.android.internal.R.integer.config_sysCPUTempMultiplier);
+            
+            if (cpuTempMultiplier == 0) {
+                cpuTempMultiplier = 1;
+            }
+            
+            int temp = Integer.parseInt(value.trim()) / cpuTempMultiplier;
+            return String.format("%d°C", temp);
+        } catch (NumberFormatException | Resources.NotFoundException e) {
+            Log.w("ThemeUtils", "Failed to parse CPU temperature: " + value, e);
+            return "N/A";
+        }
+    }
+
+    public static boolean fileExists(String filename) {
+        if (filename == null || filename.isEmpty()) {
+            return false;
+        }
+        return new File(filename).exists();
+    }
+
+    public static String readOneLine(String fname) {
+        if (fname == null || fname.isEmpty()) {
+            return null;
+        }
+        
+        BufferedReader br = null;
+        try {
+            br = new BufferedReader(new FileReader(fname), 512);
+            return br.readLine();
+        } catch (Exception e) {
+            Log.w("ThemeUtils", "Failed to read file: " + fname, e);
+            return null;
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    // Ignore close errors
+                }
+            }
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/Utils.java b/core/java/com/android/internal/util/matrixx/Utils.java
new file mode 100644
index 0000000000000..a8a71c9354119
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/Utils.java
@@ -0,0 +1,578 @@
+/*
+ * Copyright (C) 2017-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.app.ActivityManager;
+import android.app.IActivityManager;
+import android.app.ActivityThread;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.role.RoleManager;
+import android.bluetooth.BluetoothAdapter;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.om.OverlayManager;
+import android.content.om.OverlayManagerTransaction;
+import android.content.om.OverlayIdentifier;
+import android.content.om.OverlayInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.hardware.SensorPrivacyManager;
+import android.location.LocationManager;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.SystemProperties;
+
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+import android.widget.Toast;
+import com.android.internal.R;
+
+import com.android.internal.notification.SystemNotificationChannels;
+import com.android.internal.util.ArrayUtils;
+import com.android.internal.util.CollectionUtils;
+
+import android.util.Log;
+
+import com.android.internal.statusbar.IStatusBarService;
+
+import java.util.List;
+
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_OFF;
+
+public class Utils {
+
+    private static final String TAG = "Utils";
+
+    public static void restartApp(String appName, Context context) {
+        new RestartAppTask(appName, context).execute();
+    }
+
+    private static class RestartAppTask extends AsyncTask<Void, Void, Void> {
+        private Context mContext;
+        private String mApp;
+
+        public RestartAppTask(String appName, Context context) {
+            super();
+            mContext = context;
+            mApp = appName;
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            try {
+                ActivityManager am =
+                        (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+                IActivityManager ams = ActivityManager.getService();
+                for (ActivityManager.RunningAppProcessInfo app: am.getRunningAppProcesses()) {
+                    if (mApp.equals(app.processName)) {
+                        ams.killApplicationProcess(app.processName, app.uid);
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static boolean isPackageInstalled(Context context, String packageName, boolean ignoreState) {
+        if (packageName != null) {
+            try {
+                PackageInfo pi = context.getPackageManager().getPackageInfo(packageName, 0);
+                if (!pi.applicationInfo.enabled && !ignoreState) {
+                    return false;
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean isPackageInstalled(Context context, String packageName) {
+        return isPackageInstalled(context, packageName, true);
+    }
+
+    public static boolean isPackageEnabled(Context context, String packageName) {
+        try {
+            PackageInfo pi = context.getPackageManager().getPackageInfo(packageName, 0);
+            return pi.applicationInfo.enabled;
+        } catch (PackageManager.NameNotFoundException notFound) {
+            return false;
+        }
+    }
+
+    public static void switchScreenOff(Context ctx) {
+        PowerManager pm = (PowerManager) ctx.getSystemService(Context.POWER_SERVICE);
+        if (pm!= null) {
+            pm.goToSleep(SystemClock.uptimeMillis());
+        }
+    }
+
+    public static boolean deviceHasFlashlight(Context ctx) {
+        return ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
+    }
+
+    public static boolean hasNavbarByDefault(Context context) {
+        boolean needsNav = context.getResources().getBoolean(
+                com.android.internal.R.bool.config_showNavigationBar);
+        String navBarOverride = SystemProperties.get("qemu.hw.mainkeys");
+        if ("1".equals(navBarOverride)) {
+            needsNav = false;
+        } else if ("0".equals(navBarOverride)) {
+            needsNav = true;
+        }
+        return needsNav;
+    }
+
+    public static void restartSystemUI() {
+        final IStatusBarService mBarService = IStatusBarService.Stub.asInterface(
+                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+        try {
+            mBarService.restartSystemUI();
+        } catch (RemoteException e) {
+        }
+    }
+
+    public static void toggleOverlay(Context context, String overlayName, boolean enable) {
+        OverlayManager overlayManager = context.getSystemService(OverlayManager.class);
+        if (overlayManager == null) {
+            Log.e(TAG, "OverlayManager is not available");
+            return;
+        }
+
+        OverlayIdentifier overlayId = getOverlayID(overlayManager, overlayName);
+        if (overlayId == null) {
+            Log.e(TAG, "Overlay ID not found for " + overlayName);
+            return;
+        }
+
+        OverlayManagerTransaction.Builder transaction = new OverlayManagerTransaction.Builder();
+        transaction.setEnabled(overlayId, enable, UserHandle.USER_CURRENT);
+
+        try {
+            overlayManager.commit(transaction.build());
+        } catch (Exception e) {
+            Log.e(TAG, "Error toggling overlay", e);
+        }
+    }
+
+    private static OverlayIdentifier getOverlayID(OverlayManager overlayManager, String name) {
+        try {
+            if (name.contains(":")) {
+                String[] parts = name.split(":");
+                List<OverlayInfo> infos = overlayManager.getOverlayInfosForTarget(parts[0], UserHandle.CURRENT);
+                for (OverlayInfo info : infos) {
+                    if (parts[1].equals(info.getOverlayName())) return info.getOverlayIdentifier();
+                }
+            } else {
+                OverlayInfo info = overlayManager.getOverlayInfo(name, UserHandle.CURRENT);
+                if (info != null) return info.getOverlayIdentifier();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error retrieving overlay ID", e);
+        }
+        return null;
+    }
+
+    public static String getDefaultLauncher(Context context) {
+        final RoleManager roleManager = context.getSystemService(RoleManager.class);
+        final String packageName = CollectionUtils.firstOrNull(
+                roleManager.getRoleHolders(RoleManager.ROLE_HOME));
+        return packageName != null ? packageName : "";
+    }
+
+    public static void forceStopDefaultLauncher(Context context) {
+        final ActivityManager activityManager = context.getSystemService(ActivityManager.class);
+        try {
+            activityManager.forceStopPackageAsUser(getDefaultLauncher(context), UserHandle.USER_CURRENT);
+        } catch (Exception ignored) {}
+    }
+
+    public static class SleepModeController {
+        private final Resources mResources;
+        private final Context mUiContext;
+
+        private Context mContext;
+        private AudioManager mAudioManager;
+        private NotificationManager mNotificationManager;
+        private WifiManager mWifiManager;
+        private SensorPrivacyManager mSensorPrivacyManager;
+        private BluetoothAdapter mBluetoothAdapter;
+        private int mSubscriptionId;
+        private Toast mToast;
+
+        private boolean mSleepModeEnabled;
+
+        private static boolean mWifiState;
+        private static boolean mCellularState;
+        private static boolean mBluetoothState;
+        private static int mRingerState;
+        private static int mZenState;
+
+        private static final String TAG = "SleepModeController";
+        private static final int SLEEP_NOTIFICATION_ID = 727;
+        public static final String SLEEP_MODE_TURN_OFF = "android.intent.action.SLEEP_MODE_TURN_OFF";
+
+        public SleepModeController(Context context) {
+            mContext = context;
+            mUiContext = ActivityThread.currentActivityThread().getSystemUiContext();
+            mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+            mSensorPrivacyManager = (SensorPrivacyManager) mContext.getSystemService(Context.SENSOR_PRIVACY_SERVICE);
+            mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+            mResources = mContext.getResources();
+
+            mSleepModeEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+
+            SettingsObserver observer = new SettingsObserver(new Handler(Looper.getMainLooper()));
+            observer.observe();
+            observer.update();
+        }
+
+        private TelephonyManager getTelephonyManager() {
+            int subscriptionId = mSubscriptionId;
+
+            // If mSubscriptionId is invalid, get default data sub.
+            if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
+                subscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
+            }
+
+            // If data sub is also invalid, get any active sub.
+            if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
+                int[] activeSubIds = SubscriptionManager.from(mContext).getActiveSubscriptionIdList();
+                if (!ArrayUtils.isEmpty(activeSubIds)) {
+                    subscriptionId = activeSubIds[0];
+                }
+            }
+
+            return mContext.getSystemService(
+                    TelephonyManager.class).createForSubscriptionId(subscriptionId);
+        }
+
+        private boolean isWifiEnabled() {
+            if (mWifiManager == null) {
+                mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+            }
+            try {
+                return mWifiManager.isWifiEnabled();
+            } catch (Exception e) {
+                return false;
+            }
+        }
+
+        private void setWifiEnabled(boolean enable) {
+            if (mWifiManager == null) {
+                mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+            }
+            try {
+                mWifiManager.setWifiEnabled(enable);
+            } catch (Exception e) {
+            }
+        }
+
+        private boolean isBluetoothEnabled() {
+            if (mBluetoothAdapter == null) {
+                mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            }
+            try {
+                return mBluetoothAdapter.isEnabled();
+            } catch (Exception e) {
+                return false;
+            }
+        }
+
+        private void setBluetoothEnabled(boolean enable) {
+            if (mBluetoothAdapter == null) {
+                mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+            }
+            try {
+                if (enable) mBluetoothAdapter.enable();
+                else mBluetoothAdapter.disable();
+            } catch (Exception e) {
+            }
+        }
+
+        private boolean isSensorEnabled() {
+            if (mSensorPrivacyManager == null) {
+                mSensorPrivacyManager = (SensorPrivacyManager) mContext.getSystemService(Context.SENSOR_PRIVACY_SERVICE);
+            }
+            try {
+                return !mSensorPrivacyManager.isAllSensorPrivacyEnabled();
+            } catch (Exception e) {
+                return false;
+            }
+        }
+
+        private void setSensorEnabled(boolean enable) {
+            if (mSensorPrivacyManager == null) {
+                mSensorPrivacyManager = (SensorPrivacyManager) mContext.getSystemService(Context.SENSOR_PRIVACY_SERVICE);
+            }
+            try {
+                mSensorPrivacyManager.setAllSensorPrivacy(!enable);
+            } catch (Exception e) {
+            }
+        }
+
+        private int getZenMode() {
+            if (mNotificationManager == null) {
+                mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            }
+            try {
+                return mNotificationManager.getZenMode();
+            } catch (Exception e) {
+                return -1;
+            }
+        }
+
+        private void setZenMode(int mode) {
+            if (mNotificationManager == null) {
+                mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+            }
+            try {
+                mNotificationManager.setZenMode(mode, null, TAG);
+            } catch (Exception e) {
+            }
+        }
+
+        private int getRingerModeInternal() {
+            if (mAudioManager == null) {
+                mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            }
+            try {
+                return mAudioManager.getRingerModeInternal();
+            } catch (Exception e) {
+                return -1;
+            }
+        }
+
+        private void setRingerModeInternal(int mode) {
+            if (mAudioManager == null) {
+                mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            }
+            try {
+                mAudioManager.setRingerModeInternal(mode);
+            } catch (Exception e) {
+            }
+        }
+
+        private void enable() {
+            if (!ActivityManager.isSystemReady()) return;
+
+            // Disable Wi-Fi
+            final boolean disableWifi = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_WIFI_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableWifi) {
+                mWifiState = isWifiEnabled();
+                setWifiEnabled(false);
+            }
+
+            // Disable Bluetooth
+            final boolean disableBluetooth = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_BLUETOOTH_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableBluetooth) {
+                mBluetoothState = isBluetoothEnabled();
+                setBluetoothEnabled(false);
+            }
+
+            // Disable Mobile Data
+            final boolean disableData = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_CELLULAR_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableData) {
+                mCellularState = getTelephonyManager().isDataEnabled();
+                getTelephonyManager().setDataEnabled(false);
+            }
+
+            // Disable Sensors
+            final boolean disableSensors = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_SENSORS_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableSensors) {
+                setSensorEnabled(false);
+            }
+
+            // Set Ringer mode (0: Off, 1: Vibrate, 2:DND: 3:Silent)
+            final int ringerMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_RINGER_MODE, 0, UserHandle.USER_CURRENT);
+            if (ringerMode != 0) {
+                mRingerState = getRingerModeInternal();
+                mZenState = getZenMode();
+                if (ringerMode == 1) {
+                    setRingerModeInternal(AudioManager.RINGER_MODE_VIBRATE);
+                    setZenMode(ZEN_MODE_OFF);
+                } else if (ringerMode == 2) {
+                    setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);
+                    setZenMode(ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+                } else if (ringerMode == 3) {
+                    setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);
+                    setZenMode(ZEN_MODE_OFF);
+                }
+            }
+
+            showToast(mResources.getString(R.string.sleep_mode_enabled_toast), Toast.LENGTH_LONG);
+            addNotification();
+        }
+
+        private void disable() {
+            if (!ActivityManager.isSystemReady()) return;
+
+            // Enable Wi-Fi
+            final boolean disableWifi = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_WIFI_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableWifi && mWifiState != isWifiEnabled()) {
+                setWifiEnabled(mWifiState);
+            }
+
+            // Enable Bluetooth
+            final boolean disableBluetooth = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_BLUETOOTH_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableBluetooth && mBluetoothState != isBluetoothEnabled()) {
+                setBluetoothEnabled(mBluetoothState);
+            }
+
+            // Enable Mobile Data
+            final boolean disableData = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_CELLULAR_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableData && mCellularState != getTelephonyManager().isDataEnabled()) {
+                getTelephonyManager().setDataEnabled(mCellularState);
+            }
+
+            // Enable Sensors
+            final boolean disableSensors = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_SENSORS_TOGGLE, 1, UserHandle.USER_CURRENT) == 1;
+            if (disableSensors) {
+                setSensorEnabled(true);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {}
+                if (!isSensorEnabled()) {
+                    setSensorEnabled(true);
+                }
+            }
+
+            // Set Ringer mode (0: Off, 1: Vibrate, 2:DND: 3:Silent)
+            final int ringerMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SLEEP_MODE_RINGER_MODE, 0, UserHandle.USER_CURRENT);
+            if (ringerMode != 0 && (mRingerState != getRingerModeInternal() ||
+                    mZenState != getZenMode())) {
+                setRingerModeInternal(mRingerState);
+                setZenMode(mZenState);
+            }
+
+            showToast(mResources.getString(R.string.sleep_mode_disabled_toast), Toast.LENGTH_LONG);
+            mNotificationManager.cancel(SLEEP_NOTIFICATION_ID);
+        }
+
+        private void addNotification() {
+            Intent intent = new Intent(SLEEP_MODE_TURN_OFF);
+            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+            // Display a notification
+            Notification.Builder builder = new Notification.Builder(mContext, SystemNotificationChannels.SLEEP)
+                .setTicker(mResources.getString(R.string.sleep_mode_notification_title))
+                .setContentTitle(mResources.getString(R.string.sleep_mode_notification_title))
+                .setContentText(mResources.getString(R.string.sleep_mode_notification_content))
+                .setSmallIcon(R.drawable.ic_sleep)
+                .setWhen(java.lang.System.currentTimeMillis())
+                .setOngoing(true)
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(false);
+
+            Notification notification = builder.build();
+            mNotificationManager.notify(SLEEP_NOTIFICATION_ID, notification);
+        }
+
+        private void showToast(String msg, int duration) {
+            Handler handler = new Handler(Looper.getMainLooper());
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        if (mToast != null) mToast.cancel();
+                        mToast = Toast.makeText(mUiContext, msg, duration);
+                        mToast.show();
+                    } catch (Exception e) {
+                    }
+                }
+            });
+        }
+
+        private void setSleepMode(boolean enabled) {
+            if (mSleepModeEnabled == enabled) {
+                return;
+            }
+
+            mSleepModeEnabled = enabled;
+
+            if (mSleepModeEnabled) {
+                enable();
+            } else {
+                disable();
+            }
+        }
+
+        class SettingsObserver extends ContentObserver {
+            SettingsObserver(Handler handler) {
+                super(handler);
+            }
+
+            void observe() {
+                ContentResolver resolver = mContext.getContentResolver();
+                resolver.registerContentObserver(Settings.Secure.getUriFor(
+                        Settings.Secure.SLEEP_MODE_ENABLED), false, this,
+                        UserHandle.USER_ALL);
+            }
+
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                update();
+            }
+
+            void update() {
+                final boolean enabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                        Settings.Secure.SLEEP_MODE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+                setSleepMode(enabled);
+            }
+        }
+    }
+}
diff --git a/core/java/com/android/internal/util/matrixx/VibrationUtils.java b/core/java/com/android/internal/util/matrixx/VibrationUtils.java
new file mode 100644
index 0000000000000..8ea7b83b33fc2
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/VibrationUtils.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023-2024 risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class VibrationUtils {
+
+    private static Executor executor = Executors.newSingleThreadExecutor();
+
+    public static void triggerVibration(final Context context, final int intensity) {
+        executor.execute(new Runnable() {
+            @Override
+            public void run() {
+                Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+                if (vibrator == null || intensity == 0) {
+                    return;
+                }
+                VibrationEffect effect = createVibrationEffect(intensity);
+                if (effect == null) {
+                    return;
+                }
+                vibrator.cancel();
+                vibrator.vibrate(effect);
+            }
+        });
+    }
+
+    private static VibrationEffect createVibrationEffect(int intensity) {
+        switch (intensity) {
+            case 1:
+                return VibrationEffect.createPredefined(VibrationEffect.EFFECT_TEXTURE_TICK);
+            case 2:
+                return VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK);
+            case 3:
+                return VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK);
+            case 4:
+                return VibrationEffect.createPredefined(VibrationEffect.EFFECT_DOUBLE_CLICK);
+            case 5:
+                return VibrationEffect.createPredefined(VibrationEffect.EFFECT_HEAVY_CLICK);
+            default:
+                return null;
+        }
+    }
+}
+
diff --git a/core/java/com/android/internal/util/matrixx/cutout/CutoutFullscreenController.java b/core/java/com/android/internal/util/matrixx/cutout/CutoutFullscreenController.java
new file mode 100644
index 0000000000000..81ae41774b915
--- /dev/null
+++ b/core/java/com/android/internal/util/matrixx/cutout/CutoutFullscreenController.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (C) 2018 The LineageOS project
+ * Copyright (C) 2019 The PixelExperience project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util.matrixx.cutout;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.text.TextUtils;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import android.provider.Settings;
+
+public class CutoutFullscreenController {
+    private Set<String> mApps = new HashSet<>();
+    private Context mContext;
+
+    private final boolean isAvailable;
+
+    public CutoutFullscreenController(Context context) {
+        mContext = context;
+        final Resources resources = mContext.getResources();
+
+	final String displayCutout = resources.getString(com.android.internal.R.string.config_mainBuiltInDisplayCutout);
+        isAvailable = !TextUtils.isEmpty(displayCutout);
+
+        if (!isAvailable) {
+            return;
+        }
+
+        SettingsObserver observer = new SettingsObserver(
+                new Handler(Looper.getMainLooper()));
+        observer.observe();
+    }
+
+    public boolean isSupported() {
+        return isAvailable;
+    }
+
+    public boolean shouldForceCutoutFullscreen(String packageName) {
+        return isSupported() && mApps.contains(packageName);
+    }
+
+    public Set<String> getApps() {
+        return mApps;
+    }
+
+    public void addApp(String packageName) {
+        mApps.add(packageName);
+        Settings.System.putString(mContext.getContentResolver(),
+                Settings.System.FORCE_FULLSCREEN_CUTOUT_APPS, String.join(",", mApps));
+    }
+
+    public void removeApp(String packageName) {
+        mApps.remove(packageName);
+        Settings.System.putString(mContext.getContentResolver(),
+                Settings.System.FORCE_FULLSCREEN_CUTOUT_APPS, String.join(",", mApps));
+    }
+
+    public void setApps(Set<String> apps) {
+        mApps = apps;
+    }
+
+    class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.FORCE_FULLSCREEN_CUTOUT_APPS), false, this,
+                    UserHandle.USER_ALL);
+
+            update();
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            update();
+        }
+
+        public void update() {
+            ContentResolver resolver = mContext.getContentResolver();
+
+            String apps = Settings.System.getStringForUser(resolver,
+                    Settings.System.FORCE_FULLSCREEN_CUTOUT_APPS,
+                    UserHandle.USER_CURRENT);
+            if (apps != null) {
+                setApps(new HashSet<>(Arrays.asList(apps.split(","))));
+            } else {
+                setApps(new HashSet<>());
+            }
+        }
+    }
+}
diff --git a/core/java/com/android/internal/widget/BigPictureNotificationImageView.java b/core/java/com/android/internal/widget/BigPictureNotificationImageView.java
index 3f3b513eff509..1c428ff0228d1 100644
--- a/core/java/com/android/internal/widget/BigPictureNotificationImageView.java
+++ b/core/java/com/android/internal/widget/BigPictureNotificationImageView.java
@@ -66,7 +66,7 @@ public BigPictureNotificationImageView(@NonNull Context context, @Nullable Attri
     public BigPictureNotificationImageView(@NonNull Context context, @Nullable AttributeSet attrs,
             @AttrRes int defStyleAttr, @StyleRes int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        boolean isLowRam = ActivityManager.isLowRamDeviceStatic();
+        boolean isLowRam = true;
         mMaximumDrawableWidth = context.getResources().getDimensionPixelSize(
                 isLowRam ? R.dimen.notification_big_picture_max_width_low_ram
                         : R.dimen.notification_big_picture_max_width);
diff --git a/core/java/com/android/internal/widget/LocalImageResolver.java b/core/java/com/android/internal/widget/LocalImageResolver.java
index 6351c0e631ac7..97e66d9ddfd06 100644
--- a/core/java/com/android/internal/widget/LocalImageResolver.java
+++ b/core/java/com/android/internal/widget/LocalImageResolver.java
@@ -34,6 +34,7 @@
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.IOException;
+import java.util.Locale;
 
 /** A class to extract Drawables from a MessagingStyle/ConversationStyle message. */
 public class LocalImageResolver {
@@ -259,6 +260,28 @@ private static void onHeaderDecoded(ImageDecoder decoder, ImageDecoder.ImageInfo
             int maxWidth, int maxHeight) {
         final Size size = info.getSize();
 
+        final String mimeType = info.getMimeType();
+        boolean isAllowedCodec = false;
+        if (mimeType != null) {
+            switch (mimeType.toLowerCase(Locale.US)) {
+                case "image/png":
+                case "image/jpeg":
+                case "image/webp":
+                case "image/gif":
+                case "image/bmp":
+                case "image/x-ico":
+                case "image/vnd.wap.wbmp":
+                case "image/heif":
+                case "image/heic":
+                case "image/avif":
+                    isAllowedCodec = true;
+                    break;
+            }
+        }
+        if (!isAllowedCodec) {
+            throw new RuntimeException("Image mime type (" + mimeType + ") is not allowed.");
+        }
+
         if (size.getWidth() > DEFAULT_DECODE_HARD_LIMIT_PX
                 || size.getHeight() > DEFAULT_DECODE_HARD_LIMIT_PX) {
             // The image is larger than what we can reasonably expect to decode without filling up
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 842404753fb8d..ff58e9b992f2c 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -128,7 +128,7 @@ public class LockPatternUtils {
     public static final int PIN_LENGTH_UNAVAILABLE = -1;
 
     // This is the minimum pin length at which auto confirmation is supported
-    public static final int MIN_AUTO_PIN_REQUIREMENT_LENGTH = 6;
+    public static final int MIN_AUTO_PIN_REQUIREMENT_LENGTH = 4;
 
     /**
      * Header used for the encryption and decryption of the device credential for
diff --git a/core/java/com/android/server/LocalServices.java b/core/java/com/android/server/LocalServices.java
index 9c0fe03dd1cae..fec0147e821df 100644
--- a/core/java/com/android/server/LocalServices.java
+++ b/core/java/com/android/server/LocalServices.java
@@ -18,7 +18,7 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 
-import android.util.ArrayMap;
+import java.util.HashMap;
 
 /**
  * This class is used in a similar way as ServiceManager, except the services registered here
@@ -33,8 +33,8 @@
 public final class LocalServices {
     private LocalServices() {}
 
-    private static final ArrayMap<Class<?>, Object> sLocalServiceObjects =
-            new ArrayMap<Class<?>, Object>();
+    private static final HashMap<Class<?>, Object> sLocalServiceObjects =
+            new HashMap<Class<?>, Object>();
 
     /**
      * Returns a local service instance that implements the specified interface.
diff --git a/core/java/com/oplus/theme/OplusThemeUtil.java b/core/java/com/oplus/theme/OplusThemeUtil.java
new file mode 100644
index 0000000000000..cea1cfd31b834
--- /dev/null
+++ b/core/java/com/oplus/theme/OplusThemeUtil.java
@@ -0,0 +1,9 @@
+package com.oplus.theme;
+
+import android.compat.annotation.UnsupportedAppUsage;
+
+public class OplusThemeUtil {
+    /** @hide */
+    @UnsupportedAppUsage
+    public static String CUSTOM_THEME_PATH = "/data/theme/com.oplus.camera";
+}
diff --git a/core/java/com/oplus/util/OplusTypeCastingHelper.java b/core/java/com/oplus/util/OplusTypeCastingHelper.java
new file mode 100644
index 0000000000000..4819e9f20b720
--- /dev/null
+++ b/core/java/com/oplus/util/OplusTypeCastingHelper.java
@@ -0,0 +1,10 @@
+package com.oplus.util;
+
+public final class OplusTypeCastingHelper {
+    public static <T> T typeCasting(Class<T> type, Object object) {
+        if (object != null && type.isInstance(object)) {
+            return type.cast(object);
+        }
+        return null;
+    }
+}
diff --git a/core/java/org/derpfest/display/IRefreshRateListener.aidl b/core/java/org/derpfest/display/IRefreshRateListener.aidl
new file mode 100644
index 0000000000000..4a14c48d9d8d4
--- /dev/null
+++ b/core/java/org/derpfest/display/IRefreshRateListener.aidl
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2023-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.derpfest.display;
+
+/** @hide */
+oneway interface IRefreshRateListener {
+
+    void onRequestedRefreshRate(int refreshRate);
+
+    void onRequestedMemcRefreshRate(int refreshRate);
+}
diff --git a/core/java/org/derpfest/display/IRefreshRateManagerService.aidl b/core/java/org/derpfest/display/IRefreshRateManagerService.aidl
new file mode 100644
index 0000000000000..39a94d7e0413d
--- /dev/null
+++ b/core/java/org/derpfest/display/IRefreshRateManagerService.aidl
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.derpfest.display;
+
+import org.derpfest.display.IRefreshRateListener;
+
+/** @hide */
+interface IRefreshRateManagerService {
+
+    /* Request MEMC required refresh rate in video apps */
+    void requestMemcRefreshRate(in int refreshRate);
+
+    /* Restore refresh rate after exiting MEMC mode */
+    void clearRequestedMemcRefreshRate();
+
+    /* Get user preferred refresh rate for specific package, return -1 if not set */
+    int getRefreshRateForPackage(in String packageName);
+
+    /* Request user preferred refresh rate for specific package */
+    void setRefreshRateForPackage(in String packageName, in int refreshRate);
+
+    /* Reset user preferred refresh rate for specific package (Follow system) */
+    void unsetRefreshRateForPackage(in String packageName);
+
+    /* Force highest refresh rate in every apps, unless MEMC is running */
+    void setExtremeRefreshRateEnabled(in boolean enabled);
+
+    /* Get user preferred refresh in current app, return -1 if not set */
+    int getRequestedRefreshRate();
+
+    /* Get current MEMC requested refresh rate, return -1 if not set */
+    int getRequestedMemcRefreshRate();
+
+    /* Register listener to listen requested refresh rate change */
+    boolean registerRefreshRateListener(in IRefreshRateListener listener);
+
+    /* Unregister listener to listen requested refresh rate change */
+    boolean unregisterRefreshRateListener(in IRefreshRateListener listener);
+}
diff --git a/core/java/org/derpfest/display/RefreshRateManager.java b/core/java/org/derpfest/display/RefreshRateManager.java
new file mode 100644
index 0000000000000..38e26f9b85c89
--- /dev/null
+++ b/core/java/org/derpfest/display/RefreshRateManager.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2023-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.derpfest.display;
+
+import android.annotation.SystemService;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.internal.util.matrixx.Utils;
+import com.android.internal.util.matrixx.DisplayRefreshRateHelper;
+
+/** @hide */
+@SystemService(Context.REFRESH_RATE_MANAGER_SERVICE)
+public class RefreshRateManager {
+
+    private static final String TAG = "RefreshRateManager";
+
+    private final Context mContext;
+    private final DisplayRefreshRateHelper mDisplayRefreshRateHelper;
+    private final IRefreshRateManagerService mService;
+
+    public RefreshRateManager(Context context, IRefreshRateManagerService service) {
+        mContext = context;
+        mService = service;
+        mDisplayRefreshRateHelper = DisplayRefreshRateHelper.getInstance(context);
+    }
+
+    public void requestMemcRefreshRate(int refreshRate) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to request memc refresh rate. Service is null");
+            return;
+        }
+        if (refreshRate > 0f &&
+                !mDisplayRefreshRateHelper.isRefreshRateValid(refreshRate)) {
+            Slog.e(TAG, "Failed to request memc refresh rate. Invalid refresh rate");
+            return;
+        }
+        try {
+            mService.requestMemcRefreshRate(refreshRate);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void clearRequestedMemcRefreshRate() {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to clear memc refresh rate. Service is null");
+            return;
+        }
+        try {
+            mService.clearRequestedMemcRefreshRate();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public int getRefreshRateForPackage(String packageName) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to get refresh rate for package. Service is null");
+            return -1;
+        }
+        if (!Utils.isPackageInstalled(mContext, packageName)) {
+            Slog.e(TAG, "Failed to get refresh rate for package. Package " + packageName + " is unavailable");
+            return -1;
+        }
+        try {
+            return mService.getRefreshRateForPackage(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void setRefreshRateForPackage(String packageName, int refreshRate) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to set refresh rate for package. Service is null");
+            return;
+        }
+        if (!Utils.isPackageInstalled(mContext, packageName)) {
+            Slog.e(TAG, "Failed to set refresh rate for package. Package " + packageName + " is unavailable");
+            return;
+        }
+        if (refreshRate > 0f &&
+                !mDisplayRefreshRateHelper.isRefreshRateValid(refreshRate)) {
+            Slog.e(TAG, "Failed to set refresh rate for package. Invalid refresh rate");
+            return;
+        }
+        try {
+            mService.setRefreshRateForPackage(packageName, refreshRate);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void unsetRefreshRateForPackage(String packageName) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to unset refresh rate for package. Service is null");
+            return;
+        }
+        if (!Utils.isPackageInstalled(mContext, packageName)) {
+            Slog.e(TAG, "Failed to unset refresh rate for package. Package " + packageName + " is unavailable");
+            return;
+        }
+        try {
+            mService.unsetRefreshRateForPackage(packageName);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public void setExtremeRefreshRateEnabled(boolean enabled) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to set extreme refresh rate. Service is null");
+            return;
+        }
+        try {
+            mService.setExtremeRefreshRateEnabled(enabled);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public int getRequestedRefreshRate() {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to get requested refresh rate. Service is null");
+            return -1;
+        }
+        try {
+            return mService.getRequestedRefreshRate();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public int getRequestedMemcRefreshRate() {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to get requested memc refresh rate. Service is null");
+            return -1;
+        }
+        try {
+            return mService.getRequestedMemcRefreshRate();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public boolean registerRefreshRateListener(IRefreshRateListener.Stub listener) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to register refresh rate listener. Service is null");
+            return false;
+        }
+        try {
+            return mService.registerRefreshRateListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    public boolean unregisterRefreshRateListener(IRefreshRateListener.Stub listener) {
+        if (mService == null) {
+            Slog.e(TAG, "Failed to unregister refresh rate listener. Service is null");
+            return false;
+        }
+        try {
+            return mService.unregisterRefreshRateListener(listener);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+}
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index eb3d539c9a98c..99fa0928417d6 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -70,6 +70,18 @@ struct fields_t {
     jmethodID   rect_constructor;
     jmethodID   face_constructor;
     jmethodID   point_constructor;
+    jfieldID    face_sm_degree;
+    jfieldID    face_sm_score;
+    jfieldID    face_blink_detected;
+    jfieldID    face_gaze_angle;
+    jfieldID    face_updown_dir;
+    jfieldID    face_leftright_dir;
+    jfieldID    face_roll_dir;
+    jfieldID    face_leye_blink;
+    jfieldID    face_reye_blink;
+    jfieldID    face_left_right_gaze;
+    jfieldID    face_top_bottom_gaze;
+    jfieldID    face_recognised;
 };
 
 static fields_t fields;
@@ -108,6 +120,7 @@ class JNICameraContext: public CameraListener
     jclass      mFaceClass;  // strong reference to Face class
     jclass      mRectClass;  // strong reference to Rect class
     jclass      mPointClass;  // strong reference to Point class
+    bool        mIsExtendedFace;
     Mutex       mLock;
 
     /*
@@ -159,8 +172,16 @@ JNICameraContext::JNICameraContext(JNIEnv* env, jobject weak_this, jclass clazz,
     mCameraJClass = (jclass)env->NewGlobalRef(clazz);
     mCamera = camera;
 
-    jclass faceClazz = env->FindClass("android/hardware/Camera$Face");
-    mFaceClass = (jclass) env->NewGlobalRef(faceClazz);
+    jclass extendedfaceClazz = env->FindClass("com/qualcomm/qti/camera/ExtendedFace");
+    if (NULL != extendedfaceClazz) {
+        mFaceClass = (jclass) env->NewGlobalRef(extendedfaceClazz);
+        mIsExtendedFace = true;
+    } else {
+        env->ExceptionClear();
+        jclass faceClazz = env->FindClass("android/hardware/Camera$Face");
+        mFaceClass = (jclass) env->NewGlobalRef(faceClazz);
+        mIsExtendedFace = false;
+    }
 
     jclass rectClazz = env->FindClass("android/graphics/Rect");
     mRectClass = (jclass) env->NewGlobalRef(rectClazz);
@@ -412,7 +433,6 @@ void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_m
         env->SetIntField(rect, fields.rect_top, metadata->faces[i].rect[1]);
         env->SetIntField(rect, fields.rect_right, metadata->faces[i].rect[2]);
         env->SetIntField(rect, fields.rect_bottom, metadata->faces[i].rect[3]);
-
         env->SetObjectField(face, fields.face_rect, rect);
         env->SetIntField(face, fields.face_score, metadata->faces[i].score);
 
@@ -441,6 +461,21 @@ void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_m
             env->SetIntField(mouth, fields.point_y, metadata->faces[i].mouth[1]);
             env->SetObjectField(face, fields.face_mouth, mouth);
             env->DeleteLocalRef(mouth);
+
+            if (mIsExtendedFace) {
+                env->SetIntField(face, fields.face_sm_degree, metadata->faces[i].smile_degree);
+                env->SetIntField(face, fields.face_sm_score, metadata->faces[i].smile_score);
+                env->SetIntField(face, fields.face_blink_detected, metadata->faces[i].blink_detected);
+                env->SetIntField(face, fields.face_recognised, metadata->faces[i].face_recognised);
+                env->SetIntField(face, fields.face_gaze_angle, metadata->faces[i].gaze_angle);
+                env->SetIntField(face, fields.face_updown_dir, metadata->faces[i].updown_dir);
+                env->SetIntField(face, fields.face_leftright_dir, metadata->faces[i].leftright_dir);
+                env->SetIntField(face, fields.face_roll_dir, metadata->faces[i].roll_dir);
+                env->SetIntField(face, fields.face_leye_blink, metadata->faces[i].leye_blink);
+                env->SetIntField(face, fields.face_reye_blink, metadata->faces[i].reye_blink);
+                env->SetIntField(face, fields.face_left_right_gaze, metadata->faces[i].left_right_gaze);
+                env->SetIntField(face, fields.face_top_bottom_gaze, metadata->faces[i].top_bottom_gaze);
+            }
         }
 
         env->DeleteLocalRef(face);
@@ -478,6 +513,56 @@ void JNICameraContext::setCallbackMode(JNIEnv *env, bool installed, bool manualM
     }
 }
 
+static void android_hardware_Camera_setLongshot(JNIEnv *env, jobject thiz, jboolean enable)
+{
+    ALOGV("setLongshot");
+    JNICameraContext* context;
+    status_t rc;
+    sp<Camera> camera = get_native_camera(env, thiz, &context);
+    if (camera == 0) return;
+
+    if ( enable ) {
+        rc = camera->sendCommand(CAMERA_CMD_LONGSHOT_ON, 0, 0);
+    } else {
+        rc = camera->sendCommand(CAMERA_CMD_LONGSHOT_OFF, 0, 0);
+    }
+
+    if (rc != NO_ERROR) {
+       jniThrowException(env, "java/lang/RuntimeException", "enabling longshot mode failed");
+    }
+}
+
+static void android_hardware_Camera_sendHistogramData(JNIEnv *env, jobject thiz)
+ {
+   ALOGV("sendHistogramData" );
+   JNICameraContext* context;
+   status_t rc;
+   sp<Camera> camera = get_native_camera(env, thiz, &context);
+   if (camera == 0) return;
+
+   rc = camera->sendCommand(CAMERA_CMD_HISTOGRAM_SEND_DATA, 0, 0);
+
+   if (rc != NO_ERROR) {
+      jniThrowException(env, "java/lang/RuntimeException", "send histogram data failed");
+    }
+ }
+ static void android_hardware_Camera_setHistogramMode(JNIEnv *env, jobject thiz, jboolean mode)
+ {
+   ALOGV("setHistogramMode: mode:%d", (int)mode);
+   JNICameraContext* context;
+   status_t rc;
+   sp<Camera> camera = get_native_camera(env, thiz, &context);
+   if (camera == 0) return;
+
+   if(mode == true)
+      rc = camera->sendCommand(CAMERA_CMD_HISTOGRAM_ON, 0, 0);
+   else
+      rc = camera->sendCommand(CAMERA_CMD_HISTOGRAM_OFF, 0, 0);
+
+   if (rc != NO_ERROR) {
+      jniThrowException(env, "java/lang/RuntimeException", "set histogram mode failed");
+     }
+ }
 void JNICameraContext::addCallbackBuffer(
         JNIEnv *env, jbyteArray cbb, int msgType)
 {
@@ -868,7 +953,25 @@ static void android_hardware_Camera_setHasPreviewCallback(JNIEnv *env, jobject t
     context->setCallbackMode(env, installed, manualBuffer);
 }
 
-static void android_hardware_Camera_addCallbackBuffer(JNIEnv *env, jobject thiz, jbyteArray bytes, jint msgType) {
+static void android_hardware_Camera_setMetadataCb(JNIEnv *env, jobject thiz, jboolean mode)
+{
+    ALOGV("setMetadataCb: mode:%d", (int)mode);
+    JNICameraContext* context;
+    status_t rc;
+    sp<Camera> camera = get_native_camera(env, thiz, &context);
+    if (camera == 0) return;
+
+    if(mode == true)
+        rc = camera->sendCommand(CAMERA_CMD_METADATA_ON, 0, 0);
+    else
+        rc = camera->sendCommand(CAMERA_CMD_METADATA_OFF, 0, 0);
+
+    if (rc != NO_ERROR) {
+        jniThrowException(env, "java/lang/RuntimeException", "set metadata mode failed");
+    }
+}
+
+static void android_hardware_Camera_addCallbackBuffer(JNIEnv *env, jobject thiz, jbyteArray bytes, int msgType) {
     ALOGV("addCallbackBuffer: 0x%x", msgType);
 
     JNICameraContext* context = reinterpret_cast<JNICameraContext*>(env->GetLongField(thiz, fields.context));
@@ -1133,6 +1236,18 @@ static int32_t android_hardware_Camera_getAudioRestriction(
     return ret;
 }
 
+static void android_hardware_Camera_sendVendorCommand(JNIEnv *env, jobject thiz,
+        jint cmd, jint arg1, jint arg2)
+{
+    ALOGV("sendVendorCommand");
+    sp<Camera> camera = get_native_camera(env, thiz, NULL);
+    if (camera == 0) return;
+
+    if (camera->sendCommand(cmd, arg1, arg2) != NO_ERROR) {
+        jniThrowRuntimeException(env, "sending vendor command failed");
+    }
+}
+
 //-------------------------------------------------
 
 static const JNINativeMethod camMethods[] = {
@@ -1158,6 +1273,10 @@ static const JNINativeMethod camMethods[] = {
         {"native_autoFocus", "()V", (void *)android_hardware_Camera_autoFocus},
         {"native_cancelAutoFocus", "()V", (void *)android_hardware_Camera_cancelAutoFocus},
         {"native_takePicture", "(I)V", (void *)android_hardware_Camera_takePicture},
+        { "native_setHistogramMode", "(Z)V", (void *)android_hardware_Camera_setHistogramMode },
+        { "native_setMetadataCb", "(Z)V", (void *)android_hardware_Camera_setMetadataCb },
+        { "native_sendHistogramData", "()V", (void *)android_hardware_Camera_sendHistogramData },
+        { "native_setLongshot", "(Z)V", (void *)android_hardware_Camera_setLongshot },
         {"native_setParameters", "(Ljava/lang/String;)V",
          (void *)android_hardware_Camera_setParameters},
         {"native_getParameters", "()Ljava/lang/String;",
@@ -1175,6 +1294,7 @@ static const JNINativeMethod camMethods[] = {
          (void *)android_hardware_Camera_enableFocusMoveCallback},
         {"setAudioRestriction", "(I)V", (void *)android_hardware_Camera_setAudioRestriction},
         {"getAudioRestriction", "()I", (void *)android_hardware_Camera_getAudioRestriction},
+        {"_sendVendorCommand", "(III)V", (void *)android_hardware_Camera_sendVendorCommand},
 };
 
 struct field {
@@ -1217,6 +1337,27 @@ int register_android_hardware_Camera(JNIEnv *env)
         { "android/graphics/Point", "y", "I", &fields.point_y},
     };
 
+    field extendedfacefields_to_find[] = {
+        { "com/qualcomm/qti/camera/ExtendedFace", "rect", "Landroid/graphics/Rect;", &fields.face_rect },
+        { "com/qualcomm/qti/camera/ExtendedFace", "score", "I", &fields.face_score },
+        { "com/qualcomm/qti/camera/ExtendedFace", "id", "I", &fields.face_id },
+        { "com/qualcomm/qti/camera/ExtendedFace", "leftEye", "Landroid/graphics/Point;", &fields.face_left_eye },
+        { "com/qualcomm/qti/camera/ExtendedFace", "rightEye", "Landroid/graphics/Point;", &fields.face_right_eye },
+        { "com/qualcomm/qti/camera/ExtendedFace", "mouth", "Landroid/graphics/Point;", &fields.face_mouth },
+        { "com/qualcomm/qti/camera/ExtendedFace", "smileDegree", "I", &fields.face_sm_degree },
+        { "com/qualcomm/qti/camera/ExtendedFace", "smileScore", "I", &fields.face_sm_score },
+        { "com/qualcomm/qti/camera/ExtendedFace", "blinkDetected", "I", &fields.face_blink_detected },
+        { "com/qualcomm/qti/camera/ExtendedFace", "faceRecognized", "I", &fields.face_recognised },
+        { "com/qualcomm/qti/camera/ExtendedFace", "gazeAngle", "I", &fields.face_gaze_angle },
+        { "com/qualcomm/qti/camera/ExtendedFace", "updownDir", "I", &fields.face_updown_dir },
+        { "com/qualcomm/qti/camera/ExtendedFace", "leftrightDir", "I", &fields.face_leftright_dir },
+        { "com/qualcomm/qti/camera/ExtendedFace", "rollDir", "I", &fields.face_roll_dir },
+        { "com/qualcomm/qti/camera/ExtendedFace", "leyeBlink", "I", &fields.face_leye_blink },
+        { "com/qualcomm/qti/camera/ExtendedFace", "reyeBlink", "I", &fields.face_reye_blink },
+        { "com/qualcomm/qti/camera/ExtendedFace", "leftrightGaze", "I", &fields.face_left_right_gaze },
+        { "com/qualcomm/qti/camera/ExtendedFace", "topbottomGaze", "I", &fields.face_top_bottom_gaze },
+    };
+
     find_fields(env, fields_to_find, NELEM(fields_to_find));
 
     jclass clazz = FindClassOrDie(env, "android/hardware/Camera");
@@ -1236,6 +1377,14 @@ int register_android_hardware_Camera(JNIEnv *env)
         return -1;
     }
 
+    clazz = env->FindClass("com/qualcomm/qti/camera/ExtendedFace");
+    if (NULL != clazz) {
+        fields.face_constructor = env->GetMethodID(clazz, "<init>", "()V");
+        find_fields(env, extendedfacefields_to_find, NELEM(extendedfacefields_to_find));
+    } else {
+        env->ExceptionClear();
+    }
+
     // Register native functions
     return RegisterMethodsOrDie(env, "android/hardware/Camera", camMethods, NELEM(camMethods));
 }
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp
index 828f2eb76c60b..f7d4e4cc2b8c0 100644
--- a/core/jni/android_hardware_camera2_DngCreator.cpp
+++ b/core/jni/android_hardware_camera2_DngCreator.cpp
@@ -1514,6 +1514,19 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
                 writer);
     }
 
+    // MIUI ADD START
+    {
+        // market name
+        // Use "" to represent unknown productname as suggested in XiaoMi spec.
+        std::string productname = GetProperty("ro.product.marketname", "");
+        uint32_t count = static_cast<uint32_t>(productname.size()) + 1;
+
+        BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_XIAOMI_PRODUCT, count,
+                reinterpret_cast<const uint8_t*>(productname.c_str()), TIFF_IFD_0), env, TAG_XIAOMI_PRODUCT,
+                writer);
+    }
+    // END
+
     {
         // x resolution
         uint32_t xres[] = { 72, 1 }; // default 72 ppi
@@ -1660,6 +1673,38 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image
                 TIFF_IFD_0), env, TAG_FOCALLENGTH, writer);
     }
 
+    {
+        // FocalLengthIn35mmFilm
+        uint16_t focalLengthIn35mmFilm = 0;
+        uint32_t tag = 0;
+        sp<VendorTagDescriptor> vTags;
+        sp<VendorTagDescriptorCache> cache = VendorTagDescriptorCache::getGlobalVendorTagCache();
+        if (cache) {
+            auto vendorId = results.getVendorId();
+            cache->getVendorTagDescriptor(vendorId, &vTags);
+        }
+
+        if (vTags != NULL) {
+            const char *section = "com.xiaomi.sensor.info";
+            const char *TagName = "focalLength35mm";
+            const String8 sectionName(section);
+            const String8 tagName(TagName);
+            status_t ret = vTags->lookupTag(tagName, sectionName, &tag);
+            if (ret == 0) {
+                camera_metadata_entry entry = results.find(tag);
+                if (entry.count != 0) {
+                    focalLengthIn35mmFilm =static_cast<uint16_t> (entry.data.f[0] + 0.5f);
+                    BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_FOCALLLENGTHIN35MMFILM, 1, &focalLengthIn35mmFilm,
+                            TIFF_IFD_0), env, TAG_FOCALLLENGTHIN35MMFILM, writer);
+                } else {
+                    ALOGW("%s: get focalLength35mm failed.", __FUNCTION__);
+                }
+            }
+        } else {
+            ALOGW("%s:com.xiaomi.sensor.info.focalLength35mm vTags is null.", __FUNCTION__);
+        }
+    }
+
     {
         // f number
         camera_metadata_entry entry =
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index efd279b3b244f..afdde0c8c438f 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -34,6 +34,7 @@
 #include <binder/IBinder.h>
 #include <jni.h>
 #include <media/AidlConversion.h>
+#include <media/AppVolume.h>
 #include <media/AudioContainers.h>
 #include <media/AudioPolicy.h>
 #include <media/AudioSystem.h>
@@ -95,6 +96,9 @@ static jmethodID gIntegerCstor;
 static jclass gMapClass;
 static jmethodID gMapPut;
 
+static jclass gAppVolumeClass;
+static jmethodID gAppVolumeCstor;
+
 static jclass gAudioHandleClass;
 static jmethodID gAudioHandleCstor;
 static struct {
@@ -962,6 +966,88 @@ android_media_AudioSystem_getMasterBalance(JNIEnv *env, jobject thiz)
     return balance;
 }
 
+static jint
+android_media_AudioSystem_setAppVolume(JNIEnv *env, jobject thiz, jstring packageName, jfloat value)
+{
+    const jchar* c_packageName = env->GetStringCritical(packageName, 0);
+    String8 package8 = String8(reinterpret_cast<const char16_t*>(c_packageName), env->GetStringLength(packageName));
+    env->ReleaseStringCritical(packageName, c_packageName);
+    return (jint) check_AudioSystem_Command(AudioSystem::setAppVolume(package8, value));
+}
+
+static jint
+android_media_AudioSystem_setAppMute(JNIEnv *env, jobject thiz, jstring packageName, jboolean mute)
+{
+    const jchar* c_packageName = env->GetStringCritical(packageName, 0);
+    String8 package8 = String8(reinterpret_cast<const char16_t*>(c_packageName), env->GetStringLength(packageName));
+    env->ReleaseStringCritical(packageName, c_packageName);
+    return (jint) check_AudioSystem_Command(AudioSystem::setAppMute(package8, mute));
+}
+
+jint convertAppVolumeFromNative(JNIEnv *env, jobject *jAppVolume, const media::AppVolume *AppVolume)
+{
+    jint jStatus = (jint)AUDIO_JAVA_SUCCESS;
+    jstring jPackageName;
+    jfloat jVolume;
+    jboolean jMute;
+    jboolean jActive;
+
+    if (AppVolume == NULL || jAppVolume == NULL) {
+        jStatus = (jint)AUDIO_JAVA_ERROR;
+        goto exit;
+    }
+
+    jPackageName = env->NewStringUTF(AppVolume->packageName);
+    jVolume = AppVolume->volume;
+    jMute =  AppVolume->muted;
+    jActive = AppVolume->active;
+
+    *jAppVolume = env->NewObject(gAppVolumeClass, gAppVolumeCstor,
+                                jPackageName, jMute, jVolume, jActive);
+
+    env->DeleteLocalRef(jPackageName);
+exit:
+    return jStatus;
+}
+
+static jint
+android_media_AudioSystem_listAppVolumes(JNIEnv *env, jobject clazz, jobject jVolumes)
+{
+    ALOGV("listAppVolumes");
+
+    if (jVolumes == NULL) {
+        ALOGE("listAppVolumes NULL AppVolume ArrayList");
+        return (jint)AUDIO_JAVA_BAD_VALUE;
+    }
+    if (!env->IsInstanceOf(jVolumes, gArrayListClass)) {
+        ALOGE("listAppVolumes not an arraylist");
+        return (jint)AUDIO_JAVA_BAD_VALUE;
+    }
+
+    std::vector<media::AppVolume> volumes;
+
+    jint jStatus = (jint)AUDIO_JAVA_SUCCESS;
+    status_t status = AudioSystem::listAppVolumes(&volumes);
+
+    if (status != NO_ERROR) {
+        ALOGE("AudioSystem::listAppVolumes error %d", status);
+        jStatus = nativeToJavaStatus(status);
+        return jStatus;
+    }
+
+    for (size_t i = 0; i < volumes.size(); i++) {
+        jobject jAppVolume;
+        jStatus = convertAppVolumeFromNative(env, &jAppVolume, &volumes[i]);
+        if (jStatus != AUDIO_JAVA_SUCCESS) {
+            return jStatus;
+        }
+        env->CallBooleanMethod(jVolumes, gArrayListMethods.add, jAppVolume);
+        env->DeleteLocalRef(jAppVolume);
+    }
+
+    return jStatus;
+}
+
 static jint
 android_media_AudioSystem_getPrimaryOutputSamplingRate(JNIEnv *env, jobject clazz)
 {
@@ -3696,6 +3782,13 @@ static const JNINativeMethod gMethods[] = {
                                android_media_AudioSystem_listenForSystemPropertyChange),
         MAKE_JNI_NATIVE_METHOD("triggerSystemPropertyUpdate", "(J)V",
                                android_media_AudioSystem_triggerSystemPropertyUpdate),
+
+       MAKE_JNI_NATIVE_METHOD("setAppVolume", "(Ljava/lang/String;F)I",
+                              android_media_AudioSystem_setAppVolume),
+       MAKE_JNI_NATIVE_METHOD("setAppMute", "(Ljava/lang/String;Z)I",
+                              android_media_AudioSystem_setAppMute),
+       MAKE_JNI_NATIVE_METHOD("listAppVolumes", "(Ljava/util/ArrayList;)I",
+                              android_media_AudioSystem_listAppVolumes),
         MAKE_AUDIO_SYSTEM_METHOD(setSimulateDeviceConnections),
 };
 
@@ -3978,6 +4071,11 @@ int register_android_media_AudioSystem(JNIEnv *env)
 
     LOG_ALWAYS_FATAL_IF(env->GetJavaVM(&gVm) != 0);
 
+    jclass AppVolumeClass = FindClassOrDie(env, "android/media/AppVolume");
+    gAppVolumeClass = MakeGlobalRefOrDie(env, AppVolumeClass);
+    gAppVolumeCstor = GetMethodIDOrDie(env, AppVolumeClass, "<init>",
+            "(Ljava/lang/String;ZFZ)V");
+
     AudioSystem::addErrorCallback(android_media_AudioSystem_error_callback);
 
     RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 0a5e786175682..2e9aa3405dac2 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -68,16 +68,16 @@ static void android_util_EventLog_readEventsOnWrapping(JNIEnv* env, jobject claz
  */
 static const JNINativeMethod gRegisterMethods[] = {
     /* name, signature, funcPtr */
-    { "writeEvent", "(II)I", (void*) ELog::writeEventInteger },
-    { "writeEvent", "(IJ)I", (void*) ELog::writeEventLong },
-    { "writeEvent", "(IF)I", (void*) ELog::writeEventFloat },
-    { "writeEvent", "(ILjava/lang/String;)I", (void*) ELog::writeEventString },
-    { "writeEvent", "(I[Ljava/lang/Object;)I", (void*) ELog::writeEventArray },
-    { "readEvents",
+    { "nativeWriteEvent", "(II)I", (void*) ELog::writeEventInteger },
+    { "nativeWriteEvent", "(IJ)I", (void*) ELog::writeEventLong },
+    { "nativeWriteEvent", "(IF)I", (void*) ELog::writeEventFloat },
+    { "nativeWriteEvent", "(ILjava/lang/String;)I", (void*) ELog::writeEventString },
+    { "nativeWriteEvent", "(I[Ljava/lang/Object;)I", (void*) ELog::writeEventArray },
+    { "nativeReadEvents",
       "([ILjava/util/Collection;)V",
       (void*) android_util_EventLog_readEvents
     },
-    { "readEventsOnWrapping",
+    { "nativeReadEventsOnWrapping",
       "([IJLjava/util/Collection;)V",
       (void*) android_util_EventLog_readEventsOnWrapping
     },
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index fe69dd9a21b27..74c35777afe48 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -551,12 +551,7 @@ void android_os_Process_setThreadScheduler(JNIEnv* env, jclass clazz,
 #if defined(__linux__)
     struct sched_param param;
     param.sched_priority = pri;
-    int rc = sched_setscheduler(tid, policy, &param);
-    if (rc) {
-        signalExceptionForPriorityError(env, errno, tid);
-    }
-#else
-    signalExceptionForPriorityError(env, ENOSYS, tid);
+    sched_setscheduler(tid, policy, &param);
 #endif
 }
 
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 769c3d3110dff..0ca79769c40cf 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -831,6 +831,7 @@
     <protected-broadcast android:name="android.service.autofill.action.DELAYED_FILL" />
     <protected-broadcast android:name="android.app.action.PROVISIONING_COMPLETED" />
     <protected-broadcast android:name="android.app.action.LOST_MODE_LOCATION_UPDATE" />
+    <protected-broadcast android:name="android.intent.action.DISPLAY_STATE_CHANGED" />
 
     <!-- Added in U -->
     <protected-broadcast android:name="android.intent.action.PROFILE_ADDED" />
@@ -869,6 +870,9 @@
     <!-- Used for long press power torch feature - automatic turn off on timeout -->
     <protected-broadcast android:name="com.android.server.policy.PhoneWindowManager.ACTION_TORCH_OFF" />
 
+    <!-- Sleep Mode -->
+    <protected-broadcast android:name="android.intent.action.SLEEP_MODE_TURN_OFF" />
+
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->
     <!-- ====================================================================== -->
@@ -949,6 +953,10 @@
         android:knownCerts="@array/config_setContactsDefaultAccountKnownSigners"
         android:featureFlag="android.provider.new_default_account_api_enabled"/>
 
+    <!-- @hide -->
+    <permission android:name="com.libremobileos.permission.START_FREEFORM"
+                android:protectionLevel="signature|privileged" />
+
     <!-- ====================================================================== -->
     <!-- Permissions for accessing user's calendar                              -->
     <!-- ====================================================================== -->
@@ -9495,6 +9503,8 @@
     <!-- Attribution for Device Policy Manager service. -->
     <attribution android:tag="DevicePolicyManagerService"
         android:label="@string/device_policy_manager_service"/>
+    <!-- Attribution for VCN management service. -->
+    <attribution android:tag="VCN" android:label="@string/vcn_management_service"/>
 
     <application android:process="system"
                  android:persistent="true"
@@ -9505,7 +9515,7 @@
                  android:killAfterRestore="false"
                  android:icon="@drawable/ic_launcher_android"
                  android:supportsRtl="true"
-                 android:theme="@style/Theme.DeviceDefault.Light.DarkActionBar"
+                 android:theme="@style/Theme.DeviceDefault.System"
                  android:defaultToDeviceProtectedStorage="true"
                  android:forceQueryable="true"
                  android:directBootAware="true">
diff --git a/core/res/res/anim/activity_close_exit.xml b/core/res/res/anim/activity_close_exit.xml
index a6710490d820d..10ac35fb21730 100644
--- a/core/res/res/anim/activity_close_exit.xml
+++ b/core/res/res/anim/activity_close_exit.xml
@@ -18,6 +18,7 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:hasRoundedCorners="true"
     android:shareInterpolator="false">
 
     <alpha
diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml
index f3172e4cace97..c999c0b1870e7 100644
--- a/core/res/res/anim/activity_open_enter.xml
+++ b/core/res/res/anim/activity_open_enter.xml
@@ -17,6 +17,7 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:hasRoundedCorners="true"
     android:shareInterpolator="false">
 
     <alpha
diff --git a/core/res/res/color-night/surface_effect_1_color.xml b/core/res/res/color-night/surface_effect_1_color.xml
index 80b95ae31d1cd..89bee63efd4ed 100644
--- a/core/res/res/color-night/surface_effect_1_color.xml
+++ b/core/res/res/color-night/surface_effect_1_color.xml
@@ -16,5 +16,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@android:color/system_neutral1_500"
-          android:lStar="6" android:alpha="0.54"/>
+          android:lStar="4" android:alpha="0.56"/>
 </selector>
diff --git a/core/res/res/color/config_progress_background_tint.xml b/core/res/res/color/config_progress_background_tint.xml
index b086e20bf1619..dfc914e76c8d0 100644
--- a/core/res/res/color/config_progress_background_tint.xml
+++ b/core/res/res/color/config_progress_background_tint.xml
@@ -15,5 +15,5 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorControlNormal" />
+    <item android:color="?attr/colorControlActivated" />
 </selector>
diff --git a/core/res/res/drawable/color_surface_alpha_toast.xml b/core/res/res/drawable/color_surface_alpha_toast.xml
new file mode 100644
index 0000000000000..7858cbd2620e9
--- /dev/null
+++ b/core/res/res/drawable/color_surface_alpha_toast.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.85" android:color="@color/toast_color_background" />
+</selector>
\ No newline at end of file
diff --git a/core/res/res/drawable/ic_link.xml b/core/res/res/drawable/ic_link.xml
new file mode 100644
index 0000000000000..97322a4f24bdf
--- /dev/null
+++ b/core/res/res/drawable/ic_link.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>
+</vector>
diff --git a/core/res/res/drawable/ic_sleep.xml b/core/res/res/drawable/ic_sleep.xml
new file mode 100644
index 0000000000000..1dddd7baf35e5
--- /dev/null
+++ b/core/res/res/drawable/ic_sleep.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
+</vector>
diff --git a/core/res/res/drawable/ic_zen_priority_modes.xml b/core/res/res/drawable/ic_zen_priority_modes.xml
index 7412ef0ab3879..295a42118e178 100644
--- a/core/res/res/drawable/ic_zen_priority_modes.xml
+++ b/core/res/res/drawable/ic_zen_priority_modes.xml
@@ -19,7 +19,8 @@ Copyright (C) 2024 The Android Open Source Project
     android:viewportWidth="960"
     android:viewportHeight="960"
     android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M320,520L640,520Q657,520 668.5,508.5Q680,497 680,480Q680,463 668.5,451.5Q657,440 640,440L320,440Q303,440 291.5,451.5Q280,463 280,480Q280,497 291.5,508.5Q303,520 320,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
-</vector>
\ No newline at end of file
+  <path
+      android:pathData="M480,140C385.56,140 305.25,173.03 239.14,239.14C173.03,305.25 140,385.56 140,480C140,574.44 173.03,654.75 239.14,720.86C305.25,786.97 385.56,820 480,820C574.44,820 654.75,786.97 720.86,720.86C786.97,654.75 820,574.44 820,480C820,385.56 786.97,305.25 720.86,239.14C654.75,173.03 574.44,140 480,140zM488.91,255.7C524.9,256.78 559.81,267.13 593.59,286.64C647.66,317.85 682.68,363.28 698.67,422.97C709.3,462.63 709.51,501.11 699.3,538.28L322.81,320.94C349.9,293.51 383.31,274.38 422.97,263.75C445.35,257.75 467.31,255.06 488.91,255.7zM263.91,421.64L641.48,639.61C614.06,668.1 580.05,687.79 539.45,698.67C479.76,714.67 422.97,707.07 368.91,675.86C314.84,644.65 279.74,599.15 263.75,539.45C252.87,498.85 252.95,459.64 263.91,421.64z"
+      android:strokeWidth="1.41667"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/core/res/res/drawable/pocket_mode_illustration.xml b/core/res/res/drawable/pocket_mode_illustration.xml
new file mode 100644
index 0000000000000..3b55a10cbaf60
--- /dev/null
+++ b/core/res/res/drawable/pocket_mode_illustration.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2024 Paranoid Android
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="950dp"
+    android:height="1900dp"
+    android:viewportWidth="950"
+    android:viewportHeight="1900">
+    <path
+        android:fillColor="#7C8287"
+        android:fillType="evenOdd"
+        android:pathData="M933 506.1V164c0-44.2-35.8-80-80-80H97c-44.2 0-80 35.8-80 80v1573c0 44.2 35.8 80 80 80h756c44.2 0 80-35.8 80-80V930.9c9.5-0.7 17-8.7 17-18.4v-160c0-9.7-7.5-17.7-17-18.4V607.9c9.5-0.7 17-8.7 17-18.4v-65c0-9.7-7.5-17.7-17-18.4zM853 104H97c-33.1 0-60 26.9-60 60v1573c0 33.1 26.9 60 60 60h756c33.1 0 60-26.9 60-60V164c0-33.1-26.9-60-60-60z" />
+    <path
+        android:fillAlpha="0.5"
+        android:fillColor="#92D5EC"
+        android:pathData="M0 163c0-52.5 42.5-95 95-95h760c52.5 0 95 42.5 95 95v258H0V163z" />
+</vector>
diff --git a/core/res/res/drawable/popup_background_material.xml b/core/res/res/drawable/popup_background_material.xml
index 9ad7bfc68122b..5910b9f163a51 100644
--- a/core/res/res/drawable/popup_background_material.xml
+++ b/core/res/res/drawable/popup_background_material.xml
@@ -18,7 +18,7 @@
        android:shape="rectangle">
 
     <corners
-            android:radius="2dp" />
+            android:radius="?attr/dialogCornerRadius" />
     <solid
             android:color="?attr/colorPopupBackground" />
 
diff --git a/core/res/res/drawable/sym_def_app_icon_background.xml b/core/res/res/drawable/sym_def_app_icon_background.xml
index fa5cbd9d504be..17b592fe10f3c 100644
--- a/core/res/res/drawable/sym_def_app_icon_background.xml
+++ b/core/res/res/drawable/sym_def_app_icon_background.xml
@@ -1,14 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#167C80"/>
+    android:width="108dp"
+    android:viewportHeight="108.0"
+    android:viewportWidth="108.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/accent_device_default_light"
+        android:pathData="M0,0h108v108h-108z"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>
 </vector>
+
diff --git a/core/res/res/drawable/sym_def_app_icon_foreground.xml b/core/res/res/drawable/sym_def_app_icon_foreground.xml
index 68cf7c93bca51..0a5a334d10f72 100644
--- a/core/res/res/drawable/sym_def_app_icon_foreground.xml
+++ b/core/res/res/drawable/sym_def_app_icon_foreground.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+<!-- Copyright 2020 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
@@ -9,25 +19,28 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
     <path
-        android:pathData="M66.757,43.857L71.103,36.363C71.352,35.933 71.194,35.39 70.764,35.141C70.334,34.892 69.79,35.05 69.541,35.481L65.149,43.064C61.799,41.525 58.041,40.665 54.034,40.665C50.027,40.665 46.246,41.525 42.896,43.042L38.504,35.458C38.255,35.028 37.712,34.869 37.282,35.118C36.852,35.367 36.693,35.911 36.942,36.341L41.266,43.834C33.841,47.886 28.747,55.402 28,64.299H80C79.276,55.425 74.205,47.909 66.757,43.857Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
     </path>
-  </group>
+    <path
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/core/res/res/drawable/toast_frame.xml b/core/res/res/drawable/toast_frame.xml
index 34987394b2ece..be1fdcc9c35ea 100644
--- a/core/res/res/drawable/toast_frame.xml
+++ b/core/res/res/drawable/toast_frame.xml
@@ -17,7 +17,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="?android:attr/colorBackgroundFloating" />
+    <solid android:color="@drawable/color_surface_alpha_toast" />
     <corners android:radius="28dp" />
 </shape>
 
diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml
index 178505c264a46..b1510fdcb93dd 100644
--- a/core/res/res/layout/alert_dialog_material.xml
+++ b/core/res/res/layout/alert_dialog_material.xml
@@ -54,7 +54,7 @@
                     android:layout_height="wrap_content"
                     android:paddingEnd="?attr/dialogPreferredPadding"
                     android:paddingStart="?attr/dialogPreferredPadding"
-                    style="@style/TextAppearance.Material.Subhead" />
+                    style="@style/TextAppearance.DeviceDefault.Subhead" />
 
                 <Space
                     android:id="@+id/textSpacerNoButtons"
diff --git a/core/res/res/layout/app_error_dialog.xml b/core/res/res/layout/app_error_dialog.xml
index c3b149a1e2959..4da9619a64ef5 100644
--- a/core/res/res/layout/app_error_dialog.xml
+++ b/core/res/res/layout/app_error_dialog.xml
@@ -56,6 +56,14 @@
         android:drawableStart="@drawable/ic_feedback"
         style="@style/aerr_list_item" />
 
+    <Button
+        android:id="@+id/aerr_copy"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/aerr_copy"
+        android:drawableStart="@drawable/ic_link"
+        style="@style/aerr_list_item" />
+
     <Button
         android:id="@+id/aerr_mute"
         android:layout_width="match_parent"
diff --git a/core/res/res/layout/pocket_lock_view.xml b/core/res/res/layout/pocket_lock_view.xml
new file mode 100644
index 0000000000000..41a3b915954d6
--- /dev/null
+++ b/core/res/res/layout/pocket_lock_view.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2021 Wave-OS
+     SPDX-FileCopyrightText: 2024 Paranoid Android
+     SPDX-License-Identifier: Apache-2.0
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pocket_mode_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone">
+
+    <View
+        android:id="@+id/background_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black" />
+
+    <LinearLayout
+        android:id="@+id/pocket_mode_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/pocket_mode_title"
+            style="@style/PocketModeTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/pocket_mode_title_margin_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/pocket_mode_title" />
+
+        <ImageView
+            android:id="@+id/pocket_mode_illustration"
+            android:layout_width="@dimen/pocket_mode_illustration_width"
+            android:layout_height="@dimen/pocket_mode_illustration_height"
+            android:layout_marginTop="@dimen/pocket_mode_illustration_margin_top"
+            android:contentDescription="@string/pocket_mode_illustration_description"
+            android:src="@drawable/pocket_mode_illustration" />
+
+        <LinearLayout
+            android:id="@+id/pocket_mode_instructions_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/pocket_mode_instructions_container_margin_horizontal"
+            android:layout_marginTop="@dimen/pocket_mode_instructions_container_margin_top"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/pocket_mode_instructions_title"
+                style="@style/PocketModeInstructionsTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/pocket_mode_instructions_header" />
+
+            <LinearLayout
+                android:id="@+id/pocket_mode_instructions_steps"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/pocket_mode_instructions_steps_margin_top"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/pocket_mode_instruction_step1"
+                    style="@style/PocketModeInstructionStep"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pocket_mode_instruction_step1" />
+
+                <TextView
+                    android:id="@+id/pocket_mode_instruction_step2"
+                    style="@style/PocketModeInstructionStep"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/pocket_mode_instructions_step_margin_top"
+                    android:text="@string/pocket_mode_instruction_step2" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/core/res/res/layout/shutdown_dialog.xml b/core/res/res/layout/shutdown_dialog.xml
index 726c25540e6f4..a6ff5fedbd2fd 100644
--- a/core/res/res/layout/shutdown_dialog.xml
+++ b/core/res/res/layout/shutdown_dialog.xml
@@ -29,7 +29,7 @@
     <TextView
         android:id="@id/text1"
         android:layout_width="wrap_content"
-        android:layout_height="32sp"
+        android:layout_height="wrap_content"
         android:text="@string/shutdown_progress"
         android:textDirection="locale"
         android:textSize="18sp"
@@ -42,7 +42,7 @@
     <TextView
         android:id="@id/text2"
         android:layout_width="wrap_content"
-        android:layout_height="32sp"
+        android:layout_height="wrap_content"
         android:text="@string/shutdown_progress"
         android:textDirection="locale"
         android:textSize="24sp"
diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml
index 8bedb897dc196..4bf3433148cb6 100644
--- a/core/res/res/layout/transient_notification.xml
+++ b/core/res/res/layout/transient_notification.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
-/* //device/apps/common/res/layout/transient_notification.xml
-**
-** Copyright 2006, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
+  ~ Copyright (C) 2021 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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,20 +23,33 @@
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:maxWidth="@dimen/toast_width"
-    android:background="?android:attr/colorBackground"
+    android:background="@drawable/toast_frame"
     android:elevation="@dimen/toast_elevation"
     android:layout_marginEnd="16dp"
     android:layout_marginStart="16dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
 
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="10dp"/>
     <TextView
         android:id="@android:id/message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
+        android:textAlignment="center"
+        android:layout_gravity="center_vertical"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:scrollHorizontally="true"
         android:textAppearance="@style/TextAppearance.Toast"/>
 </LinearLayout>
diff --git a/core/res/res/layout/transient_notification_with_icon.xml b/core/res/res/layout/transient_notification_with_icon.xml
index 04518b2a75a2e..05da8676ada80 100644
--- a/core/res/res/layout/transient_notification_with_icon.xml
+++ b/core/res/res/layout/transient_notification_with_icon.xml
@@ -22,7 +22,7 @@
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:maxWidth="@dimen/toast_width"
-    android:background="@android:drawable/toast_frame"
+    android:background="@drawable/toast_frame"
     android:elevation="@dimen/toast_elevation"
     android:layout_marginEnd="16dp"
     android:layout_marginStart="16dp"
@@ -41,9 +41,15 @@
         android:id="@android:id/message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
+        android:textAlignment="center"
+        android:layout_gravity="center_vertical"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:scrollHorizontally="true"
         android:textAppearance="@style/TextAppearance.Toast"/>
 </LinearLayout>
diff --git a/core/res/res/raw/color_fade_frag.frag b/core/res/res/raw/color_fade_frag.frag
index 29975d5f7b5e4..db0f63f2ee24e 100644
--- a/core/res/res/raw/color_fade_frag.frag
+++ b/core/res/res/raw/color_fade_frag.frag
@@ -3,12 +3,34 @@
 precision mediump float;
 uniform samplerExternalOES texUnit;
 uniform float opacity;
-uniform float gamma;
 varying vec2 UV;
 
-void main()
-{
-    vec4 color = texture2D(texUnit, UV);
-    vec3 rgb = pow(color.rgb * opacity, vec3(gamma));
-    gl_FragColor = vec4(rgb, 1.0);
+vec3 mixBvec3(vec3 a, vec3 b, bvec3 sel) {
+    return vec3(
+        sel.x ? b.x : a.x,
+        sel.y ? b.y : a.y,
+        sel.z ? b.z : a.z
+    );
+}
+
+vec3 srgbTransfer(vec3 c) {
+    vec3 gamma = 1.055 * pow(c, vec3(1.0/2.4)) - 0.055;
+    vec3 linear = 12.92 * c;
+    bvec3 selectParts = lessThan(c, vec3(0.0031308));
+    return mixBvec3(gamma, linear, selectParts);
+}
+
+vec3 srgbTransferInv(vec3 c) {
+    vec3 gamma = pow((c + 0.055)/1.055, vec3(2.4));
+    vec3 linear = c / 12.92;
+    bvec3 selectParts = lessThan(c, vec3(0.04045));
+    return mixBvec3(gamma, linear, selectParts);
+}
+
+void main() {
+    vec3 inRgb = srgbTransferInv(texture2D(texUnit, UV).rgb);
+    vec3 fade = inRgb * opacity * opacity;
+    vec3 outRgb = srgbTransfer(fade);
+
+    gl_FragColor = vec4(outRgb, 1.0);
 }
diff --git a/core/res/res/values-af-rZA/matrixx_strings.xml b/core/res/res/values-af-rZA/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-af-rZA/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ar-rSA/matrixx_strings.xml b/core/res/res/values-ar-rSA/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-ar-rSA/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ca-rES/matrixx_strings.xml b/core/res/res/values-ca-rES/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-ca-rES/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-cs-rCZ/matrixx_strings.xml b/core/res/res/values-cs-rCZ/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-cs-rCZ/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-da-rDK/matrixx_strings.xml b/core/res/res/values-da-rDK/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-da-rDK/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-de-rDE/matrixx_strings.xml b/core/res/res/values-de-rDE/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-de-rDE/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-el-rGR/matrixx_strings.xml b/core/res/res/values-el-rGR/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-el-rGR/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-en-rUS/matrixx_strings.xml b/core/res/res/values-en-rUS/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-en-rUS/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-es-rES/matrixx_strings.xml b/core/res/res/values-es-rES/matrixx_strings.xml
new file mode 100644
index 0000000000000..0766e991b9065
--- /dev/null
+++ b/core/res/res/values-es-rES/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Reinicio de configuración requerida</string>
+    <string name="settings_restart_message">Para que todos los cambios surtan efecto, es necesario reiniciar la aplicación de Configuración. ¿Reiniciar la aplicación de Configuración ahora?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">Reinicio de sistema requerido</string>
+    <string name="system_restart_message">Para que los cambios tengan efecto, se requiere reiniciar el sistema. ¿Reiniciar el sistema ahora?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">Reinicio de Ui de sistema requerido</string>
+    <string name="systemui_restart_message">Para que todos los cambios surtan efecto, es necesario reiniciar SystemUI. ¿Reiniciar SystemUI ahora?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Reinicio de lanzador requerido</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Toca para desactivar modo dormir</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-fi-rFI/matrixx_strings.xml b/core/res/res/values-fi-rFI/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-fi-rFI/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-fr-rFR/matrixx_strings.xml b/core/res/res/values-fr-rFR/matrixx_strings.xml
new file mode 100644
index 0000000000000..d0411fb98d7b6
--- /dev/null
+++ b/core/res/res/values-fr-rFR/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Redémarrage des paramètres requis</string>
+    <string name="settings_restart_message">Pour que toutes les modifications prennent effet, un redémarrage de l\'application Paramètres est nécessaire. Redémarrer l\'application Paramètres maintenant ?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">Redémarrage du système requis</string>
+    <string name="system_restart_message">Pour que toutes les modifications prennent effet, un redémarrage du système est nécessaire. Redémarrer le système maintenant ?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">Redémarrage de SystemUI est nécessaire</string>
+    <string name="systemui_restart_message">Afin que toutes les modifications soient prises en compte, un redémarrage de SystemUI est nécessaire. Voulez-vous redémarrer SystemUI maintenant ?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Redémarrage du lanceur requis</string>
+    <string name="launcher_restart_message">Afin que toutes les modifications soient prises en compte, un redémarrage du lanceur est nécessaire. Voulez-vous redémarrer le lanceur maintenant ?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copier l\'URL du rapport d\'erreur</string>
+    <string name="url_copy_success">URL copiée avec succès</string>
+    <string name="url_copy_failed">Une erreur est survenue lors du téléchargement du rapport sur Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Le mode poche est activé</string>
+    <string name="pocket_mode_illustration_description">Illustration d\'un téléphone dans une poche</string>
+    <string name="pocket_mode_instructions_header">Pour utiliser votre téléphone :</string>
+    <string name="pocket_mode_instruction_step1">1. Assurez-vous que la zone bleue (capteur de proximité) indiquée ci-dessus est dégagée et exempte de saleté ou de poussière.</string>
+    <string name="pocket_mode_instruction_step2">2. Appuyez et maintenez le bouton d\'alimentation pour sortir du mode poche.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Sonnerie activée pour les notifications et les appels</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Mode veille</string>
+    <string name="sleep_mode_notification_title">Mode veille activé</string>
+    <string name="sleep_mode_notification_content">Appuyer pour désactiver le mode veille</string>
+    <string name="sleep_mode_enabled_toast">Mode veille activé</string>
+    <string name="sleep_mode_disabled_toast">Mode veille désactivé</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> ajouté a GameSpace</string>
+</resources>
diff --git a/core/res/res/values-hu-rHU/matrixx_strings.xml b/core/res/res/values-hu-rHU/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-hu-rHU/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-it-rIT/matrixx_strings.xml b/core/res/res/values-it-rIT/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-it-rIT/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-iw-rIL/matrixx_strings.xml b/core/res/res/values-iw-rIL/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-iw-rIL/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ja-rJP/matrixx_strings.xml b/core/res/res/values-ja-rJP/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-ja-rJP/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ko-rKR/matrixx_strings.xml b/core/res/res/values-ko-rKR/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-ko-rKR/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ms-rMY/matrixx_strings.xml b/core/res/res/values-ms-rMY/matrixx_strings.xml
new file mode 100644
index 0000000000000..b52c3fc1b2bb3
--- /dev/null
+++ b/core/res/res/values-ms-rMY/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Mulakan semula tetapan diperlukan</string>
+    <string name="settings_restart_message">Untuk semua perubahan yang anda telah buat, mulakan semula Tetapan diperlukan. Mulakan semula tetapan sekarang?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">Mulakan semula tetapan diperlukan</string>
+    <string name="system_restart_message">Untuk semua perubahan yang anda telah buat, mulakan semula sistem diperlukan. Mulakan semula sistem sekarang?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">Mula semula SystemUI diperlukan</string>
+    <string name="systemui_restart_message">Untuk semua perubahan yang anda telah buat, mulakan semula SystemUI diperlukan. Mulakan semula SystemUI sekarang?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Mulakan semula Launcher diperlukan</string>
+    <string name="launcher_restart_message">Untuk semua perubahan yang anda telah buat, mulakan semula Launcher diperlukan. Mulakan semula Launcher sekarang?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Salin crash log URL</string>
+    <string name="url_copy_success">URL berjaya disalin</string>
+    <string name="url_copy_failed">Ralat berlaku semasa memuat naik log ke Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Mod poket sedang aktif</string>
+    <string name="pocket_mode_illustration_description">Ilustrasi telefon di dalam poket</string>
+    <string name="pocket_mode_instructions_header">Untuk menggunakan telefon:</string>
+    <string name="pocket_mode_instruction_step1">1. Pastikan kawasan biru (proximity sensor) yang ditunjuk di atas tidak halang dan bebas dari tanah atau habuk.</string>
+    <string name="pocket_mode_instruction_step2">2. Tekan dan tahan butang kuasa untuk keluar dari mod poket.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Panggilan dan pemberitahuan akan berdering</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Mod tidur</string>
+    <string name="sleep_mode_notification_title">Mod tidur sedang aktif</string>
+    <string name="sleep_mode_notification_content">Sentuh untuk mematikan mod tidur</string>
+    <string name="sleep_mode_enabled_toast">Mod tidur dihidupkan</string>
+    <string name="sleep_mode_disabled_toast">Mod Tidur dipadamkan</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> telah ditambah ke GameSpace</string>
+</resources>
diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml
index 4f2d77cac256b..cba30748ec3eb 100644
--- a/core/res/res/values-night/colors.xml
+++ b/core/res/res/values-night/colors.xml
@@ -63,4 +63,6 @@
     <!-- Color for APM USB Data Protection Notification-->
     <!-- Notification icon tint color-->
     <color name="security_privacy_notification_tint_normal">#8AB4F8</color>
+    
+    <color name="toast_color_background">@*android:color/system_neutral1_900</color>
 </resources>
diff --git a/packages/SystemUI/res/values-h841dp/dimens.xml b/core/res/res/values-night/styles.xml
similarity index 57%
rename from packages/SystemUI/res/values-h841dp/dimens.xml
rename to core/res/res/values-night/styles.xml
index 412da199f6b6a..13fafa235be70 100644
--- a/packages/SystemUI/res/values-h841dp/dimens.xml
+++ b/core/res/res/values-night/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2022 The Android Open Source Project
+  ~ Copyright (C) 2018 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.
@@ -12,8 +12,14 @@
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ limitations under the License
   -->
+
 <resources>
-    <dimen name="volume_row_slider_height">237dp</dimen>
+    <style name="TextAppearance.Toast" parent="@*android:style/TextAppearance">
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineHeight">20sp</item>
+        <item name="android:textColor">@*android:color/system_neutral1_10</item>
+    </style>
 </resources>
diff --git a/core/res/res/values-night/themes_device_defaults.xml b/core/res/res/values-night/themes_device_defaults.xml
index 7cfdba7a65bee..88e474853bd0e 100644
--- a/core/res/res/values-night/themes_device_defaults.xml
+++ b/core/res/res/values-night/themes_device_defaults.xml
@@ -104,4 +104,6 @@ easier.
     <style name="Theme.DeviceDefault.AutofillHalfScreenDialogList" parent="Theme.DeviceDefault.DayNight">
         <item name="colorForeground">@android:color/white</item>
     </style>
+
+    <style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault.DayNight" />
 </resources>
diff --git a/core/res/res/values-nl-rNL/matrixx_strings.xml b/core/res/res/values-nl-rNL/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-nl-rNL/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-no-rNO/matrixx_strings.xml b/core/res/res/values-no-rNO/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-no-rNO/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-pl-rPL/matrixx_strings.xml b/core/res/res/values-pl-rPL/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-pl-rPL/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-pt-rBR/matrixx_strings.xml b/core/res/res/values-pt-rBR/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-pt-rBR/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-pt-rPT/matrixx_strings.xml b/core/res/res/values-pt-rPT/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-pt-rPT/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ro-rRO/matrixx_strings.xml b/core/res/res/values-ro-rRO/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-ro-rRO/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-ru-rRU/matrixx_strings.xml b/core/res/res/values-ru-rRU/matrixx_strings.xml
new file mode 100644
index 0000000000000..d56aceaab7cce
--- /dev/null
+++ b/core/res/res/values-ru-rRU/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Необходима перезагрузка системного интерфейса</string>
+    <string name="settings_restart_message">Чтобы все изменения вступили в силу, требуется перезагрузка системного интерфейса. Перезагрузить сейчас?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">Требуется перезагрузка</string>
+    <string name="system_restart_message">Чтобы все изменения вступили в силу, требуется перезагрузка системного интерфейса. Перезагрузить сейчас?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">Необходима перезагрузка интерфейса</string>
+    <string name="systemui_restart_message">Чтобы все изменения вступили в силу, требуется перезагрузка пользовательского интерфейса. Перезагрузить интерфейс?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Требуется перезапуск лаунчера</string>
+    <string name="launcher_restart_message">Чтобы все изменения вступили в силу, требуется перезагрузка лаунчера. Перезапустить лаунчер сейчас?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Скопировать URL журнала ошибки</string>
+    <string name="url_copy_success">URL успешно скопирован</string>
+    <string name="url_copy_failed">Произошла ошибка во время загрузки лога на Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Режим «В кармане» включен</string>
+    <string name="pocket_mode_illustration_description">Иллюстрация телефона в кармане</string>
+    <string name="pocket_mode_instructions_header">Чтобы использовать телефон:</string>
+    <string name="pocket_mode_instruction_step1">1. Убедитесь, что синяя область (датчик приближения), показанная выше, не закрыт и не содержит грязи или пыли.</string>
+    <string name="pocket_mode_instruction_step2">2. Нажмите и удерживайте кнопку питания, чтобы выйти из режима «В кармане».</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Звук в звонках и уведомлениях включён</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Спящий режим</string>
+    <string name="sleep_mode_notification_title">Спящий режим включен</string>
+    <string name="sleep_mode_notification_content">Нажмите, чтобы выключить спящий режим</string>
+    <string name="sleep_mode_enabled_toast">Спящий режим включен</string>
+    <string name="sleep_mode_disabled_toast">Спящий режим выключен</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> Добавлено в GameSpace</string>
+</resources>
diff --git a/core/res/res/values-sr-rSP/matrixx_strings.xml b/core/res/res/values-sr-rSP/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-sr-rSP/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-sv-rSE/matrixx_strings.xml b/core/res/res/values-sv-rSE/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-sv-rSE/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-tr-rTR/matrixx_strings.xml b/core/res/res/values-tr-rTR/matrixx_strings.xml
new file mode 100644
index 0000000000000..597e71494818b
--- /dev/null
+++ b/core/res/res/values-tr-rTR/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Ayarların yeniden başlatılması gerekiyor</string>
+    <string name="settings_restart_message">Tüm değişikliklerin etkin olabilmesi için ayarların yeniden başlatılması gerekiyor. Ayarlar şimdi yeniden başlatılsın mı?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">Sistemin yeniden başlatılması gerekiyor</string>
+    <string name="system_restart_message">Tüm değişikliklerin etkili olması için sistemin yeniden başlatılması gerekiyor. Sistem yeniden başlatılsın mı?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">Sistem arayüzünün yeniden başlatılması gerekiyor</string>
+    <string name="systemui_restart_message">Tüm değişikliklerin etkili olması için Sistem Arayüzünün yeniden başlatılması gerekiyor. Şimdi yeniden başlatılsın mı?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Başlatıcının yeniden başlatılması gerekiyor</string>
+    <string name="launcher_restart_message">Tüm değişikliklerin etkili olması için başlatıcının yeniden başlatılması gerekiyor. Şimdi yeniden başlatılsın mı?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Kilitlenme günlüğü bağlantısını kopyala</string>
+    <string name="url_copy_success">Bağlantı başarıyla kopyalandı</string>
+    <string name="url_copy_failed">Günlük Pasty\'ye yüklenirken bir hata oluştu</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Cep modu etkin</string>
+    <string name="pocket_mode_illustration_description">Telefon cepte illüstrasyonu</string>
+    <string name="pocket_mode_instructions_header">Telefonunuzu kullanmak için:</string>
+    <string name="pocket_mode_instruction_step1">1. Yukarıda gösterilen mavi alanın (yakınlık sensörü) engellenmediğinden ve kir veya toz içinde olmadığından emin olun.</string>
+    <string name="pocket_mode_instruction_step2">2. Cep modundan çıkmak için güç düğmesine basılı tutun.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Çağrılar ve bildirimler telefonu çaldıracak</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Uyku Modu</string>
+    <string name="sleep_mode_notification_title">Uyku modu etkinleştirildi</string>
+    <string name="sleep_mode_notification_content">Uyku modunu kapatmak için dokunun</string>
+    <string name="sleep_mode_enabled_toast">Uyku modu açıldı</string>
+    <string name="sleep_mode_disabled_toast">Uyku modu kapatıldı</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> Oyun Alanı\'na eklendi</string>
+</resources>
diff --git a/core/res/res/values-uk-rUA/matrixx_strings.xml b/core/res/res/values-uk-rUA/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-uk-rUA/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-vi-rVN/matrixx_strings.xml b/core/res/res/values-vi-rVN/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-vi-rVN/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values-zh-rCN/matrixx_strings.xml b/core/res/res/values-zh-rCN/matrixx_strings.xml
new file mode 100644
index 0000000000000..1f8401219ca55
--- /dev/null
+++ b/core/res/res/values-zh-rCN/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">需要重启设置</string>
+    <string name="settings_restart_message">要使更改生效，需要重启设置。现在重启设置应用吗？</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">需要重启系统</string>
+    <string name="system_restart_message">要使更改生效，需要重启系统。现在重启系统吗？</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">需要重启系统界面</string>
+    <string name="systemui_restart_message">要使所有更改生效，需要重启系统界面。现在重启系统界面吗？</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">需要重启系统桌面</string>
+    <string name="launcher_restart_message">要使所有更改生效，需要重启系统桌面。现在重启系统桌面吗？</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">复制崩溃日志URL</string>
+    <string name="url_copy_success">已成功复制URL</string>
+    <string name="url_copy_failed">将日志上传到 Pasty 时出错</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">口袋模式已启用</string>
+    <string name="pocket_mode_illustration_description">口袋检测说明</string>
+    <string name="pocket_mode_instructions_header">如需使用您的手机：</string>
+    <string name="pocket_mode_instruction_step1">1. 确保蓝色区域（距离传感器）不被遮挡，无泥土或灰尘。</string>
+    <string name="pocket_mode_instruction_step2">2. 按住电源键退出口袋模式。</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">来电或通知时响铃</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">睡眠模式</string>
+    <string name="sleep_mode_notification_title">睡眠模式已启用</string>
+    <string name="sleep_mode_notification_content">点击关闭睡眠模式</string>
+    <string name="sleep_mode_enabled_toast">睡眠模式已开启</string>
+    <string name="sleep_mode_disabled_toast">睡眠模式已关闭</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> 已添加到游戏空间</string>
+</resources>
diff --git a/core/res/res/values-zh-rTW/matrixx_strings.xml b/core/res/res/values-zh-rTW/matrixx_strings.xml
new file mode 100644
index 0000000000000..e078f3b87b299
--- /dev/null
+++ b/core/res/res/values-zh-rTW/matrixx_strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+    <!-- Pocket Lock -->
+    <string name="pocket_mode_title">Pocket mode is active</string>
+    <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+    <string name="pocket_mode_instructions_header">To use your phone:</string>
+    <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+    <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+    <!-- Cycle through ringer modes -->
+    <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
+</resources>
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index f11ae909a1b58..2640e647f61fe 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -769,4 +769,6 @@
     <!-- Color for APM USB Data Protection Notification-->
     <!-- Notification icon tint color-->
     <color name="security_privacy_notification_tint_normal">#1A73E8</color>
+    
+    <color name="toast_color_background">@*android:color/system_neutral1_10</color>
 </resources>
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 4c5a008a3402e..5d3d6a3155a97 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -59,7 +59,7 @@
     <color name="surface_variant_dark">@color/system_neutral1_700</color>
     <color name="surface_variant_light">@color/system_neutral2_100</color>
     <color name="surface_dark">@color/system_neutral1_800</color>
-    <color name="surface_highlight_light">@color/system_neutral1_0</color>
+    <color name="surface_highlight_light">@color/system_neutral1_10</color>
 
     <!-- Please refer to text_color_[primary]_device_default_[light].xml for text colors-->
     <color name="foreground_device_default_light">@color/text_color_primary_device_default_light</color>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 40dec4659c271..a3faf214c8215 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -927,11 +927,11 @@
     <integer name="config_defaultNightDisplayCustomEndTime">21600000</integer>
 
     <!-- Minimum color temperature, in Kelvin, supported by Night display. -->
-    <integer name="config_nightDisplayColorTemperatureMin">2596</integer>
+    <integer name="config_nightDisplayColorTemperatureMin">1600</integer>
 
     <!-- Default color temperature, in Kelvin, to tint the screen when Night display is
          activated. -->
-    <integer name="config_nightDisplayColorTemperatureDefault">2850</integer>
+    <integer name="config_nightDisplayColorTemperatureDefault">2650</integer>
 
     <!-- Maximum color temperature, in Kelvin, supported by Night display. -->
     <integer name="config_nightDisplayColorTemperatureMax">4082</integer>
@@ -1460,7 +1460,10 @@
     <integer name="config_notificationsBatteryMediumARGB">0xFFFFFF00</integer>
 
     <!-- Default value for led color when battery is fully or nearly fully charged -->
-    <integer name="config_notificationsBatteryFullARGB">0xFF00FF00</integer>
+    <integer name="config_notificationsBatteryFullARGB">0xFF0000FF</integer>
+
+    <!-- Default value for led color when battery is really fully charged -->
+    <integer name="config_notificationsBatteryReallyFullARGB">0xFF00FF00</integer>
 
     <!-- Default value for LED on time when the battery is low on charge in miliseconds -->
     <integer name="config_notificationsBatteryLedOn">125</integer>
@@ -3909,7 +3912,7 @@
     <integer name="config_maxNumVisibleRecentTasks">-1</integer>
 
     <!-- The duration in which a recent task is considered in session and should be visible. -->
-    <integer name="config_activeTaskDurationHours">6</integer>
+    <integer name="config_activeTaskDurationHours">12</integer>
 
     <!-- Whether this device prefers to show snapshot or splash screen on back predict target.
          When set true, there will create windowless starting surface for the preview target, so it
@@ -4221,7 +4224,7 @@
 
     <!-- The maximum bitmap size that can be written to a MediaMetadata object. This value
          is the max width/height allowed in dips.-->
-    <dimen name="config_mediaMetadataBitmapMaxSize">320dp</dimen>
+    <dimen name="config_mediaMetadataBitmapMaxSize">260dp</dimen>
 
     <string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">false</string>
 
@@ -5382,6 +5385,8 @@
     <!-- URI for camera shutter sound -->
     <string translatable="false" name="config_cameraShutterSound">/product/media/audio/ui/camera_click.ogg</string>
 
+    <string translatable="false" name="config_screenshotSound">/product/media/audio/ui/screenshot.ogg</string>
+
     <!-- @deprecated This configuration is no longer used. -->
     <string translatable="false" name="config_defaultRingtoneVibrationSound"></string>
 
@@ -7619,7 +7624,7 @@
 
     <!-- The maximum number of call log entries for each sim card that can be stored in the call log
          provider on the device. -->
-    <integer name="config_maximumCallLogEntriesPerSim">500</integer>
+    <integer name="config_maximumCallLogEntriesPerSim">5000</integer>
 
     <!-- Whether to enable scaling and fading animation to scrollviews while scrolling.
          P.S this is a change only intended for wear devices. -->
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index b85e158a6cd97..6aa31ad0050a3 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -37,7 +37,7 @@
     <!-- Text size of the message within a toast -->
     <dimen name="toast_text_size">14sp</dimen>
     <!-- Elevation of toast view -->
-    <dimen name="toast_elevation">2dp</dimen>
+    <dimen name="toast_elevation">4dp</dimen>
 
     <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
          calculate the status bar height. -->
@@ -1159,7 +1159,7 @@
     <dimen name="slice_padding">16dp</dimen>
 
     <!-- Default dialog corner radius -->
-    <dimen name="dialog_corner_radius">2dp</dimen>
+    <dimen name="dialog_corner_radius">@dimen/config_dialogCornerRadius</dimen>
 
     <!-- Size of thumbnail used in the cross profile apps animation -->
     <dimen name="cross_profile_apps_thumbnail_size">72dp</dimen>
@@ -1306,4 +1306,9 @@
 
     <!-- Default height of taskbar for Launcher.   -->
     <dimen name="taskbar_stashed_size">24dp</dimen>
+
+    <!-- Custom clocks -->
+    <dimen name="presentation_clock_text_size">50dp</dimen>
+    <dimen name="large_clock_text_size">150dp</dimen>
+    <dimen name="small_clock_text_size">86dp</dimen>
 </resources>
diff --git a/core/res/res/values/locale_config.xml b/core/res/res/values/locale_config.xml
index cc5cb5cf20b30..dc63d45bbd702 100644
--- a/core/res/res/values/locale_config.xml
+++ b/core/res/res/values/locale_config.xml
@@ -79,7 +79,6 @@
         <item>ar-TD-u-nu-latn</item> <!-- Arabic (Chad, Western Digits) -->
         <item>ar-TN</item> <!-- Arabic (Tunisia) -->
         <item>ar-TN-u-nu-arab</item> <!-- Arabic (Tunisia, Arabic-Indic Digits) -->
-        <item>ar-XB</item> <!-- Arabic (Pseudo-Bidi) -->
         <item>ar-YE</item> <!-- Arabic (Yemen) -->
         <item>ar-YE-u-nu-latn</item> <!-- Arabic (Yemen, Western Digits) -->
         <item>as-IN</item> <!-- Assamese (India) -->
@@ -268,7 +267,6 @@
         <item>en-VI</item> <!-- English (U.S. Virgin Islands) -->
         <item>en-VU</item> <!-- English (Vanuatu) -->
         <item>en-WS</item> <!-- English (Samoa) -->
-        <item>en-XA</item> <!-- English (Pseudo-Accents) -->
         <item>en-ZA</item> <!-- English (South Africa) -->
         <item>en-ZM</item> <!-- English (Zambia) -->
         <item>en-ZW</item> <!-- English (Zimbabwe) -->
diff --git a/core/res/res/values/matrixx_arrays.xml b/core/res/res/values/matrixx_arrays.xml
index a2a2f90915aac..197cf33b41aad 100644
--- a/core/res/res/values/matrixx_arrays.xml
+++ b/core/res/res/values/matrixx_arrays.xml
@@ -4,5 +4,29 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
+    
+    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->
+    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>
 
+    <!-- Pocket Mode -->
+    <dimen name="pocket_mode_illustration_width">175dp</dimen>
+    <dimen name="pocket_mode_illustration_height">350dp</dimen>
+    <dimen name="pocket_mode_illustration_margin_top">56dp</dimen>
+    <dimen name="pocket_mode_title_size">24sp</dimen>
+    <dimen name="pocket_mode_title_margin_horizontal">56dp</dimen>
+    <dimen name="pocket_mode_instructions_container_margin_horizontal">24dp</dimen>
+    <dimen name="pocket_mode_instructions_container_margin_top">56dp</dimen>
+    <dimen name="pocket_mode_instructions_title_size">16sp</dimen>
+    <dimen name="pocket_mode_instructions_steps_margin_top">8dp</dimen>
+    <dimen name="pocket_mode_instructions_step_size">14sp</dimen>
+    <dimen name="pocket_mode_instructions_step_margin_top">8dp</dimen>
+
+    <!-- Whitelist of package names to bypass foreground service type validation -->
+    <string-array name="config_fgsTypeValidationBypassPackages" translatable="false"/>
+
+    <!-- Whitelist of package names to bypass alarm manager validation -->
+    <string-array name="config_alarmManagerValidationBypassPackages" translatable="false"/>
+
+    <!-- Whitelist of package names to bypass broadcast receiver validation -->
+    <string-array name="config_broadcastReceiverValidationBypassPackages" translatable="false"/>
 </resources>
diff --git a/core/res/res/values/matrixx_config.xml b/core/res/res/values/matrixx_config.xml
index 50682a745a2d2..fcac34dc52736 100644
--- a/core/res/res/values/matrixx_config.xml
+++ b/core/res/res/values/matrixx_config.xml
@@ -4,10 +4,105 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-
     <!-- Name of a font family to use as light font. For theming purpose. -->
     <string name="config_lightFontFamily" translatable="false">sans-serif-light</string>
 
     <!-- Name of a font family to use as regular font. For theming purpose. -->
     <string name="config_regularFontFamily" translatable="false">sans-serif-regular</string>
+
+    <!-- Define device configs on boot -->
+    <string-array name="global_device_configs_override" translatable="false">
+    </string-array>
+    <string-array name="device_configs_override" translatable="false">
+    </string-array>
+
+    <!-- Whether device has dash charging support -->
+    <bool name="config_hasDashCharger">false</bool>
+
+    <!-- Whether device has warp charging support -->
+    <bool name="config_hasWarpCharger">false</bool>
+
+    <!-- Whether device has VOOC charging support -->
+    <bool name="config_hasVoocCharger">false</bool>
+
+    <!-- Whether device has turbo power charging support -->
+    <bool name="config_hasTurboPowerCharger">false</bool>
+
+    <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
+    <string name="config_oemFastChargerStatusPath" translatable="false"></string>
+
+    <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
+    <string name="config_oemFastChargerStatusPath2" translatable="false"></string>
+
+    <!-- Expected value from fast charging status file  -->
+    <string name="config_oemFastChargerStatusValue" translatable="false">1</string>
+
+    <!-- Any package that has one of the package names defined below will be prevented
+       from using specific sensors in order to stop battery drain -->
+    <string-array name="config_blockPackagesSensorDrain">
+        <item>com.whatsapp</item>
+        <item>com.gbwhatsapp</item>
+        <item>com.yowhatsapp</item>
+        <item>com.whatsapp.plus</item>
+        <item>org.telegram.messenger</item>
+        <item>org.telegram.messenger.plus</item>
+        <item>com.netease.cloudmusic</item>
+        <item>fm.xiami.main</item>
+        <item>com.netease.snailread</item>
+        <item>com.baidu.browser.apps</item>
+        <item>org.thunderdog.challegram</item>
+        <item>com.snapchat.android</item>
+        <item>com.facebook.orca</item>
+        <item>com.Slack</item>
+        <item>tugapower.codeaurora.browser</item>
+        <item>org.mozilla.firefox</item>
+        <item>com.android.chrome</item>
+        <item>com.amazon.mShop.android.shopping</item>
+        <item>com.google.android.inputmethod.latin</item>
+        <item>com.google.android.apps.plus</item>
+        <item>com.google.android.apps.maps</item>
+        <item>ru.ok.android</item>
+        <item>com.instagram.android.MainTabActivity</item>
+        <item>com.facebook.orca</item>
+        <item>com.facebook.orca.StartScreenActivity</item>
+        <item>com.spotify.music</item>
+        <item>com.spotify.music.MainActivity</item>
+        <item>com.android.vending</item>
+        <item>com.trtf.blue</item>
+        <item>com.truecaller</item>
+        <item>com.gaana</item>
+        <item>com.facebook.katana.LoginActivity</item>
+    </string-array>
+
+    <!-- Whether device has physical tri state switch -->
+    <bool name="config_hasAlertSlider">false</bool>
+
+    <!-- Defines the sysfs attribute path used by pocket bridge
+         to communicate pocket state to the pocket judge kernel driver. -->
+    <string name="config_pocketBridgeSysfsInpocket"></string>
+
+    <!-- Pocket Lock -->
+    <bool name="config_pocketModeSupported">true</bool>
+    <bool name="config_pocketUseLightSensor">true</bool>
+
+    <!-- Defines custom OEM sensor for pocket detection. -->
+    <string name="config_pocketJudgeVendorSensorName"></string>
+    <item name="config_pocketJudgeVendorSensorValue" format="float" type="dimen">1.0</item>
+    <string name="config_pocketJudgeVendorProximitySensorName"></string>
+
+    <!-- Whether device supports sensor based doze customizations -->
+    <bool name="config_dozePulseTilt">false</bool>
+    <bool name="config_dozePulseProximity">false</bool>
+    <bool name="config_deviceHaveWakeUpProximity">false</bool>
+
+    <!-- Whether to cancel fingerprint operation if not idle -->
+    <bool name="config_fpCancelIfNotIdle">false</bool>
+
+    <!-- Component name of the activity that allows choosing the usb function when a usb device is plugged in. -->
+    <string name="config_usbFunctionActivity" translatable="false">com.android.systemui/com.android.systemui.usb.UsbFunctionActivity</string>
+
+    <!-- CPU temperature -->
+    <string name="config_cpu_temp_path">/sys/class/thermal/thermal_zone0/temp</string>
+    <integer name="config_sysCPUTempMultiplier">1</integer>
+    <integer name="config_sysBatteryTempMultiplier">1</integer>
 </resources>
diff --git a/core/res/res/values/matrixx_dimens.xml b/core/res/res/values/matrixx_dimens.xml
index a2a2f90915aac..a6bebcd84dc87 100644
--- a/core/res/res/values/matrixx_dimens.xml
+++ b/core/res/res/values/matrixx_dimens.xml
@@ -5,4 +5,23 @@
 -->
 <resources>
 
+    <!-- Pocket Mode -->
+    <style name="PocketModeTitle">
+        <item name="android:textSize">@dimen/pocket_mode_title_size</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:alpha">0.85</item>
+    </style>
+
+    <style name="PocketModeInstructionsTitle">
+        <item name="android:textSize">@dimen/pocket_mode_instructions_title_size</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:alpha">0.5</item>
+    </style>
+
+    <style name="PocketModeInstructionStep">
+        <item name="android:textSize">@dimen/pocket_mode_instructions_step_size</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:alpha">0.5</item>
+    </style>
+
 </resources>
diff --git a/core/res/res/values/matrixx_strings.xml b/core/res/res/values/matrixx_strings.xml
index 2b6e38489246e..ef483f574dcc1 100644
--- a/core/res/res/values/matrixx_strings.xml
+++ b/core/res/res/values/matrixx_strings.xml
@@ -5,4 +5,44 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <!-- Settings Restart -->
+    <string name="settings_restart_title">Settings restart required</string>
+    <string name="settings_restart_message">For all changes to take effect, a Settings app restart is required. Restart Settings app now?</string>
+
+    <!-- System Reboot -->
+    <string name="system_restart_title">System restart required</string>
+    <string name="system_restart_message">For all the changes to take effect, a system restart is required. Perform system restart now?</string>
+
+    <!-- SystemUI Restart -->
+    <string name="systemui_restart_title">SystemUI restart required</string>
+    <string name="systemui_restart_message">For all changes to take effect, a SystemUI restart is required. Restart SystemUI now?</string>
+
+    <!-- Launcher Restart -->
+    <string name="launcher_restart_title">Launcher restart required</string>
+    <string name="launcher_restart_message">For all changes to take effect, a Launcher restart is required. Restart Launcher now?</string>
+
+    <!-- Button that copies the url to the log of a crashed application -->
+    <string name="aerr_copy">Copy crash log URL</string>
+    <string name="url_copy_success">URL copied successfully</string>
+    <string name="url_copy_failed">An error occured while uploading the log to Pasty</string>
+
+     <!-- Pocket Lock -->
+     <string name="pocket_mode_title">Pocket mode is active</string>
+     <string name="pocket_mode_illustration_description">Illustration of phone in pocket</string>
+     <string name="pocket_mode_instructions_header">To use your phone:</string>
+     <string name="pocket_mode_instruction_step1">1. Ensure the blue area (proximity sensor) shown above is unobstructed and free from dirt or dust.</string>
+     <string name="pocket_mode_instruction_step2">2. Press and hold the power button to exit pocket mode.</string>
+
+     <!-- Cycle through ringer modes -->
+     <string name="volume_dialog_ringer_guidance_normal">Calls and notifications will ring</string>
+
+    <!-- Sleep Mode -->
+    <string name="notification_channel_sleep">Sleep Mode</string>
+    <string name="sleep_mode_notification_title">Sleep mode enabled</string>
+    <string name="sleep_mode_notification_content">Tap to turn off sleep mode</string>
+    <string name="sleep_mode_enabled_toast">Sleep mode turned on</string>
+    <string name="sleep_mode_disabled_toast">Sleep mode turned off</string>
+
+    <!-- GameSpace -->
+    <string name="gamespace_new_game_added"><xliff:g id="name" example="MyApp">%s</xliff:g> added to GameSpace</string>
 </resources>
diff --git a/core/res/res/values/matrixx_symbols.xml b/core/res/res/values/matrixx_symbols.xml
index a8c9c7d3fc4d9..8612a396afbc4 100644
--- a/core/res/res/values/matrixx_symbols.xml
+++ b/core/res/res/values/matrixx_symbols.xml
@@ -8,4 +8,111 @@
     <!-- Light / Regular style fonts -->
     <java-symbol type="string" name="config_lightFontFamily" />
     <java-symbol type="string" name="config_regularFontFamily" />
+
+    <!-- Define device configs on boot -->
+    <java-symbol type="array" name="global_device_configs_override" />
+    <java-symbol type="array" name="device_configs_override" />
+
+    <!-- Settings Restart -->
+    <java-symbol type="string" name="settings_restart_title" />
+    <java-symbol type="string" name="settings_restart_message" />
+
+    <!-- Soft restart dialog -->
+    <java-symbol type="string" name="system_restart_title" />
+    <java-symbol type="string" name="system_restart_message" />
+
+    <!-- SystemUI restart dialog -->
+    <java-symbol type="string" name="systemui_restart_title" />
+    <java-symbol type="string" name="systemui_restart_message" />
+
+    <!-- Launcher restart dialog -->
+    <java-symbol type="string" name="launcher_restart_title" />
+    <java-symbol type="string" name="launcher_restart_message" />
+
+    <!-- App error dialog -->
+    <java-symbol type="id" name="aerr_copy" />
+    <java-symbol type="string" name="url_copy_success" />
+    <java-symbol type="string" name="url_copy_failed" />
+
+    <!-- Whether device has dash charging support -->
+    <java-symbol type="bool" name="config_hasDashCharger" />
+
+    <!-- Whether device has warp charging support -->
+    <java-symbol type="bool" name="config_hasWarpCharger" />
+
+    <!-- Whether device has VOOC charging support -->
+    <java-symbol type="bool" name="config_hasVoocCharger" />
+
+    <!-- Whether device has turbo power charging support -->
+    <java-symbol type="bool" name="config_hasTurboPowerCharger" />
+
+    <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
+    <java-symbol type="string" name="config_oemFastChargerStatusPath" />
+
+    <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
+    <java-symbol type="string" name="config_oemFastChargerStatusPath2" />
+
+    <!-- Expected value from fast charging status file -->
+    <java-symbol type="string" name="config_oemFastChargerStatusValue" />
+
+    <!-- Default line spacing multiplier between hours and minutes of the keyguard clock-->
+    <java-symbol type="dimen" format="float" name="keyguard_clock_line_spacing_scale" />
+
+    <!-- Sensor block -->
+    <java-symbol type="array" name="config_blockPackagesSensorDrain" />
+
+    <!-- Whether device has physical tri state switch -->
+    <java-symbol type="bool" name="config_hasAlertSlider" />
+
+    <!-- Pocket Lock -->
+    <java-symbol type="layout" name="pocket_lock_view" />
+
+    <!-- Pocket bridge -->
+    <java-symbol type="string" name="config_pocketBridgeSysfsInpocket" />
+    <java-symbol type="bool" name="config_pocketModeSupported" />
+    <java-symbol type="bool" name="config_pocketUseLightSensor" />
+
+    <!-- Pocket Service -->
+    <java-symbol type="string" name="config_pocketJudgeVendorSensorName" />
+    <java-symbol type="dimen" name="config_pocketJudgeVendorSensorValue" />
+    <java-symbol type="string" name="config_pocketJudgeVendorProximitySensorName" />
+
+    <!-- Whether device supports sensor based doze customizations -->
+    <java-symbol type="bool" name="config_dozePulseTilt" />
+    <java-symbol type="bool" name="config_dozePulseProximity" />
+    <java-symbol type="bool" name="config_deviceHaveWakeUpProximity" />
+
+    <!-- Whether to cancel fingerprint operation if not idle -->
+    <java-symbol type="bool" name="config_fpCancelIfNotIdle" />
+
+    <!-- Cycle through ringer modes -->
+    <java-symbol type="string" name="volume_dialog_ringer_guidance_normal" />
+
+    <!-- USB -->
+    <java-symbol type="string" name="config_usbFunctionActivity" />
+
+    <!-- CPU temperature -->
+    <java-symbol type="string" name="config_cpu_temp_path" />
+    <java-symbol type="integer" name="config_sysCPUTempMultiplier" />
+    <java-symbol type="integer" name="config_sysBatteryTempMultiplier" />
+
+    <!-- Sleep Mode -->
+    <java-symbol type="drawable" name="ic_sleep" />
+    <java-symbol type="string" name="notification_channel_sleep" />
+    <java-symbol type="string" name="sleep_mode_notification_title" />
+    <java-symbol type="string" name="sleep_mode_notification_content" />
+    <java-symbol type="string" name="sleep_mode_enabled_toast" />
+    <java-symbol type="string" name="sleep_mode_disabled_toast" />
+
+    <!-- Whitelist of package names to bypass foreground service type validation -->
+    <java-symbol type="array" name="config_fgsTypeValidationBypassPackages"/>
+
+    <!-- Whitelist of package names to bypass alarm manager validation -->
+    <java-symbol type="array" name="config_alarmManagerValidationBypassPackages"/>
+
+    <!-- Whitelist of package names to bypass broadcast receiver validation -->
+    <java-symbol type="array" name="config_broadcastReceiverValidationBypassPackages"/>
+
+    <!-- GameSpace -->
+    <java-symbol type="string" name="gamespace_new_game_added" />
 </resources>
diff --git a/core/res/res/values/quickswitch_arrays.xml b/core/res/res/values/quickswitch_arrays.xml
new file mode 100644
index 0000000000000..f384908c23748
--- /dev/null
+++ b/core/res/res/values/quickswitch_arrays.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2023, The risingOS Android Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="config_launcherComponents">
+        <item>com.android.launcher3/com.android.quickstep.RecentsActivity</item>
+    </string-array>
+    
+    <string-array name="config_launcherPackages">
+        <item>com.android.launcher3</item>
+    </string-array>
+</resources>
diff --git a/packages/SystemUI/res/values-sw900dp/config.xml b/core/res/res/values/quickswitch_symbols.xml
similarity index 72%
rename from packages/SystemUI/res/values-sw900dp/config.xml
rename to core/res/res/values/quickswitch_symbols.xml
index 221b0139e713f..87da280f46f7b 100644
--- a/packages/SystemUI/res/values-sw900dp/config.xml
+++ b/core/res/res/values/quickswitch_symbols.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
-** Copyright 2016, The Android Open Source Project
+**
+** Copyright 2023, The risingOS Android Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -16,9 +17,7 @@
 ** limitations under the License.
 */
 -->
-<resources>
-
-    <!-- Nav bar button default ordering/layout -->
-    <string name="config_navBarLayout" translatable="false">back,home,left;space;right,recent</string>
-
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <java-symbol type="array" name="config_launcherComponents" />
+  <java-symbol type="array" name="config_launcherPackages" />
 </resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 7c46eddc58b9a..1fbb96ba9136b 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -644,6 +644,8 @@
 
     <!-- Attribution for MusicRecognitionManagerService. [CHAR LIMIT=NONE]-->
     <string name="music_recognition_manager_service">Music Recognition Manager Service</string>
+    <!-- Attribution for VCN management service. [CHAR LIMIT=NONE]-->
+    <string name="vcn_management_service">VCN Management Service</string>
 
     <!-- Factory reset warning dialog strings--> <skip />
     <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index fa37c65c9ca29..085272fbb411f 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -995,7 +995,7 @@ please see styles_device_defaults.xml.
 
         <item name="textSize">14sp</item>
         <item name="lineHeight">20sp</item>
-        <item name="textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColor">@*android:color/system_neutral1_900</item>
     </style>
 
     <style name="TextAppearance.Tooltip">
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 0da4e5964131f..122bcca8c789b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -370,9 +370,7 @@
   <java-symbol type="bool" name="config_enableDefaultHdrConversionPassthrough" />
   <java-symbol type="bool" name="config_allowAnimationsInLowPowerMode" />
   <java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
-  <java-symbol type="bool" name="config_safe_media_volume_enabled" />
   <java-symbol type="bool" name="config_safe_media_disable_on_volume_up" />
-  <java-symbol type="bool" name="config_safe_sound_dosage_enabled" />
   <java-symbol type="bool" name="config_camera_sound_forced" />
   <java-symbol type="bool" name="config_dontPreferApn" />
   <java-symbol type="bool" name="config_restartRadioAfterProvisioning" />
@@ -2199,6 +2197,7 @@
   <java-symbol type="integer" name="config_reservedPrivilegedKeepaliveSlots" />
   <java-symbol type="integer" name="config_allowedUnprivilegedKeepalivePerUid" />
   <java-symbol type="integer" name="config_notificationsBatteryFullARGB" />
+  <java-symbol type="integer" name="config_notificationsBatteryReallyFullARGB" />
   <java-symbol type="integer" name="config_notificationsBatteryLedOff" />
   <java-symbol type="integer" name="config_notificationsBatteryLedOn" />
   <java-symbol type="integer" name="config_notificationsBatteryLowBehavior" />
@@ -4250,6 +4249,7 @@
   <java-symbol type="dimen" name="config_inCallNotificationVolume" />
   <java-symbol type="string" name="config_inCallNotificationSound" />
   <java-symbol type="string" name="config_cameraShutterSound" />
+  <java-symbol type="string" name="config_screenshotSound" />
   <java-symbol type="integer" name="config_autoGroupAtCount" />
   <java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" />
   <java-symbol type="bool" name="config_dozePickupGestureEnabled" />
@@ -4560,8 +4560,8 @@
 
   <!-- Display White-Balance -->
   <java-symbol type="integer" name="config_displayWhiteBalanceBrightnessSensorRate" />
-  <java-symbol type="integer" name="config_displayWhiteBalanceBrightnessFilterHorizon" />
-  <java-symbol type="dimen" name="config_displayWhiteBalanceBrightnessFilterIntercept" />
+  <java-symbol type="integer" name="config_displayWhiteBalanceBrightnessFilterHorizon" id="0x010e0087" />
+  <java-symbol type="dimen" name="config_displayWhiteBalanceBrightnessFilterIntercept" id="0x010500f6" />
   <java-symbol type="string" name="config_displayWhiteBalanceColorTemperatureSensorName" />
   <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureSensorRate" />
   <java-symbol type="integer" name="config_displayWhiteBalanceColorTemperatureFilterHorizon" />
@@ -6082,10 +6082,10 @@
   <java-symbol type="string" name="config_pluginsProviderJarPath" />
 
   <java-symbol type="bool" name="config_watchlistUseFileHashesCache" />
-  <java-symbol type="string" name="config_defaultContextualSearchPackageName" />
-  <java-symbol type="string" name="config_defaultContextualSearchKey" />
-  <java-symbol type="string" name="config_defaultContextualSearchEnabled" />
-  <java-symbol type="string" name="config_defaultContextualSearchLegacyEnabled" />
+  <java-symbol type="string" name="config_defaultContextualSearchPackageName" id="0x01040241" />
+  <java-symbol type="string" name="config_defaultContextualSearchKey" id="0x0104023f" />
+  <java-symbol type="string" name="config_defaultContextualSearchEnabled" id="0x0104023e" />
+  <java-symbol type="string" name="config_defaultContextualSearchLegacyEnabled" id="0x01040240" />
 
   <java-symbol type="string" name="unarchival_session_app_label" />
 
@@ -6347,4 +6347,9 @@
 
   <!-- Action for opening trusted location settings page -->
   <java-symbol type="string" name="trusted_location_settings_action" />
+
+  <!-- Custom clocks -->
+  <java-symbol type="dimen" format="float" name="presentation_clock_text_size" />
+  <java-symbol type="dimen" format="float" name="large_clock_text_size" />
+  <java-symbol type="dimen" format="float" name="small_clock_text_size" />
 </resources>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml b/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml
index 127dbfd25b092..42687499a0490 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml
+++ b/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml
@@ -20,48 +20,33 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.BATTERY_STATS"/>
-    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <application
-        android:theme="@style/Theme"
+        android:theme="@style/Theme.SubSettingsBase.Expressive"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="Battery Stats Viewer">
+        android:enableOnBackInvokedCallback="true"
+        android:label="@string/app_name">
         <activity android:name=".BatteryConsumerPickerActivity"
-                  android:label="Battery Stats"
-                  android:launchMode="singleTop"
-                  android:exported="true"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".BatteryStatsViewerActivity"
-                  android:label="Battery Stats"
-                  android:parentActivityName=".BatteryConsumerPickerActivity"/>
-
-        <activity android:name=".TrampolineActivity"
-            android:exported="true"
-            android:theme="@android:style/Theme.NoDisplay">
+                  android:label="@string/header"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS"/>
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
             <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.development" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/settings_title" />
+                android:value="com.android.settings.category.ia.battery" />
             <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/settings_summary" />
-            <meta-data android:name="com.android.settings.group_key"
-                android:value="debug_debugging_category" />
+                android:resource="@string/display_dashboard_summary" />
+            <meta-data android:name="com.android.settings.profile"
+                android:value="primary_profile_only" />
             <meta-data android:name="com.android.settings.order"
-                android:value="2" />
+                android:value="255" />
         </activity>
+
+        <activity android:name=".BatteryStatsViewerActivity"
+                  android:label="@string/header"
+                  android:parentActivityName=".BatteryConsumerPickerActivity"/>
     </application>
 </manifest>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/color/card_color_state_list.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/color/card_color_state_list.xml
new file mode 100644
index 0000000000000..cda48796df467
--- /dev/null
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/color/card_color_state_list.xml
@@ -0,0 +1,22 @@
+<?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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
+    <item android:color="?androidprv:attr/colorSurface"/>
+</selector>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml
index b88425a57187c..109293725c983 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_picker_layout.xml
@@ -20,14 +20,6 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar" />
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml
index 46d8f04f9eef2..d06a74d00f76f 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_stats_viewer_layout.xml
@@ -47,9 +47,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:minHeight="80dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp">
+                    android:minHeight="80dp">
 
                     <include layout="@layout/battery_consumer_info_layout"/>
                 </LinearLayout>
@@ -79,11 +77,6 @@
                     android:paddingEnd="20dp"
                     android:text="Apps"/>
             </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@android:color/darker_gray"/>
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/calyx_strings.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/calyx_strings.xml
new file mode 100644
index 0000000000000..3d20f54dd5ef7
--- /dev/null
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/calyx_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2023 The Calyx Institute
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <string name="app_name">Battery Stats Viewer</string>
+    <string name="header">Battery stats</string>
+    <string name="display_dashboard_summary">View detailed battery usage stats</string>
+</resources>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml
index 1dc288af89b62..7108a57d8bf48 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/colors.xml
@@ -16,7 +16,5 @@
   -->
 
 <resources>
-    <color name="battery_consumer_bg_power_profile">#ffffff</color>
-    <color name="battery_consumer_bg_energy_consumption">#fff5eb</color>
     <color name="battery_consumer_slice_icon">#aaaaaa</color>
 </resources>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/strings.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/strings.xml
deleted file mode 100644
index c23c1484cf59d..0000000000000
--- a/core/tests/batterystatstests/BatteryStatsViewer/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (C) 2024 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="settings_title">Launch Battery Stats Viewer</string>
-    <string name="settings_summary">The Battery Stats Viewer will be visible in the Launcher after it is opened once.</string>
-</resources>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml b/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml
index a298cc9f59e3e..20779dd89c687 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml
+++ b/core/tests/batterystatstests/BatteryStatsViewer/res/values/styles.xml
@@ -17,19 +17,13 @@
   -->
 
 <resources>
-    <style name="Theme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">#34a853</item>
-        <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
-    </style>
-
     <style name="LoadTestCardView" parent="Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">#ceead6</item>
+        <item name="cardBackgroundColor">@color/card_color_state_list</item>
+        <item name="cardCornerRadius">28dp</item>
+        <item name="cardElevation">0dp</item>
     </style>
 
-    <style name="TextAppearanceBody" parent="android:TextAppearance.DeviceDefault">
-        <item name="android:textColor">#000000</item>
-        <item name="android:textSize">18sp</item>
-    </style>
+    <style name="TextAppearanceBody" parent="android:TextAppearance.DeviceDefault"/>
 
     <style name="TableCell">
         <item name="android:layout_height">match_parent</item>
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
index 3699690aca591..799010297c549 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
+++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerPickerActivity.java
@@ -31,13 +31,13 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 import java.util.ArrayList;
@@ -50,7 +50,7 @@
  * Picker, showing a sorted lists of applications and other types of entities consuming power.
  * Opens BatteryStatsViewerActivity upon item selection.
  */
-public class BatteryConsumerPickerActivity extends AppCompatActivity {
+public class BatteryConsumerPickerActivity extends CollapsingToolbarBaseActivity {
     private static final String PREF_SELECTED_BATTERY_CONSUMER = "batteryConsumerId";
     private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000;
     private static final String FORCE_FRESH_STATS = "force_fresh_stats";
@@ -68,10 +68,8 @@ protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         setContentView(R.layout.battery_consumer_picker_layout);
-        setSupportActionBar(findViewById(R.id.toolbar));
 
         mSwipeRefreshLayout = findViewById(R.id.swipe_refresh);
-        mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_green_light);
         mSwipeRefreshLayout.setRefreshing(true);
         mSwipeRefreshLayout.setOnRefreshListener(this::onRefresh);
         mAppList = findViewById(R.id.list_view);
@@ -79,14 +77,6 @@ protected void onCreate(Bundle icicle) {
         mBatteryConsumerListAdapter =
                 new BatteryConsumerListAdapter((this::setSelectedBatteryConsumer));
         mAppList.setAdapter(mBatteryConsumerListAdapter);
-
-        if (icicle == null) {
-            final String batteryConsumerId = getPreferences(Context.MODE_PRIVATE)
-                    .getString(PREF_SELECTED_BATTERY_CONSUMER, null);
-            if (batteryConsumerId != null) {
-                startBatteryStatsActivity(batteryConsumerId);
-            }
-        }
     }
 
     public void setSelectedBatteryConsumer(String batteryConsumerId) {
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java
index 350213161b7b2..d65d936a5f46d 100644
--- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java
+++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryStatsViewerActivity.java
@@ -32,7 +32,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.ComponentActivity;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.loader.app.LoaderManager;
@@ -42,6 +41,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 import java.util.ArrayList;
@@ -49,7 +49,7 @@
 import java.util.List;
 import java.util.Locale;
 
-public class BatteryStatsViewerActivity extends ComponentActivity {
+public class BatteryStatsViewerActivity extends CollapsingToolbarBaseActivity {
     public static final String EXTRA_BATTERY_CONSUMER = "batteryConsumerId";
 
     private static final int BATTERY_STATS_REFRESH_RATE_MILLIS = 60 * 1000;
@@ -88,7 +88,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.battery_stats_viewer_layout);
 
         mSwipeRefreshLayout = findViewById(R.id.swipe_refresh);
-        mSwipeRefreshLayout.setColorSchemeResources(android.R.color.holo_green_light);
         mSwipeRefreshLayout.setRefreshing(true);
         mSwipeRefreshLayout.setOnRefreshListener(this::onRefresh);
 
@@ -343,27 +342,26 @@ public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) {
             switch (entry.entryType) {
                 case UID:
                     setTitleIconAndBackground(viewHolder, entry.title,
-                            R.drawable.gm_energy_24, 0);
+                            R.drawable.gm_energy_24);
                     setPowerText(viewHolder.value1TextView, entry.value1);
                     setProportionText(viewHolder.value2TextView, entry);
                     bindSlices(viewHolder, entry);
                     break;
                 case DEVICE_TOTAL_POWER:
                     setTitleIconAndBackground(viewHolder, entry.title,
-                            R.drawable.gm_sum_24, 0);
+                            R.drawable.gm_sum_24);
                     setPowerText(viewHolder.value1TextView, entry.value1);
                     setPowerText(viewHolder.value2TextView, entry.value2);
                     break;
                 case DEVICE_POWER:
                     setTitleIconAndBackground(viewHolder, entry.title,
-                            R.drawable.gm_calculate_24,
-                            R.color.battery_consumer_bg_power_profile);
+                            R.drawable.gm_calculate_24);
                     setPowerText(viewHolder.value1TextView, entry.value1);
                     setPowerText(viewHolder.value2TextView, entry.value2);
                     break;
                 case DEVICE_DURATION:
                     setTitleIconAndBackground(viewHolder, entry.title,
-                            R.drawable.gm_timer_24, 0);
+                            R.drawable.gm_timer_24);
                     setDurationText(viewHolder.value1TextView, (long) entry.value1);
                     viewHolder.value2TextView.setVisibility(View.GONE);
                     break;
@@ -429,11 +427,9 @@ private void bindSlices(ViewHolder viewHolder, BatteryConsumerData.Entry entry)
             }
         }
 
-        private void setTitleIconAndBackground(ViewHolder viewHolder, String title, int icon,
-                int background) {
+        private void setTitleIconAndBackground(ViewHolder viewHolder, String title, int icon) {
             viewHolder.titleTextView.setText(title);
             viewHolder.iconImageView.setImageResource(icon);
-            viewHolder.itemView.setBackgroundResource(background);
         }
 
         private void setProportionText(TextView textView, BatteryConsumerData.Entry entry) {
diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java
deleted file mode 100644
index 412169e7a905f..0000000000000
--- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/TrampolineActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2024 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.frameworks.core.batterystatsviewer;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-public class TrampolineActivity extends Activity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        showLauncherIcon();
-        launchMainActivity();
-    }
-
-    private void showLauncherIcon() {
-        PackageManager pm = getPackageManager();
-        pm.setComponentEnabledSetting(new ComponentName(this, BatteryConsumerPickerActivity.class),
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-                PackageManager.DONT_KILL_APP);
-    }
-
-    private void launchMainActivity() {
-        startActivity(new Intent(this, BatteryConsumerPickerActivity.class));
-        finish();
-    }
-}
diff --git a/core/tests/coretests/res/raw/dng_opcode_MapTable_ProcessArea.png b/core/tests/coretests/res/raw/dng_opcode_MapTable_ProcessArea.png
new file mode 100644
index 0000000000000..3003143c8f831
Binary files /dev/null and b/core/tests/coretests/res/raw/dng_opcode_MapTable_ProcessArea.png differ
diff --git a/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java b/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java
index e2ce346b6bc66..474e3c3f010b0 100644
--- a/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java
+++ b/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java
@@ -334,4 +334,12 @@ public void resolveResourcesForIcon_invalidPackageSpecified_returnsNull() {
         Icon icon = Icon.createWithResource("invalid.package", R.drawable.test32x24);
         assertThat(LocalImageResolver.resolveResourcesForIcon(mContext, icon)).isNull();
     }
+
+    @Test(expected = IOException.class)
+    public void resolveImage_asset_invalidMimeType() throws IOException {
+        // dng mimetype is not supported
+        Uri uri = Uri.parse("android.resource://"
+                + mContext.getPackageName() + "/" + R.raw.dng_opcode_MapTable_ProcessArea);
+        LocalImageResolver.resolveImage(uri, mContext);
+    }
 }
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 0000000000000..579a58161fff8
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,3 @@
+files:
+  - source: /**/values/matrixx_strings.xml
+    translation: /%original_path%-%android_code%/%original_file_name%
diff --git a/data/etc/com.android.dialer.xml b/data/etc/com.android.dialer.xml
index 405279f8b1a4f..488b04cd46fd0 100644
--- a/data/etc/com.android.dialer.xml
+++ b/data/etc/com.android.dialer.xml
@@ -26,5 +26,8 @@
         <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+        <permission name="android.permission.NETWORK_STACK"/>
+        <permission name="android.permission.MAINLINE_NETWORK_STACK"/>
     </privapp-permissions>
 </permissions>
diff --git a/data/etc/com.android.launcher3.xml b/data/etc/com.android.launcher3.xml
index 47e2e3844bb9f..4545eca9efd14 100644
--- a/data/etc/com.android.launcher3.xml
+++ b/data/etc/com.android.launcher3.xml
@@ -20,6 +20,7 @@
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
         <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
         <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
         <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml
index 1e0e221f786f6..66d1e4d0a0792 100644
--- a/data/etc/com.android.settings.xml
+++ b/data/etc/com.android.settings.xml
@@ -21,6 +21,7 @@
         <permission name="android.permission.BACKUP"/>
         <permission name="android.permission.BATTERY_STATS"/>
         <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <permission name="android.permission.BIND_WALLPAPER"/>
         <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
         <permission name="android.permission.CHANGE_CONFIGURATION"/>
         <permission name="android.permission.CONTROL_UI_TRACING"/>
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index b632df559ff8e..f5d66a2e03cec 100644
--- a/data/etc/com.android.systemui.xml
+++ b/data/etc/com.android.systemui.xml
@@ -29,6 +29,7 @@
         <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
         <permission name="android.permission.CONTROL_VPN"/>
         <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES" />
         <permission name="android.permission.GET_APP_OPS_STATS"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.LOCATION_HARDWARE"/>
@@ -82,7 +83,6 @@
         <permission name="android.permission.READ_WIFI_CREDENTIAL" />
         <permission name="android.permission.USE_BACKGROUND_BLUR" />
         <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
-        <permission name="android.permission.FORCE_STOP_PACKAGES" />
         <permission name="android.permission.ACCESS_FPS_COUNTER" />
         <permission name="android.permission.CHANGE_CONFIGURATION" />
         <permission name="android.permission.LOG_COMPAT_CHANGE" />
@@ -98,5 +98,8 @@
         <permission name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW"/>
         <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" />
         <permission name="android.permission.SET_UNRESTRICTED_GESTURE_EXCLUSION" />
+        <permission name="android.permission.WRITE_APN_SETTINGS" />
+        <permission name="android.permission.ACCESS_NOTIFICATIONS"/>
+        <permission name="android.permission.CHANGE_APP_IDLE_STATE" />
     </privapp-permissions>
 </permissions>
diff --git a/data/etc/hiddenapi-package-whitelist.xml b/data/etc/hiddenapi-package-whitelist.xml
index 98f5824011ae2..1c2cc613e9f6b 100644
--- a/data/etc/hiddenapi-package-whitelist.xml
+++ b/data/etc/hiddenapi-package-whitelist.xml
@@ -40,6 +40,7 @@ Do NOT include any apps that are updatable via Play Store!
   <hidden-api-whitelisted-app package="com.android.dreams.basic" />
   <hidden-api-whitelisted-app package="com.android.gallery" />
   <hidden-api-whitelisted-app package="com.android.launcher3" />
+  <hidden-api-whitelisted-app package="com.android.deskclock" />
   <hidden-api-whitelisted-app package="com.android.mtp" />
   <hidden-api-whitelisted-app package="com.android.musicfx" />
   <hidden-api-whitelisted-app package="com.android.permissioncontroller" />
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 1789861025d14..bf6dbf0915598 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -387,4 +387,5 @@
          devices. -->
     <allow-in-power-save package="com.android.devicelockcontroller" />
     <allow-in-data-usage-save package="com.android.devicelockcontroller" />
+    <allow-in-power-save package="com.google.android.gms"/>
 </permissions>
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index a3495209fba0f..865c9466fbfd1 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -219,6 +219,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/effects/ogg/KeypressInvalid_120_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/KeypressInvalid.ogg \
     $(LOCAL_PATH)/effects/ogg/Lock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Lock.ogg \
     $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/LowBattery.ogg \
+    $(LOCAL_PATH)/effects/ogg/screenshot.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/screenshot.ogg \
     $(LOCAL_PATH)/effects/ogg/Undock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Undock.ogg \
     $(LOCAL_PATH)/effects/ogg/Unlock.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Unlock.ogg \
     $(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/Trusted.ogg \
diff --git a/data/sounds/AudioPackage14.mk b/data/sounds/AudioPackage14.mk
index 3d161aabbf952..52474821394d3 100644
--- a/data/sounds/AudioPackage14.mk
+++ b/data/sounds/AudioPackage14.mk
@@ -30,3 +30,5 @@ PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\
 	$(LOCAL_PATH)/effects/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg)
 PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\
 	$(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/$(fn).ogg)
+	
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/effects/ogg/screenshot.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/screenshot.ogg
diff --git a/data/sounds/effects/ogg/screenshot.ogg b/data/sounds/effects/ogg/screenshot.ogg
new file mode 100644
index 0000000000000..0c46a8aaa2a32
Binary files /dev/null and b/data/sounds/effects/ogg/screenshot.ogg differ
diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java
index da40a7ac3a498..9066f55e55310 100644
--- a/graphics/java/android/graphics/FontListParser.java
+++ b/graphics/java/android/graphics/FontListParser.java
@@ -39,6 +39,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -110,17 +111,35 @@ public static FontConfig parse(
             long lastModifiedDate,
             int configVersion
     ) throws IOException, XmlPullParserException {
-        FontCustomizationParser.Result oemCustomization;
+        final List<String> customizationXmlPaths = new ArrayList<>();
         if (oemCustomizationXmlPath != null) {
-            try (InputStream is = new FileInputStream(oemCustomizationXmlPath)) {
-                oemCustomization = FontCustomizationParser.parse(is, productFontDir,
-                        updatableFontMap);
+            customizationXmlPaths.add(oemCustomizationXmlPath);
+        }
+        return parse(fontsXmlPath, systemFontDir, customizationXmlPaths, productFontDir,
+                updatableFontMap, lastModifiedDate, configVersion);
+    }
+
+    /**
+     * Parses system font config XMLs with multiple OEM customization layers.
+     */
+    public static FontConfig parse(
+            @NonNull String fontsXmlPath,
+            @NonNull String systemFontDir,
+            @NonNull List<String> customizationXmlPaths,
+            @Nullable String productFontDir,
+            @Nullable Map<String, File> updatableFontMap,
+            long lastModifiedDate,
+            int configVersion
+    ) throws IOException, XmlPullParserException {
+        FontCustomizationParser.Result oemCustomization = new FontCustomizationParser.Result();
+        for (String customizationXmlPath : customizationXmlPaths) {
+            try (InputStream is = new FileInputStream(customizationXmlPath)) {
+                oemCustomization = mergeCustomizationResults(
+                        oemCustomization,
+                        FontCustomizationParser.parse(is, productFontDir, updatableFontMap));
             } catch (IOException e) {
-                // OEM customization may not exists. Ignoring
-                oemCustomization = new FontCustomizationParser.Result();
+                // OEM customization may not exist. Ignoring.
             }
-        } else {
-            oemCustomization = new FontCustomizationParser.Result();
         }
 
         try (InputStream is = new FileInputStream(fontsXmlPath)) {
@@ -132,6 +151,23 @@ public static FontConfig parse(
         }
     }
 
+    private static FontCustomizationParser.Result mergeCustomizationResults(
+            @NonNull FontCustomizationParser.Result base,
+            @NonNull FontCustomizationParser.Result extra) {
+        final Map<String, NamedFamilyList> namedFamilies =
+                new HashMap<>(base.getAdditionalNamedFamilies());
+        namedFamilies.putAll(extra.getAdditionalNamedFamilies());
+
+        final List<FontConfig.Customization.LocaleFallback> localeFallbacks =
+                new ArrayList<>(base.getLocaleFamilyCustomizations());
+        localeFallbacks.addAll(extra.getLocaleFamilyCustomizations());
+
+        final List<FontConfig.Alias> aliases = new ArrayList<>(base.getAdditionalAliases());
+        aliases.addAll(extra.getAdditionalAliases());
+
+        return new FontCustomizationParser.Result(namedFamilies, localeFallbacks, aliases);
+    }
+
     /**
      * Parses the familyset tag in font.xml
      * @param parser a XML pull parser
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 6f94566599bd7..bde80231dd669 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -27,8 +27,11 @@
 import android.annotation.Nullable;
 import android.annotation.TestApi;
 import android.annotation.UiThread;
+import android.app.ActivityThread;
+import android.app.Application;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.res.AssetManager;
+import android.content.res.Resources;
 import android.graphics.fonts.Font;
 import android.graphics.fonts.FontFamily;
 import android.graphics.fonts.FontStyle;
@@ -56,6 +59,7 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.matrixx.FontController;
 import com.android.internal.util.Preconditions;
 import com.android.text.flags.Flags;
 
@@ -77,6 +81,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -154,7 +159,7 @@ private static class NoImagePreloadHolder {
     private static final LruCache<Long, LruCache<String, Typeface>> sVariableCache =
             new LruCache<>(16);
     private static final Object sVariableCacheLock = new Object();
-
+    
     /** @hide */
     @VisibleForTesting
     public static void clearTypefaceCachesForTestingPurpose() {
@@ -178,7 +183,7 @@ public static void clearTypefaceCachesForTestingPurpose() {
      */
     @GuardedBy("SYSTEM_FONT_MAP_LOCK")
     @UnsupportedAppUsage(trackingBug = 123769347)
-    static final Map<String, Typeface> sSystemFontMap = new ArrayMap<>();
+    static final Map<String, Typeface> sSystemFontMap = new HashMap<>();
 
     // DirectByteBuffer object to hold sSystemFontMap's backing memory mapping.
     static ByteBuffer sSystemFontMapBuffer = null;
@@ -289,7 +294,10 @@ private void completeTypefaceInitialization(@NonNull Typeface initializedTypefac
      * The key of the default font family.
      * @hide
      */
-    public static final String DEFAULT_FAMILY = "sans-serif";
+    public static final String DEFAULT_FAMILY =
+            SystemProperties.get("persist.sys.ax_default_font", "google-sans-flex");
+
+    private static volatile String sFontName = DEFAULT_FAMILY;
 
     static {
         if (Flags.doNotOverwriteStaticFinalField()) {
@@ -997,7 +1005,7 @@ public CustomFallbackBuilder(@NonNull FontFamily family) {
      * @return The best matching typeface.
      */
     public static Typeface create(String familyName, @Style int style) {
-        return create(getSystemDefaultTypeface(familyName), style);
+        return create(getOverrideTypeface(familyName), style);
     }
 
     /**
@@ -1380,11 +1388,21 @@ public void releaseNativeObjectForTest() {
         mCleaner.run();
     }
 
-    private static Typeface getSystemDefaultTypeface(@NonNull String familyName) {
+    /** @hide */
+    public static Typeface getOverrideTypeface(@NonNull String familyName) {
+        if (DEFAULT.mPendingTypeface != null && DEFAULT.mPendingTypeface.get() == null) {
+            return getSystemDefaultTypeface(familyName);
+        }
+        Typeface tf = FontController.getOverrideTypeface(familyName);
+        return tf != null ? tf : getSystemDefaultTypeface(familyName);
+    }
+
+    /** @hide */
+    public static Typeface getSystemDefaultTypeface(@NonNull String familyName) {
         Typeface tf = sSystemFontMap.get(familyName);
         return tf == null ? Typeface.DEFAULT : tf;
     }
-
+    
     /** @hide */
     @VisibleForTesting
     public static void initSystemDefaultTypefaces(Map<String, FontFamily[]> fallbacks,
@@ -1584,6 +1602,47 @@ public static void initializePendingTypefaceLocked(Typeface pending, String fami
         systemFontMap.put(familyName, pending);
     }
 
+    /** @hide */
+    public static void changeFont() {
+        synchronized (sStyledCacheLock) {
+            sStyledTypefaceCache.clear();
+        }
+        synchronized (sWeightCacheLock) {
+            sWeightTypefaceCache.clear();
+        }
+        synchronized (sDynamicCacheLock) {
+            sDynamicTypefaceCache.evictAll();
+        }
+
+        FontController.clearCaches();
+
+        sFontName = FontController.getBodyFont();
+
+        Typeface base = sSystemFontMap.get(sFontName);
+        if (base == null) base = sSystemFontMap.get(DEFAULT_FAMILY);
+        if (base == null) return;
+
+        sDefaultTypeface = base;
+
+        Typeface tf = create(base, NORMAL);
+        Typeface tfBold = create(base, BOLD);
+        Typeface tfItalic = create(base, ITALIC);
+        Typeface tfItalicBold = create(base, BOLD_ITALIC);
+
+        nativeForceSetStaticFinalField("DEFAULT", tf);
+        nativeForceSetStaticFinalField("DEFAULT_BOLD", tfBold);
+        nativeForceSetStaticFinalField("SANS_SERIF", tf);
+
+        changeDefaultFontForTest(
+                Arrays.asList(tf, tfBold, tfItalic, tfItalicBold),
+                Arrays.asList(tf, Typeface.SERIF, Typeface.MONOSPACE));
+    }
+
+    /** @hide */
+    public static String getFontName() {
+        return sFontName;
+    }
+
     /** @hide */
     @VisibleForTesting
     public static void setSystemFontMap(Map<String, Typeface> systemFontMap) {
@@ -1718,6 +1777,11 @@ public static void init() {
         // Preload Roboto-Regular.ttf in Zygote for improving app launch performance.
         preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "Roboto-Regular.ttf");
         preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "RobotoStatic-Regular.ttf");
+        preloadFontFile(SystemFonts.OEM_FONT_DIR + "GoogleSansFlex-Regular.ttf");
+
+        preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "GoogleSans-Regular.ttf");
+        preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "GoogleSans-Italic.ttf");
+        preloadFontFile(SystemFonts.SYSTEM_FONT_DIR + "GoogleSansFlex-Regular.ttf");
 
         String locale = SystemProperties.get("persist.sys.locale", "en-US");
         String script = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale)).getScript();
diff --git a/graphics/java/android/graphics/fonts/SystemFonts.java b/graphics/java/android/graphics/fonts/SystemFonts.java
index 399345abd8ab5..1a4ac71552e0b 100644
--- a/graphics/java/android/graphics/fonts/SystemFonts.java
+++ b/graphics/java/android/graphics/fonts/SystemFonts.java
@@ -25,6 +25,7 @@
 import android.graphics.FontListParser;
 import android.graphics.Typeface;
 import android.os.LocaleList;
+import android.os.SystemProperties;
 import android.ravenwood.annotation.RavenwoodReplace;
 import android.text.FontConfig;
 import android.util.ArrayMap;
@@ -63,6 +64,19 @@ public final class SystemFonts {
     /** @hide */
     public static final String SYSTEM_FONT_DIR = getSystemFontDir();
     private static final String OEM_XML = "/product/etc/fonts_customization.xml";
+    private static final String OEM_EMOJI_XML_IOS = "/product/etc/fonts_customization_emoji_ios.xml";
+    private static final String OEM_EMOJI_XML_SAMSUNG =
+            "/product/etc/fonts_customization_emoji_samsung.xml";
+    private static final String OEM_EMOJI_XML_SWIFTUI =
+        "/product/etc/fonts_customization_emoji_swiftui.xml";
+    private static final String OEM_EMOJI_XML_FACEBOOK =
+        "/product/etc/fonts_customization_emoji_facebook.xml";
+    private static final String PROP_EMOJI_STYLE = "persist.sys.ax_emoji_style";
+    private static final String EMOJI_STYLE_ANDROID = "android";
+    private static final String EMOJI_STYLE_IOS = "ios";
+    private static final String EMOJI_STYLE_SAMSUNG = "samsung";
+    private static final String EMOJI_STYLE_SWIFTUI = "swiftui";
+    private static final String EMOJI_STYLE_FACEBOOK = "facebook";
     /** @hide */
     public static final String OEM_FONT_DIR = "/product/fonts/";
 
@@ -352,8 +366,9 @@ private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList na
             long lastModifiedDate,
             int configVersion
     ) {
-        return getSystemFontConfigInternal(FONTS_XML, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR,
-                updatableFontMap, lastModifiedDate, configVersion);
+        return getSystemFontConfigInternal(FONTS_XML, SYSTEM_FONT_DIR, OEM_XML,
+                getEmojiCustomizationXml(), OEM_FONT_DIR, updatableFontMap,
+                lastModifiedDate, configVersion);
     }
 
     /**
@@ -368,8 +383,9 @@ private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList na
             long lastModifiedDate,
             int configVersion
     ) {
-        return getSystemFontConfigInternal(fontsXml, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR,
-                updatableFontMap, lastModifiedDate, configVersion);
+        return getSystemFontConfigInternal(fontsXml, SYSTEM_FONT_DIR, OEM_XML,
+                getEmojiCustomizationXml(), OEM_FONT_DIR, updatableFontMap,
+                lastModifiedDate, configVersion);
     }
 
     /**
@@ -377,22 +393,23 @@ private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList na
      * @hide
      */
     public static @NonNull FontConfig getSystemPreinstalledFontConfig() {
-        return getSystemFontConfigInternal(FONTS_XML, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR, null,
-                0, 0);
+        return getSystemFontConfigInternal(FONTS_XML, SYSTEM_FONT_DIR, OEM_XML,
+                getEmojiCustomizationXml(), OEM_FONT_DIR, null, 0, 0);
     }
 
     /**
      * @hide
      */
     public static @NonNull FontConfig getSystemPreinstalledFontConfigFromLegacyXml() {
-        return getSystemFontConfigInternal(LEGACY_FONTS_XML, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR,
-                null, 0, 0);
+        return getSystemFontConfigInternal(LEGACY_FONTS_XML, SYSTEM_FONT_DIR, OEM_XML,
+                getEmojiCustomizationXml(), OEM_FONT_DIR, null, 0, 0);
     }
 
     /* package */ static @NonNull FontConfig getSystemFontConfigInternal(
             @NonNull String fontsXml,
             @NonNull String systemFontDir,
             @Nullable String oemXml,
+            @Nullable String emojiXml,
             @Nullable String productFontDir,
             @Nullable Map<String, File> updatableFontMap,
             long lastModifiedDate,
@@ -400,8 +417,15 @@ private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList na
     ) {
         try {
             Log.i(TAG, "Loading font config from " + fontsXml);
-            return FontListParser.parse(fontsXml, systemFontDir, oemXml, productFontDir,
-                                                updatableFontMap, lastModifiedDate, configVersion);
+            final List<String> customizationXmls = new ArrayList<>();
+            if (oemXml != null) {
+                customizationXmls.add(oemXml);
+            }
+            if (emojiXml != null) {
+                customizationXmls.add(emojiXml);
+            }
+            return FontListParser.parse(fontsXml, systemFontDir, customizationXmls,
+                    productFontDir, updatableFontMap, lastModifiedDate, configVersion);
         } catch (IOException e) {
             Log.e(TAG, "Failed to open/read system font configurations.", e);
             return new FontConfig(Collections.emptyList(), Collections.emptyList(),
@@ -413,6 +437,26 @@ private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList na
         }
     }
 
+    private static @Nullable String getEmojiCustomizationXml() {
+        final String style = SystemProperties.get(PROP_EMOJI_STYLE, EMOJI_STYLE_ANDROID);
+        if (EMOJI_STYLE_SAMSUNG.equals(style)) {
+            return OEM_EMOJI_XML_SAMSUNG;
+        }
+        if (EMOJI_STYLE_IOS.equals(style)) {
+            return OEM_EMOJI_XML_IOS;
+        }
+        if (EMOJI_STYLE_SWIFTUI.equals(style)) {
+            return OEM_EMOJI_XML_SWIFTUI;
+        }
+        if (EMOJI_STYLE_FACEBOOK.equals(style)) {
+            return OEM_EMOJI_XML_FACEBOOK;
+        }
+        if (EMOJI_STYLE_ANDROID.equals(style)) {
+            return null;
+        }
+        return OEM_EMOJI_XML_IOS;
+    }
+
     /**
      * Build the system fallback from FontConfig.
      * @hide
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
index 5e93f8db93886..f32ebbbbd0083 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
@@ -21,13 +21,16 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
+import android.app.ActivityThread;
 import android.content.Context;
 import android.hardware.security.keymint.EcCurve;
 import android.hardware.security.keymint.KeyParameter;
 import android.hardware.security.keymint.KeyPurpose;
 import android.hardware.security.keymint.SecurityLevel;
 import android.hardware.security.keymint.Tag;
+import android.os.Binder;
 import android.os.Build;
+import android.os.Process;
 import android.os.StrictMode;
 import android.security.Flags;
 import android.security.KeyPairGeneratorSpec;
@@ -43,6 +46,8 @@
 import android.security.keystore.KeyProperties;
 import android.security.keystore.SecureKeyImportUnavailableException;
 import android.security.keystore.StrongBoxUnavailableException;
+import android.security.trickystore.CertificateGenerator;
+import android.security.trickystore.TrickyStoreService;
 import android.system.keystore2.Authorization;
 import android.system.keystore2.Domain;
 import android.system.keystore2.IKeystoreSecurityLevel;
@@ -57,6 +62,8 @@
 
 import libcore.util.EmptyArray;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
@@ -66,6 +73,8 @@
 import java.security.ProviderException;
 import java.security.SecureRandom;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.NamedParameterSpec;
@@ -696,8 +705,103 @@ public KeyPair generateKeyPair() {
         try {
             KeyStoreSecurityLevel iSecurityLevel = mKeyStore.getSecurityLevel(securityLevel);
 
-            KeyMetadata metadata = iSecurityLevel.generateKey(descriptor, mAttestKeyDescriptor,
-                    constructKeyGenerationArguments(), flags, additionalEntropy);
+
+            KeyMetadata metadata = null;
+            boolean needGenerate = false;
+            if (!"TrickyStoreTeeCheck".equals(mEntryAlias) && 
+                !"trickystore_attestation_key".equals(mEntryAlias)) {
+                try {
+                    String[] packages = ActivityThread.getPackageManager().getPackagesForUid(Process.myUid());
+                    if (TrickyStoreService.getInstance()
+                            .needGenerate(Process.myUid(), packages)) {
+                        needGenerate = true;
+                    }
+                } catch (Exception e) {
+                    Log.w(TAG, "Failed to check TrickyStore needGenerate", e);
+                }
+            }
+
+            if (needGenerate) {
+                Log.i(TAG, "Generating software key for " + mEntryAlias);
+                
+                CertificateGenerator.KeyGenParameters params = new CertificateGenerator.KeyGenParameters();
+                params.keySize = mKeySizeBits;
+                params.algorithm = mKeymasterAlgorithm;
+                params.certificateSubject = mSpec.getCertificateSubject();
+                params.certificateSerial = mSpec.getCertificateSerialNumber();
+                params.certificateNotBefore = mSpec.getCertificateNotBefore();
+                params.certificateNotAfter = mSpec.getCertificateNotAfter();
+                params.rsaPublicExponent = mRSAPublicExponent == null ? null : BigInteger.valueOf(mRSAPublicExponent);
+                params.ecCurveName = mEcCurveName;
+                params.attestationChallenge = mSpec.getAttestationChallenge();
+
+                if (mKeymasterPurposes != null) {
+                    for (int p : mKeymasterPurposes) params.purpose.add(p);
+                }
+                if (mKeymasterDigests != null) {
+                    for (int d : mKeymasterDigests) params.digest.add(d);
+                }
+
+                if (mSpec.isDevicePropertiesAttestationIncluded()) {
+                    try {
+                        final String brand = isPropertyEmptyOrUnknown(Build.BRAND_FOR_ATTESTATION)
+                                ? Build.BRAND : Build.BRAND_FOR_ATTESTATION;
+                        params.brand = brand.getBytes(StandardCharsets.UTF_8);
+
+                        final String device = isPropertyEmptyOrUnknown(Build.DEVICE_FOR_ATTESTATION)
+                                ? Build.DEVICE : Build.DEVICE_FOR_ATTESTATION;
+                        params.device = device.getBytes(StandardCharsets.UTF_8);
+
+                        final String product = isPropertyEmptyOrUnknown(Build.PRODUCT_FOR_ATTESTATION)
+                                ? Build.PRODUCT : Build.PRODUCT_FOR_ATTESTATION;
+                        params.product = product.getBytes(StandardCharsets.UTF_8);
+
+                        final String manufacturer = isPropertyEmptyOrUnknown(Build.MANUFACTURER_FOR_ATTESTATION)
+                                ? Build.MANUFACTURER : Build.MANUFACTURER_FOR_ATTESTATION;
+                        params.manufacturer = manufacturer.getBytes(StandardCharsets.UTF_8);
+
+                        final String model = isPropertyEmptyOrUnknown(Build.MODEL_FOR_ATTESTATION)
+                                ? Build.MODEL : Build.MODEL_FOR_ATTESTATION;
+                        params.model = model.getBytes(StandardCharsets.UTF_8);
+                    } catch (Exception e) {
+                        Log.w(TAG, "Failed to set device properties for attestation", e);
+                    }
+                }
+                
+                KeyPair kp = CertificateGenerator.generateKeyPair(params);
+                if (kp == null) throw new ProviderException("Failed to generate software key");
+                
+                int callingUid = Binder.getCallingUid();
+                List<Certificate> chain = 
+                    CertificateGenerator.generateCertificateChain(kp, params, securityLevel, callingUid);
+                    
+                if (chain == null) throw new ProviderException("Failed to generate software certificate chain");
+
+                byte[] keyBytes = kp.getPrivate().getEncoded();
+                
+                metadata = iSecurityLevel.importKey(descriptor, null,
+                         constructKeyImportArguments(), flags, keyBytes);
+                         
+                byte[] userCert = null;
+                byte[] chainBytes = null;
+                
+                if (chain != null && !chain.isEmpty()) {
+                    try {
+                        userCert = chain.get(0).getEncoded();
+                        if (chain.size() > 1) {
+                             chainBytes = encodeCertificateChain(chain.subList(1, chain.size()));
+                        }
+                    } catch (Exception e) {
+                        throw new ProviderException("Failed to encode certificate chain", e);
+                    }
+                }
+                
+                mKeyStore.updateSubcomponents(descriptor, userCert, chainBytes);
+                
+            } else {
+                 metadata = iSecurityLevel.generateKey(descriptor, mAttestKeyDescriptor,
+                        constructKeyGenerationArguments(), flags, additionalEntropy);
+            }
 
             AndroidKeyStorePublicKey publicKey =
                     AndroidKeyStoreProvider.makeAndroidKeyStorePublicKeyFromKeyEntryResponse(
@@ -719,6 +823,8 @@ public KeyPair generateKeyPair() {
                 | DeviceIdAttestationException | InvalidAlgorithmParameterException e) {
             throw new ProviderException(
                     "Failed to construct key object from newly generated key pair.", e);
+        } catch (Exception e) {
+             throw new ProviderException("Failed to generate key pair via TrickyStore", e); 
         } finally {
             if (!success) {
                 try {
@@ -733,6 +839,19 @@ public KeyPair generateKeyPair() {
         }
     }
 
+    private byte[] encodeCertificateChain(List<Certificate> chain) 
+            throws CertificateEncodingException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        for (Certificate cert : chain) {
+            try {
+                baos.write(cert.getEncoded());
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to encode certificate", e);
+            }
+        }
+        return baos.toByteArray();
+    }
+
     @RequiresPermission(value = android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
             conditional = true)
     private void addAttestationParameters(@NonNull List<KeyParameter> params)
@@ -981,6 +1100,55 @@ Tag.EC_CURVE, keySizeAndNameToEcCurve(mKeySizeBits, mEcCurveName)
         return params;
     }
 
+    private Collection<KeyParameter> constructKeyImportArguments()
+            throws InvalidAlgorithmParameterException {
+        List<KeyParameter> params = new ArrayList<>();
+        params.add(KeyStore2ParameterUtils.makeInt(KeymasterDefs.KM_TAG_KEY_SIZE, mKeySizeBits));
+        params.add(KeyStore2ParameterUtils.makeEnum(
+                KeymasterDefs.KM_TAG_ALGORITHM, mKeymasterAlgorithm
+        ));
+
+        if (mKeymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_EC) {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    Tag.EC_CURVE, keySizeAndNameToEcCurve(mKeySizeBits, mEcCurveName)
+            ));
+        }
+
+        ArrayUtils.forEach(mKeymasterPurposes, (purpose) -> {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    KeymasterDefs.KM_TAG_PURPOSE, purpose
+            ));
+        });
+        ArrayUtils.forEach(mKeymasterBlockModes, (blockMode) -> {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    KeymasterDefs.KM_TAG_BLOCK_MODE, blockMode
+            ));
+        });
+        ArrayUtils.forEach(mKeymasterEncryptionPaddings, (padding) -> {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    KeymasterDefs.KM_TAG_PADDING, padding
+            ));
+        });
+        ArrayUtils.forEach(mKeymasterSignaturePaddings, (padding) -> {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    KeymasterDefs.KM_TAG_PADDING, padding
+            ));
+        });
+        ArrayUtils.forEach(mKeymasterDigests, (digest) -> {
+            params.add(KeyStore2ParameterUtils.makeEnum(
+                    KeymasterDefs.KM_TAG_DIGEST, digest
+            ));
+        });
+
+        KeyStore2ParameterUtils.addUserAuthArgs(params, mSpec);
+
+        addAlgorithmSpecificParameters(params);
+
+        params.add(KeyStore2ParameterUtils.makeBool(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED));
+
+        return params;
+    }
+
     private static boolean getMgf1DigestSetterFlag() {
         try {
             return Flags.mgf1DigestSetterV2();
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
index e6a63b9c4c17e..96676b921634e 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
@@ -90,6 +90,9 @@
 
 import javax.crypto.SecretKey;
 
+import android.security.trickystore.TrickyStoreService;
+import android.security.trickystore.CertificateHacker;
+
 /**
  * A java.security.KeyStore interface for the Android KeyStore. An instance of
  * it can be created via the {@link java.security.KeyStore#getInstance(String)
@@ -115,6 +118,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
 
     private KeyStore2 mKeyStore;
     private @KeyProperties.Namespace int mNamespace = KeyProperties.NAMESPACE_APPLICATION;
+    
+    private static final ThreadLocal<Boolean> sInHack = ThreadLocal.withInitial(() -> Boolean.FALSE);
 
     @Override
     public Key engineGetKey(String alias, char[] password) throws NoSuchAlgorithmException,
@@ -209,7 +214,7 @@ public Certificate[] engineGetCertificateChain(String alias) {
 
         caList[0] = leaf;
 
-        return caList;
+        return hackCertificateChainIfNeeded(caList);
     }
 
     @Override
@@ -266,6 +271,39 @@ private static boolean getMgf1DigestSetterFlag() {
         }
     }
 
+    private static Certificate[] hackCertificateChainIfNeeded(Certificate[] chain) {
+        if (chain == null || chain.length == 0) {
+            return chain;
+        }
+        if (sInHack.get()) {
+            return chain;
+        }
+        sInHack.set(Boolean.TRUE);
+        try {
+            TrickyStoreService service = TrickyStoreService.getInstance();
+            if (!service.hasKeyboxes()) {
+                return chain;
+            }
+
+            int callingUid = android.os.Binder.getCallingUid();
+            String[] packages = android.app.ActivityThread.getPackageManager()
+                    .getPackagesForUid(callingUid);
+
+            if (service.needHack(callingUid, packages)) {
+                Certificate[] hackedChain = CertificateHacker.hackCertificateChain(chain);
+                if (hackedChain != null) {
+                    Log.d(TAG, "TrickyStore: Hacked certificate chain for uid=" + callingUid);
+                    return hackedChain;
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "TrickyStore: Failed to hack certificate chain", e);
+        } finally {
+            sInHack.set(Boolean.FALSE);
+        }
+        return chain;
+    }
+
     @Override
     public Date engineGetCreationDate(String alias) {
         KeyEntryResponse response = getKeyMetadata(alias);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/logging/BubbleSessionTracker.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/logging/BubbleSessionTracker.kt
index d31d43eef47c4..8f1797abe6bc2 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/logging/BubbleSessionTracker.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/logging/BubbleSessionTracker.kt
@@ -19,6 +19,7 @@ package com.android.wm.shell.bubbles.logging
 import com.android.wm.shell.bubbles.Bubble
 import com.android.wm.shell.bubbles.BubbleOverflow
 import com.android.wm.shell.bubbles.BubbleViewProvider
+import com.android.wm.shell.shared.bubbles.logging.BubbleLog
 
 /**
  * Keeps track of the current Bubble session.
@@ -81,10 +82,20 @@ fun interface BubbleSessionTracker {
 
     companion object {
         @JvmStatic
-        fun BubbleViewProvider.getBubblePackageForLogging() = when (this) {
+        fun BubbleViewProvider?.getBubblePackageForLogging() = when (this) {
             is Bubble -> packageName
             is BubbleOverflow -> "Overflow"
-            else -> throw IllegalArgumentException("Unsupported type of BubbleViewProvider")
+            null -> {
+                BubbleLog.w("BubbleSessionTracker.getBubblePackageForLogging: null BubbleViewProvider")
+                "null"
+            }
+            else -> {
+                BubbleLog.w(
+                    "BubbleSessionTracker.getBubblePackageForLogging: Unsupported type of BubbleViewProvider with key %s",
+                    getKey()
+                )
+                "unknown"
+            }
         }
     }
 }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/ExternalInterfaceBinder.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/ExternalInterfaceBinder.java
index d6f4d81b44f32..7816dd0b1dff7 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/ExternalInterfaceBinder.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/ExternalInterfaceBinder.java
@@ -17,6 +17,7 @@
 package com.android.wm.shell.common;
 
 import android.Manifest;
+import android.os.Binder;
 import android.os.IBinder;
 import android.util.Slog;
 
@@ -53,10 +54,13 @@ default <T> void executeRemoteCallWithTaskPermission(RemoteCallable<T> controlle
     default <T> void executeRemoteCallWithTaskPermission(RemoteCallable<T> controllerInstance,
             String log, Consumer<T> callback, boolean blocking) {
         if (controllerInstance == null) return;
-
+        
         final RemoteCallable<T> controller = controllerInstance;
-        controllerInstance.getContext().enforceCallingPermission(
-                Manifest.permission.MANAGE_ACTIVITY_TASKS, log);
+        if (!com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassManageActivityTaskPermission(
+                controllerInstance.getContext())) {
+            controllerInstance.getContext().enforceCallingPermission(
+                    Manifest.permission.MANAGE_ACTIVITY_TASKS, log);
+        }
         if (blocking) {
             try {
                 controllerInstance.getRemoteCallExecutor().executeBlocking(() -> {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
index fdca70849b689..855512c2c7e3c 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
@@ -28,21 +28,21 @@
 public enum ShellProtoLogGroup implements IProtoLogGroup {
     // NOTE: Since we enable these from the same WM ShellCommand, these names should not conflict
     // with those in the framework ProtoLogGroup
-    WM_SHELL(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+    WM_SHELL(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             Consts.TAG_WM_SHELL),
-    WM_SHELL_INIT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+    WM_SHELL_INIT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             Consts.TAG_WM_SHELL),
     WM_SHELL_TASK_ORG(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
             "ShellTaskOrganizer"),
     WM_SHELL_TASK_ORG_NOISY(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             "ShellTaskOrganizer"),
-    WM_SHELL_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+    WM_SHELL_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             Consts.TAG_WM_SHELL),
     WM_SHELL_IME_CONTROLLER(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             "ShellIme"),
-    WM_SHELL_RECENTS_TRANSITION(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+    WM_SHELL_RECENTS_TRANSITION(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             "ShellRecents"),
-    WM_SHELL_DRAG_AND_DROP(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+    WM_SHELL_DRAG_AND_DROP(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             "ShellDragAndDrop"),
     WM_SHELL_STARTING_WINDOW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
             Consts.TAG_WM_STARTING_WINDOW),
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java
index 3d211516f6bba..3c193f2baaf32 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java
@@ -72,6 +72,9 @@ void makeTaskSnapshotWindow(StartingWindowInfo info, SurfaceControl rootSurface,
             return;
         }
         final Display display = mDisplayManager.getDisplay(runningTaskInfo.displayId);
+        if (display == null) {
+            return;
+        }
         final StartingSurfaceDrawer.WindowlessStartingWindow wlw =
                 new StartingSurfaceDrawer.WindowlessStartingWindow(
                         mContext.getResources().getConfiguration(), rootSurface);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
index b9cb9e19c8684..e8751d16fb0bd 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultSurfaceAnimator.java
@@ -33,6 +33,7 @@
 import com.android.wm.shell.shared.TransactionPool;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Consumer;
 
@@ -106,6 +107,10 @@ public void onAnimationUpdate(@NonNull ValueAnimator animator) {
     private static class DefaultAnimationAdapter extends AnimationAdapter {
         final Transformation mTransformation = new Transformation();
         final float[] mMatrix = new float[9];
+        final float[] mPrevMatrix = new float[9];
+        float mPrevAlpha = Float.NaN;
+        final Rect mPrevAnimClipRect = new Rect();
+        boolean mCornerRadiusApplied = false;
         @NonNull final Animation mAnim;
         @Nullable final Point mPosition;
         @Nullable final Rect mClipRect;
@@ -143,8 +148,16 @@ void applyTransformation(@NonNull ValueAnimator animator, long currentPlayTime)
             if (mPosition != null) {
                 transformation.getMatrix().postTranslate(mPosition.x, mPosition.y);
             }
-            t.setMatrix(leash, transformation.getMatrix(), mMatrix);
-            t.setAlpha(leash, transformation.getAlpha());
+            transformation.getMatrix().getValues(mMatrix);
+            if (!Arrays.equals(mMatrix, mPrevMatrix)) {
+                t.setMatrix(leash, transformation.getMatrix(), mMatrix);
+                System.arraycopy(mMatrix, 0, mPrevMatrix, 0, 9);
+            }
+            final float alpha = transformation.getAlpha();
+            if (alpha != mPrevAlpha) {
+                t.setAlpha(leash, alpha);
+                mPrevAlpha = alpha;
+            }
 
             if (mClipRect != null) {
                 boolean needCrop = false;
@@ -166,11 +179,15 @@ void applyTransformation(@NonNull ValueAnimator animator, long currentPlayTime)
                 }
                 if (mCornerRadius > 0 && mAnim.hasRoundedCorners()) {
                     // Rounded corner can only be applied if a crop is set.
-                    t.setCornerRadius(leash, mCornerRadius);
+                    if (!mCornerRadiusApplied) {
+                        t.setCornerRadius(leash, mCornerRadius);
+                        mCornerRadiusApplied = true;
+                    }
                     needCrop = true;
                 }
-                if (needCrop) {
+                if (needCrop && !mAnimClipRect.equals(mPrevAnimClipRect)) {
                     t.setWindowCrop(leash, mAnimClipRect);
+                    mPrevAnimClipRect.set(mAnimClipRect);
                 }
             }
         }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
index 9daeed72cfdb2..20cdad92d4217 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
@@ -88,9 +88,11 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.hardware.power.Boost;
 import android.hardware.HardwareBuffer;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.PowerManagerInternal;
 import android.os.UserHandle;
 import android.util.ArrayMap;
 import android.view.SurfaceControl;
@@ -107,6 +109,7 @@
 import com.android.internal.policy.ScreenDecorationsUtils;
 import com.android.internal.policy.TransitionAnimation;
 import com.android.internal.protolog.ProtoLog;
+import com.android.server.LocalServices;
 import com.android.window.flags.Flags;
 import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
 import com.android.wm.shell.animation.SizeChangeAnimation;
@@ -661,6 +664,21 @@ public boolean startAnimation(@NonNull IBinder transition, @NonNull TransitionIn
                         mMainHandler, CUJ_DEFAULT_TASK_TO_TASK_ANIMATION);
             }
 
+            long longestDurationMs = 0L;
+            for (int i = 0; i < animations.size(); ++i) {
+                final Animator a = animations.get(i);
+                if (a instanceof ValueAnimator va) {
+                    final long d = va.getDuration();
+                    if (d > longestDurationMs) longestDurationMs = d;
+                }
+            }
+            if (longestDurationMs > 0L) {
+                PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
+                if (pmi != null) {
+                    pmi.setPowerBoost(Boost.INTERACTION, (int) (longestDurationMs + 100L));
+                }
+            }
+
             // now start animations. they are started on another thread, so we have to post them
             // *after* applying the startTransaction
             mAnimExecutor.execute(() -> {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
index 92c4fcce3e001..6683ca4f554ce 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
@@ -725,6 +725,7 @@ public void onTransitionReady(@NonNull IBinder transitionToken, @NonNull Transit
             if (existing != null) {
                 Log.e(TAG, "Got duplicate transitionReady for " + transitionToken);
                 // The transition is already somewhere else in the pipeline, so just return here.
+                info.releaseAnimSurfaces();
                 t.apply();
                 if (existing.mFinishT != null) {
                     existing.mFinishT.merge(finishT);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java
index 127ca3c989840..951dfdc249f6c 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java
@@ -32,6 +32,7 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Insets;
 import android.graphics.Point;
@@ -54,6 +55,7 @@
 import android.window.DesktopModeFlags;
 import android.window.WindowContainerTransaction;
 
+import com.android.internal.policy.ScreenDecorationsUtils;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.wm.shell.R;
 import com.android.wm.shell.ShellTaskOrganizer;
@@ -220,7 +222,7 @@ static void updateRelayoutParams(
             boolean shouldSetTaskVisibilityPositionAndCrop,
             boolean isStatusBarVisible,
             boolean isKeyguardVisibleAndOccluded,
-            InsetsState displayInsetsState,
+            DisplayController displayController,
             boolean hasGlobalFocus,
             @NonNull Region globalExclusionRegion,
             boolean shouldSetBackground,
@@ -246,6 +248,8 @@ static void updateRelayoutParams(
                 || (isStatusBarVisible && !isKeyguardVisibleAndOccluded);
         relayoutParams.mDisplayExclusionRegion.set(globalExclusionRegion);
         relayoutParams.mInSyncWithTransition = inSyncWithTransition;
+        relayoutParams.mCornerRadius =
+                getCornerRadius(context, displayController.getDisplay(taskInfo.displayId));
 
         if (TaskInfoKt.isTransparentCaptionBarAppearance(taskInfo)) {
             // If the app is requesting to customize the caption bar, allow input to fall
@@ -265,7 +269,8 @@ static void updateRelayoutParams(
         );
 
         relayoutParams.mCaptionTopPadding = getTopPadding(relayoutParams,
-                taskInfo.getConfiguration().windowConfiguration.getBounds(), displayInsetsState);
+                taskInfo.getConfiguration().windowConfiguration.getBounds(),
+                displayController.getInsetsState(taskInfo.displayId));
         // Set opaque background for all freeform tasks to prevent freeform tasks below
         // from being visible if freeform task window above is translucent.
         // Otherwise if fluid resize is enabled, add a background to freeform tasks.
@@ -290,7 +295,7 @@ void relayout(RunningTaskInfo taskInfo,
         updateRelayoutParams(mRelayoutParams, mContext, taskInfo, applyStartTransactionOnDraw,
                 shouldSetTaskVisibilityPositionAndCrop, mIsStatusBarVisible,
                 mIsKeyguardVisibleAndOccluded,
-                mDisplayController.getInsetsState(taskInfo.displayId), hasGlobalFocus,
+                mDisplayController, hasGlobalFocus,
                 globalExclusionRegion, mDesktopConfig.shouldSetBackground(taskInfo),
                 inSyncWithTransition);
 
@@ -350,6 +355,19 @@ void relayout(RunningTaskInfo taskInfo,
         });
     }
 
+    private static int getCornerRadius(Context context, Display display) {
+        // Show rounded corners only on the internal display as we can't get rounded corners for
+        // external displays.
+        if (display.getType() != Display.TYPE_INTERNAL) {
+            return 0;
+        }
+        final TypedArray ta = context.obtainStyledAttributes(
+                new int[]{android.R.attr.dialogCornerRadius});
+        final int cornerRadius = ta.getDimensionPixelSize(0, 0);
+        ta.recycle();
+        return cornerRadius;
+    }
+
     /**
      * Sets up listeners when a new root view is created.
      */
@@ -390,17 +408,17 @@ private void setCaptionColor(int captionColor) {
         if (mResult.mRootView == null) {
             return;
         }
+        int nightModeFlags = mContext.getResources().getConfiguration().uiMode & 
+                             android.content.res.Configuration.UI_MODE_NIGHT_MASK;
+        boolean isNightMode = nightModeFlags == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+
+        int mCaptionColor = isNightMode ? Color.BLACK : Color.WHITE;
+        int buttonTintColorRes = isNightMode ? R.color.decor_button_light_color : R.color.decor_button_dark_color;
+        ColorStateList buttonTintColor = mContext.getResources().getColorStateList(buttonTintColorRes, null /* theme */);
 
         final View caption = mResult.mRootView.findViewById(R.id.caption);
         final GradientDrawable captionDrawable = (GradientDrawable) caption.getBackground();
-        captionDrawable.setColor(captionColor);
-
-        final int buttonTintColorRes =
-                Color.valueOf(captionColor).luminance() < 0.5
-                        ? R.color.decor_button_light_color
-                        : R.color.decor_button_dark_color;
-        final ColorStateList buttonTintColor =
-                caption.getResources().getColorStateList(buttonTintColorRes, null /* theme */);
+        captionDrawable.setColor(mCaptionColor);
 
         final View back = caption.findViewById(R.id.back_button);
         back.setBackgroundTintList(buttonTintColor);
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index 5b3012875ac58..a529618ecf629 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -272,6 +272,14 @@ cc_test {
         ":FrameworkResourcesNotSparseTestApp",
     ],
     test_suites: ["device-tests"],
+    test_options: {
+        test_runner_options: [
+            {
+                name: "native-test-timeout",
+                value: "1m",
+            }
+        ]
+    },
 }
 
 cc_benchmark {
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index 1186772cac865..8d922486ebd35 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -1256,6 +1256,33 @@ base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag(
     return base::unexpected(entry.error());
   }
 
+  // Resolve reference resources recursively
+  auto final_resid = resid;
+  std::vector<uint32_t> referenced_ids;
+  while (!(entry->entry_flags & ResTable_entry::FLAG_COMPLEX)) {
+    if (final_resid == 0U ||
+        std::find(referenced_ids.begin(), referenced_ids.end(),
+                  final_resid) != referenced_ids.end()) {
+      return base::unexpected(std::nullopt);
+    }
+    referenced_ids.push_back(final_resid);
+    auto value = GetResource(final_resid, false, 0);
+    if (value.has_value() && value->type == Res_value::TYPE_REFERENCE) {
+      // Follow the reference
+      final_resid = value->data;
+      // Re-fetch the entry for the target of the reference
+      entry = FindEntry(final_resid, 0u, false, false);
+
+      if (!entry.has_value()) {
+        // Target is still not a bag, can't resolve as a bag
+        return base::unexpected(std::nullopt);
+      }
+    } else {
+      // Not a bag and not a reference to one
+      return base::unexpected(std::nullopt);
+    }
+  }
+
   auto entry_map = std::get_if<incfs::verified_map_ptr<ResTable_map_entry>>(&entry->entry);
   if (entry_map == nullptr) {
     // Not a bag, nothing to do.
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp
index 7e1a0add672f2..26186a461836c 100644
--- a/libs/androidfw/tests/AssetManager2_test.cpp
+++ b/libs/androidfw/tests/AssetManager2_test.cpp
@@ -889,4 +889,100 @@ TEST_F(AssetManager2Test, GetFlaggedAssets) {
   EXPECT_TRUE(value->entry_flags & ResTable_entry::FLAG_USES_FEATURE_FLAGS);
 }
 
+TEST_F(AssetManager2Test, FindsBagThroughConcreteStringArray) {
+  AssetManager2 assetmanager;
+  assetmanager.SetApkAssets({basic_assets_});
+
+  auto bag = assetmanager.GetBag(basic::R::array::concrete_string_array);
+  ASSERT_TRUE(bag.has_value());
+
+  ASSERT_EQ(3u, (*bag)->entry_count);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[0].value.dataType);
+  EXPECT_EQ(std::string("a"),
+        GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[0].cookie), (*bag)->entries[0].value.data));
+  EXPECT_EQ(0, (*bag)->entries[0].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[1].value.dataType);
+  EXPECT_EQ(std::string("b"),
+        GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[1].cookie), (*bag)->entries[1].value.data));
+  EXPECT_EQ(0, (*bag)->entries[1].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[2].value.dataType);
+  EXPECT_EQ(std::string("c"),
+        GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[2].cookie), (*bag)->entries[2].value.data));
+  EXPECT_EQ(0, (*bag)->entries[2].cookie);
+}
+
+TEST_F(AssetManager2Test, FindsBagThroughSingleReference) {
+  AssetManager2 assetmanager;
+  assetmanager.SetApkAssets({basic_assets_});
+
+  auto bag = assetmanager.GetBag(basic::R::array::aliased_string_array);
+  ASSERT_TRUE(bag.has_value());
+
+  ASSERT_EQ(3u, (*bag)->entry_count);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[0].value.dataType);
+  EXPECT_EQ(std::string("a"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[0].cookie), (*bag)->entries[0].value.data));
+  EXPECT_EQ(0, (*bag)->entries[0].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[1].value.dataType);
+  EXPECT_EQ(std::string("b"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[1].cookie), (*bag)->entries[1].value.data));
+  EXPECT_EQ(0, (*bag)->entries[1].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[2].value.dataType);
+  EXPECT_EQ(std::string("c"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[2].cookie), (*bag)->entries[2].value.data));
+  EXPECT_EQ(0, (*bag)->entries[2].cookie);
+}
+
+TEST_F(AssetManager2Test, FindsBagThroughDoubleReference) {
+  AssetManager2 assetmanager;
+  assetmanager.SetApkAssets({basic_assets_});
+
+  auto bag = assetmanager.GetBag(basic::R::array::double_aliased_string_array);
+  ASSERT_TRUE(bag.has_value());
+
+  ASSERT_EQ(3u, (*bag)->entry_count);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[0].value.dataType);
+  EXPECT_EQ(std::string("a"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[0].cookie), (*bag)->entries[0].value.data));
+  EXPECT_EQ(0, (*bag)->entries[0].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[1].value.dataType);
+  EXPECT_EQ(std::string("b"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[1].cookie), (*bag)->entries[1].value.data));
+  EXPECT_EQ(0, (*bag)->entries[1].cookie);
+
+  EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_STRING), (*bag)->entries[2].value.dataType);
+  EXPECT_EQ(std::string("c"),
+          GetStringFromPool(assetmanager.GetStringPoolForCookie((*bag)->entries[2].cookie), (*bag)->entries[2].value.data));
+  EXPECT_EQ(0, (*bag)->entries[2].cookie);
+}
+
+TEST_F(AssetManager2Test, DetectsCircularBag) {
+  // If the test fails because it is hung you will see the following:
+  //         Result: died but not with expected exit code:
+  //                 Terminated by signal 14
+  // caused by the alarm(1) timeout.
+  EXPECT_EXIT({
+    alarm(1);
+    AssetManager2 assetmanager;
+    assetmanager.SetApkAssets({basic_assets_});
+
+    auto bag = assetmanager.GetBag(basic::R::array::circular_aliased_string_array1);
+    if (!bag.has_value()) {
+      // Success, a circular reference should not return a bag
+      exit(0);
+    }
+    // Fail, we returned a bag
+    fprintf(stderr, "GetBag returned a bag from a circular reference!");
+    exit(1);
+  }, ::testing::ExitedWithCode(0), "");
+}
+
 }  // namespace android
diff --git a/libs/androidfw/tests/LoadedArsc_test.cpp b/libs/androidfw/tests/LoadedArsc_test.cpp
index eb90765cd17a4..3bf4ade500844 100644
--- a/libs/androidfw/tests/LoadedArsc_test.cpp
+++ b/libs/androidfw/tests/LoadedArsc_test.cpp
@@ -288,6 +288,12 @@ TEST(LoadedArscTest, ResourceIdentifierIterator) {
   ASSERT_EQ(0x7f050000u, *iter++);
   ASSERT_EQ(0x7f050001u, *iter++);
   ASSERT_EQ(0x7f060000u, *iter++);
+  ASSERT_EQ(0x7f060001u, *iter++);
+  ASSERT_EQ(0x7f060002u, *iter++);
+  ASSERT_EQ(0x7f060003u, *iter++);
+  ASSERT_EQ(0x7f060004u, *iter++);
+  ASSERT_EQ(0x7f060005u, *iter++);
+  ASSERT_EQ(0x7f060006u, *iter++);
   ASSERT_EQ(0x7f070000u, *iter++);
   ASSERT_EQ(0x7f070001u, *iter++);
   ASSERT_EQ(0x7f070002u, *iter++);
diff --git a/libs/androidfw/tests/data/basic/R.h b/libs/androidfw/tests/data/basic/R.h
index b7e814fea079b..d6eb0e41e461f 100644
--- a/libs/androidfw/tests/data/basic/R.h
+++ b/libs/androidfw/tests/data/basic/R.h
@@ -73,6 +73,10 @@ struct R {
   struct array {
     enum : uint32_t {
       integerArray1 = 0x7f060000,
+      concrete_string_array = 0x7f060001,
+      aliased_string_array = 0x7f060002,
+      double_aliased_string_array = 0x7f060003,
+      circular_aliased_string_array1 = 0x7f060004,
     };
   };
 };
diff --git a/libs/androidfw/tests/data/basic/basic.apk b/libs/androidfw/tests/data/basic/basic.apk
index b721ebfde4459..42a50eaf70d30 100644
Binary files a/libs/androidfw/tests/data/basic/basic.apk and b/libs/androidfw/tests/data/basic/basic.apk differ
diff --git a/libs/androidfw/tests/data/basic/basic_de_fr.apk b/libs/androidfw/tests/data/basic/basic_de_fr.apk
index 767dff6fcfa5f..a3f52d600c97d 100644
Binary files a/libs/androidfw/tests/data/basic/basic_de_fr.apk and b/libs/androidfw/tests/data/basic/basic_de_fr.apk differ
diff --git a/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk
index 58953f56d736d..474f63fc1a095 100644
Binary files a/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk and b/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk differ
diff --git a/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk
index 103f6565bb066..225c04e9b4010 100644
Binary files a/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk and b/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk differ
diff --git a/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk
index 61369d5067862..e10788980613a 100644
Binary files a/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk and b/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk differ
diff --git a/libs/androidfw/tests/data/basic/res/values/values.xml b/libs/androidfw/tests/data/basic/res/values/values.xml
index d4b2683c62e18..beb64b11161b7 100644
--- a/libs/androidfw/tests/data/basic/res/values/values.xml
+++ b/libs/androidfw/tests/data/basic/res/values/values.xml
@@ -74,12 +74,29 @@
         <item>3</item>
     </integer-array>
 
-    <overlayable>
-        <item type="string" name="test2" />
-        <item type="array" name="integerArray1" />
+    <overlayable name="basic_overlayable">
+        <policy type="public">
+            <item type="string" name="test2" />
+            <item type="array" name="integerArray1" />
+        </policy>
     </overlayable>
 
     <item name="high_ref" type="id">@id/middle_ref</item>
     <item name="middle_ref" type="id">@id/low_ref</item>
     <item name="low_ref" type="id"/>
+
+    <public type="array" name="concrete_string_array" id="0x7f060001" />
+    <string-array name="concrete_string_array">
+      <item>a</item>
+      <item>b</item>
+      <item>c</item>
+    </string-array>
+    <public type="array" name="aliased_string_array" id="0x7f060002" />
+    <item name="aliased_string_array" type="array">@array/concrete_string_array</item>
+    <public type="array" name="double_aliased_string_array" id="0x7f060003" />
+    <item name="double_aliased_string_array" type="array">@array/aliased_string_array</item>
+    <public type="array" name="circular_aliased_string_array1" id="0x7f060004" />
+    <item name="circular_aliased_string_array1" type="array">@array/circular_aliased_string_array2</item>
+    <item name="circular_aliased_string_array2" type="array">@array/circular_aliased_string_array3</item>
+    <item name="circular_aliased_string_array3" type="array">@array/circular_aliased_string_array1</item>
 </resources>
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 0780ec281904f..d87bbe98ec565 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -50,7 +50,7 @@ cc_defaults {
         "hwui_static_deps",
         "skia_deps",
         //"hwui_bugreport_font_cache_usage",
-        //"hwui_compile_for_perf",
+        "hwui_compile_for_perf",
         "hwui_lto",
     ],
 
@@ -186,9 +186,7 @@ cc_defaults {
     name: "hwui_compile_for_perf",
     // TODO: Non-arm?
     cflags: [
-        "-fno-omit-frame-pointer",
-        "-marm",
-        "-mapcs",
+        "-O3",
     ],
 }
 
diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp
index c0160705fd47a..41c1d94bb49aa 100644
--- a/libs/hwui/DeferredLayerUpdater.cpp
+++ b/libs/hwui/DeferredLayerUpdater.cpp
@@ -265,7 +265,12 @@ sk_sp<SkImage> DeferredLayerUpdater::ImageSlot::createIfNeeded(AHardwareBuffer*
         if (!mTextureRelease) {
             mTextureRelease = new AutoBackendTextureRelease(context, buffer);
         } else {
-            mTextureRelease->newBufferContent(context);
+	        if(dataspace != mDataspace) {
+		        mTextureRelease->unref(true);
+		        mTextureRelease = new AutoBackendTextureRelease(context, buffer);
+	        } else {
+		        mTextureRelease->newBufferContent(context);
+	        }
         }
 
         mDataspace = dataspace;
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 6d81a0fab9011..9623d38d502bf 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -111,6 +111,8 @@ bool Properties::clipSurfaceViews = false;
 bool Properties::hdr10bitPlus = false;
 bool Properties::skipTelemetry = false;
 
+bool Properties::traceEachFrame = false;
+
 int Properties::timeoutMultiplier = 1;
 
 StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI;
@@ -190,6 +192,8 @@ bool Properties::load() {
     skipTelemetry = base::GetBoolProperty(PROPERTY_SKIP_EGLMANAGER_TELEMETRY,
                                           hwui_flags::skip_eglmanager_telemetry());
 
+    traceEachFrame = base::GetBoolProperty(PROPERTY_TRACE_EACH_FRAME, false);
+
     return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw);
 }
 
@@ -238,7 +242,7 @@ RenderPipelineType Properties::peekRenderPipelineType() {
         return sRenderPipelineType;
     }
     bool useVulkan = use_vulkan().value_or(false);
-    std::string rendererProperty = base::GetProperty(PROPERTY_RENDERER, useVulkan ? "skiavk" : "skiagl");
+    std::string rendererProperty = base::GetProperty("persist.sys.ax_hwui_renderer", useVulkan ? "skiavk" : "skiagl");
     if (rendererProperty == "skiavk") {
         return RenderPipelineType::SkiaVulkan;
     }
diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h
index 9b8465fee1d5d..fc9ae13e3bdd2 100644
--- a/libs/hwui/Properties.h
+++ b/libs/hwui/Properties.h
@@ -236,6 +236,8 @@ enum DebugLevel {
 
 #define PROPERTY_SKIP_EGLMANAGER_TELEMETRY "debug.hwui.skip_eglmanager_telemetry"
 
+#define PROPERTY_TRACE_EACH_FRAME "debug.hwui.trace_each_frame"
+
 /**
  * Property for font reading library.
  */
@@ -357,6 +359,8 @@ class Properties {
     static bool hdr10bitPlus;
     static bool skipTelemetry;
 
+    static bool traceEachFrame;
+
     static int timeoutMultiplier;
 
     static StretchEffectBehavior getStretchEffectBehavior() {
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 575d47b46683f..5af6ca7063be4 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -30,6 +30,7 @@
 #include "FeatureFlags.h"
 #include "Properties.h"
 #include "TreeInfo.h"
+#include "utils/FrameTraceUtils.h"
 #include "VectorDrawable.h"
 #include "private/hwui/WebViewFunctor.h"
 #include "renderthread/CanvasContext.h"
@@ -135,7 +136,7 @@ int RenderNode::getAllocatedSize() {
 
 
 void RenderNode::prepareTree(TreeInfo& info) {
-    ATRACE_CALL();
+    HWUI_FRAME_ATRACE_CALL();
     LOG_ALWAYS_FATAL_IF(!info.damageAccumulator, "DamageAccumulator missing");
     MarkAndSweepRemoved observer(&info);
 
diff --git a/libs/hwui/pipeline/skia/ShaderCache.cpp b/libs/hwui/pipeline/skia/ShaderCache.cpp
index 22f59a67bccbb..c255c9b0c1df8 100644
--- a/libs/hwui/pipeline/skia/ShaderCache.cpp
+++ b/libs/hwui/pipeline/skia/ShaderCache.cpp
@@ -36,8 +36,8 @@ namespace skiapipeline {
 
 // Cache size limits.
 static const size_t maxKeySize = 1024;
-static const size_t maxValueSize = 2 * 1024 * 1024;
-static const size_t maxTotalSize = 4 * 1024 * 1024;
+static const size_t maxValueSize = 4 * 1024 * 1024;
+static const size_t maxTotalSize = 32 * 1024 * 1024;
 static_assert(maxKeySize + maxValueSize < maxTotalSize);
 
 ShaderCache::ShaderCache() {
diff --git a/libs/hwui/pipeline/skia/ShaderCache.h b/libs/hwui/pipeline/skia/ShaderCache.h
index 4c011613710bc..0f76e2ff72051 100644
--- a/libs/hwui/pipeline/skia/ShaderCache.h
+++ b/libs/hwui/pipeline/skia/ShaderCache.h
@@ -170,7 +170,7 @@ class ShaderCache : public GrContextOptions::PersistentCache {
      *
      *  WARNING: setting this to 0 will disable writing the cache to disk.
      */
-    unsigned int mDeferredSaveDelayMs = 4 * 1000;
+    unsigned int mDeferredSaveDelayMs = 10 * 1000;
 
     /**
      * "mMutex" is the shared mutex used to prevent concurrent access to the member
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index 0768f457972bd..f7069c161fe56 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -38,6 +38,7 @@
 #include "renderthread/EglManager.h"
 #include "renderthread/Frame.h"
 #include "renderthread/IRenderPipeline.h"
+#include "utils/FrameTraceUtils.h"
 #include "utils/GLUtils.h"
 
 using namespace android::uirenderer::renderthread;
@@ -178,7 +179,7 @@ IRenderPipeline::DrawResult SkiaOpenGLPipeline::draw(
     }
 
     {
-        ATRACE_NAME("flush commands");
+        HWUI_FRAME_ATRACE_NAME("flush commands");
         skgpu::ganesh::FlushAndSubmit(surface);
     }
     layerUpdateQueue->clear();
diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp
index 3c2fcb7dba8dd..bc6fc26e66ac2 100644
--- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp
@@ -49,6 +49,7 @@
 #include "thread/CommonPool.h"
 #include "tools/SkSharingProc.h"
 #include "utils/Color.h"
+#include "utils/FrameTraceUtils.h"
 #include "utils/String8.h"
 
 using namespace android::uirenderer::renderthread;
@@ -72,7 +73,7 @@ void SkiaPipeline::renderLayers(const LightGeometry& lightGeometry,
                                 LayerUpdateQueue* layerUpdateQueue, bool opaque,
                                 const LightInfo& lightInfo) {
     LightingInfo::updateLighting(lightGeometry, lightInfo);
-    ATRACE_NAME("draw layers");
+    HWUI_FRAME_ATRACE_NAME("draw layers");
     renderLayersImpl(*layerUpdateQueue, opaque);
     layerUpdateQueue->clear();
 }
@@ -99,7 +100,7 @@ bool SkiaPipeline::renderLayerImpl(RenderNode* layerNode, const Rect& layerDamag
         return false;
     }
 
-    ATRACE_FORMAT("drawLayer [%s] %.1f x %.1f", layerNode->getName(), bounds.width(),
+    HWUI_FRAME_ATRACE_FORMAT("drawLayer [%s] %.1f x %.1f", layerNode->getName(), bounds.width(),
                   bounds.height());
 
     layerNode->getSkiaLayer()->hasRenderedSinceRepaint = false;
diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
index 05020abb22cac..44cd53dd9741d 100644
--- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
@@ -34,6 +34,7 @@
 #include "pipeline/skia/VkInteropFunctorDrawable.h"
 #include "renderstate/RenderState.h"
 #include "renderthread/Frame.h"
+#include "utils/FrameTraceUtils.h"
 #include "renderthread/IRenderPipeline.h"
 
 using namespace android::uirenderer::renderthread;
@@ -114,7 +115,7 @@ IRenderPipeline::DrawResult SkiaVulkanPipeline::draw(
 
     VulkanManager::VkDrawResult drawResult;
     {
-        ATRACE_NAME("flush commands");
+        HWUI_FRAME_ATRACE_NAME("flush commands");
         drawResult = vulkanManager().finishFrame(backBuffer.get());
     }
     layerUpdateQueue->clear();
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index b24c2cc65b0e2..3a9693459668c 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -35,6 +35,7 @@
 #include <functional>
 
 #include "../Properties.h"
+#include "../utils/FrameTraceUtils.h"
 #include "AnimationContext.h"
 #include "ColorArea.h"
 #include "FeatureFlags.h"
@@ -665,7 +666,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
 
     SkRect windowDirty = computeDirtyRect(frame, &dirty);
 
-    ATRACE_FORMAT("Drawing " RECT_STRING, SK_RECT_ARGS(dirty));
+    HWUI_FRAME_ATRACE_FORMAT("Drawing " RECT_STRING, SK_RECT_ARGS(dirty));
 
     IRenderPipeline::DrawResult drawResult;
     {
@@ -686,7 +687,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
         if (vsyncId != UiFrameInfoBuilder::INVALID_VSYNC_ID) {
             const auto inputEventId =
                     static_cast<int32_t>(mCurrentFrameInfo->get(FrameInfoIndex::InputEventId));
-            ATRACE_FORMAT(
+            HWUI_FRAME_ATRACE_FORMAT(
                 "frameTimelineInfo(frameNumber=%llu, vsyncId=%lld, inputEventId=0x%" PRIx32 ")",
                 frameCompleteNr, vsyncId, inputEventId);
             const ANativeWindowFrameTimelineInfo ftl = {
@@ -979,7 +980,7 @@ const SkM44& CanvasContext::getPixelSnapMatrix() const {
 
 void CanvasContext::prepareAndDraw(RenderNode* node) {
     int64_t vsyncId = mRenderThread.timeLord().lastVsyncId();
-    ATRACE_FORMAT("%s %" PRId64, __func__, vsyncId);
+    HWUI_FRAME_ATRACE_FORMAT("%s %" PRId64, __func__, vsyncId);
 
     nsecs_t vsync = mRenderThread.timeLord().computeFrameTimeNanos();
     int64_t frameDeadline = mRenderThread.timeLord().lastFrameDeadline();
diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp
index 826d00e1f32f5..37e87060d1b77 100644
--- a/libs/hwui/renderthread/DrawFrameTask.cpp
+++ b/libs/hwui/renderthread/DrawFrameTask.cpp
@@ -24,6 +24,7 @@
 #include "../DeferredLayerUpdater.h"
 #include "../DisplayList.h"
 #include "../Properties.h"
+#include "../utils/FrameTraceUtils.h"
 #include "../RenderNode.h"
 #include "CanvasContext.h"
 #include "HardwareBufferRenderParams.h"
@@ -80,7 +81,7 @@ int DrawFrameTask::drawFrame() {
 }
 
 void DrawFrameTask::postAndWait() {
-    ATRACE_CALL();
+    HWUI_FRAME_ATRACE_CALL();
     AutoMutex _lock(mLock);
     mRenderThread->queue().post([this]() { run(); });
     mSignal.wait(mLock);
@@ -88,7 +89,7 @@ void DrawFrameTask::postAndWait() {
 
 void DrawFrameTask::run() {
     const int64_t vsyncId = mFrameInfo[static_cast<int>(FrameInfoIndex::FrameTimelineVsyncId)];
-    ATRACE_FORMAT("DrawFrames %" PRId64, vsyncId);
+    HWUI_FRAME_ATRACE_FORMAT("DrawFrames %" PRId64, vsyncId);
 
     mContext->setSyncDelayDuration(systemTime(SYSTEM_TIME_MONOTONIC) - mSyncQueued);
     mContext->setTargetSdrHdrRatio(mRenderSdrHdrRatio);
@@ -167,7 +168,7 @@ void DrawFrameTask::run() {
 }
 
 bool DrawFrameTask::syncFrameState(TreeInfo& info) {
-    ATRACE_CALL();
+    HWUI_FRAME_ATRACE_CALL();
     int64_t vsync = mFrameInfo[static_cast<int>(FrameInfoIndex::Vsync)];
     int64_t intendedVsync = mFrameInfo[static_cast<int>(FrameInfoIndex::IntendedVsync)];
     int64_t vsyncId = mFrameInfo[static_cast<int>(FrameInfoIndex::FrameTimelineVsyncId)];
diff --git a/libs/hwui/utils/FrameTraceUtils.h b/libs/hwui/utils/FrameTraceUtils.h
new file mode 100644
index 0000000000000..8f6a9074d9f7a
--- /dev/null
+++ b/libs/hwui/utils/FrameTraceUtils.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <cutils/compiler.h>
+#include <cutils/trace.h>
+#include <gui/TraceUtils.h>
+#include <utils/Trace.h>
+
+#include "Properties.h"
+
+namespace android {
+namespace uirenderer {
+
+class ConditionalTraceEnder {
+public:
+    inline ConditionalTraceEnder(bool active) : mActive(active) {}
+    inline ~ConditionalTraceEnder() {
+        if (mActive) ATRACE_END();
+    }
+
+private:
+    bool mActive;
+};
+
+}  // namespace uirenderer
+}  // namespace android
+
+#define HWUI_FRAME_ATRACE_CALL() \
+    ::android::ScopedTrace PASTE(___tracer, __LINE__)(                  \
+        CC_UNLIKELY(::android::uirenderer::Properties::traceEachFrame)  \
+            ? ATRACE_TAG : 0,                                           \
+        __FUNCTION__)
+
+#define HWUI_FRAME_ATRACE_NAME(name) \
+    ::android::ScopedTrace PASTE(___tracer, __LINE__)(                  \
+        CC_UNLIKELY(::android::uirenderer::Properties::traceEachFrame)  \
+            ? ATRACE_TAG : 0,                                           \
+        name)
+
+#define HWUI_FRAME_ATRACE_FORMAT(fmt, ...)                                                    \
+    ::android::uirenderer::ConditionalTraceEnder PASTE(___tracer, __LINE__)(                  \
+        CC_UNLIKELY(::android::uirenderer::Properties::traceEachFrame) &&                     \
+            CC_UNLIKELY(ATRACE_ENABLED()) &&                                                  \
+                (::android::TraceUtils::atraceFormatBegin(fmt, ##__VA_ARGS__), true))
diff --git a/media/java/android/media/AppVolume.java b/media/java/android/media/AppVolume.java
new file mode 100644
index 0000000000000..732b4802c69fd
--- /dev/null
+++ b/media/java/android/media/AppVolume.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 Project Kaleidoscope
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media;
+
+import android.annotation.NonNull;
+
+/**
+ * @hide
+ */
+public class AppVolume {
+    private final String mPackageName;
+    private final float mVolume;
+    private final boolean mMute;
+    private final boolean mActive;
+
+    AppVolume(String packageName, boolean mute, float volume, boolean active) {
+        mPackageName = packageName;
+        mMute = mute;
+        mVolume = volume;
+        mActive = active;
+    }
+
+    @NonNull
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    public float getVolume() {
+        return mVolume;
+    }
+
+    public boolean isMuted() {
+        return mMute;
+    }
+
+    public boolean isActive() {
+        return mActive;
+    }
+}
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index e643ed993ed36..d3aa8180dcd08 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -763,12 +763,6 @@ public long getTestId() {
      */
     @CapturePolicy
     public int getAllowedCapturePolicy() {
-        if ((mFlags & FLAG_NO_SYSTEM_CAPTURE) == FLAG_NO_SYSTEM_CAPTURE) {
-            return ALLOW_CAPTURE_BY_NONE;
-        }
-        if ((mFlags & FLAG_NO_MEDIA_PROJECTION) == FLAG_NO_MEDIA_PROJECTION) {
-            return ALLOW_CAPTURE_BY_SYSTEM;
-        }
         return ALLOW_CAPTURE_BY_ALL;
     }
 
@@ -1920,20 +1914,7 @@ private static int toVolumeStreamType(boolean fromGetVolumeControlStream, AudioA
      * @hide
      */
     public static int capturePolicyToFlags(@CapturePolicy int capturePolicy, int flags) {
-        switch (capturePolicy) {
-            case ALLOW_CAPTURE_BY_NONE:
-                flags |= FLAG_NO_MEDIA_PROJECTION | FLAG_NO_SYSTEM_CAPTURE;
-                break;
-            case ALLOW_CAPTURE_BY_SYSTEM:
-                flags |= FLAG_NO_MEDIA_PROJECTION;
-                flags &= ~FLAG_NO_SYSTEM_CAPTURE;
-                break;
-            case ALLOW_CAPTURE_BY_ALL:
-                flags &= ~FLAG_NO_SYSTEM_CAPTURE & ~FLAG_NO_MEDIA_PROJECTION;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown allow playback capture policy");
-        }
+        flags &= ~FLAG_NO_SYSTEM_CAPTURE & ~FLAG_NO_MEDIA_PROJECTION;
         return flags;
     }
 
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 24037d40115ff..616d4d49eea15 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1173,6 +1173,32 @@ public void setMasterMute(boolean mute, int flags) {
         }
     }
 
+    /** @hide */
+    @UnsupportedAppUsage
+    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
+    public int setAppVolume(String packageName, float volume) {
+        return AudioSystem.setAppVolume(packageName, volume);
+    }
+
+    /** @hide */
+    @UnsupportedAppUsage
+    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
+    public int setAppMute(String packageName, boolean mute) {
+        return AudioSystem.setAppMute(packageName, mute);
+    }
+
+    /** @hide */
+    @UnsupportedAppUsage
+    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
+    public ArrayList<AppVolume> listAppVolumes() {
+        ArrayList<AppVolume> volumes = new ArrayList<AppVolume>();
+        int status = AudioSystem.listAppVolumes(volumes);
+        if (status != AudioManager.SUCCESS) {
+            return new ArrayList<AppVolume>();
+        }
+        return volumes;
+    }
+
     /**
      * Returns the current ringtone mode.
      *
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 966dcece50b20..442fc38d13d9c 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -2006,6 +2006,13 @@ public static int getDevicesForStream(int stream) {
                 getDevicesForAttributes(attr, true /* forVolume */)));
     }
 
+    /** @hide */
+    public static native int setAppVolume(@NonNull String packageName, float volume);
+    /** @hide */
+    public static native int setAppMute(@NonNull String packageName, boolean mute);
+    /** @hide */
+    public static native int listAppVolumes(ArrayList<AppVolume> volumes);
+
     /** @hide
      * Conversion from a device set to a bit mask.
      *
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 917640d993473..61ef04d1762b5 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -101,7 +101,7 @@
  */
 public class ExifInterface {
     private static final String TAG = "ExifInterface";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final boolean DEBUG = false;
 
     // The Exif tag names. See Tiff 6.0 Section 3 and Section 8.
     /** Type is String. */
@@ -2037,10 +2037,12 @@ private void loadAttributes(@NonNull InputStream in) {
             // Ignore exceptions in order to keep the compatibility with the old versions of
             // ExifInterface.
             mIsSupportedFile = false;
-            Log.d(
-                    TAG,
-                    "Invalid image: ExifInterface got an unsupported or corrupted image file",
-                    e);
+            if (DEBUG) {
+                Log.d(
+                        TAG,
+                        "Invalid image: ExifInterface got an unsupported or corrupted image file",
+                        e);
+            }
         } finally {
             addDefaultValuesForCompatibility();
 
diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java
index eb2ea4c94b557..32526a7308636 100644
--- a/media/java/android/media/MediaMetadata.java
+++ b/media/java/android/media/MediaMetadata.java
@@ -24,6 +24,9 @@
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.media.browse.MediaBrowser;
 import android.media.session.MediaController;
 import android.media.session.MediaSession;
@@ -1008,14 +1011,26 @@ public MediaMetadata build() {
         }
 
         private Bitmap scaleBitmap(Bitmap bmp, int maxDimension) {
-            float maxDimensionF = maxDimension;
-            float widthScale = maxDimensionF / bmp.getWidth();
-            float heightScale = maxDimensionF / bmp.getHeight();
-            float scale = Math.min(widthScale, heightScale);
-            int height = (int) (bmp.getHeight() * scale);
-            int width = (int) (bmp.getWidth() * scale);
+            if (bmp == null) return null;
+            int srcWidth = bmp.getWidth();
+            int srcHeight = bmp.getHeight();
+            float scale = Math.max(
+                (float) maxDimension / srcWidth,
+                (float) maxDimension / srcHeight
+            );
+            float scaledWidth = scale * srcWidth;
+            float scaledHeight = scale * srcHeight;
+            float dx = (maxDimension - scaledWidth) / 2f;
+            float dy = (maxDimension - scaledHeight) / 2f;
+            Bitmap output = Bitmap.createBitmap(maxDimension, maxDimension, bmp.getConfig());
+            Canvas canvas = new Canvas(output);
+            Matrix matrix = new Matrix();
+            matrix.setScale(scale, scale);
+            matrix.postTranslate(dx, dy);
+            Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG);
+            canvas.drawBitmap(bmp, matrix, paint);
             StrictMode.noteSlowCall("Downscaling oversized MediaMetadata Bitmap");
-            return Bitmap.createScaledBitmap(bmp, width, height, true);
+            return output;
         }
     }
 }
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index b22019dd0ac5c..23cc1834e15e1 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -48,6 +48,8 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.Settings;
 import android.provider.Settings.System;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.database.SortCursor;
@@ -150,6 +152,7 @@ public class RingtoneManager {
      * for this {@link Uri}. If showing an item for "Default" (@see
      * {@link #EXTRA_RINGTONE_SHOW_DEFAULT}), this can also be one of
      * {@link System#DEFAULT_RINGTONE_URI},
+     * {@link System#DEFAULT_RINGTONE2_URI},
      * {@link System#DEFAULT_NOTIFICATION_URI}, or
      * {@link System#DEFAULT_ALARM_ALERT_URI} to have the "Default" item
      * checked.
@@ -163,7 +166,7 @@ public class RingtoneManager {
      * Given to the ringtone picker as a {@link Uri}. The {@link Uri} of the
      * ringtone to play when the user attempts to preview the "Default"
      * ringtone. This can be one of {@link System#DEFAULT_RINGTONE_URI},
-     * {@link System#DEFAULT_NOTIFICATION_URI}, or
+     * {@link System#DEFAULT_RINGTONE2_URI}, {@link System#DEFAULT_NOTIFICATION_URI}, or
      * {@link System#DEFAULT_ALARM_ALERT_URI} to have the "Default" point to
      * the current sound for the given default sound type. If you are showing a
      * ringtone picker for some other type of sound, you are free to provide any
@@ -202,7 +205,7 @@ public class RingtoneManager {
      * It will be one of:
      * <li> the picked ringtone,
      * <li> a {@link Uri} that equals {@link System#DEFAULT_RINGTONE_URI},
-     * {@link System#DEFAULT_NOTIFICATION_URI}, or
+     * {@link System#DEFAULT_RINGTONE2_URI}, {@link System#DEFAULT_NOTIFICATION_URI}, or
      * {@link System#DEFAULT_ALARM_ALERT_URI} if the default was chosen,
      * <li> null if the "Silent" item was picked.
      * 
@@ -875,8 +878,8 @@ private static Ringtone getRingtone(final Context context, Uri ringtoneUri, int
     /**
      * Gets the current default sound's {@link Uri}. This will give the actual
      * sound {@link Uri}, instead of using this, most clients can use
-     * {@link System#DEFAULT_RINGTONE_URI}.
-     * 
+     * {@link System#DEFAULT_RINGTONE_URI} or {@link System#DEFAULT_RINGTONE2_URI}.
+     *
      * @param context A context used for querying.
      * @param type The type whose default sound should be returned. One of
      *            {@link #TYPE_RINGTONE}, {@link #TYPE_NOTIFICATION}, or
@@ -885,7 +888,27 @@ private static Ringtone getRingtone(final Context context, Uri ringtoneUri, int
      * @see #setActualDefaultRingtoneUri(Context, int, Uri)
      */
     public static Uri getActualDefaultRingtoneUri(Context context, int type) {
-        String setting = getSettingForType(type);
+        return getActualDefaultRingtoneUriBySlot(context, type,
+                SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * Gets the current default sound's {@link Uri} by slotId. This will give the actual
+     * sound {@link Uri}, instead of using this, most clients can use
+     * {@link System#DEFAULT_RINGTONE_URI} or {@link System#DEFAULT_RINGTONE2_URI}.
+     *
+     * @param context A context used for querying.
+     * @param type The type whose default sound should be returned. One of
+     *            {@link #TYPE_RINGTONE}, {@link #TYPE_NOTIFICATION}, or
+     *            {@link #TYPE_ALARM}.
+     * @param slotId The slotId whose default sound should be returned.
+     * @return A {@link Uri} pointing to the default sound for the sound type.
+     * @see #setActualDefaultRingtoneUriBySlot(Context, int, Uri, int)
+     *
+     * @hide
+     */
+    public static Uri getActualDefaultRingtoneUriBySlot(Context context, int type, int slotId) {
+        String setting = getSettingForTypeBySlot(type, slotId);
         if (setting == null) return null;
         final String uriString = Settings.System.getStringForUser(context.getContentResolver(),
                 setting, context.getUserId());
@@ -912,7 +935,26 @@ public static Uri getActualDefaultRingtoneUri(Context context, int type) {
      * @see #getActualDefaultRingtoneUri(Context, int)
      */
     public static void setActualDefaultRingtoneUri(Context context, int type, Uri ringtoneUri) {
-        String setting = getSettingForType(type);
+        setActualDefaultRingtoneUriBySlot(context, type, ringtoneUri,
+                SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * Sets the {@link Uri} of the default sound by slotId for a given sound type.
+     *
+     * @param context A context used for querying.
+     * @param type The type whose default sound should be set. One of
+     *            {@link #TYPE_RINGTONE}, {@link #TYPE_NOTIFICATION}, or
+     *            {@link #TYPE_ALARM}.
+     * @param ringtoneUri A {@link Uri} pointing to the default sound to set.
+     * @param slotId The slotId whose default sound should be set.
+     * @see #getActualDefaultRingtoneUriBySlot(Context, int, int)
+     *
+     * @hide
+     */
+    public static void setActualDefaultRingtoneUriBySlot(Context context, int type,
+                Uri ringtoneUri, int slotId) {
+        String setting = getSettingForTypeBySlot(type, slotId);
         if (setting == null) return;
 
         final ContentResolver resolver = context.getContentResolver();
@@ -1035,9 +1077,9 @@ private static final String getExternalDirectoryForType(final int type) {
         }
     }
 
-    private static String getSettingForType(int type) {
+    private static String getSettingForTypeBySlot(int type, int slotId) {
         if ((type & TYPE_RINGTONE) != 0) {
-            return Settings.System.RINGTONE;
+            return slotId == 1 ? Settings.System.RINGTONE2 : Settings.System.RINGTONE;
         } else if ((type & TYPE_NOTIFICATION) != 0) {
             return Settings.System.NOTIFICATION_SOUND;
         } else if ((type & TYPE_ALARM) != 0) {
@@ -1049,13 +1091,22 @@ private static String getSettingForType(int type) {
 
     /** @hide */
     public static Uri getCacheForType(int type) {
-        return getCacheForType(type, UserHandle.getCallingUserId());
+        return getCacheForTypeBySlot(type, UserHandle.getCallingUserId(),
+                SubscriptionManager.getDefaultVoicePhoneId());
     }
 
     /** @hide */
     public static Uri getCacheForType(int type, int userId) {
+        return getCacheForTypeBySlot(type, userId, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /** @hide */
+    public static Uri getCacheForTypeBySlot(int type, int userId, int slotId) {
         if ((type & TYPE_RINGTONE) != 0) {
-            return ContentProvider.maybeAddUserId(Settings.System.RINGTONE_CACHE_URI, userId);
+            Uri ringtoneUri = slotId == 1
+                    ? Settings.System.RINGTONE2_CACHE_URI
+                    : Settings.System.RINGTONE_CACHE_URI;
+            return ContentProvider.maybeAddUserId(ringtoneUri, userId);
         } else if ((type & TYPE_NOTIFICATION) != 0) {
             return ContentProvider.maybeAddUserId(Settings.System.NOTIFICATION_SOUND_CACHE_URI,
                     userId);
@@ -1080,6 +1131,7 @@ public static boolean isDefault(Uri ringtoneUri) {
      * 
      * @param defaultRingtoneUri The default {@link Uri}. For example,
      *            {@link System#DEFAULT_RINGTONE_URI},
+     *            {@link System#DEFAULT_RINGTONE2_URI},
      *            {@link System#DEFAULT_NOTIFICATION_URI}, or
      *            {@link System#DEFAULT_ALARM_ALERT_URI}.
      * @return The type of the defaultRingtoneUri, or -1.
@@ -1105,7 +1157,8 @@ public static int getDefaultType(Uri defaultRingtoneUri) {
             }
         }
 
-        if (defaultRingtoneUri.equals(Settings.System.DEFAULT_RINGTONE_URI)) {
+        if (defaultRingtoneUri.equals(Settings.System.DEFAULT_RINGTONE_URI)
+                    || defaultRingtoneUri.equals(Settings.System.DEFAULT_RINGTONE2_URI)) {
             return TYPE_RINGTONE;
         } else if (defaultRingtoneUri.equals(Settings.System.DEFAULT_NOTIFICATION_URI)) {
             return TYPE_NOTIFICATION;
@@ -1115,19 +1168,37 @@ public static int getDefaultType(Uri defaultRingtoneUri) {
             return -1;
         }
     }
- 
+
     /**
      * Returns the {@link Uri} for the default ringtone of a particular type.
      * Rather than returning the actual ringtone's sound {@link Uri}, this will
      * return the symbolic {@link Uri} which will resolved to the actual sound
      * when played.
-     * 
+     *
      * @param type The ringtone type whose default should be returned.
      * @return The {@link Uri} of the default ringtone for the given type.
      */
     public static Uri getDefaultUri(int type) {
+        return getDefaultUriBySlot(type, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * Returns the {@link Uri} for the default ringtone by slotId of a particular type.
+     * Rather than returning the actual ringtone's sound {@link Uri}, this will
+     * return the symbolic {@link Uri} which will resolved to the actual sound
+     * when played.
+     *
+     * @param type The ringtone type whose default should be returned.
+     * @param slotId The slotId whose default should be returned.
+     * @return The {@link Uri} of the default ringtone for the given type.
+     *
+     * @hide
+     */
+    public static Uri getDefaultUriBySlot(int type, int slotId) {
         if ((type & TYPE_RINGTONE) != 0) {
-            return Settings.System.DEFAULT_RINGTONE_URI;
+            return slotId == 1
+                    ? Settings.System.DEFAULT_RINGTONE2_URI
+                    : Settings.System.DEFAULT_RINGTONE_URI;
         } else if ((type & TYPE_NOTIFICATION) != 0) {
             return Settings.System.DEFAULT_NOTIFICATION_URI;
         } else if ((type & TYPE_ALARM) != 0) {
@@ -1152,7 +1223,8 @@ public static Uri getDefaultUri(int type) {
         // Try cached ringtone first since the actual provider may not be
         // encryption aware, or it may be stored on CE media storage
         final int type = getDefaultType(uri);
-        final Uri cacheUri = getCacheForType(type, context.getUserId());
+        final Uri cacheUri = getCacheForTypeBySlot(type, context.getUserId(),
+                                    SubscriptionManager.getDefaultVoicePhoneId());
         final Uri actualUri = getActualDefaultRingtoneUri(context, type);
         final ContentResolver resolver = context.getContentResolver();
 
@@ -1241,14 +1313,20 @@ public static void ensureDefaultRingtones(@NonNull Context context) {
             // Skip if we've already defined it at least once, so we don't
             // overwrite the user changing to null
             final String setting = getDefaultRingtoneSetting(type);
+            String defaultRingtone2 = Settings.System.getString(context.getContentResolver(), Settings.System.RINGTONE2);
             if (Settings.System.getInt(context.getContentResolver(), setting, 0) != 0) {
-                continue;
+                if (!TextUtils.isEmpty(defaultRingtone2)) {
+                    continue;
+                }
             }
 
             // Try finding the scanned ringtone
             Uri ringtoneUri = computeDefaultRingtoneUri(context, type);
             if (ringtoneUri != null) {
                 RingtoneManager.setActualDefaultRingtoneUri(context, type, ringtoneUri);
+                if (TextUtils.isEmpty(defaultRingtone2)) {
+                    RingtoneManager.setActualDefaultRingtoneUriBySlot(context, TYPE_RINGTONE, ringtoneUri, 1);
+                }
                 Settings.System.putInt(context.getContentResolver(), setting, 1);
             }
         }
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 8989ae8eebe47..161da450fa4d8 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -200,8 +200,12 @@ public MediaSession(@NonNull Context context, @NonNull String tag,
         }
 
         mContext = context;
-        mMaxBitmapSize = context.getResources().getDimensionPixelSize(
+
+        int bitmapSize = context.getResources().getDimensionPixelSize(
                 com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize);
+
+        mMaxBitmapSize = Math.min(bitmapSize, 460); 
+
         mCbStub = new CallbackStub(this);
         MediaSessionManager manager = (MediaSessionManager) context
                 .getSystemService(Context.MEDIA_SESSION_SERVICE);
diff --git a/media/mca/filterfw/java/android/filterfw/geometry/Point.java b/media/mca/filterfw/java/android/filterfw/geometry/Point.java
index 96d2d7b08b74b..c38d776594d3c 100644
--- a/media/mca/filterfw/java/android/filterfw/geometry/Point.java
+++ b/media/mca/filterfw/java/android/filterfw/geometry/Point.java
@@ -101,9 +101,9 @@ public Point rotated90(int count) {
     }
 
     public Point rotated(float radians) {
-        // TODO(renn): Optimize: Keep cache of cos/sin values
-        return new Point((float)(Math.cos(radians) * x - Math.sin(radians) * y),
-                         (float)(Math.sin(radians) * x + Math.cos(radians) * y));
+        double cos = Math.cos(radians);
+        double sin = Math.sin(radians);
+        return new Point((float)(cos * x - sin * y), (float)(sin * x + cos * y));
     }
 
     public Point rotatedAround(Point center, float radians) {
diff --git a/native/android/Android.bp b/native/android/Android.bp
index 0baa5104e4842..3f4cd85afb373 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -39,6 +39,10 @@ cc_defaults {
         "-Wunreachable-code",
         "-Wthread-safety",
     ],
+    lto: {
+        thin: true,
+    },
+    whole_program_vtables: true, // Requires LTO
 }
 
 cc_library_shared {
diff --git a/native/android/performance_hint.cpp b/native/android/performance_hint.cpp
index 1e48c1f6d7bbb..97da7b8577501 100644
--- a/native/android/performance_hint.cpp
+++ b/native/android/performance_hint.cpp
@@ -443,7 +443,7 @@ int APerformanceHintManager::createSessionUsingConfig(ASessionCreationConfig* se
     sessionCreationConfig->layerTokens.clear();
 
     if (!ret.isOk() || !returnValue.session) {
-        ALOGE("%s: PerformanceHint cannot create session. %s", __FUNCTION__, ret.getMessage());
+        //ALOGE("%s: PerformanceHint cannot create session. %s", __FUNCTION__, ret.getMessage());
         switch (ret.getExceptionCode()) {
             case binder::Status::EX_UNSUPPORTED_OPERATION:
                 return ENOTSUP;
diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java
index 8251fb4c98e43..3d5d33cc1a87e 100644
--- a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java
+++ b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java
@@ -199,7 +199,7 @@ private static boolean isDisabled() {
         }
 
         // One last-ditch check
-        if (SystemProperties.getBoolean(PROP_DISABLE_RESCUE, false)) {
+        if (SystemProperties.getBoolean(PROP_DISABLE_RESCUE, true)) {
             Slog.v(TAG, "Disabled because of manual property");
             return true;
         }
diff --git a/packages/EasterEgg/src/com/android/egg/neko/Cat.java b/packages/EasterEgg/src/com/android/egg/neko/Cat.java
index bf09bc7959af5..af84202a9d65c 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/Cat.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/Cat.java
@@ -273,7 +273,7 @@ public Notification.Builder buildNotification(Context context) {
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setContentText(getName())
                 .setContentIntent(
-                        PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE))
+                        PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_MUTABLE))
                 .setAutoCancel(true)
                 .setStyle(new Notification.MessagingStyle(createPerson())
                         .addMessage(mFirstMessage, System.currentTimeMillis(), createPerson())
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 78255627903d0..8deee2c77cccf 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -386,6 +386,12 @@ private boolean isRestrictedPath(String rootId, String canonicalPath) {
     @Override
     protected boolean shouldBlockDirectoryFromTree(@NonNull String documentId)
             throws FileNotFoundException {
+        // Remove the restriction if user really want it.
+        if (Settings.Global.getInt(
+                getContext().getContentResolver(), Settings.Global.NO_STORAGE_RESTRICT, 0) == 1) {
+            return false;
+        }
+
         final File dir = getFileForDocId(documentId, false);
         // The file is null or it is not a directory
         if (dir == null || !dir.isDirectory()) {
diff --git a/packages/NetworkSecurityConfig/platform/src/android/security/net/config/PinSet.java b/packages/NetworkSecurityConfig/platform/src/android/security/net/config/PinSet.java
index d3c975eb31014..ff66b6c3be496 100644
--- a/packages/NetworkSecurityConfig/platform/src/android/security/net/config/PinSet.java
+++ b/packages/NetworkSecurityConfig/platform/src/android/security/net/config/PinSet.java
@@ -17,8 +17,10 @@
 package android.security.net.config;
 
 import android.util.ArraySet;
+
 import java.util.Collections;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /** @hide */
 public final class PinSet {
@@ -26,6 +28,7 @@ public final class PinSet {
             new PinSet(Collections.<Pin>emptySet(), Long.MAX_VALUE);
     public final long expirationTime;
     public final Set<Pin> pins;
+    private final Set<String> algorithms;
 
     public PinSet(Set<Pin> pins, long expirationTime) {
         if (pins == null) {
@@ -33,14 +36,12 @@ public PinSet(Set<Pin> pins, long expirationTime) {
         }
         this.pins = pins;
         this.expirationTime = expirationTime;
+        this.algorithms = pins.stream()
+            .map(pin -> pin.digestAlgorithm)
+            .collect(Collectors.toCollection(ArraySet::new));
     }
 
     Set<String> getPinAlgorithms() {
-        // TODO: Cache this.
-        Set<String> algorithms = new ArraySet<String>();
-        for (Pin pin : pins) {
-            algorithms.add(pin.digestAlgorithm);
-        }
         return algorithms;
     }
 }
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
index 3c8f87de2c714..ba648167fb6bf 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt
@@ -513,9 +513,6 @@ object PackageUtil {
         var result: Boolean
         try {
             result = android.content.pm.Flags.usePiaV2()
-                    && context.resources.getBoolean(
-                android.R.bool.config_enableMaterialDesignInPackageInstaller
-            )
         } catch (_: Resources.NotFoundException) {
             return false
         }
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt
index 1fa5f224cecf7..b8c02fd1a5691 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.kt
@@ -65,13 +65,15 @@ class UninstallRepository(private val context: Context) {
     private val notificationManager: NotificationManager? =
         context.getSystemService(NotificationManager::class.java)
     val uninstallResult = MutableLiveData<UninstallStage?>()
-    private var uninstalledUser: UserHandle? = null
+    var uninstalledUser: UserHandle? = null
+        private set
     private var callback: PackageManager.UninstallCompleteCallback? = null
     private var targetAppInfo: ApplicationInfo? = null
     private var targetActivityInfo: ActivityInfo? = null
     private lateinit var intent: Intent
     private lateinit var targetAppLabel: CharSequence
-    private var targetPackageName: String? = null
+    var targetPackageName: String? = null
+        private set
     private var callingActivity: String? = null
     private var uninstallFromAllUsers = false
     private var isClonedApp = false
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallActionListener.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallActionListener.kt
index 33f5db34f754b..ac034c76eefe4 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallActionListener.kt
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallActionListener.kt
@@ -18,5 +18,6 @@ package com.android.packageinstaller.v2.ui
 
 interface UninstallActionListener {
     fun onPositiveResponse(keepData: Boolean)
+    fun onAppSnippetClick()
     fun onNegativeResponse()
 }
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.kt b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.kt
index ed66d8e0481a8..b2e4ac9948abd 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.kt
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.kt
@@ -18,8 +18,10 @@ package com.android.packageinstaller.v2.ui
 
 import android.app.NotificationManager
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.os.Process
+import android.provider.Settings
 import android.util.Log
 import android.view.WindowManager
 import android.widget.Toast
@@ -202,6 +204,18 @@ class UninstallLaunch : FragmentActivity(), UninstallActionListener {
         uninstallViewModel!!.initiateUninstall(keepData)
     }
 
+    override fun onAppSnippetClick() {
+        if (localLogv) {
+            Log.d(LOG_TAG, "onAppSnippetClick")
+        }
+        val repository = uninstallViewModel!!.repository
+        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            setData(Uri.fromParts("package", repository.targetPackageName!!, null))
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        startActivityAsUser(intent, repository.uninstalledUser!!)
+    }
+
     override fun onNegativeResponse() {
         if (localLogv) {
             Log.d(LOG_TAG, "Cancelling uninstall")
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallationFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallationFragment.java
index e32267a20d37e..a885daf7b8a29 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallationFragment.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallationFragment.java
@@ -123,6 +123,7 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
                 (dialog, which) -> {
                     mInstallActionListener.onNegativeResponse(installStage.getStageCode());
                 });
+        mDialog.setCanceledOnTouchOutside(false);
 
         return mDialog;
     }
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/UninstallationFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/UninstallationFragment.java
index 02064068dc099..1e448b75dd0ed 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/UninstallationFragment.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/UninstallationFragment.java
@@ -169,6 +169,10 @@ private void updateUserActionRequiredUI(Dialog dialog,
             UninstallUserActionRequired uninstallStage) {
         mAppSnippet.setVisibility(View.VISIBLE);
 
+        mAppSnippet.setOnClickListener(view -> {
+            mUninstallActionListener.onAppSnippetClick();
+        });
+
         // Set app icon and label
         mAppIcon.setImageDrawable(uninstallStage.getAppIcon());
         mAppLabelTextView.setText(uninstallStage.getAppLabel(requireContext()));
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml
index 9986a60250fec..1ef24ad12903c 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml
@@ -22,7 +22,7 @@
             <size android:width="40dp" android:height="40dp" />
             <solid android:color="@color/settingslib_materialColorSurfaceContainerHighest" />
             <corners
-                android:radius="100dp" />
+                android:radius="14dp" />
         </shape>
     </item>
 
@@ -44,4 +44,4 @@
                 android:pathData="M3.626,9L8.526,13.9C8.726,14.1 8.817,14.333 8.801,14.6C8.801,14.867 8.701,15.1 8.501,15.3C8.301,15.483 8.067,15.583 7.801,15.6C7.534,15.6 7.301,15.5 7.101,15.3L0.501,8.7C0.401,8.6 0.326,8.492 0.276,8.375C0.242,8.258 0.226,8.133 0.226,8C0.226,7.867 0.242,7.742 0.276,7.625C0.326,7.508 0.401,7.4 0.501,7.3L7.101,0.7C7.284,0.517 7.509,0.425 7.776,0.425C8.059,0.425 8.301,0.517 8.501,0.7C8.701,0.9 8.801,1.142 8.801,1.425C8.801,1.692 8.701,1.925 8.501,2.125L3.626,7H14.801C15.084,7 15.317,7.1 15.501,7.3C15.701,7.483 15.801,7.717 15.801,8C15.801,8.283 15.701,8.525 15.501,8.725C15.317,8.908 15.084,9 14.801,9H3.626Z"/>
         </vector>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_content_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_content_layout.xml
index 9848749e2d1c3..78c24ee250dc9 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_content_layout.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_content_layout.xml
@@ -33,6 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/settingslib_toolbar_layout_height"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:titleCollapseMode="scale"
             app:toolbarId="@id/action_bar"
             style="@style/CollapsingToolbarLayoutStyle.SettingsLib">
 
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml
index 092f76b7d61a3..9466eb6509f17 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml
@@ -27,7 +27,6 @@
         android:outlineSpotShadowColor="@android:color/transparent"
         android:background="@android:color/transparent"
         android:touchscreenBlocksFocus="false"
-        app:expanded="false"
         android:theme="@style/SettingsLibTheme.CollapsingToolbar.Expressive">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml
index 344b336dc6751..4075249b3b0b9 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml
@@ -23,25 +23,27 @@
         <item name="expandedTitleMarginBottom">@dimen/settingslib_expressive_space_medium1</item>
         <item name="maxLines">3</item>
         <item name="scrimVisibleHeightTrigger">@dimen/settingslib_scrim_visible_height_trigger</item>
-        <item name="contentScrim">@color/settingslib_materialColorSurfaceVariant</item>
+        <item name="contentScrim">@color/legacy_settingslib_materialColorSurfaceContainer</item>
         <item name="statusBarScrim">@null</item>
-        <item name="scrimAnimationDuration">50</item>
+        <item name="scrimAnimationDuration">70</item>
         <item name="collapsedTitleTextColor">@color/settingslib_materialColorOnSurface</item>
         <item name="expandedTitleTextColor">@color/settingslib_materialColorOnSurface</item>
-        <item name="titleCollapseMode">fade</item>
+        <item name="titleCollapseMode">scale</item>
         <item name="extraMultilineHeightEnabled">true</item>
     </style>
     <style name="SettingsLibCollapsingToolbarLayoutStyle.Expressive">
-        <item name="contentScrim">@color/settingslib_materialColorSurfaceContainer</item>
+        <item name="contentScrim">@color/legacy_settingslib_materialColorSurfaceContainer</item>
     </style>
 
     <style name="SettingsLibCollapsingToolbarTitle.Collapsed" parent="@style/TextAppearance.SettingsLib.TitleLarge.Emphasized">
         <!--set dp because we don't want size adjust when font size change-->
         <item name="android:textSize">22dp</item>
+        <item name="android:textColor">@color/luna_text_color_primary</item>
     </style>
 
     <style name="SettingsLibCollapsingToolbarTitle.Expanded" parent="@style/TextAppearance.SettingsLib.DisplaySmall.Emphasized">
-        <item name="android:textSize">36dp</item>
+        <item name="android:textSize">38dp</item>
+        <item name="android:textColor">@color/luna_text_color_primary</item>
     </style>
 
     <style name="Widget.SettingsLib.Material3Expressive.FloatingToolbar" parent="Base.Widget.Material3.FloatingToolbar">
@@ -52,4 +54,4 @@
         <item name="android:paddingBottom">@dimen/settingslib_expressive_space_extrasmall6</item>
         <item name="android:layout_gravity">bottom|center</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java b/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java
index 60ec915089309..7dbde286a66ba 100644
--- a/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java
+++ b/packages/SettingsLib/EmergencyNumber/src/com/android/settingslib/emergencynumber/EmergencyNumberUtils.java
@@ -147,11 +147,16 @@ public void setEmergencySoundEnabled(boolean enabled) {
      * Whether or not emergency gesture is enabled.
      */
     public boolean getEmergencyGestureEnabled() {
-        final Bundle bundle = mContext.getContentResolver().call(
-                EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,
-                METHOD_NAME_GET_EMERGENCY_GESTURE_ENABLED, null /* args */, null /* bundle */);
-        return bundle == null ? true : bundle.getInt(EMERGENCY_SETTING_VALUE, EMERGENCY_SETTING_ON)
-                == EMERGENCY_SETTING_ON;
+        try {
+            final Bundle bundle = mContext.getContentResolver().call(
+                    EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,
+                    METHOD_NAME_GET_EMERGENCY_GESTURE_ENABLED, null /* args */, null /* bundle */);
+            return bundle != null && bundle.getInt(EMERGENCY_SETTING_VALUE, EMERGENCY_SETTING_ON)
+                    == EMERGENCY_SETTING_ON;
+        } catch (Exception e) {
+            Log.e("EmergencyGesture", "Failed to get emergency gesture status", e);
+            return false;
+        }
     }
 
     /**
diff --git a/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml b/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml
index a027f287a0aad..2a1f38507bdf9 100644
--- a/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml
+++ b/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml
@@ -18,7 +18,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/settingslib_protection_color"/>
+            <solid android:color="@android:color/transparent"/>
             <corners android:radius="28dp"/>
             <size android:width="@dimen/settingslib_illustration_width"
                   android:height="@dimen/settingslib_illustration_height"/>
diff --git a/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml b/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml
index a987f69f6ad8d..2240ab6e1affb 100644
--- a/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml
+++ b/packages/SettingsLib/SettingsTheme/res/layout/settingslib_expressive_preference_text_frame.xml
@@ -22,9 +22,25 @@
 
     <TextView
         android:id="@android:id/title"
-        style="?expressivePreferenceTextFrameTitleStyle" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:textAlignment="viewStart"
+        android:maxLines="2"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        android:textColor="@color/luna_text_color_primary"
+        android:ellipsize="marquee"/>
 
     <TextView
         android:id="@android:id/summary"
-        style="?expressivePreferenceTextFrameSummaryStyle" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@android:id/title"
+        android:layout_alignStart="@android:id/title"
+        android:layout_gravity="start"
+        android:textAlignment="viewStart"
+        android:textSize="14sp"
+        android:textColor="@color/luna_text_color_secondary"
+        android:maxLines="10"/>
 </RelativeLayout>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml
index e31e801766255..26b652a7594d1 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml
@@ -46,4 +46,5 @@
     <color name="settingslib_colorSurfaceHeader">@color/settingslib_materialColorSurfaceVariant</color>
 
     <color name="settingslib_text_color_preference_category_title">@color/settingslib_materialColorPrimary</color>
+    <color name="legacy_settingslib_materialColorSurfaceContainer">@android:color/system_neutral1_900</color>
 </resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-night/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night/colors.xml
index d677bbaa4ee8a..377687935f3ef 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-night/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-night/colors.xml
@@ -55,4 +55,7 @@
     <color name="settingslib_colorContentLevel_high">@color/m3_ref_palette_red10</color>
     <color name="settingslib_colorBackgroundLevel_low">@color/m3_ref_palette_green70</color>
     <color name="settingslib_colorContentLevel_low">@color/m3_ref_palette_green10</color>
-</resources>
\ No newline at end of file
+
+    <color name="luna_text_color_primary">#fff5f5f5</color>
+    <color name="luna_text_color_secondary">#89ffffff</color>
+</resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml
index b1b37b12c5729..b6a103741a0f3 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml
@@ -54,4 +54,5 @@
     <color name="settingslib_spinner_title_color">@color/settingslib_materialColorOnPrimaryContainer</color>
     <!-- The text color of dropdown item title -->
     <color name="settingslib_spinner_dropdown_color">@color/settingslib_materialColorOnPrimaryContainer</color>
-</resources>
\ No newline at end of file
+    <color name="legacy_settingslib_materialColorSurfaceContainer">@android:color/system_neutral1_50</color>
+</resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml
index d783956ee240b..e579988ec54d9 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml
@@ -16,5 +16,5 @@
   -->
 
 <resources>
-    <dimen name="settingslib_preference_corner_radius">20dp</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="settingslib_preference_corner_radius">24dp</dimen>
+</resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml
index 54bd069f2fc33..724def5545f68 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml
@@ -18,7 +18,7 @@
 <resources>
     <style name="Theme.SettingsBase_v36" parent="Theme.SettingsBase_v33" >
         <item name="android:colorAccent">@color/settingslib_materialColorPrimary</item>
-        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainer</item>
+        <item name="android:colorBackground">@color/legacy_settingslib_materialColorSurfaceContainer</item>
         <item name="android:textColorPrimary">@color/settingslib_materialColorOnSurface</item>
         <item name="android:textColorSecondary">@color/settingslib_text_color_secondary</item>
         <item name="android:textColorTertiary">@color/settingslib_materialColorOutline</item>
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml
index 1e67ecc81b0a4..3d6f3b01de734 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml
@@ -18,7 +18,7 @@
 <resources>
     <style name="Theme.SettingsBase.Expressive">
         <!-- Set up background color -->
-        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainer</item>
+        <item name="android:colorBackground">@color/legacy_settingslib_materialColorSurfaceContainer</item>
 
         <!-- Set up Preference title text style -->
         <item name="android:textAppearanceListItem">@style/TextAppearance.SettingsLib.PreferenceTitle</item>
diff --git a/packages/SettingsLib/SettingsTheme/res/values/colors.xml b/packages/SettingsLib/SettingsTheme/res/values/colors.xml
index e8ab99e6bc14e..f469469953a0e 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/colors.xml
@@ -83,4 +83,7 @@
     <color name="settingslib_colorContentLevel_medium">@color/m3_ref_palette_yellow10</color>
     <color name="settingslib_colorBackgroundLevel_low">@color/m3_ref_palette_green50</color>
     <color name="settingslib_colorContentLevel_low">@color/m3_ref_palette_green100</color>
-</resources>
\ No newline at end of file
+
+    <color name="luna_text_color_primary">#d8000000</color>
+    <color name="luna_text_color_secondary">#66000000</color>
+</resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values/themes.xml b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
index 2d881d1a8a7b3..0cbab1439550b 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
@@ -32,11 +32,9 @@
     </style>
 
     <style name="Theme.AlertDialog.SettingsLib" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <!-- TODO(b/189308264): fix the crash in Android R if set the attributes:
-             <item name="colorAccent">@*android:color/accent_device_default_light</item>
-             <item name="android:colorBackground">@color/settingslib_dialog_background</item>
-             <item name="dialogCornerRadius">@dimen/settingslib_dialogCornerRadius</item>
-        -->
+        <item name="colorAccent">@color/settingslib_materialColorPrimary</item>
+        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainerHigh</item>
+
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:clipToPadding">true</item>
         <item name="android:clipChildren">true</item>
diff --git a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
index 00de14a3bcd07..c3bfc57ff2f12 100644
--- a/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
+++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt
@@ -38,7 +38,7 @@ abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() {
     ): View {
         val view = super.onCreateView(inflater, container, savedInstanceState)
 
-        if (SettingsThemeHelper.isExpressiveTheme(requireContext())) {
+        if (SettingsThemeHelper.isExpressiveTheme(requireContext()) && listView != null) {
             // Don't allow any divider in between the preferences in expressive design.
             setDivider(null)
             listView?.addItemDecoration(MarginItemDecoration())
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt
index 03e8f7d2a2d89..41471e551d473 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
+
 package com.android.settingslib.spa.framework.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MotionScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
@@ -30,8 +35,9 @@ import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
 fun SettingsTheme(content: @Composable () -> Unit) {
     val isDarkTheme = isSystemInDarkTheme()
 
-    MaterialTheme(
+    MaterialExpressiveTheme(
         colorScheme = materialColorScheme(isDarkTheme),
+        motionScheme = MotionScheme.expressive(),
         typography = rememberSettingsTypography(),
     ) {
         CompositionLocalProvider(
diff --git a/packages/SettingsLib/SpaPrivileged/res/values/lunaris_strings.xml b/packages/SettingsLib/SpaPrivileged/res/values/lunaris_strings.xml
new file mode 100644
index 0000000000000..4a867c5a1c206
--- /dev/null
+++ b/packages/SettingsLib/SpaPrivileged/res/values/lunaris_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_info_install_time">Installed: %1$s</string>
+    <string name="app_info_update_time">Updated: %1$s</string>
+</resources>
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt
index 132ddad3149cb..23cd13fe652fc 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt
@@ -113,15 +113,16 @@ internal class AppListRepositoryImplHelper(
         userId: Int,
         matchAnyUserForAdmin: Boolean,
     ): List<ApplicationInfo> {
-        val disabledComponentsFlag =
-            (PackageManager.MATCH_DISABLED_COMPONENTS or
-                    PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS)
-                .toLong()
+        val disabledComponentsFlag = (PackageManager.MATCH_DISABLED_COMPONENTS or
+            PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS or
+            PackageManager.MATCH_UNINSTALLED_PACKAGES).toLong()
         val archivedPackagesFlag: Long =
-            if (isArchivingEnabled(featureFlags)) PackageManager.MATCH_ARCHIVED_PACKAGES else 0L
+            if (featureFlags.archiving()) PackageManager.MATCH_ARCHIVED_PACKAGES else 0L
         val regularFlags = ApplicationInfoFlags.of(disabledComponentsFlag or archivedPackagesFlag)
         return if (!matchAnyUserForAdmin || !userManager.getUserInfo(userId).isAdmin) {
-            packageManager.getInstalledApplicationsAsUser(regularFlags, userId)
+            packageManager.getInstalledApplicationsAsUser(regularFlags, userId).filter {
+                it.installed
+            }
         } else {
             coroutineScope {
                 val deferredPackageNamesInChildProfiles =
@@ -227,6 +228,7 @@ internal class AppListRepositoryImplHelper(
         ) =
             when {
                 !showInstantApps && isInstantApp -> false
+                isResourceOverlay -> false
                 !Flags.removeHiddenModuleUsage() && (packageName in hiddenSystemModules) -> false
                 packageName in hideWhenDisabledPackages -> enabled && !isDisabledUntilUsed
                 enabled -> true
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt
index a15302a14c426..ccf59fce70252 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt
@@ -16,6 +16,7 @@
 
 package com.android.settingslib.spaprivileged.template.app
 
+import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.text.BidiFormatter
@@ -45,6 +46,8 @@ import com.android.settingslib.spa.widget.ui.SettingsBody
 import com.android.settingslib.spa.widget.ui.SettingsTitle
 import com.android.settingslib.spaprivileged.R
 import com.android.settingslib.spaprivileged.model.app.rememberAppRepository
+import java.text.DateFormat
+import java.util.Date
 
 class AppInfoProvider(private val packageInfo: PackageInfo) {
     @Composable
@@ -122,12 +125,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) {
         val context = LocalContext.current
         val footer =
             remember(packageInfo) {
-                val list = mutableListOf<String>()
-                packageInfo.versionNameBidiWrapped?.let {
-                    list += context.getString(R.string.version_text, it)
-                }
-                list += packageInfo.packageName
-                list.joinToString(separator = System.lineSeparator())
+                getFooterText(context)
             }
         if (footer.isBlank()) return
         if (!isSpaExpressiveEnabled) HorizontalDivider()
@@ -141,6 +139,56 @@ class AppInfoProvider(private val packageInfo: PackageInfo) {
         val PackageInfo.versionNameBidiWrapped: String?
             get() = BidiFormatter.getInstance().unicodeWrap(versionName)
     }
+
+    private fun getFooterText(ctx: Context): String {
+        val pi = packageInfo
+
+        val dateFormat = android.text.format.DateFormat.getMediumDateFormat(ctx)
+        val timeFormat = android.text.format.DateFormat.getTimeFormat(ctx)
+
+        fun formatDate(unixTs: Long, dateFormat: DateFormat, timeFormat: DateFormat): String {
+            val d = Date(unixTs)
+            return dateFormat.format(d) + "; " + timeFormat.format(d)
+        }
+
+        val appInfo = pi.applicationInfo
+
+        val lines = mutableListOf<String>()
+        pi.versionNameBidiWrapped?.let {
+            lines.add(ctx.getString(R.string.version_text, it))
+            lines.add("")
+        }
+        lines.add(pi.packageName)
+        lines.add("versionCode ${pi.getLongVersionCode()}")
+        lines.add("")
+        if (appInfo != null) {
+            lines.add("targetSdk ${appInfo.targetSdkVersion}")
+            lines.add("minSdk ${appInfo.minSdkVersion}")
+        }
+
+        // some system apps report being installed in January 2009, skip showing install time for them
+        val minTime = 1_240_000_000_000 // April 2009
+
+        var addedBlankLineBeforeTime = false
+
+        if (pi.firstInstallTime > minTime) {
+            lines.add("")
+            addedBlankLineBeforeTime = true
+            val s = formatDate(pi.firstInstallTime, dateFormat, timeFormat)
+            lines.add(ctx.getString(R.string.app_info_install_time, s))
+        }
+
+        if (pi.lastUpdateTime != pi.firstInstallTime) {
+            if (!addedBlankLineBeforeTime) {
+                lines.add("")
+                addedBlankLineBeforeTime = true
+            }
+            val s = formatDate(pi.lastUpdateTime, dateFormat, timeFormat)
+            lines.add(ctx.getString(R.string.app_info_update_time, s))
+        }
+
+        return lines.joinToString(separator = System.lineSeparator())
+    }
 }
 
 @Composable
diff --git a/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java b/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
index bb2c56baa9104..c2d45e2119d67 100644
--- a/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
+++ b/packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java
@@ -16,6 +16,7 @@
 
 package com.android.settingslib.widget;
 
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -179,41 +180,49 @@ public void onBindViewHolder(PreferenceViewHolder holder) {
         holder.setDividerAllowedBelow(false);
 
         final TextView usageSummary = (TextView) holder.findViewById(R.id.usage_summary);
-        usageSummary.setText(enlargeFontOfNumber(mUsageSummary));
+        if (usageSummary != null && mUsageSummary != null) {
+            usageSummary.setText(enlargeFontOfNumber(mUsageSummary));
+        }
 
         final TextView totalSummary = (TextView) holder.findViewById(R.id.total_summary);
-        if (mTotalSummary != null) {
+        if (totalSummary != null && mTotalSummary != null) {
             totalSummary.setText(mTotalSummary);
         }
 
         final TextView bottomSummary = (TextView) holder.findViewById(R.id.bottom_summary);
-        if (TextUtils.isEmpty(mBottomSummary)) {
-            bottomSummary.setVisibility(View.GONE);
-        } else {
-            bottomSummary.setVisibility(View.VISIBLE);
-            bottomSummary.setMovementMethod(LinkMovementMethod.getInstance());
-            bottomSummary.setText(mBottomSummary);
-            if (!TextUtils.isEmpty(mBottomSummaryContentDescription)) {
-                bottomSummary.setContentDescription(mBottomSummaryContentDescription);
+        if (bottomSummary != null) {
+            if (TextUtils.isEmpty(mBottomSummary)) {
+                bottomSummary.setVisibility(View.GONE);
+            } else {
+                bottomSummary.setVisibility(View.VISIBLE);
+                bottomSummary.setMovementMethod(LinkMovementMethod.getInstance());
+                bottomSummary.setText(mBottomSummary);
+                if (!TextUtils.isEmpty(mBottomSummaryContentDescription)) {
+                    bottomSummary.setContentDescription(mBottomSummaryContentDescription);
+                }
             }
         }
 
         final ProgressBar progressBar = (ProgressBar) holder.findViewById(android.R.id.progress);
-        if (mPercent < 0) {
-            progressBar.setIndeterminate(true);
-        } else {
-            progressBar.setIndeterminate(false);
-            progressBar.setProgress(mPercent);
+        if (progressBar != null) {
+            if (mPercent < 0) {
+                progressBar.setIndeterminate(true);
+            } else {
+                progressBar.setIndeterminate(false);
+                animateBatteryLevel(progressBar, 0, mPercent);
+            }
         }
 
         final FrameLayout customLayout = (FrameLayout) holder.findViewById(R.id.custom_content);
-        if (mCustomImageView == null) {
-            customLayout.removeAllViews();
-            customLayout.setVisibility(View.GONE);
-        } else {
-            customLayout.removeAllViews();
-            customLayout.addView(mCustomImageView);
-            customLayout.setVisibility(View.VISIBLE);
+        if (customLayout != null) {
+            if (mCustomImageView == null) {
+                customLayout.removeAllViews();
+                customLayout.setVisibility(View.GONE);
+            } else {
+                customLayout.removeAllViews();
+                customLayout.addView(mCustomImageView);
+                customLayout.setVisibility(View.VISIBLE);
+            }
         }
     }
 
@@ -234,4 +243,17 @@ private CharSequence enlargeFontOfNumber(CharSequence summary) {
         }
         return summary;
     }
+    
+    private void animateBatteryLevel(final ProgressBar progressbar, final int startValue, final int endValue) {
+        final ValueAnimator animator = ValueAnimator.ofInt(startValue, endValue);
+        animator.setDuration(1000);
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int animatedValue = (int) animation.getAnimatedValue();
+                progressbar.setProgress(animatedValue);
+            }
+        });
+        animator.start();
+    }
 }
diff --git a/packages/SettingsLib/res/drawable/ic_4g_plus_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_4g_plus_mobiledata.xml
index 1d048ae440495..32b7819b62324 100644
--- a/packages/SettingsLib/res/drawable/ic_4g_plus_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_4g_plus_mobiledata.xml
@@ -14,20 +14,17 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="19.41dp"
-    android:height="15dp"
-    android:viewportWidth="22"
-    android:viewportHeight="17">
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M5.32,10.13h1.11v1.03H5.32v2.31H4.11v-2.31H0.35v-0.75l3.7-6.9h1.27V10.13z M1.69,10.13h2.42V5.4L1.69,10.13z" />
+        android:width="20dp"
+        android:height="12dp"
+        android:viewportWidth="27.0"
+        android:viewportHeight="16.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M14.15,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26H12.9 c-0.05-0.62-0.22-1.1-0.52-1.45s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.97,6.37,8.96,7.4v2.03 c0,1,0.19,1.77,0.57,2.31c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59h-1.82V8.52h3.07V12.24z" />
+        android:fillColor="#FF000000"
+        android:pathData="M2,10.98V9.81l4.28,-6.83h1.6v6.59h1.19v1.41H7.88V13H6.4v-2.02H2zM3.68,9.57H6.4V5.33H6.31L3.68,9.57z"/>
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M 19.3 5.74 L 19.3 3.39 L 18 3.39 L 18 5.74 L 15.65 5.74 L 15.65 7.04 L 18 7.04 L 18 9.39 L 19.3 9.39 L 19.3 7.04 L 21.65 7.04 L 21.65 5.74 Z" />
+        android:fillColor="#FF000000"
+        android:pathData="M15,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83c-0.38,-0.79 -0.57,-1.71 -0.57,-2.76c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27c-0.28,0.56 -0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6h-1.41v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C16.34,13.07 15.73,13.22 15,13.22z"/>
     <path
-        android:pathData="M 0 0 H 22 V 17 H 0 V 0 Z" />
+        android:fillColor="#FF000000"
+        android:pathData="M24.62 5.24 24.62 2.89 23.32 2.89 23.32 5.24 20.97 5.24 20.97 6.54 23.32 6.54 23.32 8.89 24.62 8.89 24.62 6.54 26.97 6.54 26.97 5.24Z"/>
 </vector>
diff --git a/packages/SettingsLib/res/drawable/ic_5g_plus_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_plus_mobiledata.xml
index 10bbcc7b37376..60de42cfdc953 100644
--- a/packages/SettingsLib/res/drawable/ic_5g_plus_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_5g_plus_mobiledata.xml
@@ -1,5 +1,6 @@
 <!--
      Copyright (C) 2018 The Android Open Source Project
+               (C) 2023 Paranoid Android
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,20 +15,17 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="22"
-    android:viewportHeight="17"
-    android:width="22dp"
-    android:height="17dp">
-  <group>
-    <group>
-      <path android:fillColor="#FF000000"
-          android:pathData="M1.03 8.47l0.43-4.96h4.33v1.17H2.48L2.25 7.39C2.66 7.1 3.1 6.96 3.57 6.96c0.77 0 1.38 0.3 1.83 0.9 s0.66 1.41 0.66 2.43c0 1.03-0.24 1.84-0.72 2.43S4.2 13.6 3.36 13.6c-0.75 0-1.36-0.24-1.83-0.73s-0.74-1.16-0.81-2.02h1.13 c0.07 0.57 0.23 1 0.49 1.29s0.59 0.43 1.01 0.43c0.47 0 0.84-0.2 1.1-0.61c0.26-0.41 0.4-0.96 0.4-1.65 c0-0.65-0.14-1.18-0.43-1.59S3.76 8.09 3.28 8.09c-0.4 0-0.72 0.1-0.96 0.31L1.99 8.73L1.03 8.47z"/>
-    </group>
-    <group>
-      <path android:fillColor="#FF000000"
-          android:pathData="M 18.93,5.74 L 18.93,3.39 L 17.63,3.39 L 17.63,5.74 L 15.28,5.74 L 15.28,7.04 L 17.63,7.04 L 17.63,9.39 L 18.93,9.39 L 18.93,7.04 L 21.28,7.04 L 21.28,5.74 z"/>
-    </group>
-    <path android:fillColor="#FF000000"
-        android:pathData="M13.78 12.24l-0.22 0.27c-0.63 0.73-1.55 1.1-2.76 1.1c-1.08 0-1.92-0.36-2.53-1.07s-0.93-1.72-0.94-3.02V7.56 c0-1.39 0.28-2.44 0.84-3.13s1.39-1.04 2.51-1.04c0.95 0 1.69 0.26 2.23 0.79s0.83 1.28 0.89 2.26h-1.25 c-0.05-0.62-0.22-1.1-0.52-1.45s-0.74-0.52-1.34-0.52c-0.72 0-1.24 0.23-1.57 0.7S8.6 6.37 8.59 7.4v2.03c0 1 0.19 1.77 0.57 2.31 c0.38 0.54 0.93 0.8 1.65 0.8c0.67 0 1.19-0.16 1.54-0.49l0.18-0.17V9.59h-1.82V8.52h3.07V12.24z"/>
-  </group>
+        android:width="27dp"
+        android:height="16dp"
+        android:viewportWidth="27"
+        android:viewportHeight="16">
+    <path
+        android:pathData="M 5.3 13.22 C 4.73 13.22 4.2 13.11 3.72 12.88 C 3.24 12.66 2.85 12.33 2.54 11.9 C 2.24 11.47 2.06 10.93 2 10.3 L 3.48 10.1 C 3.55 10.6 3.73 11.02 4.04 11.35 C 4.36 11.67 4.78 11.83 5.3 11.83 C 5.87 11.83 6.32 11.65 6.64 11.28 C 6.97 10.91 7.13 10.41 7.13 9.8 C 7.13 9.19 6.97 8.71 6.64 8.34 C 6.32 7.96 5.88 7.78 5.32 7.78 C 5 7.78 4.7 7.85 4.42 8 C 4.15 8.14 3.93 8.33 3.76 8.56 L 2.28 7.92 L 2.88 2.98 L 8.14 2.98 L 8.14 4.34 L 4.1 4.34 L 3.72 7.02 L 3.8 7.05 C 4 6.87 4.25 6.73 4.55 6.62 C 4.85 6.5 5.18 6.44 5.56 6.44 C 6.16 6.44 6.69 6.58 7.16 6.85 C 7.62 7.11 7.98 7.5 8.24 8 C 8.51 8.5 8.65 9.1 8.65 9.79 C 8.65 10.45 8.51 11.05 8.22 11.57 C 7.94 12.08 7.55 12.49 7.04 12.79 C 6.55 13.08 5.97 13.22 5.3 13.22 Z"
+        android:fillColor="#FF000000"/>
+    <path
+        android:pathData="M 14.51 13.22 C 13.63 13.22 12.85 13.01 12.17 12.58 C 11.5 12.14 10.97 11.53 10.57 10.75 C 10.19 9.95 10 9.03 10 7.99 C 10 6.94 10.21 6.03 10.62 5.25 C 11.03 4.46 11.59 3.85 12.29 3.42 C 12.99 2.98 13.79 2.76 14.68 2.76 C 15.77 2.76 16.69 3.01 17.42 3.52 C 18.17 4.02 18.64 4.73 18.83 5.63 L 17.36 6.02 C 17.19 5.46 16.88 5.02 16.42 4.7 C 15.97 4.37 15.39 4.21 14.67 4.21 C 14.1 4.21 13.58 4.35 13.1 4.64 C 12.62 4.93 12.25 5.35 11.97 5.91 C 11.69 6.47 11.55 7.16 11.55 7.98 C 11.55 8.79 11.69 9.48 11.96 10.05 C 12.24 10.61 12.61 11.03 13.07 11.32 C 13.54 11.61 14.05 11.75 14.61 11.75 C 15.18 11.75 15.67 11.64 16.08 11.41 C 16.5 11.18 16.83 10.86 17.07 10.47 C 17.32 10.07 17.48 9.62 17.53 9.11 L 14.65 9.11 L 14.65 7.79 L 19.02 7.79 C 19.02 8.66 19.02 9.53 19.02 10.39 C 19.02 11.26 19.02 12.13 19.02 12.99 L 17.6 12.99 L 17.6 11.59 L 17.52 11.59 C 17.24 12.08 16.85 12.47 16.34 12.77 C 15.85 13.07 15.24 13.22 14.51 13.22 Z"
+        android:fillColor="#FF000000"/>
+    <path
+        android:pathData="M 24.12 5.24 L 24.12 2.89 L 22.82 2.89 L 22.82 5.24 L 20.47 5.24 L 20.47 6.54 L 22.82 6.54 L 22.82 8.89 L 24.12 8.89 L 24.12 6.54 L 26.47 6.54 L 26.47 5.24 Z"
+        android:fillColor="#FF000000"/>
 </vector>
diff --git a/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata.xml
new file mode 100644
index 0000000000000..41e8b19ede087
--- /dev/null
+++ b/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata.xml
@@ -0,0 +1,33 @@
+<!--
+     Copyright (C) 2025 Yet Another AOSP Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="17dp"
+    android:viewportWidth="22"
+    android:viewportHeight="17">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m19.326,3.428 l-1.34,3.824h0.881l0.293,-0.896h1.344l0.295,0.896h0.879L20.328,3.428ZM19.828,4.004 L19.896,4.281c0.028,0.11 0.057,0.22 0.086,0.326 0.032,0.107 0.054,0.185 0.068,0.238l0.268,0.828L19.354,5.674L19.625,4.846c0.018,-0.068 0.04,-0.15 0.064,-0.25l0.074,-0.309c0.028,-0.107 0.05,-0.201 0.064,-0.283z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16.627,3.391c-0.398,0 -0.712,0.095 -0.943,0.287 -0.231,0.188 -0.348,0.454 -0.348,0.795 0,0.174 0.031,0.325 0.092,0.449 0.06,0.124 0.136,0.231 0.229,0.32 0.096,0.085 0.196,0.156 0.299,0.217 0.103,0.057 0.2,0.108 0.289,0.15 0.142,0.068 0.267,0.131 0.377,0.191 0.11,0.057 0.198,0.12 0.262,0.188 0.068,0.068 0.102,0.148 0.102,0.244 0,0.117 -0.042,0.217 -0.127,0.295 -0.082,0.075 -0.223,0.111 -0.422,0.111 -0.192,0 -0.386,-0.032 -0.582,-0.096 -0.192,-0.068 -0.377,-0.141 -0.559,-0.219v0.752c0.316,0.153 0.674,0.229 1.076,0.229 0.448,0 0.793,-0.1 1.035,-0.299 0.245,-0.203 0.367,-0.473 0.367,-0.811 0,-0.199 -0.037,-0.365 -0.111,-0.5C17.587,5.56 17.48,5.441 17.342,5.342 17.207,5.242 17.041,5.147 16.846,5.055 16.607,4.941 16.428,4.846 16.307,4.768 16.186,4.689 16.125,4.582 16.125,4.447c0,-0.114 0.041,-0.206 0.123,-0.277 0.082,-0.071 0.201,-0.107 0.354,-0.107 0.146,0 0.287,0.019 0.426,0.059 0.139,0.039 0.295,0.095 0.469,0.166L17.758,3.658C17.562,3.573 17.375,3.505 17.193,3.459 17.016,3.413 16.826,3.391 16.627,3.391Z"/>
+  <path
+      android:pathData="M1.03,8.47L1.46,3.51L5.79,3.51L5.79,4.68L2.48,4.68L2.25,7.39C2.66,7.1 3.1,6.96 3.57,6.96C4.34,6.96 4.95,7.26 5.4,7.86C5.85,8.46 6.06,9.27 6.06,10.29C6.06,11.32 5.82,12.13 5.34,12.72C4.86,13.31 4.2,13.6 3.36,13.6C2.61,13.6 2,13.36 1.53,12.87C1.06,12.38 0.79,11.71 0.72,10.85L1.85,10.85C1.92,11.42 2.08,11.85 2.34,12.14C2.6,12.43 2.93,12.57 3.35,12.57C3.82,12.57 4.19,12.37 4.45,11.96C4.71,11.55 4.85,11 4.85,10.31C4.85,9.66 4.71,9.13 4.42,8.72C4.13,8.31 3.76,8.09 3.28,8.09C2.88,8.09 2.56,8.19 2.32,8.4L1.99,8.73L1.03,8.47Z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M13.78,12.24L13.56,12.51C12.93,13.24 12.01,13.61 10.8,13.61C9.72,13.61 8.88,13.25 8.27,12.54C7.66,11.83 7.34,10.82 7.33,9.52L7.33,7.56C7.33,6.17 7.61,5.12 8.17,4.43C8.73,3.74 9.56,3.39 10.68,3.39C11.63,3.39 12.37,3.65 12.91,4.18C13.45,4.71 13.74,5.46 13.8,6.44L12.55,6.44C12.5,5.82 12.33,5.34 12.03,4.99C11.73,4.64 11.29,4.47 10.69,4.47C9.97,4.47 9.45,4.7 9.12,5.17C8.79,5.64 8.6,6.37 8.59,7.4L8.59,9.43C8.59,10.43 8.78,11.2 9.16,11.74C9.54,12.28 10.09,12.54 10.81,12.54C11.48,12.54 12,12.38 12.35,12.05L12.53,11.88L12.53,9.59L10.71,9.59L10.71,8.52L13.78,8.52L13.78,12.24Z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata_updated.xml b/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata_updated.xml
new file mode 100644
index 0000000000000..2f0d5adfd7143
--- /dev/null
+++ b/packages/SettingsLib/res/drawable/ic_5g_sa_mobiledata_updated.xml
@@ -0,0 +1,30 @@
+<!--
+     Copyright (C) 2025 Yet Another AOSP Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="11.63dp"
+    android:viewportWidth="20"
+    android:viewportHeight="10.42">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18.063,0.24 L17.059,3.107h0.66l0.219,-0.672h1.008l0.221,0.672h0.66L18.814,0.24ZM18.438,0.672 L18.49,0.881c0.021,0.083 0.043,0.162 0.064,0.242 0.024,0.08 0.04,0.142 0.051,0.182l0.201,0.619h-0.725l0.203,-0.619c0.013,-0.051 0.03,-0.115 0.049,-0.189l0.057,-0.23c0.021,-0.08 0.036,-0.152 0.047,-0.213z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m16.037,0.213c-0.299,0 -0.534,0.071 -0.707,0.215 -0.173,0.141 -0.26,0.34 -0.26,0.596 0,0.131 0.023,0.243 0.068,0.336 0.045,0.093 0.103,0.174 0.172,0.24 0.072,0.064 0.145,0.119 0.223,0.164 0.077,0.043 0.15,0.081 0.217,0.113 0.107,0.051 0.201,0.097 0.283,0.143 0.083,0.043 0.149,0.09 0.197,0.141 0.051,0.051 0.076,0.112 0.076,0.184 0,0.088 -0.032,0.162 -0.096,0.221 -0.061,0.056 -0.167,0.084 -0.316,0.084 -0.144,0 -0.291,-0.024 -0.438,-0.072 -0.144,-0.051 -0.284,-0.105 -0.42,-0.164v0.564c0.237,0.115 0.507,0.172 0.809,0.172 0.336,0 0.594,-0.075 0.775,-0.225 0.184,-0.152 0.277,-0.354 0.277,-0.607 0,-0.149 -0.028,-0.276 -0.084,-0.377 -0.056,-0.101 -0.136,-0.189 -0.24,-0.264 -0.101,-0.075 -0.226,-0.146 -0.373,-0.215 -0.179,-0.085 -0.312,-0.158 -0.402,-0.217 -0.091,-0.059 -0.137,-0.139 -0.137,-0.24 0,-0.085 0.03,-0.154 0.092,-0.207 0.061,-0.053 0.149,-0.08 0.264,-0.08 0.109,0 0.216,0.014 0.32,0.043 0.104,0.029 0.221,0.072 0.352,0.125l0.197,-0.473c-0.147,-0.064 -0.288,-0.114 -0.424,-0.148 -0.133,-0.035 -0.276,-0.051 -0.426,-0.051z"/>
+  <path
+      android:pathData="M2.807,10.416C2.247,10.416 1.774,10.325 1.386,10.143C0.999,9.956 0.684,9.704 0.441,9.387C0.199,9.065 0.056,8.745 0.014,8.428C-0.028,8.111 0.014,7.859 0.14,7.672C0.271,7.485 0.439,7.366 0.644,7.315C0.85,7.259 1.036,7.266 1.204,7.336C1.372,7.406 1.494,7.506 1.568,7.637C1.643,7.763 1.727,7.912 1.82,8.085C1.914,8.253 2.03,8.393 2.17,8.505C2.315,8.617 2.504,8.673 2.737,8.673C3.055,8.673 3.309,8.57 3.5,8.365C3.696,8.16 3.794,7.849 3.794,7.434L3.794,6.461C3.794,6.083 3.701,5.796 3.514,5.6C3.332,5.399 3.092,5.299 2.793,5.299C2.593,5.299 2.427,5.341 2.296,5.425C2.166,5.509 2.054,5.605 1.96,5.712C1.858,5.819 1.715,5.901 1.533,5.957C1.351,6.008 1.148,6.001 0.924,5.936C0.682,5.861 0.49,5.714 0.35,5.495C0.215,5.271 0.159,5.035 0.182,4.788L0.455,1.281C0.483,0.987 0.614,0.733 0.847,0.518C1.081,0.303 1.347,0.196 1.645,0.196L4.515,0.196C4.758,0.196 4.966,0.282 5.138,0.455C5.316,0.628 5.404,0.833 5.404,1.071C5.404,1.314 5.316,1.521 5.138,1.694C4.966,1.867 4.758,1.953 4.515,1.953L2.044,1.953L1.841,4.34L1.897,4.354C2.07,4.172 2.285,4.03 2.541,3.927C2.803,3.824 3.094,3.773 3.416,3.773C4.126,3.773 4.697,4.02 5.131,4.515C5.565,5.005 5.782,5.677 5.782,6.531L5.782,7.378C5.782,8.33 5.516,9.074 4.984,9.611C4.452,10.148 3.727,10.416 2.807,10.416ZM10.853,10.416C9.729,10.411 8.83,10.031 8.158,9.275C7.491,8.514 7.157,7.406 7.157,5.95L7.157,4.417C7.157,2.975 7.498,1.878 8.179,1.127C8.861,0.371 9.773,-0.005 10.916,0C11.43,0 11.864,0.075 12.218,0.224C12.578,0.369 12.883,0.576 13.135,0.847C13.392,1.113 13.569,1.374 13.667,1.631C13.765,1.883 13.772,2.121 13.688,2.345C13.604,2.569 13.46,2.732 13.254,2.835C13.054,2.938 12.858,2.968 12.666,2.926C12.475,2.884 12.326,2.802 12.218,2.681C12.111,2.555 12.001,2.422 11.889,2.282C11.777,2.142 11.637,2.032 11.469,1.953C11.301,1.869 11.101,1.827 10.867,1.827C10.349,1.822 9.934,2.011 9.621,2.394C9.313,2.777 9.159,3.358 9.159,4.137L9.159,6.293C9.159,7.063 9.318,7.644 9.635,8.036C9.957,8.428 10.377,8.624 10.895,8.624C11.399,8.624 11.794,8.477 12.078,8.183C12.363,7.889 12.517,7.474 12.54,6.937L12.54,6.265L11.567,6.265C11.362,6.265 11.185,6.188 11.035,6.034C10.886,5.875 10.811,5.689 10.811,5.474C10.811,5.255 10.888,5.068 11.042,4.914C11.201,4.755 11.39,4.676 11.609,4.676L13.576,4.676C13.81,4.676 14.008,4.755 14.171,4.914C14.335,5.073 14.419,5.269 14.423,5.502L14.423,6.538C14.423,7.77 14.101,8.724 13.457,9.401C12.818,10.078 11.95,10.416 10.853,10.416Z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/packages/SettingsLib/res/drawable/ic_lte_plus_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_lte_plus_mobiledata.xml
index e5cdff33fe981..d1f4b6fd818bc 100644
--- a/packages/SettingsLib/res/drawable/ic_lte_plus_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_lte_plus_mobiledata.xml
@@ -14,23 +14,20 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22.94dp"
-    android:height="15dp"
-    android:viewportWidth="26"
-    android:viewportHeight="17">
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1.59,12.4h3.9v1.07H0.33V3.52h1.26V12.4z" />
+        android:width="31dp"
+        android:height="16dp"
+        android:viewportWidth="31.0"
+        android:viewportHeight="16.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M11.35,4.6H8.73v8.88H7.48V4.6H4.87V3.52h6.48V4.6z" />
+        android:fillColor="#FF000000"
+        android:pathData="M2,13V2.98h1.53v8.57H8.3V13H2z"/>
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M17.59,8.88h-3.52v3.53h4.1v1.07h-5.35V3.52h5.28V4.6h-4.03V7.8h3.52V8.88z" />
+        android:fillColor="#FF000000"
+        android:pathData="M11.24,13V4.43H8.19V2.98h7.63v1.46h-3.05V13H11.24z"/>
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M 23.32 5.74 L 23.32 3.39 L 22.02 3.39 L 22.02 5.74 L 19.67 5.74 L 19.67 7.04 L 22.02 7.04 L 22.02 9.39 L 23.32 9.39 L 23.32 7.04 L 25.67 7.04 L 25.67 5.74 Z" />
+        android:fillColor="#FF000000"
+        android:pathData="M17.41,13V2.98h6.36v1.46h-4.83v2.65h4.4v1.46h-4.4v3.01h4.83V13H17.41z"/>
     <path
-        android:pathData="M 0 0 H 26 V 17 H 0 V 0 Z" />
+        android:fillColor="#FF000000"
+        android:pathData="M28.72 5.24 28.72 2.89 27.42 2.89 27.42 5.24 25.07 5.24 25.07 6.54 27.42 6.54 27.42 8.89 28.72 8.89 28.72 6.54 31.07 6.54 31.07 5.24Z"/>
 </vector>
diff --git a/packages/SettingsLib/res/drawable/ic_mobile_level_list.xml b/packages/SettingsLib/res/drawable/ic_mobile_level_list.xml
index 6ec6793ea233e..5ff7e5fcb6be6 100644
--- a/packages/SettingsLib/res/drawable/ic_mobile_level_list.xml
+++ b/packages/SettingsLib/res/drawable/ic_mobile_level_list.xml
@@ -23,12 +23,12 @@ SignalDrawable.java for usage. -->
     <item android:minLevel="2" android:maxLevel="2" android:drawable="@drawable/ic_mobile_2_4_bar" />
     <item android:minLevel="3" android:maxLevel="3" android:drawable="@drawable/ic_mobile_3_4_bar" />
     <item android:minLevel="4" android:maxLevel="4" android:drawable="@drawable/ic_mobile_4_4_bar" />
-    <item android:minLevel="10" android:maxLevel="10" android:drawable="@drawable/ic_mobile_0_5_bar" />
-    <item android:minLevel="11" android:maxLevel="11" android:drawable="@drawable/ic_mobile_1_5_bar" />
-    <item android:minLevel="12" android:maxLevel="12" android:drawable="@drawable/ic_mobile_2_5_bar" />
-    <item android:minLevel="13" android:maxLevel="13" android:drawable="@drawable/ic_mobile_3_5_bar" />
-    <item android:minLevel="14" android:maxLevel="14" android:drawable="@drawable/ic_mobile_4_5_bar" />
-    <item android:minLevel="15" android:maxLevel="15" android:drawable="@drawable/ic_mobile_5_5_bar" />
+    <item android:minLevel="10" android:maxLevel="10" android:drawable="@drawable/ic_mobile_0_4_bar" />
+    <item android:minLevel="11" android:maxLevel="11" android:drawable="@drawable/ic_mobile_1_4_bar" />
+    <item android:minLevel="12" android:maxLevel="12" android:drawable="@drawable/ic_mobile_2_4_bar" />
+    <item android:minLevel="13" android:maxLevel="13" android:drawable="@drawable/ic_mobile_3_4_bar" />
+    <item android:minLevel="14" android:maxLevel="14" android:drawable="@drawable/ic_mobile_4_4_bar" />
+    <item android:minLevel="15" android:maxLevel="15" android:drawable="@drawable/ic_mobile_4_4_bar" />
     
     <!-- Error states, so we don't have to draw them manually anymore -->
     <item android:minLevel="20" android:maxLevel="20" android:drawable="@drawable/ic_mobile_0_4_bar_error" />
@@ -37,10 +37,10 @@ SignalDrawable.java for usage. -->
     <item android:minLevel="23" android:maxLevel="23" android:drawable="@drawable/ic_mobile_3_4_bar_error" />
     <item android:minLevel="24" android:maxLevel="24" android:drawable="@drawable/ic_mobile_4_4_bar_error" />
 
-    <item android:minLevel="30" android:maxLevel="30" android:drawable="@drawable/ic_mobile_0_5_bar_error" />
-    <item android:minLevel="31" android:maxLevel="31" android:drawable="@drawable/ic_mobile_1_5_bar_error" />
-    <item android:minLevel="32" android:maxLevel="32" android:drawable="@drawable/ic_mobile_2_5_bar_error" />
-    <item android:minLevel="33" android:maxLevel="33" android:drawable="@drawable/ic_mobile_3_5_bar_error" />
-    <item android:minLevel="34" android:maxLevel="34" android:drawable="@drawable/ic_mobile_4_5_bar_error" />
-    <item android:minLevel="35" android:maxLevel="35" android:drawable="@drawable/ic_mobile_5_5_bar_error" />
+    <item android:minLevel="30" android:maxLevel="30" android:drawable="@drawable/ic_mobile_0_4_bar_error" />
+    <item android:minLevel="31" android:maxLevel="31" android:drawable="@drawable/ic_mobile_1_4_bar_error" />
+    <item android:minLevel="32" android:maxLevel="32" android:drawable="@drawable/ic_mobile_2_4_bar_error" />
+    <item android:minLevel="33" android:maxLevel="33" android:drawable="@drawable/ic_mobile_3_4_bar_error" />
+    <item android:minLevel="34" android:maxLevel="34" android:drawable="@drawable/ic_mobile_4_4_bar_error" />
+    <item android:minLevel="35" android:maxLevel="35" android:drawable="@drawable/ic_mobile_4_4_bar_error" />
 </level-list>
diff --git a/packages/SettingsLib/res/drawable/user_avatar_bg.xml b/packages/SettingsLib/res/drawable/user_avatar_bg.xml
index 1f50496f3a5c4..caf9103fc2a4c 100644
--- a/packages/SettingsLib/res/drawable/user_avatar_bg.xml
+++ b/packages/SettingsLib/res/drawable/user_avatar_bg.xml
@@ -22,7 +22,7 @@
         android:viewportHeight="100">
 
     <path
-        android:fillColor="@color/user_avatar_color_bg"
+        android:fillColor="@*android:color/transparent"
         android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"/>
 
 </vector>
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index 53c9658414c72..297a04418145f 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -494,6 +494,20 @@
         <item>show_deuteranomaly</item>
     </string-array>
 
+    <!-- Titles for debug renderer preference. [CHAR LIMIT=50] -->
+    <string-array name="debug_hw_renderer_entries">
+        <item>OpenGL (Default)</item>
+        <item>OpenGL (Skia)</item>
+        <item>Vulkan (Skia)</item>
+    </string-array>
+
+    <!-- Values for debug renderer preference. -->
+    <string-array name="debug_hw_renderer_values" translatable="false" >
+        <item>opengl</item>
+        <item>skiagl</item>
+        <item>skiavk</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
diff --git a/packages/SettingsLib/res/values/cr_config.xml b/packages/SettingsLib/res/values/cr_config.xml
new file mode 100644
index 0000000000000..45e7745feea97
--- /dev/null
+++ b/packages/SettingsLib/res/values/cr_config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024-2026 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Roaming symbol (R) path for SignalDrawable as defined on a 24x24 canvas. -->
+    <string name="config_signalRoamingPath" translatable="false">
+        M 19.436 19.688 L 18.152 19.688 L 18.152 22 L 17 22 L 17 16 L 19.332 16 C 20.097 16 20.687 16.155 21.103 16.466 C 21.519 16.776 21.727 17.225 21.727 17.813 C 21.727 18.214 21.619 18.551 21.403 18.823 C 21.191 19.092 20.893 19.299 20.511 19.445 L 22 21.946 L 22 22 L 20.766 22 L 19.436 19.688 Z M 18.152 18.852 L 19.336 18.852 C 19.725 18.852 20.028 18.764 20.247 18.588 C 20.465 18.409 20.575 18.166 20.575 17.859 C 20.575 17.537 20.473 17.288 20.27 17.113 C 20.069 16.937 19.769 16.846 19.368 16.841 L 18.152 16.841 L 18.152 18.852 Z
+    </string>
+    <!-- config_roamingCutout{Height,Width}Fraction define fraction of the 24x24 canvas that
+         should be cut out to display config_signalRoamingPath. -->
+    <item name="config_roamingCutoutWidthFraction" format="float" type="dimen">8</item>
+    <item name="config_roamingCutoutHeightFraction" format="float" type="dimen">9</item>
+</resources>
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index bdc08f6949d09..2f57588fe07e9 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -956,6 +956,9 @@
     <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
     <string name="debug_hw_overdraw">Debug GPU overdraw</string>
 
+    <!-- UI debug setting: select the renderer to use by RenderThread [CHAR LIMIT=25] -->
+    <string name="debug_hw_renderer">Set GPU Renderer</string>
+
     <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
     <string name="disable_overlays">Disable HW overlays</string>
     <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
@@ -1789,6 +1792,9 @@
     <!-- Content description of the data connection type 5G. [CHAR LIMIT=NONE] -->
     <string name="data_connection_5g" translatable="false">5G</string>
 
+    <!-- Content description of the data connection type 5G stand alone. [CHAR LIMIT=NONE] -->
+    <string name="data_connection_5g_sa" translate="false">5G SA</string>
+
     <!-- Content description of the data connection type 5G+. [CHAR LIMIT=NONE] -->
     <string name="data_connection_5g_plus" translatable="false">5G+</string>
     <!-- Content description of the data connection type 5G+ for carrier 2032. [CHAR LIMIT=NONE] -->
diff --git a/packages/SettingsLib/src/com/android/settingslib/NetworkPolicyEditor.java b/packages/SettingsLib/src/com/android/settingslib/NetworkPolicyEditor.java
index b4e84dd546547..abff66f8e1807 100644
--- a/packages/SettingsLib/src/com/android/settingslib/NetworkPolicyEditor.java
+++ b/packages/SettingsLib/src/com/android/settingslib/NetworkPolicyEditor.java
@@ -155,6 +155,24 @@ public int getPolicyCycleDay(NetworkTemplate template) {
         }
     }
 
+    public int getPolicyCycleDayOfWeek(NetworkTemplate template) {
+        final NetworkPolicy policy = getPolicy(template);
+        if (policy != null && policy.cycleRule.isWeekly()) {
+            return policy.cycleRule.start.getDayOfWeek().getValue();
+        } else {
+            return CYCLE_NONE;
+        }
+    }
+
+    public int getPolicyCycleHour(NetworkTemplate template) {
+        final NetworkPolicy policy = getPolicy(template);
+        if (policy != null && policy.cycleRule.isDaily()) {
+            return policy.cycleRule.start.getHour();
+        } else {
+            return CYCLE_NONE;
+        }
+    }
+
     @Deprecated
     public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cycleTimezone) {
         final NetworkPolicy policy = getOrCreatePolicy(template);
@@ -164,6 +182,22 @@ public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cyc
         writeAsync();
     }
 
+    public void setPolicyCycleDayOfWeek(NetworkTemplate template, int cycleDay, String cycleTimezone) {
+        final NetworkPolicy policy = getOrCreatePolicy(template);
+        policy.cycleRule = NetworkPolicy.buildWeeklyRule(cycleDay, ZoneId.of(cycleTimezone));
+        policy.inferred = false;
+        policy.clearSnooze();
+        writeAsync();
+    }
+
+    public void setPolicyCycleHour(NetworkTemplate template, int cycleHour, String cycleTimezone) {
+        final NetworkPolicy policy = getOrCreatePolicy(template);
+        policy.cycleRule = NetworkPolicy.buildDailyRule(cycleHour, ZoneId.of(cycleTimezone));
+        policy.inferred = false;
+        policy.clearSnooze();
+        writeAsync();
+    }
+
     public long getPolicyWarningBytes(NetworkTemplate template) {
         final NetworkPolicy policy = getPolicy(template);
         return (policy != null) ? policy.warningBytes : WARNING_DISABLED;
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 4e7611ed802d4..9b07cbbabadb8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -767,6 +767,10 @@ private AppEntry getEntryLocked(ApplicationInfo info) {
                 }
                 return null;
             }
+            if (info.sourceDir == null) {
+                // Avoid NullPointerException for broken uninstalled packages.
+                return null;
+            }
             if (DEBUG) {
                 Log.i(TAG, "Creating AppEntry for " + info.packageName);
             }
@@ -2122,7 +2126,7 @@ public void init() {
 
         @Override
         public boolean filterApp(AppEntry entry) {
-            return true;
+            return !hasFlag(entry.info.privateFlags, ApplicationInfo.PRIVATE_FLAG_IS_RESOURCE_OVERLAY);
         }
     };
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
index 70126ace7d4ca..d7951ebf5dca0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
@@ -42,6 +42,7 @@
 
 public class A2dpProfile implements LocalBluetoothProfile {
     private static final String TAG = "A2dpProfile";
+    private static boolean V = true;
 
     private Context mContext;
 
@@ -224,6 +225,11 @@ boolean isA2dpPlaying() {
     }
 
     public boolean supportsHighQualityAudio(BluetoothDevice device) {
+        if (V) Log.d(TAG, " execute supportsHighQualityAudio()");
+        if (mService == null) {
+            if (V) Log.d(TAG,"mService is null.");
+            return false;
+        }
         BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
         if (bluetoothDevice == null) {
             return false;
@@ -237,6 +243,11 @@ public boolean supportsHighQualityAudio(BluetoothDevice device) {
      */
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     public boolean isHighQualityAudioEnabled(BluetoothDevice device) {
+        if (V) Log.d(TAG, " execute isHighQualityAudioEnabled()");
+        if (mService == null) {
+            if (V) Log.d(TAG,"mService is null.");
+            return false;
+        }
         BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
         if (bluetoothDevice == null) {
             return false;
@@ -263,6 +274,11 @@ && supportsHighQualityAudio(bluetoothDevice)) {
     }
 
     public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled) {
+        if (V) Log.d(TAG, " execute setHighQualityAudioEnabled()");
+        if (mService == null) {
+            if (V) Log.d(TAG,"mService is null.");
+            return;
+        }
         BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
         if (bluetoothDevice == null) {
             return;
@@ -289,6 +305,7 @@ public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled)
      */
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
+        if (V) Log.d(TAG, " execute getHighQualityAudioOptionLabel()");
         BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
         int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;
         if (bluetoothDevice == null || !supportsHighQualityAudio(device)
@@ -298,7 +315,7 @@ public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
         // We want to get the highest priority codec, since that's the one that will be used with
         // this device, and see if it is high-quality (ie non-mandatory).
         List<BluetoothCodecConfig> selectable = null;
-        if (mService.getCodecStatus(device) != null) {
+        if (mService != null && mService.getCodecStatus(device) != null) {
             selectable = mService.getCodecStatus(device).getCodecsSelectableCapabilities();
             // To get the highest priority, we sort in reverse.
             Collections.sort(selectable,
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java
index 5468efbdbd3e8..29e1424f205d2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java
@@ -76,10 +76,12 @@ public void onServiceConnected(int profile, BluetoothProfile proxy) {
                 device.refresh();
             }
             mIsProfileReady = true;
+            mProfileManager.callServiceConnectedListeners();
         }
 
         public void onServiceDisconnected(int profile) {
             mIsProfileReady = false;
+            mProfileManager.callServiceDisconnectedListeners();
         }
     }
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
index b849d44622b20..df5eca51fccb7 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
@@ -70,10 +70,12 @@ public void onServiceConnected(int profile, BluetoothProfile proxy) {
                 device.refresh();
             }
             mIsProfileReady=true;
+            mProfileManager.callServiceConnectedListeners();
         }
 
         public void onServiceDisconnected(int profile) {
             mIsProfileReady=false;
+            mProfileManager.callServiceDisconnectedListeners();
         }
     }
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
index aaa6987079b4c..0389f04ced2c4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
@@ -333,6 +333,11 @@ private class StateChangedHandler implements BluetoothEventManager.Handler {
         }
 
         public void onReceive(Context context, Intent intent, BluetoothDevice device) {
+            if (device == null) {
+                if(DEBUG) Log.d(TAG, "StateChangedHandler receives state-change for invalid device");
+                return;
+            }
+
             CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
             if (cachedDevice == null) {
                 Log.w(TAG, "StateChangedHandler found new device: " + device);
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
index b29595eab5c71..79416ce6a4f80 100644
--- a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java
@@ -75,14 +75,18 @@ public void onDeveloperOptionsDisabled() {
      * Called when developer options is enabled and the preference is available
      */
     protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        if (mPreference != null) {
+            mPreference.setEnabled(true);
+        }
     }
 
     /**
      * Called when developer options is disabled and the preference is available
      */
     protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
+        if (mPreference != null) {
+            mPreference.setEnabled(false);
+        }
     }
 
 }
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSleeptimePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSleeptimePreferenceController.java
new file mode 100644
index 0000000000000..926c601b9ecb9
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSleeptimePreferenceController.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2021-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settingslib.deviceinfo;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.os.SystemClock;
+import android.text.format.DateUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Preference controller for sleeptime
+ */
+public abstract class AbstractSleeptimePreferenceController extends AbstractPreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    @VisibleForTesting
+    static final String KEY_SLEEPTIME = "sleep_time";
+    private static final int EVENT_UPDATE_STATS = 500;
+
+    private Preference mSleeptime;
+    private Handler mHandler;
+
+    public AbstractSleeptimePreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @Override
+    public void onStart() {
+        getHandler().sendEmptyMessage(EVENT_UPDATE_STATS);
+    }
+
+    @Override
+    public void onStop() {
+        getHandler().removeMessages(EVENT_UPDATE_STATS);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SLEEPTIME;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mSleeptime = screen.findPreference(KEY_SLEEPTIME);
+        updateTimes();
+    }
+
+    private Handler getHandler() {
+        if (mHandler == null) {
+            mHandler = new MyHandler(this);
+        }
+        return mHandler;
+    }
+
+    private void updateTimes() {
+        long deepSleepTime = Math.max((SystemClock.elapsedRealtime() - SystemClock.uptimeMillis()), 0);
+        float deepSleepRatio = (float)deepSleepTime / SystemClock.elapsedRealtime();
+        int deepSleepPercent = Math.round(deepSleepRatio * 100);
+
+        final StringBuilder summary = new StringBuilder();
+
+        summary.append(DateUtils.formatElapsedTime(deepSleepTime / 1000));
+        summary.append(" (");
+        summary.append(deepSleepPercent);
+        summary.append("%)");
+
+        mSleeptime.setSummary(summary.toString());
+    }
+
+    private static class MyHandler extends Handler {
+        private WeakReference<AbstractSleeptimePreferenceController> mStatus;
+
+        public MyHandler(AbstractSleeptimePreferenceController activity) {
+            mStatus = new WeakReference<>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            AbstractSleeptimePreferenceController status = mStatus.get();
+            if (status == null) {
+                return;
+            }
+
+            switch (msg.what) {
+                case EVENT_UPDATE_STATS:
+                    status.updateTimes();
+                    sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000);
+                    break;
+
+                default:
+                    throw new IllegalStateException("Unknown message " + msg.what);
+            }
+        }
+    }
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
index 192bad137b0f4..b5a07ec2c44f1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
+++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatteryStatus.java
@@ -26,9 +26,11 @@
 import static android.os.BatteryManager.EXTRA_HEALTH;
 import static android.os.BatteryManager.EXTRA_MAX_CHARGING_CURRENT;
 import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
+import static android.os.BatteryManager.EXTRA_OEM_CHARGER;
 import static android.os.BatteryManager.EXTRA_PLUGGED;
 import static android.os.BatteryManager.EXTRA_PRESENT;
 import static android.os.BatteryManager.EXTRA_STATUS;
+import static android.os.BatteryManager.EXTRA_TEMPERATURE;
 import static android.os.OsProtoEnums.BATTERY_PLUGGED_NONE;
 
 import android.content.Context;
@@ -51,19 +53,25 @@ public class BatteryStatus {
     public static final int CHARGING_SLOWLY = 0;
     public static final int CHARGING_REGULAR = 1;
     public static final int CHARGING_FAST = 2;
+    public static final int CHARGING_OEM = 3;
     public static final int LOW_BATTERY_THRESHOLD = 20;
     public static final int SEVERE_LOW_BATTERY_THRESHOLD = 10;
-    public static final int EXTREME_LOW_BATTERY_THRESHOLD = 3;
+    public static final int EXTREME_LOW_BATTERY_THRESHOLD = 4;
 
     public final int status;
     public final int level;
     public final int plugged;
     public final int health;
     public final int chargingStatus;
-    public final int maxChargingWattage;
+    public final float maxChargingCurrent;
+    public final float maxChargingVoltage;
+    public final float maxChargingWattage;
+    public final float temperature;
     public final boolean present;
     public final Optional<Boolean> incompatibleCharger;
 
+    public final boolean oemChargeStatus;
+
     public static BatteryStatus create(Context context, boolean incompatibleCharger) {
         final Intent batteryChangedIntent = BatteryUtils.getBatteryIntent(context);
         return batteryChangedIntent == null
@@ -71,13 +79,19 @@ public static BatteryStatus create(Context context, boolean incompatibleCharger)
     }
 
     public BatteryStatus(int status, int level, int plugged, int chargingStatus,
-            int maxChargingWattage, boolean present) {
+            float maxChargingWattage, boolean present,
+            float maxChargingCurrent, float maxChargingVoltage,
+            float temperature, boolean oemChargeStatus) {
         this.status = status;
         this.level = level;
         this.plugged = plugged;
         this.chargingStatus = chargingStatus;
+        this.maxChargingCurrent = maxChargingCurrent;
+        this.maxChargingVoltage = maxChargingVoltage;
         this.maxChargingWattage = maxChargingWattage;
+        this.oemChargeStatus = oemChargeStatus;
         this.present = present;
+        this.temperature = temperature;
         this.incompatibleCharger = Optional.empty();
         this.health = BATTERY_HEALTH_UNKNOWN;
     }
@@ -98,10 +112,18 @@ private BatteryStatus(Intent batteryChangedIntent, Optional<Boolean> incompatibl
         health = batteryChangedIntent.getIntExtra(EXTRA_HEALTH, BATTERY_HEALTH_UNKNOWN);
         chargingStatus = batteryChangedIntent.getIntExtra(EXTRA_CHARGING_STATUS,
                 CHARGING_POLICY_DEFAULT);
+        oemChargeStatus = batteryChangedIntent.getBooleanExtra(EXTRA_OEM_CHARGER, false);
         present = batteryChangedIntent.getBooleanExtra(EXTRA_PRESENT, true);
+        temperature = batteryChangedIntent.getIntExtra(EXTRA_TEMPERATURE, -1);
         this.incompatibleCharger = incompatibleCharger;
 
         maxChargingWattage = calculateMaxChargingMicroWatt(batteryChangedIntent);
+        maxChargingCurrent = batteryChangedIntent.getIntExtra(EXTRA_MAX_CHARGING_CURRENT, -1);
+        int maxChargingMicroVolt = batteryChangedIntent.getIntExtra(EXTRA_MAX_CHARGING_VOLTAGE, -1);
+        if (maxChargingMicroVolt <= 0) {
+            maxChargingMicroVolt = DEFAULT_CHARGING_VOLTAGE_MICRO_VOLT;
+        }
+        maxChargingVoltage = maxChargingMicroVolt;
     }
 
     /** Determine whether the device is plugged. */
@@ -162,7 +184,8 @@ public final int getChargingSpeed(Context context) {
         final int fastThreshold = context.getResources().getInteger(
                 getFastChargingThresholdResId());
 
-        return maxChargingWattage <= 0 ? CHARGING_UNKNOWN :
+        return oemChargeStatus ? CHARGING_OEM :
+                maxChargingWattage <= 0 ? CHARGING_UNKNOWN :
                 maxChargingWattage < slowThreshold ? CHARGING_SLOWLY :
                         maxChargingWattage > fastThreshold ? CHARGING_FAST :
                                 CHARGING_REGULAR;
diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java
index 14fa9ec02575f..69e58077de90d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java
+++ b/packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java
@@ -68,6 +68,8 @@ public class SignalDrawable extends DrawableWrapper {
     private static final int STATE_MASK = 0xff << STATE_SHIFT;
     private static final int STATE_CUT = 2;
     private static final int STATE_CARRIER_CHANGE = 3;
+    private static final int STATE_R = 4;
+    private static final int STATE_CUT_AND_R = 5;
 
     private static final long DOT_DELAY = 1000;
 
@@ -81,11 +83,15 @@ public class SignalDrawable extends DrawableWrapper {
     private final Path mCutoutPath = new Path();
     private final Path mForegroundPath = new Path();
     private final Path mAttributionPath = new Path();
+    private final Path mRoamingPath = new Path();
     private final Matrix mAttributionScaleMatrix = new Matrix();
     private final Path mScaledAttributionPath = new Path();
+    private final Path mScaledRoamingPath = new Path();
     private final Handler mHandler;
     private final float mCutoutWidthFraction;
     private final float mCutoutHeightFraction;
+    private final float mRCutoutWidthFraction;
+    private final float mRCutoutHeightFraction;
     private float mDarkIntensity = -1;
     private final int mIntrinsicSize;
     private boolean mAnimating;
@@ -99,12 +105,19 @@ public SignalDrawable(@NonNull Context context, @NonNull Handler handler) {
         super(context.getDrawable(ICON_RES));
         final String attributionPathString = context.getString(
                 com.android.internal.R.string.config_signalAttributionPath);
+        final String roamingPathString = context.getString(
+                R.string.config_signalRoamingPath);
         mAttributionPath.set(PathParser.createPathFromPathData(attributionPathString));
+        mRoamingPath.set(PathParser.createPathFromPathData(roamingPathString));
         updateScaledAttributionPath();
         mCutoutWidthFraction = context.getResources().getFloat(
                 com.android.internal.R.dimen.config_signalCutoutWidthFraction);
         mCutoutHeightFraction = context.getResources().getFloat(
                 com.android.internal.R.dimen.config_signalCutoutHeightFraction);
+        mRCutoutWidthFraction = context.getResources().getFloat(
+                R.dimen.config_roamingCutoutWidthFraction);
+        mRCutoutHeightFraction = context.getResources().getFloat(
+                R.dimen.config_roamingCutoutHeightFraction);
         mDarkModeFillColor = Utils.getColorStateListDefaultColor(context,
                 R.color.dark_mode_icon_color_single_tone);
         mLightModeFillColor = Utils.getColorStateListDefaultColor(context,
@@ -124,6 +137,7 @@ private void updateScaledAttributionPath() {
                     getBounds().width() / VIEWPORT, getBounds().height() / VIEWPORT);
         }
         mAttributionPath.transform(mAttributionScaleMatrix, mScaledAttributionPath);
+        mRoamingPath.transform(mAttributionScaleMatrix, mScaledRoamingPath);
     }
 
     @Override
@@ -250,9 +264,32 @@ public void draw(@NonNull Canvas canvas) {
             drawDotAndPadding(x - dotSpacing * 2, y, dotPadding, dotSize, 0);
             canvas.drawPath(mCutoutPath, mTransparentPaint);
             canvas.drawPath(mForegroundPath, mForegroundPaint);
-        } else if (!newStatusBarIcons() && isInState(STATE_CUT)) {
-            float cutX = (mCutoutWidthFraction * width / VIEWPORT);
-            float cutY = (mCutoutHeightFraction * height / VIEWPORT);
+        } else if (!newStatusBarIcons() && isInState(STATE_CUT_AND_R)) {
+            // Roaming
+            float cutWidth = mRCutoutWidthFraction;
+            float cutHeight = mRCutoutHeightFraction;
+            float cutX = (cutWidth * width / VIEWPORT);
+            float cutY = (cutHeight * height / VIEWPORT);
+            float rIconOffset = -0.8f * (mCutoutWidthFraction * width / VIEWPORT);
+            mCutoutPath.moveTo(width + rIconOffset, height);
+            mCutoutPath.rLineTo(-cutX, 0);
+            mCutoutPath.rLineTo(0, -cutY);
+            mCutoutPath.rLineTo(cutX, 0);
+            mCutoutPath.rLineTo(0, cutY);
+            canvas.drawPath(mCutoutPath, mTransparentPaint);
+            // Adjust mScaledRoamingPath
+            Path adjustedRoamingPath = new Path(mScaledRoamingPath);
+            Matrix matrix = new Matrix();
+            matrix.postTranslate(rIconOffset, 0);
+            adjustedRoamingPath.transform(matrix);
+            canvas.drawPath(adjustedRoamingPath, mForegroundPaint);
+            // Attribution
+            mCutoutPath.reset();
+            mCutoutPath.setFillType(FillType.WINDING);
+            cutWidth = mCutoutWidthFraction;
+            cutHeight = mCutoutHeightFraction;
+            cutX = (cutWidth * width / VIEWPORT);
+            cutY = (cutHeight * height / VIEWPORT);
             mCutoutPath.moveTo(width, height);
             mCutoutPath.rLineTo(-cutX, 0);
             mCutoutPath.rLineTo(0, -cutY);
@@ -260,6 +297,20 @@ public void draw(@NonNull Canvas canvas) {
             mCutoutPath.rLineTo(0, cutY);
             canvas.drawPath(mCutoutPath, mTransparentPaint);
             canvas.drawPath(mScaledAttributionPath, mForegroundPaint);
+        } else if (!newStatusBarIcons() && (isInState(STATE_CUT) || isInState(STATE_R))) {
+            boolean isRoaming = isInState(STATE_R);
+            float cutWidth = isRoaming ? mRCutoutWidthFraction : mCutoutWidthFraction;
+            float cutHeight = isRoaming ? mRCutoutHeightFraction : mCutoutHeightFraction;
+            float cutX = (cutWidth * width / VIEWPORT);
+            float cutY = (cutHeight * height / VIEWPORT);
+            mCutoutPath.moveTo(width, height);
+            mCutoutPath.rLineTo(-cutX, 0);
+            mCutoutPath.rLineTo(0, -cutY);
+            mCutoutPath.rLineTo(cutX, 0);
+            mCutoutPath.rLineTo(0, cutY);
+            canvas.drawPath(mCutoutPath, mTransparentPaint);
+            canvas.drawPath(isRoaming ? mScaledRoamingPath : mScaledAttributionPath,
+                    mForegroundPaint);
         }
         if (isRtl) {
             canvas.restore();
@@ -321,10 +372,13 @@ public static int getState(int fullState) {
         return (fullState & STATE_MASK) >> STATE_SHIFT;
     }
 
+    public static int getState(int level, int numLevels, boolean cutOut, boolean roaming) {
+        int state = cutOut ? (roaming ? STATE_CUT_AND_R : STATE_CUT) : (roaming ? STATE_R : 0);
+        return (state << STATE_SHIFT) | (numLevels << NUM_LEVEL_SHIFT) | level;
+    }
+
     public static int getState(int level, int numLevels, boolean cutOut) {
-        return ((cutOut ? STATE_CUT : 0) << STATE_SHIFT)
-                | (numLevels << NUM_LEVEL_SHIFT)
-                | level;
+        return getState(level, numLevels, cutOut, false);
     }
 
     @Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
index cf52eb3ab0602..aea4118eb48dc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
+++ b/packages/SettingsLib/src/com/android/settingslib/mobile/MobileMappings.java
@@ -67,7 +67,7 @@ public static String toDisplayIconKey(@Annotation.OverrideNetworkType int displa
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO:
                 return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus";
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA:
-                return toIconKey(TelephonyManager.NETWORK_TYPE_NR);
+                return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_NSA";
             case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED:
                 return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_Plus";
             default:
@@ -204,7 +204,7 @@ public static Map<String, MobileIconGroup> mapIconSets(Config config) {
                 config.mobileIconGroup5gPlus);
         networkToIconLookup.put(toIconKey(
                 TelephonyManager.NETWORK_TYPE_NR),
-                TelephonyIcons.NR_5G);
+                TelephonyIcons.NR_5G_SA);
         return networkToIconLookup;
     }
 
diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java
index 615c05addd14c..7ddca6c0fc434 100644
--- a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java
+++ b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java
@@ -56,6 +56,8 @@ public class TelephonyIcons {
             flagged(R.drawable.ic_1x_mobiledata, R.drawable.ic_1x_mobiledata_updated);
     public static final int ICON_5G =
             flagged(R.drawable.ic_5g_mobiledata, R.drawable.ic_5g_mobiledata_updated);
+    public static final int ICON_5G_SA =
+            flagged(R.drawable.ic_5g_sa_mobiledata, R.drawable.ic_5g_sa_mobiledata_updated);
     public static final int ICON_5G_PLUS =
             flagged(R.drawable.ic_5g_plus_mobiledata, R.drawable.ic_5g_plus_mobiledata_updated);
     public static final int ICON_CWF =
@@ -169,6 +171,11 @@ private static int flagged(int oldIcon, int newIcon) {
             TelephonyIcons.ICON_5G
     );
 
+    public static final MobileIconGroup NR_5G_SA = new MobileIconGroup(
+            "5G SA",
+            R.string.data_connection_5g_sa,
+            TelephonyIcons.ICON_5G_SA);
+
     public static final MobileIconGroup NR_5G_PLUS = new MobileIconGroup(
             "5G_PLUS",
             R.string.data_connection_5g_plus,
@@ -217,6 +224,7 @@ private static int flagged(int oldIcon, int newIcon) {
         ICON_NAME_TO_ICON.put("lte", LTE);
         ICON_NAME_TO_ICON.put("lte+", LTE_PLUS);
         ICON_NAME_TO_ICON.put("5g", NR_5G);
+        ICON_NAME_TO_ICON.put("5gsa", NR_5G_SA);
         ICON_NAME_TO_ICON.put("5g_plus", NR_5G_PLUS);
         ICON_NAME_TO_ICON.put("datadisable", DATA_DISABLED);
         ICON_NAME_TO_ICON.put("notdefaultdata", NOT_DEFAULT_DATA);
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
index d088c3be3857f..503516f24a411 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
@@ -23,9 +23,11 @@
 import android.app.usage.NetworkStats.Bucket;
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
+import android.net.ConnectivityManager;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
+import android.net.wifi.WifiManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.format.DateUtils;
@@ -36,9 +38,14 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
 
+import java.time.DayOfWeek;
 import java.time.ZonedDateTime;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.WeekFields;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Set;
 
 public class DataUsageController {
 
@@ -52,6 +59,7 @@ public class DataUsageController {
     private final Context mContext;
     private final NetworkPolicyManager mPolicyManager;
     private final NetworkStatsManager mNetworkStatsManager;
+    private final WifiManager mWifiManager;
 
     private Callback mCallback;
     private NetworkNameProvider mNetworkController;
@@ -61,6 +69,7 @@ public DataUsageController(Context context) {
         mContext = context;
         mPolicyManager = NetworkPolicyManager.from(mContext);
         mNetworkStatsManager = context.getSystemService(NetworkStatsManager.class);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
 
@@ -94,6 +103,55 @@ private DataUsageInfo warn(String msg) {
         return null;
     }
 
+    public DataUsageInfo getDataUsageInfo() {
+        NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
+
+        return getDataUsageInfo(template);
+    }
+
+    public DataUsageInfo getDailyDataUsageInfo() {
+        NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
+
+        return getDailyDataUsageInfo(template);
+    }
+
+    public DataUsageInfo getWeeklyDataUsageInfo() {
+        NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
+
+        return getWeeklyDataUsageInfo(template);
+    }
+
+    public DataUsageInfo getWifiDataUsageInfo() {
+        return getWifiDataUsageInfo(false);
+    }
+
+    public DataUsageInfo getWifiDataUsageInfo(boolean currentNetwork) {
+        return getDataUsageInfo(getWifiNetworkTemplate(currentNetwork));
+    }
+
+    public DataUsageInfo getWifiDailyDataUsageInfo(boolean currentNetwork) {
+        return getDailyDataUsageInfo(getWifiNetworkTemplate(currentNetwork));
+    }
+
+    public DataUsageInfo getWifiWeeklyDataUsageInfo(boolean currentNetwork) {
+        return getWeeklyDataUsageInfo(getWifiNetworkTemplate(currentNetwork));
+    }
+
+    public NetworkTemplate getWifiNetworkTemplate(boolean currentNetwork) {
+        final NetworkTemplate.Builder builder =
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI);
+        if (currentNetwork) {
+            final var info = mWifiManager.getConnectionInfo();
+            if (info != null) {
+                final String networkKey = info.getNetworkKey();
+                if (networkKey != null && !networkKey.isEmpty()) {
+                    builder.setWifiNetworkKeys(Set.of(networkKey));
+                }
+            }
+        }
+        return builder.build();
+    }
+
     public DataUsageInfo getDataUsageInfo(NetworkTemplate template) {
         final NetworkPolicy policy = findNetworkPolicy(template);
         final long now = System.currentTimeMillis();
@@ -125,7 +183,77 @@ public DataUsageInfo getDataUsageInfo(NetworkTemplate template) {
         } else {
             usage.warningLevel = getDefaultWarningLevel();
         }
-        if (mNetworkController != null) {
+        if (usage != null && mNetworkController != null) {
+            usage.carrier = mNetworkController.getMobileDataNetworkName();
+        }
+        return usage;
+    }
+
+    public DataUsageInfo getDailyDataUsageInfo(NetworkTemplate template) {
+        final NetworkPolicy policy = findNetworkPolicy(template);
+        final long end = System.currentTimeMillis();
+        long start = end - DataUsageUtils.getTodayMillis();
+
+        final long totalBytes = getUsageLevel(template, start, end);
+        if (totalBytes < 0L) {
+            return warn("no entry data");
+        }
+        final DataUsageInfo usage = new DataUsageInfo();
+        usage.startDate = start;
+        usage.usageLevel = totalBytes;
+        usage.period = formatDateRange(start, end);
+        usage.cycleStart = start;
+        usage.cycleEnd = end;
+
+        if (policy != null) {
+            usage.limitLevel = policy.limitBytes > 0 ? policy.limitBytes : 0;
+            usage.warningLevel = policy.warningBytes > 0 ? policy.warningBytes : 0;
+        } else {
+            usage.warningLevel = getDefaultWarningLevel();
+        }
+        if (usage != null && mNetworkController != null) {
+            usage.carrier = mNetworkController.getMobileDataNetworkName();
+        }
+        return usage;
+    }
+
+    private long[] getWeekToDateWindowMillis() {
+        final ZoneId zone = ZoneId.systemDefault();
+        final DayOfWeek weekStart = WeekFields.of(Locale.getDefault()).getFirstDayOfWeek();
+
+        final ZonedDateTime now = ZonedDateTime.now(zone);
+        final ZonedDateTime startOfWeek =
+                now.with(TemporalAdjusters.previousOrSame(weekStart))
+                   .toLocalDate()
+                   .atStartOfDay(zone);
+
+        return new long[] { startOfWeek.toInstant().toEpochMilli(), now.toInstant().toEpochMilli() };
+    }
+
+    public DataUsageInfo getWeeklyDataUsageInfo(NetworkTemplate template) {
+        final NetworkPolicy policy = findNetworkPolicy(template);
+        final long[] win = getWeekToDateWindowMillis();
+        final long start = win[0];
+        final long end = win[1];
+
+        final long totalBytes = getUsageLevel(template, start, end);
+        if (totalBytes < 0L) {
+            return warn("no entry data");
+        }
+        DataUsageInfo usage = new DataUsageInfo();
+        usage.startDate = start;
+        usage.usageLevel = totalBytes;
+        usage.period = formatDateRange(start, end);
+        usage.cycleStart = start;
+        usage.cycleEnd = end;
+
+        if (policy != null) {
+            usage.limitLevel = policy.limitBytes > 0 ? policy.limitBytes : 0;
+            usage.warningLevel = policy.warningBytes > 0 ? policy.warningBytes : 0;
+        } else {
+            usage.warningLevel = getDefaultWarningLevel();
+        }
+        if (usage != null && mNetworkController != null) {
             usage.carrier = mNetworkController.getMobileDataNetworkName();
         }
         return usage;
@@ -158,7 +286,9 @@ private NetworkPolicy findNetworkPolicy(NetworkTemplate template) {
         if (mPolicyManager == null || template == null) return null;
         final NetworkPolicy[] policies = mPolicyManager.getNetworkPolicies();
         if (policies == null) return null;
-        for (final NetworkPolicy policy : policies) {
+        final int N = policies.length;
+        for (int i = 0; i < N; i++) {
+            final NetworkPolicy policy = policies[i];
             if (policy != null && template.equals(policy.template)) {
                 return policy;
             }
@@ -166,6 +296,17 @@ private NetworkPolicy findNetworkPolicy(NetworkTemplate template) {
         return null;
     }
 
+    private static String statsBucketToString(Bucket bucket) {
+        return bucket == null ? null : new StringBuilder("Entry[")
+            .append("bucketDuration=").append(bucket.getEndTimeStamp() - bucket.getStartTimeStamp())
+            .append(",bucketStart=").append(bucket.getStartTimeStamp())
+            .append(",rxBytes=").append(bucket.getRxBytes())
+            .append(",rxPackets=").append(bucket.getRxPackets())
+            .append(",txBytes=").append(bucket.getTxBytes())
+            .append(",txPackets=").append(bucket.getTxPackets())
+            .append(']').toString();
+    }
+
     @VisibleForTesting
     public TelephonyManager getTelephonyManager() {
         int subscriptionId = mSubscriptionId;
@@ -183,8 +324,8 @@ public TelephonyManager getTelephonyManager() {
             }
         }
 
-        return mContext.getSystemService(TelephonyManager.class)
-                .createForSubscriptionId(subscriptionId);
+        return mContext.getSystemService(
+                TelephonyManager.class).createForSubscriptionId(subscriptionId);
     }
 
     public void setMobileDataEnabled(boolean enabled) {
@@ -205,6 +346,28 @@ public boolean isMobileDataEnabled() {
         return getTelephonyManager().isDataEnabled();
     }
 
+    static int getNetworkType(NetworkTemplate networkTemplate) {
+        if (networkTemplate == null) {
+            return ConnectivityManager.TYPE_NONE;
+        }
+        final int matchRule = networkTemplate.getMatchRule();
+        switch (matchRule) {
+            case NetworkTemplate.MATCH_MOBILE:
+                return ConnectivityManager.TYPE_MOBILE;
+            case NetworkTemplate.MATCH_WIFI:
+                return  ConnectivityManager.TYPE_WIFI;
+            case NetworkTemplate.MATCH_ETHERNET:
+                return  ConnectivityManager.TYPE_ETHERNET;
+            default:
+                return ConnectivityManager.TYPE_MOBILE;
+        }
+    }
+
+    private String getActiveSubscriberId() {
+        final String actualSubscriberId = getTelephonyManager().getSubscriberId();
+        return actualSubscriberId;
+    }
+
     private String formatDateRange(long start, long end) {
         final int flags = FORMAT_SHOW_DATE | FORMAT_ABBREV_MONTH;
         synchronized (PERIOD_BUILDER) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java
new file mode 100644
index 0000000000000..bfb31e0a8a162
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settingslib.net;
+
+import android.content.Context;
+import android.net.NetworkStats;
+import android.net.NetworkTemplate;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.format.Time;
+import android.util.Log;
+
+import com.android.internal.util.ArrayUtils;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Utils class for data usage
+ */
+public class DataUsageUtils {
+    private static final String TAG = "DataUsageUtils";
+
+    /**
+     * Return mobile NetworkTemplate based on {@code subId}
+     */
+    public static NetworkTemplate getMobileTemplate(Context context, int subId) {
+        final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+        final int mobileDefaultSubId = telephonyManager.getSubscriptionId();
+
+        final SubscriptionManager subscriptionManager =
+                context.getSystemService(SubscriptionManager.class);
+        final List<SubscriptionInfo> subInfoList =
+                subscriptionManager.getAvailableSubscriptionInfoList();
+        if (subInfoList == null) {
+            Log.i(TAG, "Subscription is not inited: " + subId);
+            return getMobileTemplateForSubId(telephonyManager, mobileDefaultSubId);
+        }
+
+        for (SubscriptionInfo subInfo : subInfoList) {
+            if ((subInfo != null) && (subInfo.getSubscriptionId() == subId)) {
+                return getNormalizedMobileTemplate(telephonyManager, subId);
+            }
+        }
+        Log.i(TAG, "Subscription is not active: " + subId);
+        return getMobileTemplateForSubId(telephonyManager, mobileDefaultSubId);
+    }
+
+    private static NetworkTemplate getNormalizedMobileTemplate(
+            TelephonyManager telephonyManager, int subId) {
+        final NetworkTemplate mobileTemplate = getMobileTemplateForSubId(telephonyManager, subId);
+        final String[] mergedSubscriberIds = telephonyManager
+                .createForSubscriptionId(subId).getMergedImsisFromGroup();
+        if (ArrayUtils.isEmpty(mergedSubscriberIds)) {
+            Log.i(TAG, "mergedSubscriberIds is null.");
+            return mobileTemplate;
+        }
+
+        return normalizeMobileTemplate(mobileTemplate, Set.of(mergedSubscriberIds));
+    }
+
+    private static NetworkTemplate normalizeMobileTemplate(
+            NetworkTemplate template, Set<String> mergedSet) {
+        if (template.getSubscriberIds().isEmpty()) return template;
+        // The input template should have at most 1 subscriberId.
+        final String subscriberId = template.getSubscriberIds().iterator().next();
+
+        if (mergedSet.contains(subscriberId)) {
+            // Requested template subscriber is part of the merge group; return
+            // a template that matches all merged subscribers.
+            return new NetworkTemplate.Builder(template.getMatchRule())
+                    .setSubscriberIds(mergedSet)
+                    .setWifiNetworkKeys(template.getWifiNetworkKeys())
+                    .setMeteredness(NetworkStats.METERED_YES).build();
+        }
+
+        return template;
+    }
+
+    private static NetworkTemplate getMobileTemplateForSubId(
+            TelephonyManager telephonyManager, int subId) {
+        // Create template that matches any mobile network when the subscriberId is null.
+        String subscriberId = telephonyManager.getSubscriberId(subId);
+        return subscriberId != null
+                ? new NetworkTemplate.Builder(NetworkTemplate.MATCH_CARRIER)
+                .setSubscriberIds(Set.of(subscriberId))
+                .setMeteredness(NetworkStats.METERED_YES)
+                .build()
+                : new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                        .setMeteredness(NetworkStats.METERED_YES)
+                        .build();
+    }
+
+    /**
+     * Returns today's passed time in Millisecond
+     */
+    public static long getTodayMillis() {
+        final long passedMillis;
+        Time time = new Time();
+        time.set(System.currentTimeMillis());
+        passedMillis = ((time.hour * 60 * 60) + (time.minute * 60) + time.second) * 1000;
+        return passedMillis;
+    }
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
index 1d2b3ed11e1cb..2162108c1e0eb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
+++ b/packages/SettingsLib/src/com/android/settingslib/volume/data/repository/AudioRepository.kt
@@ -144,7 +144,7 @@ class AudioRepositoryImpl(
 
     override val ringerMode: StateFlow<RingerMode> =
         audioManagerEventsReceiver.events
-            .filterIsInstance(AudioManagerEvent.InternalRingerModeChanged::class)
+            .filterIsInstance<AudioManagerEvent.InternalRingerModeChanged>()
             .map { RingerMode(audioManager.ringerModeInternal) }
             .onStart { emit(RingerMode(audioManager.ringerModeInternal)) }
             .flowOn(backgroundCoroutineContext)
diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml
index 79677eeac4296..167aca81e2f78 100644
--- a/packages/SettingsProvider/AndroidManifest.xml
+++ b/packages/SettingsProvider/AndroidManifest.xml
@@ -12,7 +12,7 @@
                  android:backupAgent="SettingsBackupAgent"
                  android:killAfterRestore="false"
                  android:restoreAnyVersion="true"
-                 android:icon="@mipmap/ic_launcher_settings"
+                 android:icon="@drawable/ic_launcher_settings"
                  android:defaultToDeviceProtectedStorage="true"
                  android:forceQueryable="true"
                  android:directBootAware="true">
diff --git a/packages/SettingsProvider/res/drawable/ic_launcher_background.xml b/packages/SettingsProvider/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index fa5cbd9d504be..0000000000000
--- a/packages/SettingsProvider/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#167C80"/>
-</vector>
diff --git a/packages/SettingsProvider/res/drawable/ic_launcher_foreground.xml b/packages/SettingsProvider/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 416693e860151..0000000000000
--- a/packages/SettingsProvider/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M57.538,32C58.424,32 59.162,32.683 59.23,33.567L59.324,34.795C59.474,36.744 60.817,38.369 62.508,39.349C64.199,40.33 66.252,40.661 68.015,39.816L69.128,39.283C69.928,38.899 70.889,39.196 71.332,39.965L74.837,46.034C75.28,46.803 75.058,47.784 74.325,48.285L73.309,48.981C71.696,50.085 70.955,52.045 70.955,54C70.955,55.955 71.696,57.915 73.309,59.019L74.325,59.714C75.058,60.216 75.28,61.197 74.837,61.966L71.332,68.035C70.889,68.803 69.928,69.101 69.128,68.717L68.015,68.184C66.252,67.339 64.199,67.67 62.508,68.651C60.817,69.631 59.474,71.257 59.324,73.205L59.23,74.433C59.162,75.317 58.424,76 57.538,76H50.527C49.64,76 48.903,75.317 48.835,74.433L48.74,73.205C48.59,71.257 47.247,69.631 45.556,68.651C43.865,67.67 41.812,67.339 40.049,68.184L38.936,68.717C38.136,69.101 37.175,68.803 36.732,68.035L33.228,61.966C32.784,61.197 33.007,60.216 33.739,59.714L34.755,59.019C36.368,57.914 37.109,55.955 37.109,54C37.109,52.045 36.368,50.086 34.755,48.981L33.739,48.286C33.007,47.784 32.784,46.803 33.228,46.034L36.732,39.965C37.175,39.196 38.136,38.899 38.936,39.283L40.049,39.816C41.812,40.661 43.865,40.33 45.556,39.349C47.247,38.369 48.59,36.744 48.74,34.795L48.835,33.567C48.903,32.683 49.64,32 50.527,32H57.538ZM54.032,69.231C62.444,69.231 69.263,62.412 69.263,54C69.263,45.588 62.444,38.769 54.032,38.769C45.62,38.769 38.801,45.588 38.801,54C38.801,62.412 45.62,69.231 54.032,69.231Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
diff --git a/packages/SettingsProvider/res/drawable/ic_launcher_settings.xml b/packages/SettingsProvider/res/drawable/ic_launcher_settings.xml
new file mode 100644
index 0000000000000..9ede59d3c7bc4
--- /dev/null
+++ b/packages/SettingsProvider/res/drawable/ic_launcher_settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_launcher_setting_color"/>
+    <foreground android:drawable="@mipmap/ic_launcher_settings"/>
+</adaptive-icon>
diff --git a/packages/SettingsProvider/res/mipmap-anydpi/ic_launcher_settings.xml b/packages/SettingsProvider/res/mipmap-anydpi/ic_launcher_settings.xml
deleted file mode 100644
index 3d90bc5c3365d..0000000000000
--- a/packages/SettingsProvider/res/mipmap-anydpi/ic_launcher_settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
diff --git a/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000..ddce98e04e44c
Binary files /dev/null and b/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png differ
diff --git a/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000..86f3be86ab547
Binary files /dev/null and b/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png differ
diff --git a/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000..360aa696792fb
Binary files /dev/null and b/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png differ
diff --git a/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000..7cb67a92b2410
Binary files /dev/null and b/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png differ
diff --git a/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000000000..3fec9c491bfaf
Binary files /dev/null and b/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png differ
diff --git a/packages/SettingsProvider/res/values/matrixx_colors.xml b/packages/SettingsProvider/res/values/matrixx_colors.xml
new file mode 100644
index 0000000000000..2b4d76f1b018c
--- /dev/null
+++ b/packages/SettingsProvider/res/values/matrixx_colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <!-- launcher icon color -->
+    <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
+</resources>
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
index 28c113b8d90c3..b451c1498db07 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
@@ -278,7 +278,7 @@ public class SecureSettings {
         Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER,
         Settings.Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED,
         Settings.Secure.HINGE_ANGLE_LIDEVENT_ENABLED,
-        Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,
+        Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED,
         Settings.Secure.HEARING_AID_RINGTONE_ROUTING,
         Settings.Secure.HEARING_AID_CALL_ROUTING,
         Settings.Secure.HEARING_AID_MEDIA_ROUTING,
@@ -328,5 +328,8 @@ public class SecureSettings {
         Settings.Secure.IDENTITY_CHECK_PROMO_CARD_SHOWN,
         Settings.Secure.IDENTITY_CHECK_NOTIFICATION_VIEW_DETAILS_CLICKED,
         Settings.Secure.NOTIFICATION_BUNDLES_ALWAYS_EXPAND,
+        Settings.Secure.DOZE_DOUBLE_TAP_GESTURE_VIBRATE,
+        Settings.Secure.DOZE_TAP_GESTURE_VIBRATE,
+        Settings.Secure.DOZE_PICK_UP_GESTURE_VIBRATE,
     };
 }
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
index c32489fafa825..f0c7c367715d3 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
@@ -129,7 +129,8 @@ private static String[] getSettingsToBackUp() {
                 Settings.System.PREFERRED_REGION,
                 Settings.System.CV_ENABLED,
                 Settings.System.CV_DYNAMIC_ENABLED,
-                Settings.System.CV_PREFERRED_INTENSITY
+                Settings.System.CV_PREFERRED_INTENSITY,
+                Settings.System.NAVBAR_LONG_PRESS_GESTURE
         ));
         if (Flags.backUpSmoothDisplayAndForcePeakRefreshRate()) {
             settings.add(Settings.System.PEAK_REFRESH_RATE);
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
index a7508c30f8c01..b912e58a9caa9 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
@@ -449,7 +449,7 @@ public class SecureSettingsValidators {
                 Secure.BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS, ANY_STRING_VALIDATOR);
         VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR);
         VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);
-        VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);
+        VALIDATORS.put(Secure.LOCKSCREEN_SMARTSPACE_ENABLED, BOOLEAN_VALIDATOR);
         VALIDATORS.put(Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR);
         VALIDATORS.put(Secure.HINGE_ANGLE_LIDEVENT_ENABLED, BOOLEAN_VALIDATOR);
         VALIDATORS.put(Secure.HEARING_AID_RINGTONE_ROUTING,
@@ -521,5 +521,8 @@ public class SecureSettingsValidators {
                 new InclusiveIntegerRangeValidator(0, 1));
         VALIDATORS.put(Secure.IDENTITY_CHECK_NOTIFICATION_VIEW_DETAILS_CLICKED,
                 new InclusiveIntegerRangeValidator(0, 1));
+        VALIDATORS.put(Secure.DOZE_DOUBLE_TAP_GESTURE_VIBRATE, BOOLEAN_VALIDATOR);
+        VALIDATORS.put(Secure.DOZE_TAP_GESTURE_VIBRATE, BOOLEAN_VALIDATOR);
+        VALIDATORS.put(Secure.DOZE_PICK_UP_GESTURE_VIBRATE, BOOLEAN_VALIDATOR);
     }
 }
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
index a8d1f9f10e78e..c8bbc8e9696b3 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
@@ -277,6 +277,7 @@ public boolean validate(@Nullable String value) {
         VALIDATORS.put(System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, BOOLEAN_VALIDATOR);
         VALIDATORS.put(System.PREFERRED_REGION, ANY_STRING_VALIDATOR);
         VALIDATORS.put(System.CV_ENABLED, new InclusiveIntegerRangeValidator(0, 1));
+        VALIDATORS.put(System.NAVBAR_LONG_PRESS_GESTURE, BOOLEAN_VALIDATOR);
         VALIDATORS.put(System.CV_DYNAMIC_ENABLED, new InclusiveIntegerRangeValidator(0, 1));
         VALIDATORS.put(
                 System.CV_PREFERRED_INTENSITY,
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index f80b7120fcbd1..2f6a8eadfd147 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -237,6 +237,7 @@ public void restoreValue(Context context, ContentResolver cr, ContentValues cont
             } else if (isAlreadyConfiguredCriticalAccessibilitySetting(name)) {
                 return;
             } else if (Settings.System.RINGTONE.equals(name)
+                    || Settings.System.RINGTONE2.equals(name)
                     || Settings.System.NOTIFICATION_SOUND.equals(name)
                     || Settings.System.ALARM_ALERT.equals(name)) {
                 setRingtone(name, value);
@@ -346,11 +347,12 @@ private boolean shouldSkipAutoRotateRestore() {
 
     public String onBackupValue(String name, String value) {
         // Special processing for backing up ringtones & notification sounds
-        if (Settings.System.RINGTONE.equals(name)
+        if (Settings.System.RINGTONE.equals(name) || Settings.System.RINGTONE2.equals(name)
                 || Settings.System.NOTIFICATION_SOUND.equals(name)
                 || Settings.System.ALARM_ALERT.equals(name)) {
             if (value == null) {
-                if (Settings.System.RINGTONE.equals(name)) {
+                if (Settings.System.RINGTONE.equals(name)
+                        || Settings.System.RINGTONE2.equals(name)) {
                     // For ringtones, we need to distinguish between non-telephony vs telephony
                     if (mTelephonyManager != null && mTelephonyManager.isVoiceCapable()) {
                         // Backup a null ringtone as silent on voice-capable devices
@@ -407,7 +409,7 @@ public boolean isReplacedSystemSetting(String setting) {
     /**
      * Sets the ringtone of type specified by the name.
      *
-     * @param name should be Settings.System.RINGTONE, Settings.System.NOTIFICATION_SOUND
+     * @param name should be Settings.System.RINGTONE, Settings.System.RINGTONE2, Settings.System.NOTIFICATION_SOUND
      * or Settings.System.ALARM_ALERT.
      * @param value can be a canonicalized uri or "_silent" to indicate a silent (null) ringtone.
      */
@@ -460,6 +462,8 @@ private int getRingtoneType(String name) {
         switch (name) {
             case Settings.System.RINGTONE:
                 return RingtoneManager.TYPE_RINGTONE;
+            case Settings.System.RINGTONE2:
+                return RingtoneManager.TYPE_RINGTONE;
             case Settings.System.NOTIFICATION_SOUND:
                 return RingtoneManager.TYPE_NOTIFICATION;
             case Settings.System.ALARM_ALERT:
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 4ef9e9ebf6596..b66bc6211f598 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2988,9 +2988,15 @@ private static void dumpProtoSystemSettingsLocked(
         dumpSetting(s, p,
                 Settings.System.RINGTONE,
                 SystemSettingsProto.Ringtone.DEFAULT_URI);
+        dumpSetting(s, p,
+                Settings.System.RINGTONE2,
+                SystemSettingsProto.Ringtone.DEFAULT_URI);
         dumpSetting(s, p,
                 Settings.System.RINGTONE_CACHE,
                 SystemSettingsProto.Ringtone.CACHE);
+        dumpSetting(s, p,
+                Settings.System.RINGTONE2_CACHE,
+                SystemSettingsProto.Ringtone.CACHE);
         p.end(ringtoneToken);
 
         final long rotationToken = p.start(SystemSettingsProto.ROTATION);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 1231f56326491..1eef12d754701 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -50,6 +50,7 @@
 import android.annotation.UserIdInt;
 import android.app.ActivityManager;
 import android.app.AppGlobals;
+import android.app.AxSandboxManager;
 import android.app.backup.BackupManager;
 import android.app.compat.CompatChanges;
 import android.app.job.JobInfo;
@@ -262,6 +263,7 @@ public class SettingsProvider extends ContentProvider {
     public static final String SETTINGS_PROVIDER_JOBS_NS = "SettingsProviderJobsNamespace";
     // Used for scheduling jobs to make a copy for the settings files
     public static final int WRITE_FALLBACK_SETTINGS_FILES_JOB_ID = 1;
+    public static final String EXTRA_FILE_PATHS = "file_paths";
     public static final long ONE_DAY_INTERVAL_MILLIS = 24 * 60 * 60 * 1000L;
 
     // Overlay specified settings allowlisted for Instant Apps
@@ -446,6 +448,13 @@ public boolean onCreate() {
     public Bundle call(String method, String name, Bundle args) {
         final @CanBeCURRENT @UserIdInt int requestingUserId = getRequestingUserId(args);
         final int callingDeviceId = getDeviceId();
+        if (method != null && method.startsWith("GET_")) {
+            String spoofed = getSpoofedValue(name);
+            if (spoofed != null) {
+                return Bundle.forPair(Settings.NameValueTable.VALUE, spoofed);
+            }
+        }
+
         switch (method) {
             case Settings.CALL_METHOD_GET_CONFIG -> {
                 Setting setting = getConfigSetting(name);
@@ -618,6 +627,27 @@ public Bundle call(String method, String name, Bundle args) {
         return null;
     }
 
+    private String getSpoofedValue(String name) {
+        String callingPackage = getCallingPackage();
+        if (callingPackage == null) return null;
+
+        if (callingPackage.startsWith("com.android.")
+                || callingPackage.startsWith("com.google.android.")) {
+            return null;
+        }
+        
+        String settings = null;
+        try {
+            AxSandboxManager sandboxManager =
+                    getContext().getSystemService(AxSandboxManager.class);
+            if (sandboxManager != null) {
+                settings = sandboxManager.getSpoofedSetting(callingPackage, name);
+            }
+        } catch (Exception e) {}
+        
+        return settings;
+    }
+
     @Override
     public String getType(Uri uri) {
         Arguments args = new Arguments(uri, null, null, true);
@@ -643,6 +673,18 @@ public Cursor query(Uri uri, String[] projection, String where, String[] whereAr
             return new MatrixCursor(normalizedProjection, 0);
         }
 
+        if (args.name != null) {
+            String spoofed = getSpoofedValue(args.name);
+            if (spoofed != null) {
+                synchronized (mLock) {
+                    SettingsState state = mSettingsRegistry.getSettingsLocked(
+                            SettingsState.SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT);
+                    SettingsState.Setting s = state.new Setting(args.name, spoofed, true, null, null);
+                    return packageSettingForQuery(s, normalizedProjection);
+                }
+            }
+        }
+
         final int callingDeviceId = getDeviceId();
         switch (args.table) {
             case TABLE_GLOBAL -> {
@@ -853,6 +895,8 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
         final String cacheRingtoneSetting;
         if (Settings.System.RINGTONE_CACHE_URI.equals(uri)) {
             cacheRingtoneSetting = Settings.System.RINGTONE;
+        } else if (Settings.System.RINGTONE2_CACHE_URI.equals(uri)) {
+            cacheRingtoneSetting = Settings.System.RINGTONE2;
         } else if (Settings.System.NOTIFICATION_SOUND_CACHE_URI.equals(uri)) {
             cacheRingtoneSetting = Settings.System.NOTIFICATION_SOUND;
         } else if (Settings.System.ALARM_ALERT_CACHE_URI.equals(uri)) {
@@ -870,6 +914,8 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
     private String getCacheName(String setting) {
         if (Settings.System.RINGTONE.equals(setting)) {
             return Settings.System.RINGTONE_CACHE;
+        } else if (Settings.System.RINGTONE2.equals(setting)) {
+            return Settings.System.RINGTONE2_CACHE;
         } else if (Settings.System.NOTIFICATION_SOUND.equals(setting)) {
             return Settings.System.NOTIFICATION_SOUND_CACHE;
         } else if (Settings.System.ALARM_ALERT.equals(setting)) {
@@ -1062,6 +1108,9 @@ public void onReceive(Context context, Intent intent) {
                                         deviceId);
                             }
                         }
+                        // When adding a new user,
+                        // the job must be reset to ensure that backups are performed for the new user as well.
+                        scheduleWriteFallbackFilesJob(true);
                     }
                     case Intent.ACTION_USER_REMOVED -> {
                         synchronized (mLock) {
@@ -1071,6 +1120,7 @@ public void onReceive(Context context, Intent intent) {
                                         true);
                             }
                         }
+                        // The single fallback job will pick up the user removal on its next run.
                     }
                 }
             }
@@ -1251,9 +1301,10 @@ private boolean insertConfigSetting(String name, String value, boolean makeDefau
             Slog.v(LOG_TAG, "setAllConfigSettings for prefix: " + prefix);
         }
 
-        enforceDeviceConfigWritePermission(getContext(), keyValues.keySet());
         final String callingPackage = resolveCallingPackage();
 
+        enforceDeviceConfigWritePermission(getContext(), keyValues.keySet());
+
         synchronized (mLock) {
             if (getSyncDisabledModeConfigLocked() != SYNC_DISABLED_MODE_NONE) {
                 Slog.v(LOG_TAG, "did not write settings for prefix '"
@@ -2541,7 +2592,7 @@ private void enforceHasAtLeastOnePermission(String ...permissions) {
                 return;
             }
         }
-        throw new SecurityException("Permission denial, must have one of: "
+        throw new SecurityException("Permission denial: " + resolveCallingPackage() + " must have one of: "
             + Arrays.toString(permissions));
     }
 
@@ -2570,6 +2621,13 @@ private void enforceDeviceConfigWritePermission(
                 context.checkCallingOrSelfPermission(
                 Manifest.permission.WRITE_DEVICE_CONFIG)
                 == PackageManager.PERMISSION_GRANTED;
+        boolean isRoot = Binder.getCallingUid() == Process.ROOT_UID;
+        String callingPackage = resolveCallingPackage();
+
+        if (isRoot || callingPackage.equals("com.google.android.gms")) {
+             return;
+         }
+
         // Only the shell user and tests request the allowlist permission; this is used to force
         // the WRITE_ALLOWLISTED_DEVICE_CONFIG path to log any flags that need to be allowlisted.
         boolean isRestrictedShell = android.security.Flags.protectDeviceConfigFlags()
@@ -3153,45 +3211,63 @@ private static String computeTableForSetting(Uri uri, String name) {
     /**
      * Schedule the job service to make a copy of all the settings files.
      */
-    public void scheduleWriteFallbackFilesJob() {
+    public void scheduleWriteFallbackFilesJob(boolean forceReschedule) {
         final Context context = getContext();
-        JobScheduler jobScheduler =
-                (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+        JobScheduler jobScheduler = context.getSystemService(JobScheduler.class);
         if (jobScheduler == null) {
             // Might happen: SettingsProvider is created before JobSchedulerService in system server
             return;
         }
-        jobScheduler = jobScheduler.forNamespace(SETTINGS_PROVIDER_JOBS_NS);
-        // Check if the job is already scheduled. If so, skip scheduling another one
-        if (jobScheduler.getPendingJob(WRITE_FALLBACK_SETTINGS_FILES_JOB_ID) != null) {
+        final JobScheduler namespacedJobScheduler = jobScheduler.forNamespace(
+            SETTINGS_PROVIDER_JOBS_NS);
+
+        // Check if the job is already scheduled. If so, skip scheduling another one.
+        // When adding a new user, the job must be reset.
+        // The contents of the job (file paths) will be regenerated on each run.
+        if (!forceReschedule
+                && namespacedJobScheduler.getPendingJob(WRITE_FALLBACK_SETTINGS_FILES_JOB_ID) != null) {
+            return;
+        }
+        // Back up all settings files for all alive users.
+        // Profile users such as clone profiles or managed profiles also have their own
+        // settings files (secure, system, ssaid). If those files become corrupted and
+        // no fallback exists, readStateSyncLocked() will throw IllegalStateException
+        // and crash system_server on next boot.
+        final List<UserInfo> users = mUserManager.getAliveUsers();
+        if (users.isEmpty()) {
+            Slog.w(LOG_TAG, "No users found to schedule fallback write job for.");
             return;
         }
-        // Back up all settings files.
-        // Note that only default device settings need to be persisted.
+
+        ArrayList<String> allFilePaths = new ArrayList<>();
+        for (UserInfo user : users) {
+            final int userId = user.id;
+            // Global and Config are only for USER_SYSTEM
+            if (userId == UserHandle.USER_SYSTEM) {
+                allFilePaths.add(SettingsRegistry.getSettingsFile(
+                        makeKey(SETTINGS_TYPE_GLOBAL, userId, Context.DEVICE_ID_DEFAULT)).getAbsolutePath());
+                allFilePaths.add(SettingsRegistry.getSettingsFile(
+                        makeKey(SETTINGS_TYPE_CONFIG, userId, Context.DEVICE_ID_DEFAULT)).getAbsolutePath());
+            }
+            allFilePaths.add(SettingsRegistry.getSettingsFile(
+                    makeKey(SETTINGS_TYPE_SYSTEM, userId, Context.DEVICE_ID_DEFAULT)).getAbsolutePath());
+            allFilePaths.add(SettingsRegistry.getSettingsFile(
+                    makeKey(SETTINGS_TYPE_SECURE, userId, Context.DEVICE_ID_DEFAULT)).getAbsolutePath());
+            allFilePaths.add(SettingsRegistry.getSettingsFile(
+                    makeKey(SETTINGS_TYPE_SSAID, userId, Context.DEVICE_ID_DEFAULT)).getAbsolutePath());
+        }
+
         final PersistableBundle bundle = new PersistableBundle();
-        final File globalSettingsFile = SettingsRegistry.getSettingsFile(
-                makeKey(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT));
-        final File systemSettingsFile = SettingsRegistry.getSettingsFile(
-                makeKey(SETTINGS_TYPE_SYSTEM, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT));
-        final File secureSettingsFile = SettingsRegistry.getSettingsFile(
-                makeKey(SETTINGS_TYPE_SECURE, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT));
-        final File ssaidSettingsFile = SettingsRegistry.getSettingsFile(
-                makeKey(SETTINGS_TYPE_SSAID, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT));
-        final File configSettingsFile = SettingsRegistry.getSettingsFile(
-                makeKey(SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM, Context.DEVICE_ID_DEFAULT));
-        bundle.putString(TABLE_GLOBAL, globalSettingsFile.getAbsolutePath());
-        bundle.putString(TABLE_SYSTEM, systemSettingsFile.getAbsolutePath());
-        bundle.putString(TABLE_SECURE, secureSettingsFile.getAbsolutePath());
-        bundle.putString(TABLE_SSAID, ssaidSettingsFile.getAbsolutePath());
-        bundle.putString(TABLE_CONFIG, configSettingsFile.getAbsolutePath());
+        bundle.putStringArray(EXTRA_FILE_PATHS, allFilePaths.toArray(new String[0]));
         // Schedule the job to write the fallback files, once daily when phone is charging
-        jobScheduler.schedule(new JobInfo.Builder(WRITE_FALLBACK_SETTINGS_FILES_JOB_ID,
+        namespacedJobScheduler.schedule(new JobInfo.Builder(WRITE_FALLBACK_SETTINGS_FILES_JOB_ID,
                 new ComponentName(context, WriteFallbackSettingsFilesJobService.class))
                 .setExtras(bundle)
                 .setPeriodic(ONE_DAY_INTERVAL_MILLIS)
                 .setRequiresCharging(true)
                 .setPersisted(true)
                 .build());
+        Slog.i(LOG_TAG, "Scheduled single fallback write job for " + users.size() + " users.");
     }
 
     /**
@@ -4260,7 +4336,8 @@ public void handleMessage(Message msg) {
                     }
                     case MSG_NOTIFY_DATA_CHANGED -> {
                         mBackupManager.dataChanged();
-                        scheduleWriteFallbackFilesJob();
+                        // There is no need to force a job reset when only the data has changed.
+                        scheduleWriteFallbackFilesJob(false);
                     }
                 }
             }
@@ -4758,17 +4835,19 @@ private int onUpgradeLocked(int userId, int deviceId, int oldVersion, int newVer
                         }
 
                         final SettingsState ssaidSettings = getSsaidSettingsLocked(userId);
-                        for (PackageInfo info : packages) {
-                            // Check if the UID already has an entry in the table.
-                            final String uid = Integer.toString(info.applicationInfo.uid);
-                            final Setting ssaid = ssaidSettings.getSettingLocked(uid);
-
-                            if (ssaid.isNull() || ssaid.getValue() == null) {
-                                // Android Id doesn't exist for this package so create it.
-                                ssaidSettings.insertSettingOverrideableByRestoreLocked(
-                                        uid, legacySsaid, null, true, info.packageName);
-                                if (DEBUG) {
-                                    Slog.d(LOG_TAG, "Keep the legacy ssaid for uid=" + uid);
+                        if (ssaidSettings != null) {
+                            for (PackageInfo info : packages) {
+                                // Check if the UID already has an entry in the table.
+                                final String uid = Integer.toString(info.applicationInfo.uid);
+                                final Setting ssaid = ssaidSettings.getSettingLocked(uid);
+
+                                if (ssaid.isNull() || ssaid.getValue() == null) {
+                                    // Android Id doesn't exist for this package so create it.
+                                    ssaidSettings.insertSettingOverrideableByRestoreLocked(
+                                            uid, legacySsaid, null, true, info.packageName);
+                                    if (DEBUG) {
+                                        Slog.d(LOG_TAG, "Keep the legacy ssaid for uid=" + uid);
+                                    }
                                 }
                             }
                         }
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
index 8fabb3a26bf0a..0c26d224ffe29 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -443,7 +443,7 @@ public AconfigdFlagInfo getFlagOverrideToSync(
         // get package name and flag name
         int dotIdx = fullFlagName.lastIndexOf(".");
         if (dotIdx == -1) {
-            Slog.e(LOG_TAG, "invalid override flag name " + name);
+            Slog.w(LOG_TAG, "invalid override flag name " + name);
             return null;
         }
         AconfigdFlagInfo flag = flagInfoDefault.get(fullFlagName);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java b/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
index 91e8bf83b4fa0..17645507a2eab 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
@@ -17,18 +17,12 @@
 package com.android.providers.settings;
 
 import static com.android.providers.settings.SettingsProvider.SETTINGS_PROVIDER_JOBS_NS;
-import static com.android.providers.settings.SettingsProvider.TABLE_CONFIG;
-import static com.android.providers.settings.SettingsProvider.TABLE_GLOBAL;
-import static com.android.providers.settings.SettingsProvider.TABLE_SECURE;
-import static com.android.providers.settings.SettingsProvider.TABLE_SSAID;
-import static com.android.providers.settings.SettingsProvider.TABLE_SYSTEM;
 import static com.android.providers.settings.SettingsProvider.WRITE_FALLBACK_SETTINGS_FILES_JOB_ID;
+import static com.android.providers.settings.SettingsProvider.EXTRA_FILE_PATHS;
 
 import android.app.job.JobParameters;
 import android.app.job.JobService;
-
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 
 /**
  * JobService to make a copy of a list of files, given their paths.
@@ -40,13 +34,10 @@ public boolean onStartJob(final JobParameters params) {
                 || params.getJobId() != WRITE_FALLBACK_SETTINGS_FILES_JOB_ID) {
             return false;
         }
-        final List<String> settingsFiles = new ArrayList<>();
-        settingsFiles.add(params.getExtras().getString(TABLE_GLOBAL, ""));
-        settingsFiles.add(params.getExtras().getString(TABLE_SYSTEM, ""));
-        settingsFiles.add(params.getExtras().getString(TABLE_SECURE, ""));
-        settingsFiles.add(params.getExtras().getString(TABLE_SSAID, ""));
-        settingsFiles.add(params.getExtras().getString(TABLE_CONFIG, ""));
-        SettingsProvider.writeFallBackSettingsFiles(settingsFiles);
+        final String[] filePaths = params.getExtras().getStringArray(EXTRA_FILE_PATHS);
+        if (filePaths != null && filePaths.length > 0) {
+            SettingsProvider.writeFallBackSettingsFiles(Arrays.asList(filePaths));
+        }
         return false;
     }
 
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 5e993fca1e501..0f6062a3719df 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -1072,7 +1072,7 @@
                 android:resource="@xml/file_provider_paths" />
         </provider>
 
-        <provider
+        <!--<provider
             android:name=".BugreportStorageProvider"
             android:authorities="com.android.shell.documents"
             android:grantUriPermissions="true"
@@ -1082,7 +1082,7 @@
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
-        </provider>
+        </provider>-->
 
         <provider
             android:name=".HeapDumpProvider"
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index b41566be77c79..df0039492f532 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -517,6 +517,7 @@ android_library {
     static_libs: [
         "//frameworks/libs/systemui:compilelib",
         "com.android.systemui.pods-api-aosp-handheld",
+        "ax_platform_hooks",
         "SystemUI-res",
         "WifiTrackerLib",
         "WindowManager-Shell",
@@ -592,6 +593,11 @@ android_library {
         "displaylib",
         "aconfig_settings_flags_lib",
         "vendor.lineage.powershare-V1-java",
+        "FadingEdgeLayoutLib",
+        "smartspace-proto-java",
+        "smartspace-proto-lite-java",
+        "ax_compose",
+        "axquicklook-client",
     ],
     javacflags: [
         "-Aroom.schemaLocation=frameworks/base/packages/SystemUI/schemas",
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 5cc3fbf309000..5cf52aab703a4 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -48,7 +48,6 @@
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />
     <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
@@ -99,6 +98,12 @@
     <uses-permission android:name="android.permission.OBSERVE_SENSOR_PRIVACY" />
     <uses-permission android:name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT" />
 
+    <!-- Ambient indication (Now Playing) -->
+    <permission
+        android:name="com.google.android.ambientindication.permission.AMBIENT_INDICATION"
+        android:protectionLevel="signature|privileged" />
+    <uses-permission android:name="com.google.android.ambientindication.permission.AMBIENT_INDICATION" />
+
     <!-- ActivityManager -->
     <uses-permission android:name="android.permission.REAL_GET_TASKS" />
     <uses-permission android:name="android.permission.GET_DETAILED_TASKS" />
@@ -211,6 +216,9 @@
     <permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI"
         android:protectionLevel="signature|privileged" />
 
+    <permission android:name="com.android.systemui.permission.SCREEN_RECORDING"
+            android:protectionLevel="signature" />
+
     <!-- Adding Quick Settings tiles -->
     <uses-permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE" />
 
@@ -245,6 +253,8 @@
     <uses-permission android:name="android.permission.GET_RUNTIME_PERMISSIONS" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" />
 
     <!-- role holder APIs -->
     <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />
@@ -403,11 +413,35 @@
     <!-- To be able to set unrestricted system gesture exclusion rects -->
     <uses-permission android:name="android.permission.SET_UNRESTRICTED_GESTURE_EXCLUSION"/>
 
+    <!-- OmniJaws -->
+    <uses-permission android:name="org.omnirom.omnijaws.READ_WEATHER" />
+
+    <!-- Kill button in notification guts -->
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
+
+    <!-- Permission needed for Idle Manager -->
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
+
+    <!-- DataSwitch tile -->
+    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
+
     <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
     <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />
     <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />
     <protected-broadcast android:name="com.android.systemui.action.LAUNCH_SYSTEM_MEDIA_OUTPUT_DIALOG" />
     <protected-broadcast android:name="com.android.systemui.STARTED" />
+    <protected-broadcast android:name="com.android.systemui.doze.pulse" />
+
+    <!-- Smartspace -->
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <permission android:name="com.android.systemui.permission.SEND_ALERT_BROADCASTS" android:protectionLevel="preinstalled|signature"/>
+    <uses-permission android:name="com.google.android.deskclock.permission.RECEIVE_ALERT_BROADCASTS"/>
+    <uses-permission android:name="com.google.android.apps.nexuslauncher.permission.QSB"/>
+    <protected-broadcast android:name="com.google.android.systemui.smartspace.CLICK_EVENT"/>
+    <protected-broadcast android:name="com.google.android.systemui.smartspace.ENABLE_UPDATE"/>
+    <protected-broadcast android:name="com.google.android.systemui.smartspace.EXPIRE_EVENT"/>
 
     <application
         android:name=".application.impl.SystemUIApplicationImpl"
@@ -437,6 +471,13 @@
         <service android:name="SystemUIService"
             android:exported="true"
         />
+        <service
+            android:name=".ax.AxPlatformBinderService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.systemui.action.AX_PLATFORM" />
+            </intent-filter>
+        </service>
         <service android:name=".wallet.controller.WalletContextualLocationsService"
             android:exported="true"
             />
@@ -546,11 +587,22 @@
         <service android:name=".screenrecord.service.ScreenRecordingService" />
 
         <service android:name=".screenrecord.RecordingService"
-                 android:foregroundServiceType="systemExempted"/>
+            android:foregroundServiceType="systemExempted"
+            android:exported="true"
+            android:permission="com.android.systemui.permission.SCREEN_RECORDING">
+            <intent-filter>
+                <action android:name="com.android.systemui.screenrecord.RecordingService" />
+            </intent-filter>
+        </service>
 
         <service android:name=".recordissue.IssueRecordingService"
                  android:foregroundServiceType="systemExempted"/>
 
+        <!-- started from PhoneWindowManager -->
+        <service android:name=".crdroid.onthego.OnTheGoService"
+            android:process=":onthego"
+            android:exported="true" />
+
         <receiver android:name=".SysuiRestartReceiver"
             android:exported="false">
             <intent-filter>
@@ -560,6 +612,18 @@
             </intent-filter>
         </receiver>
 
+        <service android:name="com.android.systemui.CPUInfoService"
+                android:exported="true" />
+
+        <service android:name="com.android.systemui.FPSInfoService"
+                android:exported="true" />
+
+        <receiver android:name=".BootReceiver" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <service android:name=".wallpapers.ImageWallpaper"
                 android:singleUser="true"
                 android:permission="android.permission.BIND_WALLPAPER"
@@ -574,12 +638,27 @@
             </meta-data>
         </service>
 
+        <service
+            android:name="com.android.systemui.lockglymps.LockGlympsService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <receiver
+            android:name="com.android.systemui.lockglymps.LockGlympsBootReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".tuner.TunerActivity"
                   android:enabled="false"
                   android:icon="@drawable/tuner"
                   android:theme="@style/Theme.SubSettingsBase.Expressive"
                   android:label="@string/system_ui_tuner"
                   android:process=":tuner"
+                  android:enableOnBackInvokedCallback="true"
                   android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
@@ -608,6 +687,10 @@
         <receiver android:name=".screenshot.DeleteScreenshotReceiver"
             android:exported="false" />
 
+        <!-- Callback for Google Lens screenshot notification -->
+        <receiver android:name=".screenshot.LensScreenshotReceiver"
+            android:exported="false" />
+
         <!-- Callback for invoking a smart action from the screenshot notification. -->
         <receiver android:name=".screenshot.SmartActionsReceiver"
                   android:exported="false"/>
@@ -639,6 +722,15 @@
             android:excludeFromRecents="true">
         </activity>
 
+        <!-- started from UsbDeviceSettingsManager -->
+        <activity android:name=".usb.UsbFunctionActivity"
+            android:exported="true"
+            android:permission="android.permission.MANAGE_USB"
+            android:theme="@style/Theme.SystemUI.Dialog.Alert"
+            android:finishOnCloseSystemDialogs="true"
+            android:excludeFromRecents="true">
+        </activity>
+
         <!-- started from SensoryPrivacyService -->
         <activity android:name=".sensorprivacy.SensorUseStartedActivity"
                   android:exported="true"
diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index dec664fa7a149..57f6fee6d5c72 100644
--- a/packages/SystemUI/animation/Android.bp
+++ b/packages/SystemUI/animation/Android.bp
@@ -47,6 +47,7 @@ android_library {
         "com_android_systemui_flags_lib",
         "SystemUIShaderLib",
         "WindowManager-Shell-shared",
+        "com.google.android.material_material",
         "//frameworks/libs/systemui:animationlib",
         "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",
     ],
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFAB.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFAB.kt
new file mode 100644
index 0000000000000..3fa237643b383
--- /dev/null
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFAB.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.systemui.animation.view
+
+import android.content.Context
+import android.util.AttributeSet
+import com.android.systemui.animation.LaunchableView
+import com.android.systemui.animation.LaunchableViewDelegate
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+
+/** A custom [ExtendedFloatingActionButton] that implements [LaunchableView]. */
+open class LaunchableFAB : ExtendedFloatingActionButton, LaunchableView {
+
+    private val delegate: LaunchableViewDelegate
+    private val MAX_SIZE_PX = 64
+
+    constructor(context: Context) : this(context, null)
+    
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        delegate = LaunchableViewDelegate(
+            this,
+            superSetVisibility = { visibility -> super.setVisibility(visibility) }
+        )
+        setIconSize(MAX_SIZE_PX)
+    }
+
+    override fun setShouldBlockVisibilityChanges(block: Boolean) {
+        delegate.setShouldBlockVisibilityChanges(block)
+    }
+
+    override fun setVisibility(visibility: Int) {
+        super.setVisibility(visibility)
+        delegate.setVisibility(visibility)
+    }
+}
diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
index 7e56f4b3d2b22..f6c9c7d2f0795 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt
@@ -60,7 +60,7 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) :
         const val DEFAULT_CENTER_FILL_FADE_OUT_START = 0f
         const val DEFAULT_CENTER_FILL_FADE_OUT_END = 0.6f
 
-        const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f
+        const val RIPPLE_SPARKLE_STRENGTH: Float = 0.6f
         const val RIPPLE_DEFAULT_COLOR: Int = 0xffffffff.toInt()
         const val RIPPLE_DEFAULT_ALPHA: Int = 115 // full opacity is 255.
 
diff --git a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt
index b899127095762..65d516ddd148b 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleView.kt
@@ -43,7 +43,7 @@ open class RippleView(context: Context?, attrs: AttributeSet?) : View(context, a
     private val ripplePaint = Paint()
     protected val animator: ValueAnimator = ValueAnimator.ofFloat(0f, 1f)
 
-    var duration: Long = 1750
+    var duration: Long = 2250
 
     fun setMaxSize(maxWidth: Float, maxHeight: Float) {
         rippleShader.rippleSize.setMaxSize(maxWidth, maxHeight)
diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
index 3944f46dd5285..27d93862ef75e 100644
--- a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
+++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package com.android.compose.animation
 
 import android.content.Context
@@ -21,8 +23,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroupOverlay
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
@@ -141,6 +145,7 @@ fun Expandable(
     borderStroke: BorderStroke? = null,
     onClick: ((Expandable) -> Unit)? = null,
     onClickLabel: String? = null,
+    onLongClick: ((Expandable) -> Unit)? = null,
     interactionSource: MutableInteractionSource? = null,
     useModifierBasedImplementation: Boolean = expandableUseModifierImplementation(),
     defaultMinSize: Boolean = true,
@@ -158,6 +163,7 @@ fun Expandable(
         modifier,
         onClick,
         onClickLabel,
+        onLongClick,
         interactionSource,
         useModifierBasedImplementation,
         defaultMinSize,
@@ -199,6 +205,7 @@ fun Expandable(
     modifier: Modifier = Modifier,
     onClick: ((Expandable) -> Unit)? = null,
     onClickLabel: String? = null,
+    onLongClick: ((Expandable) -> Unit)? = null,
     interactionSource: MutableInteractionSource? = null,
     // TODO(b/285250939): Default this to true then remove once the Compose QS expandables have
     // proven that the new implementation is robust.
@@ -220,7 +227,7 @@ fun Expandable(
     }
 
     if (useModifierBasedImplementation) {
-        Box(modifier.expandable(controller, onClick, onClickLabel, interactionSource)) {
+        Box(modifier.expandable(controller, onClick, onClickLabel, onLongClick, interactionSource)) {
             WrappedContent(
                 controller.expandable,
                 controller.contentColor,
@@ -263,7 +270,7 @@ fun Expandable(
     // If this expandable is expanded when it's being directly clicked on, let's ensure that it has
     // the minimum interactive size followed by all M3 components (48.dp).
     val minInteractiveSizeModifier =
-        if (onClick != null) {
+        if (onClick != null || onLongClick != null) {
             Modifier.minimumInteractiveComponentSize()
         } else {
             Modifier
@@ -308,7 +315,7 @@ fun Expandable(
                 modifier
                     .updateExpandableSize()
                     .then(minInteractiveSizeModifier)
-                    .then(clickModifier(controller, onClick, onClickLabel, interactionSource))
+                    .then(clickModifier(controller, onClick, onClickLabel, onLongClick, interactionSource))
                     .animatedBackground(color, shape = shape)
                     .border(controller)
                     .onGloballyPositioned {
@@ -362,6 +369,7 @@ private fun Modifier.expandable(
     controller: ExpandableController,
     onClick: ((Expandable) -> Unit)? = null,
     onClickLabel: String? = null,
+    onLongClick: ((Expandable) -> Unit)? = null,
     interactionSource: MutableInteractionSource? = null,
 ): Modifier {
     val controller = controller as ExpandableControllerImpl
@@ -378,7 +386,7 @@ private fun Modifier.expandable(
     return this.thenIf(onClick != null) { Modifier.minimumInteractiveComponentSize() }
         .thenIf(drawContent) {
             Modifier.border(controller)
-                .then(clickModifier(controller, onClick, onClickLabel, interactionSource))
+                .then(clickModifier(controller, onClick, onClickLabel, onLongClick, interactionSource))
                 .animatedBackground(controller.color, shape = controller.shape)
         }
         .onPlaced { coords ->
@@ -487,28 +495,45 @@ private fun clickModifier(
     controller: ExpandableControllerImpl,
     onClick: ((Expandable) -> Unit)?,
     onClickLabel: String? = null,
+    onLongClick: ((Expandable) -> Unit)?,
     interactionSource: MutableInteractionSource?,
 ): Modifier {
-    if (onClick == null) {
+    if (onClick == null && onLongClick == null) {
         return Modifier
     }
 
-    if (interactionSource != null) {
-        // If the caller provided an interaction source, then that means that they will draw the
-        // click indication themselves.
+    // If the caller provided an interaction source, then that means that they will draw the
+    // click indication themselves.
+    if (interactionSource != null && onLongClick != null) {
+        return Modifier.combinedClickable(
+            interactionSource,
+            indication = null,
+            onClickLabel = onClickLabel,
+            onLongClick = { onLongClick?.invoke(controller.expandable) },
+            onClick = { onClick?.invoke(controller.expandable) }
+        )
+    } else if (interactionSource != null) {
         return Modifier.clickable(
             interactionSource,
             indication = null,
             onClickLabel = onClickLabel,
         ) {
-            onClick(controller.expandable)
+            onClick?.invoke(controller.expandable)
         }
     }
 
     // If no interaction source is provided, we draw the default indication (a ripple) and make sure
     // it's clipped by the expandable shape.
-    return Modifier.clip(controller.shape).clickable(onClickLabel = onClickLabel) {
-        onClick(controller.expandable)
+    if (onLongClick != null) {
+        return Modifier.clip(controller.shape).combinedClickable(
+            onClickLabel = onClickLabel,
+            onLongClick = { onLongClick?.invoke(controller.expandable) },
+            onClick = { onClick?.invoke(controller.expandable) }
+        )
+    } else {
+        return Modifier.clip(controller.shape).clickable(onClickLabel = onClickLabel) {
+            onClick?.invoke(controller.expandable)
+        }
     }
 }
 
diff --git a/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt b/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt
index fcaf2c6972cd7..59377bb1a06f3 100644
--- a/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt
+++ b/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MotionScheme
 import androidx.compose.material3.dynamicDarkColorScheme
@@ -74,7 +75,7 @@ fun PlatformTheme(isDarkTheme: Boolean = isSystemInDarkTheme(), content: @Compos
         }
     val windowSizeClass = calculateWindowSizeClass()
 
-    MaterialTheme(
+    MaterialExpressiveTheme(
         colorScheme = colorScheme,
         typography = typography,
         motionScheme = ExpressiveMotionScheme,
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt
index 000494199e081..4bd8d160ddc13 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
+
 package com.android.systemui.bouncer.ui.composable
 
 import android.app.AlertDialog
@@ -57,8 +59,10 @@ import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.MotionScheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -1024,12 +1028,13 @@ private fun UserSwitcherDropdownMenu(
     val context = LocalContext.current
 
     // TODO(b/303071855): once the FR is fixed, remove this composition local override.
-    MaterialTheme(
+    MaterialExpressiveTheme(
         colorScheme =
             MaterialTheme.colorScheme.copy(
                 surface = MaterialTheme.colorScheme.surfaceContainerHighest
             ),
         shapes = MaterialTheme.shapes.copy(extraSmall = RoundedCornerShape(28.dp)),
+        motionScheme = MotionScheme.expressive()
     ) {
         DropdownMenu(
             expanded = isExpanded,
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalLockSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalLockSection.kt
index 37faf952382f3..ed8a063f73014 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalLockSection.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalLockSection.kt
@@ -43,6 +43,7 @@ import com.android.systemui.log.dagger.LongPressTouchLog
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.res.R
 import com.android.systemui.statusbar.VibratorHelper
+import com.android.systemui.tuner.TunerService
 import dagger.Lazy
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
@@ -58,6 +59,7 @@ constructor(
     private val vibratorHelper: Lazy<VibratorHelper>,
     private val featureFlags: FeatureFlagsClassic,
     @LongPressTouchLog private val logBuffer: LogBuffer,
+    private val tunerService: TunerService,
 ) {
     @Composable
     fun ContentScope.LockIcon(modifier: Modifier = Modifier) {
@@ -68,7 +70,9 @@ constructor(
                 DeviceEntryIconView(
                         context,
                         null,
-                        logger = TouchHandlingViewLogger(logBuffer, tag = TAG),
+                        0,
+                        TouchHandlingViewLogger(logBuffer, tag = TAG),
+                        tunerService
                     )
                     .apply {
                         id = R.id.device_entry_icon_view
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt
index 5c677f3d61e9b..ebb0a347b1a27 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt
@@ -46,6 +46,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.compose.modifiers.height
 import com.android.compose.modifiers.width
+import com.android.systemui.Dependency
 import com.android.systemui.deviceentry.shared.model.BiometricMessage
 import com.android.systemui.deviceentry.ui.binder.UdfpsAccessibilityOverlayBinder
 import com.android.systemui.deviceentry.ui.view.UdfpsAccessibilityOverlay
@@ -58,9 +59,12 @@ import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewM
 import com.android.systemui.lifecycle.rememberViewModel
 import com.android.systemui.log.TouchHandlingViewLogger
 import com.android.systemui.res.R
+import com.android.systemui.tuner.TunerService
+import kotlinx.coroutines.CoroutineScope
 
 @Composable
 fun AlternateBouncer(
+    applicationScope: CoroutineScope,
     alternateBouncerDependencies: AlternateBouncerDependencies,
     onHideAnimationFinished: () -> Unit,
     modifier: Modifier = Modifier,
@@ -108,6 +112,7 @@ fun AlternateBouncer(
         udfpsIconLocation?.let { udfpsLocation ->
             Box {
                 DeviceEntryIcon(
+                    applicationScope,
                     viewModel = alternateBouncerDependencies.udfpsIconViewModel,
                     logger = alternateBouncerDependencies.logger,
                     modifier =
@@ -156,6 +161,7 @@ private fun StatusMessage(
 
 @Composable
 private fun DeviceEntryIcon(
+    applicationScope: CoroutineScope,
     viewModel: AlternateBouncerUdfpsIconViewModel,
     logger: TouchHandlingViewLogger,
     modifier: Modifier = Modifier,
@@ -164,12 +170,12 @@ private fun DeviceEntryIcon(
         modifier = modifier,
         factory = { context ->
             val view =
-                DeviceEntryIconView(context, null, logger = logger).apply {
+                DeviceEntryIconView(context, null, 0, logger, Dependency.get(TunerService::class.java)).apply {
                     id = R.id.alternate_bouncer_udfps_icon_view
                     contentDescription =
                         context.resources.getString(R.string.accessibility_fingerprint_label)
                 }
-            AlternateBouncerUdfpsViewBinder.bind(view, viewModel)
+            AlternateBouncerUdfpsViewBinder.bind(applicationScope, view, viewModel)
             view
         },
     )
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/LockIconElementProvider.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/LockIconElementProvider.kt
index 508f98ae2d03c..2336be18f5f59 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/LockIconElementProvider.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/LockIconElementProvider.kt
@@ -54,6 +54,7 @@ import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenSc
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.statusbar.VibratorHelper
+import com.android.systemui.tuner.TunerService
 import com.google.android.msdl.domain.MSDLPlayer
 import dagger.Lazy
 import javax.inject.Inject
@@ -77,6 +78,7 @@ constructor(
     private val vibratorHelper: Lazy<VibratorHelper>,
     private val msdlPlayer: Lazy<MSDLPlayer>,
     @LongPressTouchLog private val logBuffer: LogBuffer,
+    private val tunerService: TunerService,
 ) : LockscreenElementProvider {
     override val elements: List<LockscreenElement> by lazy { listOf(LockIconElement()) }
 
@@ -99,7 +101,9 @@ constructor(
                 DeviceEntryIconView(
                         context,
                         null,
-                        logger = TouchHandlingViewLogger(logBuffer, tag = TAG),
+                        0,
+                        TouchHandlingViewLogger(logBuffer, tag = TAG),
+                        tunerService
                     )
                     .apply {
                         id = R.id.device_entry_icon_view
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationStackContentHeight.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationStackContentHeight.kt
index 8d609df73f9ef..1d94974630bd4 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationStackContentHeight.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationStackContentHeight.kt
@@ -37,6 +37,8 @@ import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScr
  * @param totalVerticalPadding extra padding to be added to the received stack content height.
  * @param constrainToMaxHeight if true, the height will not be taller than the available space.
  */
+private const val STACK_HEIGHT_THRESHOLD = 8
+
 fun Modifier.notificationStackHeight(
     view: NotificationScrollView,
     totalVerticalPadding: Dp = 0.dp,
@@ -67,7 +69,14 @@ private class StackLayoutNode(
     var constrainToMaxHeight: Boolean,
 ) : LayoutModifierNode, Modifier.Node() {
 
-    private val stackHeightChangedListener = Runnable { invalidateMeasureIfAttached() }
+    private var lastMeasuredStackHeight = -1
+    private val stackHeightChangedListener = Runnable {
+        val currentHeight = view.intrinsicStackHeight
+        if (Math.abs(currentHeight - lastMeasuredStackHeight) > STACK_HEIGHT_THRESHOLD) {
+            lastMeasuredStackHeight = currentHeight
+            invalidateMeasureIfAttached()
+        }
+    }
 
     override fun onAttach() {
         super.onAttach()
@@ -83,7 +92,8 @@ private class StackLayoutNode(
         measurable: Measurable,
         constraints: Constraints,
     ): MeasureResult {
-        var contentHeight = padding.roundToPx() + view.intrinsicStackHeight
+        lastMeasuredStackHeight = view.intrinsicStackHeight
+        var contentHeight = padding.roundToPx() + lastMeasuredStackHeight
         if (constrainToMaxHeight) {
             contentHeight = contentHeight.coerceAtMost(constraints.maxHeight)
         }
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
index be5d95bd73b89..30b696b103b36 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
@@ -103,6 +103,7 @@ import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel
 import com.android.systemui.qs.footer.ui.viewmodel.FooterTextButtonViewModel
 import com.android.systemui.qs.panels.ui.viewmodel.TextFeedbackViewModel
 import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CustomColorScheme
 import com.android.systemui.qs.ui.composable.QuickSettingsTheme
 import com.android.systemui.qs.ui.compose.borderOnFocus
 import com.android.systemui.res.R
@@ -391,6 +392,7 @@ private fun IconButton(
     CircleExpandable(
         color = colors.background,
         onClick = model.onClick,
+        onLongClick = model.onLongClick,
         modifier = modifier,
         useModifierBasedImplementation = useModifierBasedExpandable,
     ) {
@@ -469,6 +471,7 @@ private fun CircleExpandable(
     contentColor: Color = contentColorFor(color),
     borderStroke: BorderStroke? = null,
     onClick: ((Expandable) -> Unit)? = null,
+    onLongClick: ((Expandable) -> Unit)? = null,
     interactionSource: MutableInteractionSource? = null,
     useModifierBasedImplementation: Boolean,
     content: @Composable (Expandable) -> Unit,
@@ -479,6 +482,7 @@ private fun CircleExpandable(
         borderStroke = borderStroke,
         shape = CircleShape,
         onClick = onClick,
+        onLongClick = onLongClick,
         interactionSource = interactionSource,
         modifier =
             modifier.borderOnFocus(
@@ -690,7 +694,7 @@ private object FooterActionsDefaults {
     fun inactiveButtonColors(): ButtonColors =
         ButtonColors(
             icon = MaterialTheme.colorScheme.onSurface,
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
+            background = CustomColorScheme.current.qsTileColor,
         )
 
     @Composable
@@ -698,7 +702,7 @@ private object FooterActionsDefaults {
     fun userSwitcherButtonColors(): ButtonColors =
         ButtonColors(
             icon = Color.Unspecified,
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
+            background = CustomColorScheme.current.qsTileColor,
         )
 
     @Composable
@@ -706,7 +710,7 @@ private object FooterActionsDefaults {
     fun blurTextButtonColors(): TextButtonColors =
         TextButtonColors(
             content = MaterialTheme.colorScheme.onSurface,
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
+            background = CustomColorScheme.current.qsTileColor,
             border = null,
         )
 
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
index 4225cb92513de..9168b2c9e8bcc 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayoutState.kt
@@ -463,7 +463,7 @@ internal class MutableSceneTransitionLayoutStateImpl(
     }
 
     override suspend fun startTransition(transition: TransitionState.Transition, chain: Boolean) {
-        Log.i(TAG, "startTransition(transition=$transition, chain=$chain)")
+        Log.d(TAG, "startTransition(transition=$transition, chain=$chain)")
         checkThread()
 
         // Prepare the transition before starting it. This is outside of the try/finally block on
@@ -575,7 +575,7 @@ internal class MutableSceneTransitionLayoutStateImpl(
             return
         }
 
-        Log.i(TAG, "finishTransition(transition=$transition)")
+        Log.d(TAG, "finishTransition(transition=$transition)")
         check(transitionStates.fastAll { it is TransitionState.Transition })
 
         // Mark this transition as finished.
@@ -598,7 +598,7 @@ internal class MutableSceneTransitionLayoutStateImpl(
         }
 
         val idle = TransitionState.Idle(lastTransition.currentScene, lastTransition.currentOverlays)
-        Log.i(TAG, "all transitions finished. idle=$idle")
+        Log.d(TAG, "all transitions finished. idle=$idle")
         finishedTransitions.clear()
         this.transitionStates = listOf(idle)
     }
diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt
index fc002f3db3a8a..ba26a09941960 100644
--- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt
+++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SceneTransitionLayoutTest.kt
@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MotionScheme
 import androidx.compose.material3.Text
@@ -565,7 +566,7 @@ class SceneTransitionLayoutTest {
                 }
             }
 
-            MaterialTheme(motionScheme = motionScheme2) {
+            MaterialExpressiveTheme(motionScheme = motionScheme2) {
                 // Important: we should read this state inside the MaterialTheme composable.
                 state2 = rememberMutableSceneTransitionLayoutState(initialScene = SceneA)
                 SceneTransitionLayout(state2) {
diff --git a/packages/SystemUI/customization/clocks/common/res/values/dimens.xml b/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
index ea954cc16a420..4c81e51b3db6a 100644
--- a/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
+++ b/packages/SystemUI/customization/clocks/common/res/values/dimens.xml
@@ -17,12 +17,12 @@
 -->
 <resources>
     <!-- Clock maximum font size (dp is intentional, to prevent any further scaling) -->
-    <dimen name="presentation_clock_text_size">50dp</dimen>
-    <dimen name="large_clock_text_size">150dp</dimen>
-    <dimen name="small_clock_text_size">86dp</dimen>
+    <dimen name="presentation_clock_text_size">@*android:dimen/presentation_clock_text_size</dimen>
+    <dimen name="large_clock_text_size">@*android:dimen/large_clock_text_size</dimen>
+    <dimen name="small_clock_text_size">@*android:dimen/small_clock_text_size</dimen>
 
     <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->
-    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>
+    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">@*android:dimen/keyguard_clock_line_spacing_scale</item>
     <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->
     <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
 
@@ -33,6 +33,7 @@
     <dimen name="small_clock_height">114dp</dimen>
     <dimen name="small_clock_padding_top">28dp</dimen>
     <dimen name="clock_padding_start">28dp</dimen>
+    <dimen name="clock_padding_end">100dp</dimen>
     <dimen name="weather_date_icon_padding">28dp</dimen>
     <dimen name="clock_vertical_digit_buffer">8dp</dimen>
 
@@ -45,4 +46,4 @@
     <dimen name="enhanced_smartspace_height">104dp</dimen>
     <dimen name="status_view_margin_horizontal">0dp</dimen>
     <dimen name="lock_icon_margin_bottom">74dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/SystemUI/customization/clocks/common/src/com/android/systemui/customization/clocks/view/DigitalClockTextView.kt b/packages/SystemUI/customization/clocks/common/src/com/android/systemui/customization/clocks/view/DigitalClockTextView.kt
index 2c421da1f780a..27499fb8cfae6 100644
--- a/packages/SystemUI/customization/clocks/common/src/com/android/systemui/customization/clocks/view/DigitalClockTextView.kt
+++ b/packages/SystemUI/customization/clocks/common/src/com/android/systemui/customization/clocks/view/DigitalClockTextView.kt
@@ -166,7 +166,7 @@ abstract class DigitalClockTextView(
     override fun onTouchEvent(evt: MotionEvent): Boolean {
         if (super.onTouchEvent(evt)) return true
 
-        if (clockFidgetAnimation() && evt.action == MotionEvent.ACTION_DOWN) {
+        if (evt.action == MotionEvent.ACTION_DOWN) {
             val pt = VPointF(evt.x, evt.y)
             return (parent as? DigitalClockTextViewParent)?.animateFidget(pt, enforceBounds = false)
                 ?: animateFidget(pt, enforceBounds = false)
@@ -565,7 +565,7 @@ abstract class DigitalClockTextView(
         this.textStyle = textStyle
         lockScreenPaint.strokeJoin = Paint.Join.ROUND
         lockScreenPaint.typeface = typefaceCache.getTypefaceForVariant(fontVariations.lockscreen)
-        lockScreenPaint.fontFeatureSettings = if (isLargeClock) "" else "pnum"
+        lockScreenPaint.fontFeatureSettings = if (isLargeClock) "tnum" else "pnum"
         typeface = lockScreenPaint.typeface
         textStyle.lineHeight?.let { lineHeight = it.roundToInt() }
 
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index a490ad21f1727..181112bfa8471 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -195,6 +195,7 @@ open class ClockRegistry(
                 plugin.initialize(clockBuffers)
 
                 var isClockListChanged = false
+                plugin ?: return
                 for (clock in plugin.getClocks()) {
                     val id = clock.clockId
                     val info =
@@ -232,6 +233,7 @@ open class ClockRegistry(
                 plugin: ClockProviderPlugin,
                 manager: PluginLifecycleManager<ClockProviderPlugin>,
             ) {
+                plugin ?: return
                 for (clock in plugin.getClocks()) {
                     val id = clock.clockId
                     val info = availableClocks[id]
@@ -326,6 +328,17 @@ open class ClockRegistry(
     var isRegistered: Boolean = false
         private set
 
+    private fun parseClockSettingsOrNull(raw: String?): ClockSettings? {
+        if (raw.isNullOrBlank()) return null
+        if (raw.equals("null", ignoreCase = true)) return null
+
+        return try {
+            ClockSettings.fromJson(JSONObject(raw))
+        } catch (_: Exception) {
+            null
+        }
+    }
+
     @OpenForTesting
     open fun querySettings() {
         assert.isNotMainThread()
@@ -344,7 +357,7 @@ open class ClockRegistry(
                             Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE,
                         )
                     }
-                json?.let { ClockSettings.fromJson(JSONObject(it)) }
+                parseClockSettingsOrNull(json)
             } catch (ex: Exception) {
                 logger.e("Failed to parse clock settings", ex)
                 null
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
index 5597b2f19956b..58873179c87f4 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
@@ -175,7 +175,9 @@ class DefaultClockController(
                 override fun onSecondaryDisplayChanged(onSecondaryDisplay: Boolean) {}
             }
 
-        open fun recomputePadding(targetRegion: Rect?) {}
+        open fun recomputePadding(targetRegion: Rect?) {
+            view.setFontFeatureSettings("pnum")
+        }
 
         private fun getAodColor(): Int {
             return if (ambientAod()) {
@@ -200,7 +202,9 @@ class DefaultClockController(
             animations = LargeClockAnimations(view, 0f, 0f)
         }
 
-        override fun recomputePadding(targetRegion: Rect?) {}
+        override fun recomputePadding(targetRegion: Rect?) {
+            view.setFontFeatureSettings("tnum")
+        }
 
         /** See documentation at [AnimatableClockView.offsetGlyphsForStepClockAnimation]. */
         fun offsetGlyphsForStepClockAnimation(args: ClockPositionAnimationArgs) {
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
index ae427839f7c6c..1fd94069884a5 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt
@@ -80,7 +80,7 @@ constructor(
             val clockSettings = settings.copy(axes = ClockAxisStyle(fontAxes))
             val typefaceCache =
                 TypefaceCache(buffers.infraMessageBuffer, NUM_CLOCK_FONT_ANIMATION_STEPS) {
-                    FLEX_TYPEFACE
+                    getDefaultClockFontFamily()
                 }
             FlexClockController(
                 ClockContext(
@@ -135,14 +135,24 @@ constructor(
         }
     }
 
+    private fun getDefaultClockFontFamily(): Typeface {
+        val resId = resources.getIdentifier(
+            "config_clockFontFamily",
+            "string",
+            "android"
+        )
+        val family = if (resId != 0) {
+            resources.getString(resId)
+        } else {
+            "google-sans-flex-clock"
+        }
+
+        return Typeface.create(family, Typeface.NORMAL)
+    } 
+
     companion object {
         // 750ms @ 120hz -> 90 frames of animation
         // In practice, 30 looks good enough and limits our memory usage
         const val NUM_CLOCK_FONT_ANIMATION_STEPS = 30
-
-        val FLEX_TYPEFACE by lazy {
-            // TODO(b/364680873): Move constant to config_clockFontFamily when shipping
-            Typeface.create("google-sans-flex-clock", Typeface.NORMAL)
-        }
     }
 }
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SecureSettingsRepository.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SecureSettingsRepository.kt
index cb125570b2070..15dbae84702d6 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SecureSettingsRepository.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SecureSettingsRepository.kt
@@ -28,6 +28,9 @@ interface SecureSettingsRepository {
     /** Returns a [Flow] tracking the value of a setting as a [Boolean]. */
     fun boolSetting(name: String, defaultValue: Boolean = false): Flow<Boolean>
 
+    /** Returns a [Flow] tracking the value of a setting as a [String]. */
+    fun stringSetting(name: String): Flow<String?>
+
     /** Updates the value of the setting with the given name. */
     suspend fun setInt(name: String, value: Int)
 
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SystemSettingsRepository.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SystemSettingsRepository.kt
index b5f991cdb9b43..2f2f8afc376e9 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SystemSettingsRepository.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/settings/data/repository/SystemSettingsRepository.kt
@@ -28,6 +28,9 @@ interface SystemSettingsRepository {
     /** Returns a [Flow] tracking the value of a setting as a [Boolean]. */
     fun boolSetting(name: String, defaultValue: Boolean = false): Flow<Boolean>
 
+    /** Returns a [Flow] tracking the value of a setting as a [String]. */
+    fun stringSetting(name: String): Flow<String?>
+
     /** Updates the value of the setting with the given name. */
     suspend fun setInt(name: String, value: Int)
 
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt
index f537e32ac13d7..a7dbc0e071dd9 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt
@@ -59,7 +59,7 @@ class KeyguardSmartspaceRepositoryImplTest : SysuiTestCase() {
     @Test
     fun testWeatherEnabled_true() =
         scope.runTest {
-            fakeSettings.putInt(Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED, 1)
+            fakeSettings.putInt(Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED, 1)
             val value = collectLastValue(underTest.isWeatherEnabled)
             Truth.assertThat(value()).isEqualTo(true)
         }
@@ -67,7 +67,7 @@ class KeyguardSmartspaceRepositoryImplTest : SysuiTestCase() {
     @Test
     fun testWeatherEnabled_false() =
         scope.runTest {
-            fakeSettings.putInt(Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED, 0)
+            fakeSettings.putInt(Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED, 0)
 
             val value = collectLastValue(underTest.isWeatherEnabled)
             Truth.assertThat(value()).isEqualTo(false)
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractorTest.kt
index 1f38e1beeebca..d0c01561160f4 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractorTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractorTest.kt
@@ -51,14 +51,18 @@ import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIc
 import com.android.systemui.statusbar.pipeline.shared.data.repository.connectivityRepository
 import com.android.systemui.statusbar.policy.data.repository.userSetupRepository
 import com.android.systemui.testKosmos
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.util.CarrierConfigTracker
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import platform.test.runner.parameterized.ParameterizedAndroidJunit4
 import platform.test.runner.parameterized.Parameters
 
@@ -83,6 +87,7 @@ class MobileDataTileDataInteractorTest(flags: FlagsParameterization) : SysuiTest
     private val featureFlags = kosmos.featureFlagsClassic
     private val pipelineFlagsRepository = kosmos.pipelineFlagsRepository
     private val carrierConfigTracker: CarrierConfigTracker = mock()
+    private val dataUsageRepository: DataUsageRepository = mock()
 
     // Real MobileIconsInteractor, fed by fakes
     private var mobileIconsInteractor: MobileIconsInteractor =
@@ -98,11 +103,17 @@ class MobileDataTileDataInteractorTest(flags: FlagsParameterization) : SysuiTest
         )
 
     private var underTest: MobileDataTileDataInteractor =
-        MobileDataTileDataInteractor(context, mobileIconsInteractor, pipelineFlagsRepository)
+        MobileDataTileDataInteractor(
+            context,
+            mobileIconsInteractor,
+            pipelineFlagsRepository,
+            dataUsageRepository,
+        )
 
     @Before
     fun setUp() {
         featureFlags.fake.set(Flags.FILTER_PROVISIONING_NETWORK_SUBSCRIPTIONS, true)
+        whenever(dataUsageRepository.mobileUsageFormatted).thenReturn(MutableStateFlow(null))
     }
 
     @Test
@@ -112,6 +123,7 @@ class MobileDataTileDataInteractorTest(flags: FlagsParameterization) : SysuiTest
             mobileConnectionsRepository.fake.setActiveMobileDataSubscriptionId(-1)
             runCurrent()
 
+            verify(dataUsageRepository).refresh()
             val expectedModel =
                 MobileDataTileModel(
                     isSimActive = false,
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractorTest.kt
index 79fc46c97e49b..ea8b497771220 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractorTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractorTest.kt
@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIc
 import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy
 import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
 import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiTileIconModel
@@ -54,12 +55,14 @@ import com.android.systemui.statusbar.policy.data.repository.FakeUserSetupReposi
 import com.android.systemui.testKosmos
 import com.android.systemui.util.CarrierConfigTracker
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import platform.test.runner.parameterized.ParameterizedAndroidJunit4
 import platform.test.runner.parameterized.Parameters
@@ -83,9 +86,11 @@ class WifiTileDataInteractorTest(flags: FlagsParameterization) : SysuiTestCase()
     private lateinit var mobileConnectionRepository: FakeMobileConnectionRepository
     private lateinit var connectivityRepository: FakeConnectivityRepository
     private lateinit var wifiRepository: FakeWifiRepository
+    private val dataUsageRepository: DataUsageRepository = mock()
 
     @Before
     fun setUp() {
+        whenever(dataUsageRepository.wifiUsageFormatted).thenReturn(MutableStateFlow(null))
         val mobileContextProvider = mock<MobileContextProvider>()
         whenever(mobileContextProvider.getMobileContextForSub(any(), any())).thenReturn(context)
 
@@ -119,9 +124,8 @@ class WifiTileDataInteractorTest(flags: FlagsParameterization) : SysuiTestCase()
                 testScope.backgroundScope,
                 FakeAirplaneModeRepository(),
                 connectivityRepository,
-                mobileIconsInteractor,
-                mobileContextProvider,
                 wifiInteractor,
+                dataUsageRepository,
             )
     }
 
@@ -129,7 +133,9 @@ class WifiTileDataInteractorTest(flags: FlagsParameterization) : SysuiTestCase()
     fun tileData_wifiActiveAndDefault_showsSsid() =
         kosmos.runTest {
             val tileData by collectLastValue(underTest.tileData())
+            runCurrent()
 
+            verify(dataUsageRepository).refresh()
             connectivityRepository.setWifiConnected()
             wifiRepository.setIsWifiDefault(true)
             wifiRepository.setWifiNetwork(
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
index 7f43130f3e0ab..672ecfb04c52b 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
@@ -324,7 +324,7 @@ public void testSetMobileDataIndicators_invalidSim() {
         MobileDataIndicators indicators = new MobileDataIndicators(
                 mock(IconState.class),
                 mock(IconState.class),
-                0, 0, true, true, "", "", "", 0, true, true);
+                0, 0, true, true, "", "", "", 0, true, true, false, 0);
         mSignalCallback.setMobileDataIndicators(indicators);
     }
 
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java
index ffd5efac8c6c8..f992963855772 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java
@@ -120,7 +120,7 @@ public void testSignalCallback_setMobileDataIndicators() {
         boolean roaming = true;
         MobileDataIndicators indicators = new MobileDataIndicators(
                 status, qs, type, qsType, in, out, typeDescription,
-                typeDescriptionHtml, description, subId, roaming, true);
+                typeDescriptionHtml, description, subId, roaming, true, false, 0);
         mHandler.setMobileDataIndicators(indicators);
         waitForCallbacks();
 
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
index 0504404c3db1c..2f836d5fcbd70 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java
@@ -45,6 +45,12 @@ public interface NavigationEdgeBackPlugin extends Plugin {
     /** Specifies if the long swipe should be enabled or not. */
     default void setLongSwipeEnabled(boolean enabled) {}
 
+    /** Specifies if the arrow animation is shown for back gesture. */
+    default void setBackArrowVisibility(boolean backArrowVisibility) {}
+
+    /** Specifies if the arrow animation is shown for back gesture. */
+    default void setEdgeHapticEnabled(boolean edgeHapticEnabled) {}
+
     /** Sets the base LayoutParams for the UI. */
     void setLayoutParams(WindowManager.LayoutParams layoutParams);
 
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 42b592346e5f5..7e9cbc36a2a19 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -5,3 +5,8 @@
 }
 
 -keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.DaggerReferenceGlobalRootComponent** { !synthetic *; }
+-keep class com.google.** { *; }
+
+-keep class com.android.systemui.statusbar.phone.ExpandableIndicator {
+    *;
+}
diff --git a/packages/SystemUI/proto/Android.bp b/packages/SystemUI/proto/Android.bp
new file mode 100644
index 0000000000000..883f9af6ab9d9
--- /dev/null
+++ b/packages/SystemUI/proto/Android.bp
@@ -0,0 +1,22 @@
+
+java_library {
+    name: "smartspace-proto-java",
+    proto: {
+        type: "nano",
+    },
+    srcs: [
+        "SmartspaceProto.proto",
+    ],
+    sdk_version: "current",
+}
+
+java_library {
+    name: "smartspace-proto-lite-java",
+    proto: {
+        type: "lite",
+    },
+    srcs: [
+        "SmartspaceProtoLite.proto",
+    ],
+    sdk_version: "current",
+}
diff --git a/packages/SystemUI/proto/SmartspaceProto.proto b/packages/SystemUI/proto/SmartspaceProto.proto
new file mode 100644
index 0000000000000..b5475e26b2e4d
--- /dev/null
+++ b/packages/SystemUI/proto/SmartspaceProto.proto
@@ -0,0 +1,15 @@
+syntax = "proto2";
+
+package SmartspaceProto;
+
+option java_package = "com.android.systemui.smartspace";
+option java_outer_classname = "SmartspaceProto";
+
+message SmartspaceFeatureDimension {
+  optional int32 feature_dimension_id = 1;
+  optional int32 feature_dimension_value = 2;
+}
+
+message SmartspaceCardDimensionalInfo {
+  repeated SmartspaceFeatureDimension feature_dimensions = 1;
+}
diff --git a/packages/SystemUI/proto/SmartspaceProtoLite.proto b/packages/SystemUI/proto/SmartspaceProtoLite.proto
new file mode 100644
index 0000000000000..087eab0fd0cb6
--- /dev/null
+++ b/packages/SystemUI/proto/SmartspaceProtoLite.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+package SmartspaceProtoLite;
+
+option java_package = "com.android.systemui.smartspace";
+option java_outer_classname = "SmartspaceProtoLite";
+
+message SmartSpaceCardMetadata {
+  optional int32 instance_id = 1;
+  optional int32 card_type_id = 2;
+}
+
+message SmartSpaceSubcards {
+  repeated SmartSpaceCardMetadata subcards = 1;
+  optional int32 clicked_subcard_index = 2;
+}
diff --git a/packages/SystemUI/res-keyguard/drawable/SparkCircleClock_bg.xml b/packages/SystemUI/res-keyguard/drawable/SparkCircleClock_bg.xml
new file mode 100644
index 0000000000000..ae65de38a4055
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/SparkCircleClock_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <corners
+        android:radius="64.0dip" />
+    <solid
+        android:color="?androidprv:attr/colorSurface" />
+</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/anci_dot_bg.xml b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg.xml
new file mode 100644
index 0000000000000..2a26c2dd3ad90
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape
+        android:shape="rectangle"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+        <gradient
+            android:startColor="@android:color/system_accent1_100"
+            android:endColor="@android:color/system_accent1_100"
+            android:angle="0.0"
+            android:centerColor="@android:color/system_accent1_300" />
+        <corners
+            android:radius="70.0dip" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_left.xml b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_left.xml
new file mode 100644
index 0000000000000..bc4ff8803296d
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_left.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape>
+        <solid
+            android:color="@android:color/system_accent1_100" />
+        <corners
+            android:topLeftRadius="?android:attr/dialogCornerRadius"
+            android:bottomLeftRadius="?android:attr/dialogCornerRadius" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_right.xml b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_right.xml
new file mode 100644
index 0000000000000..671110ce4a906
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/anci_dot_bg_right.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape>
+        <solid
+            android:color="@android:color/system_accent1_100" />
+        <corners
+            android:topRightRadius="?android:attr/dialogCornerRadius"
+            android:bottomRightRadius="?android:attr/dialogCornerRadius" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/arc_progress.xml b/packages/SystemUI/res-keyguard/drawable/arc_progress.xml
new file mode 100644
index 0000000000000..194c813e72173
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/arc_progress.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M13.3,52.8C9.1,49.1 6.1,44.1 4.8,38.6C3.5,33.1 3.8,27.3 5.8,22C7.9,16.7 11.5,12.2 16.1,9C20.8,5.7 26.3,4 32,4C37.6,4 43.2,5.7 47.8,8.9C52.5,12.1 56.1,16.7 58.1,21.9C60.2,27.2 60.6,33 59.2,38.5C57.9,44 55,49 50.8,52.8"
+        android:strokeWidth="7"
+        android:strokeAlpha="0.3"
+        android:strokeColor="@android:color/white"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M59.4,26.4C58.5,22 56.6,18 53.9,14.5C51.1,11.1 47.6,8.3 43.5,6.5C39.5,4.7 35.1,3.8 30.7,4C26.2,4.3 21.9,5.5 18.1,7.7C14.3,9.9 11,13 8.6,16.7C6.1,20.4 4.6,24.6 4.2,29C3.7,33.4 4.3,37.9 5.9,42C7.4,46.1 10,49.8 13.3,52.8"
+        android:strokeWidth="7"
+        android:strokeColor="@android:color/white"
+        android:strokeLineCap="round" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/clock_bubble_1.xml b/packages/SystemUI/res-keyguard/drawable/clock_bubble_1.xml
new file mode 100644
index 0000000000000..33893efe83f63
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/clock_bubble_1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="252sp"
+        android:height="252sp"/>
+    <corners android:radius="999sp"/>
+    <solid android:color="@android:color/system_accent1_50"/>
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/clock_bubble_2.xml b/packages/SystemUI/res-keyguard/drawable/clock_bubble_2.xml
new file mode 100644
index 0000000000000..20508aa745a9a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/clock_bubble_2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="108dp"
+        android:width="108dp"/>
+    <corners android:radius="999sp"/>
+    <solid android:color="@android:color/system_accent2_200"/>
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/clock_bubble_3.xml b/packages/SystemUI/res-keyguard/drawable/clock_bubble_3.xml
new file mode 100644
index 0000000000000..8eb51a434f61d
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/clock_bubble_3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="250sp"
+        android:height="250sp"/>
+    <corners android:radius="999sp"/>
+    <stroke android:color="@android:color/system_accent1_500"
+        android:width="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/gambar_atas.png b/packages/SystemUI/res-keyguard/drawable/gambar_atas.png
new file mode 100644
index 0000000000000..ddc95777a40b9
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/gambar_atas.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/gifu.gif b/packages/SystemUI/res-keyguard/drawable/gifu.gif
new file mode 100644
index 0000000000000..d8b439ab7f7ed
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/gifu.gif differ
diff --git a/packages/SystemUI/res-keyguard/drawable/gifuto.xml b/packages/SystemUI/res-keyguard/drawable/gifuto.xml
new file mode 100644
index 0000000000000..cb3542bd78a10
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/gifuto.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+        <shape>
+            <solid android:color="#00ff0000" />
+        </shape>
+    </item>
+    <item>
+    <animated-image android:src="@drawable/gifu" android:gravity="center" android:scaleType="centerCrop" android:autoStart="true" repeatMode="1" android:repeatCount="-1" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/ic_battery.xml b/packages/SystemUI/res-keyguard/drawable/ic_battery.xml
new file mode 100644
index 0000000000000..9138349dd22b2
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ic_battery.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,21h-1l1,-7H7.5c-0.88,0 -0.33,-0.75 -0.31,-0.78C8.48,10.94 10.42,7.54 13.01,3h1l-1,7h3.51c0.4,0 0.62,0.19 0.4,0.66C12.97,17.55 11,21 11,21z"/>
+</vector>
diff --git a/packages/SystemUI/res-keyguard/drawable/ic_memory.xml b/packages/SystemUI/res-keyguard/drawable/ic_memory.xml
new file mode 100644
index 0000000000000..ada36c58ff1da
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ic_memory.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2018 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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M16.0,5.0l-8.0,0.0l0.0,14.0l8.0,0.0z"
+        android:fillAlpha="0.5"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M6,9 L6,7 L4,7 L4,5 L6,5 C6,3.9 6.9,3 8,3 L16,3 C17.1,3 18,3.9 18,5 L20,5 L20,7 L18,7 L18,9 L20,9 L20,11 L18,11 L18,13 L20,13 L20,15 L18,15 L18,17 L20,17 L20,19 L18,19 C18,20.1 17.1,21 16,21 L8,21 C6.9,21 6,20.1 6,19 L4,19 L4,17 L6,17 L6,15 L4,15 L4,13 L6,13 L6,11 L4,11 L4,9 L6,9 Z M16,19 L16,5 L8,5 L8,19 L16,19 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res-keyguard/drawable/ic_temperature.xml b/packages/SystemUI/res-keyguard/drawable/ic_temperature.xml
new file mode 100644
index 0000000000000..25dc1f40fc6ba
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ic_temperature.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,13L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v8c-1.21,0.91 -2,2.37 -2,4 0,2.76 2.24,5 5,5s5,-2.24 5,-5c0,-1.63 -0.79,-3.09 -2,-4zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1h-1v1h1v2h-1v1h1v2h-2L11,5z"/>
+</vector>
diff --git a/packages/SystemUI/res-keyguard/drawable/ic_volume_eq.xml b/packages/SystemUI/res-keyguard/drawable/ic_volume_eq.xml
new file mode 100644
index 0000000000000..3e256c0ba5b3d
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ic_volume_eq.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,18h2L9,6L7,6v12zM11,22h2L13,2h-2v20zM3,14h2v-4L3,10v4zM15,18h2L17,6h-2v12zM19,10v4h2v-4h-2z"/>
+</vector>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_27_logo.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_27_logo.png
new file mode 100644
index 0000000000000..402efa1eae529
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_27_logo.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_29_bg.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_29_bg.png
new file mode 100644
index 0000000000000..83b4fbc7c6db2
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_29_bg.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_filled.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_filled.xml
new file mode 100644
index 0000000000000..3363df31bf5ef
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_filled.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <solid android:color="#FFFFFF" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_outline.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_outline.xml
new file mode 100644
index 0000000000000..6a0b6a95d50f7
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_bg_outline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="3dp"
+        android:color="#C4FFFFFF" />
+    <corners android:radius="15dp" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_date.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_date.png
new file mode 100644
index 0000000000000..8dbbc4c17ddf0
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_date.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_time.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_time.png
new file mode 100644
index 0000000000000..168a63b36882e
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_ic_time.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_logo.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_logo.png
new file mode 100644
index 0000000000000..77179dc57de6b
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_32_logo.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_content_bg.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_content_bg.xml
new file mode 100644
index 0000000000000..27df899d1bd24
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_content_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="@android:color/system_accent3_600"
+        android:startColor="@android:color/system_accent1_600" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_day_bg.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_day_bg.xml
new file mode 100644
index 0000000000000..3cb2c4f8b88b1
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_day_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <solid android:color="#FFFFFF" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo.png
new file mode 100644
index 0000000000000..4c29a81a7324d
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo_bg.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo_bg.xml
new file mode 100644
index 0000000000000..434bb64e7829e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_37_logo_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FFFFFF" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_40_bg.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_40_bg.png
new file mode 100644
index 0000000000000..9883438dbfeae
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_40_bg.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_day_bg.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_day_bg.xml
new file mode 100644
index 0000000000000..dd5872a143c5b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_day_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="14dp" />
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_time_bg.xml b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_time_bg.xml
new file mode 100644
index 0000000000000..83fc8b71b95bc
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_41_time_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="14dp" />
+    <solid android:color="#FFFFFF" />
+</shape>
diff --git a/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_49_bg.png b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_49_bg.png
new file mode 100644
index 0000000000000..3fbaf2e00e456
Binary files /dev/null and b/packages/SystemUI/res-keyguard/drawable/lockscreen_clock_49_bg.png differ
diff --git a/packages/SystemUI/res-keyguard/drawable/ls_bg_clock_outline.xml b/packages/SystemUI/res-keyguard/drawable/ls_bg_clock_outline.xml
new file mode 100644
index 0000000000000..ae8c69c122a29
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ls_bg_clock_outline.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    android:inset="4.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item
+            android:id="@android:id/mask">
+            <shape
+                android:shape="rectangle">
+                <solid
+                    android:color="@android:color/white" />
+                <corners
+                    android:radius="20.0dip" />
+            </shape>
+        </item>
+        <item>
+            <shape
+                android:shape="rectangle">
+                <corners
+                    android:radius="20.0dip" />
+                <stroke
+                    android:width="2.5dip"
+                    android:color="?android:attr/colorAccent" />
+                <solid
+                    android:color="#00ffffff" />
+                <corners
+                    android:radius="20.0dip" />
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/ls_bg_kotak2.xml b/packages/SystemUI/res-keyguard/drawable/ls_bg_kotak2.xml
new file mode 100644
index 0000000000000..f856620c32a2a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ls_bg_kotak2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="200.0dip"
+    android:width="200.0dip"
+    android:viewportWidth="200.0"
+    android:viewportHeight="200.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/system_accent1_400"
+        android:pathData="M 25.800781 81.5 L 25.800781 123 L 53 123 L 53 121.03125 C 53 118.070312 50.328125 118.398438 74.367188 118.398438 L 95 118.398438 L 95 40 L 25.800781 40 L 25.800781 81.5 M 104 79.199219 L 104 118.398438 L 125.167969 118.398438 C 149.671875 118.398438 147 118.109375 147 120.765625 L 147 122.398438 L 171.800781 122.398438 L 171.800781 40 L 104 40 L 104 79.199219"
+        android:strokeWidth="1.0"
+        android:fillAlpha="0.8"
+        android:fillType="evenOdd" />
+    <path
+        android:fillColor="@android:color/system_accent1_100"
+        android:pathData="M 22.878906 36.285156 C 22.472656 36.460938 22.171875 36.789062 22.027344 37.210938 C 21.691406 38.171875 21.703125 125.167969 22.039062 125.90625 C 22.550781 127.03125 22.113281 127 38.191406 127 L 53 127 L 53 133.398438 L 28.722656 133.398438 C 1.9375 133.398438 3.933594 133.300781 3.933594 134.640625 C 3.933594 135.871094 2.433594 135.800781 28.839844 135.800781 L 53 135.800781 L 53 143.058594 C 53 148.441406 53.0625 150.382812 53.238281 150.558594 C 53.589844 150.910156 146.410156 150.910156 146.761719 150.558594 C 146.9375 150.382812 147 148.441406 147 143.058594 L 147 135.800781 L 171.460938 135.800781 C 198.183594 135.800781 196.609375 135.875 196.644531 134.613281 C 196.679688 133.320312 198.324219 133.398438 171.460938 133.398438 L 147 133.398438 L 147 126.398438 L 160.609375 126.398438 C 175.382812 126.398438 175.050781 126.425781 175.5625 125.304688 C 175.898438 124.566406 175.910156 38.171875 175.574219 37.207031 C 175.125 35.921875 177.589844 36 137.9375 36 C 111.535156 36 101.683594 36.0625 101.207031 36.226562 C 99.917969 36.675781 100 33.800781 100 78.09375 L 100 118.398438 L 99 118.398438 L 99 78.09375 C 99 33.800781 99.082031 36.675781 97.792969 36.226562 C 96.75 35.863281 23.714844 35.921875 22.878906 36.285156 M 95 79.199219 L 95 118.398438 L 74.367188 118.398438 C 50.328125 118.398438 53 118.070312 53 121.03125 L 53 123 L 25.800781 123 L 25.800781 40 L 95 40 L 95 79.199219 M 171.800781 81.199219 L 171.800781 122.398438 L 147 122.398438 L 147 120.765625 C 147 118.109375 149.671875 118.398438 125.167969 118.398438 L 104 118.398438 L 104 40 L 171.800781 40 L 171.800781 81.199219 M 144.996094 134.601562 L 144.996094 148.800781 L 55.003906 148.800781 L 55.003906 120.398438 L 144.996094 120.398438 L 144.996094 134.601562"
+        android:strokeWidth="1.0"
+        android:fillType="evenOdd" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/ls_bg_ribbon.xml b/packages/SystemUI/res-keyguard/drawable/ls_bg_ribbon.xml
new file mode 100644
index 0000000000000..28509e7a2ac70
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/ls_bg_ribbon.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="200.0dip"
+    android:width="200.0dip"
+    android:viewportWidth="200.0"
+    android:viewportHeight="200.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/system_accent1_300"
+        android:pathData="M 50.992188 81.847656 C 48.300781 86.273438 45.046875 91.628906 43.757812 93.746094 L 41.417969 97.601562 L 100.757812 97.589844 L 160.101562 97.582031 L 167.050781 85.824219 C 170.871094 79.359375 174 74.007812 174 73.933594 C 174 73.859375 147.421875 73.800781 114.941406 73.800781 L 55.878906 73.800781 L 50.992188 81.847656 M 38.535156 102.351562 C 36.8125 105.113281 23.761719 126.660156 23.671875 126.902344 C 23.570312 127.164062 30.425781 127.199219 83.027344 127.195312 L 142.5 127.195312 L 149.398438 115.5625 C 153.195312 109.164062 156.597656 103.402344 156.960938 102.765625 L 157.621094 101.601562 L 39.003906 101.601562 L 38.535156 102.351562"
+        android:strokeWidth="1.0"
+        android:fillType="evenOdd" />
+    <path
+        android:fillColor="@android:color/system_accent1_600"
+        android:pathData="M 137.851562 53.648438 C 137.546875 54.035156 126 73.554688 126 73.683594 C 126 73.75 136.84375 73.800781 150.101562 73.800781 C 163.355469 73.800781 174.199219 73.722656 174.199219 73.628906 C 174.199219 73.484375 138.398438 53.398438 138.140625 53.398438 C 138.089844 53.398438 137.960938 53.511719 137.851562 53.648438 M 40.605469 136.617188 C 49.898438 141.796875 58.050781 146.34375 58.726562 146.722656 L 59.949219 147.40625 L 65.875 137.421875 C 69.132812 131.929688 71.800781 127.382812 71.800781 127.320312 C 71.800781 127.253906 60.980469 127.199219 47.753906 127.199219 L 23.710938 127.199219 L 40.605469 136.617188"
+        android:strokeWidth="1.0"
+        android:fillType="evenOdd" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/sparkls1_bg1.xml b/packages/SystemUI/res-keyguard/drawable/sparkls1_bg1.xml
new file mode 100644
index 0000000000000..43f4b2826dc0b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/sparkls1_bg1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="64.0dip" />
+    <solid
+        android:color="?android:attr/colorAccent" />
+</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/drawable/sparkls1_bg2.xml b/packages/SystemUI/res-keyguard/drawable/sparkls1_bg2.xml
new file mode 100644
index 0000000000000..f9d71d3a8f950
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/drawable/sparkls1_bg2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="64.0dip" />
+    <stroke
+        android:width="4.0dip"
+        android:color="?android:attr/colorAccent" />
+</shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/font/Ayame.otf b/packages/SystemUI/res-keyguard/font/Ayame.otf
new file mode 100644
index 0000000000000..352602c46ac6d
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Ayame.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/BR_SC.ttf b/packages/SystemUI/res-keyguard/font/BR_SC.ttf
new file mode 100644
index 0000000000000..d6279394bbfec
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/BR_SC.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Bebas.ttf b/packages/SystemUI/res-keyguard/font/Bebas.ttf
new file mode 100644
index 0000000000000..eaff48668af69
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Bebas.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Blackout.ttf b/packages/SystemUI/res-keyguard/font/Blackout.ttf
new file mode 100644
index 0000000000000..ca3cdbeff08a5
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Blackout.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Cotta.otf b/packages/SystemUI/res-keyguard/font/Cotta.otf
new file mode 100644
index 0000000000000..5979cec2f0811
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Cotta.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/Electroharmonix.otf b/packages/SystemUI/res-keyguard/font/Electroharmonix.otf
new file mode 100644
index 0000000000000..5574edf19b338
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Electroharmonix.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/EncodeSansBold.ttf b/packages/SystemUI/res-keyguard/font/EncodeSansBold.ttf
new file mode 100644
index 0000000000000..5aec428148172
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/EncodeSansBold.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/EncodeSansLight.ttf b/packages/SystemUI/res-keyguard/font/EncodeSansLight.ttf
new file mode 100644
index 0000000000000..c179546b22d06
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/EncodeSansLight.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Fontarian.otf b/packages/SystemUI/res-keyguard/font/Fontarian.otf
new file mode 100644
index 0000000000000..f1efe5a90a8ab
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Fontarian.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/FontsFree-Net-Carthart.ttf b/packages/SystemUI/res-keyguard/font/FontsFree-Net-Carthart.ttf
new file mode 100644
index 0000000000000..f9cbb8684153d
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/FontsFree-Net-Carthart.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Getaway.ttf b/packages/SystemUI/res-keyguard/font/Getaway.ttf
new file mode 100644
index 0000000000000..2796f64bc288f
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Getaway.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Gobold.otf b/packages/SystemUI/res-keyguard/font/Gobold.otf
new file mode 100644
index 0000000000000..bd914d4d701cd
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Gobold.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/GoldenAge.ttf b/packages/SystemUI/res-keyguard/font/GoldenAge.ttf
new file mode 100644
index 0000000000000..3acc234bb4a45
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/GoldenAge.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Hollow.otf b/packages/SystemUI/res-keyguard/font/Hollow.otf
new file mode 100644
index 0000000000000..a229a0dfe55d4
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Hollow.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/Hollow2.otf b/packages/SystemUI/res-keyguard/font/Hollow2.otf
new file mode 100644
index 0000000000000..5360f735c1b63
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Hollow2.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/Kenyen.otf b/packages/SystemUI/res-keyguard/font/Kenyen.otf
new file mode 100644
index 0000000000000..37acb312906c2
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Kenyen.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/LightPixel.ttf b/packages/SystemUI/res-keyguard/font/LightPixel.ttf
new file mode 100644
index 0000000000000..6ce8de09ebe9a
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/LightPixel.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Longest.otf b/packages/SystemUI/res-keyguard/font/Longest.otf
new file mode 100644
index 0000000000000..185ba87baab4c
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Longest.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/Neumatic.otf b/packages/SystemUI/res-keyguard/font/Neumatic.otf
new file mode 100644
index 0000000000000..a4f75aae397c3
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Neumatic.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/PlayfairDisplay.ttf b/packages/SystemUI/res-keyguard/font/PlayfairDisplay.ttf
new file mode 100644
index 0000000000000..0587b8821539c
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/PlayfairDisplay.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Quartilla.ttf b/packages/SystemUI/res-keyguard/font/Quartilla.ttf
new file mode 100644
index 0000000000000..00a5f24b40b3d
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Quartilla.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/Sans_Bold.ttf b/packages/SystemUI/res-keyguard/font/Sans_Bold.ttf
new file mode 100644
index 0000000000000..d847195c7600a
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/Sans_Bold.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Bold.ttf b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Bold.ttf
new file mode 100644
index 0000000000000..2aa65528972ef
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Bold.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Medium.ttf b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Medium.ttf
new file mode 100644
index 0000000000000..7ea0803c3b63f
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Medium.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Regular.ttf b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Regular.ttf
new file mode 100644
index 0000000000000..e71b4e0be9ef2
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/SlateForOnePlus-Regular.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/astthillabeltaden.otf b/packages/SystemUI/res-keyguard/font/astthillabeltaden.otf
new file mode 100644
index 0000000000000..63a9380b7d5ef
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/astthillabeltaden.otf differ
diff --git a/packages/SystemUI/res-keyguard/font/bebasneue.ttf b/packages/SystemUI/res-keyguard/font/bebasneue.ttf
new file mode 100644
index 0000000000000..d2190b5139486
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/bebasneue.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/bebasneue_bold.ttf b/packages/SystemUI/res-keyguard/font/bebasneue_bold.ttf
new file mode 100644
index 0000000000000..6fff6057a6d05
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/bebasneue_bold.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/cattyabrown.ttf b/packages/SystemUI/res-keyguard/font/cattyabrown.ttf
new file mode 100644
index 0000000000000..02b7d5c4d35ff
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/cattyabrown.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/general_sans.ttf b/packages/SystemUI/res-keyguard/font/general_sans.ttf
new file mode 100644
index 0000000000000..65b0dabc1b8f6
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/general_sans.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/japanese3017.ttf b/packages/SystemUI/res-keyguard/font/japanese3017.ttf
new file mode 100644
index 0000000000000..671cd7103c61f
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/japanese3017.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/montserrat_bold.ttf b/packages/SystemUI/res-keyguard/font/montserrat_bold.ttf
new file mode 100644
index 0000000000000..ae33a4538132c
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/montserrat_bold.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/ntype82.ttf b/packages/SystemUI/res-keyguard/font/ntype82.ttf
new file mode 100644
index 0000000000000..761cfd9c2030c
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/ntype82.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/samsung7.ttf b/packages/SystemUI/res-keyguard/font/samsung7.ttf
new file mode 100644
index 0000000000000..58b906158b16b
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/samsung7.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/slim.ttf b/packages/SystemUI/res-keyguard/font/slim.ttf
new file mode 100644
index 0000000000000..a999b006f94a4
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/slim.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/subway.ttf b/packages/SystemUI/res-keyguard/font/subway.ttf
new file mode 100644
index 0000000000000..06d5cc037a240
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/subway.ttf differ
diff --git a/packages/SystemUI/res-keyguard/font/tallclock.ttf b/packages/SystemUI/res-keyguard/font/tallclock.ttf
new file mode 100644
index 0000000000000..8e588d71e80c7
Binary files /dev/null and b/packages/SystemUI/res-keyguard/font/tallclock.ttf differ
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_outline.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_outline.xml
new file mode 100644
index 0000000000000..d0bfcb81f5c14
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_outline.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="horizontal"
+    android:paddingTop="50.0dip"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginStart="0.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:background="@drawable/ls_bg_clock_outline"
+        android:padding="10.0dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0.0dip">
+        <TextClock
+            android:textSize="40.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/lsclock8_a"
+            android:background="@drawable/SparkCircleClock_bg"
+            android:padding="10.0dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:layout_alignParentStart="true"
+            android:format12Hour=" hh "
+            android:format24Hour=" HH " />
+        <TextClock
+            android:textSize="20.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:gravity="end"
+            android:layout_gravity="end"
+            android:id="@+id/lsclock8_b"
+            android:background="@drawable/SparkCircleClock_bg"
+            android:padding="10.0dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=" mm "
+            android:format24Hour=" mm " />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="20.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock8_d"
+                android:background="@drawable/ls_bg_clock_outline"
+                android:padding="10.0dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=" MMMM dd "
+                android:format24Hour=" MMMM dd " />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="100.0dip"
+            android:layout_height="3.649994dip"
+            android:layout_marginTop="5.0dip" />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="70.0dip"
+            android:layout_height="2.5dip"
+            android:layout_marginTop="5.0dip" />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="100.0dip"
+            android:layout_height="3.649994dip"
+            android:layout_marginTop="5.0dip"
+            android:layout_marginBottom="5.0dip" />
+        <TextClock
+            android:textSize="20.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/lsclock8_c"
+            android:background="@drawable/ls_bg_clock_outline"
+            android:padding="10.0dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=" EEEE "
+            android:format24Hour=" EEEE " />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_ovalium.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_ovalium.xml
new file mode 100644
index 0000000000000..88c9e86111578
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_ovalium.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="-20.0dip" />
+    <FrameLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <com.airbnb.lottie.LottieAnimationView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:clickable="false"
+            android:layout_width="250.0dip"
+            android:layout_height="250.0dip"
+            android:layout_marginStart="0.0dip"
+            app:lottie_autoPlay="true"
+            app:lottie_rawRes="@raw/ovalium"
+            app:lottie_loop="true" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0.0dip">
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="40.0dip" />
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0.0dip">
+                <TextClock
+                    android:textSize="15.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:id="@+id/lsclock9_d"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" MMMM dd "
+                    android:format24Hour=" MMMM dd " />
+                <LinearLayout
+                    android:layout_gravity="center"
+                    android:background="@drawable/anci_dot_bg"
+                    android:layout_width="5.0dip"
+                    android:layout_height="16.0dip" />
+                <TextClock
+                    android:textSize="15.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:id="@+id/lsclock9_e"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" EEEE"
+                    android:format24Hour=" EEEE" />
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="30.0dip" />
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0.0dip">
+                    <TextClock
+                        android:textSize="25.0dip"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/system_accent1_100"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_a"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour=" hh"
+                        android:format24Hour=" HH" />
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="#00000000"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour="...."
+                        android:format24Hour="...." />
+                </LinearLayout>
+                <TextClock
+                    android:textSize="0.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:id="@+id/lsclock9_b"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" "
+                    android:format24Hour=" " />
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="#00000000"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour="....."
+                        android:format24Hour="....." />
+                    <TextClock
+                        android:textSize="25.0dip"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/system_accent1_100"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour="mm"
+                        android:format24Hour="mm" />
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="20.0dip" />
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_rectangle.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_rectangle.xml
new file mode 100644
index 0000000000000..1e892f9930bee
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_rectangle.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="-20.0dip" />
+    <FrameLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <com.airbnb.lottie.LottieAnimationView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:clickable="false"
+            android:layout_width="300.0dip"
+            android:layout_height="300.0dip"
+            android:layout_marginStart="0.0dip"
+            app:lottie_autoPlay="true"
+            app:lottie_rawRes="@raw/rectangle"
+            app:lottie_loop="true" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="45.0dip"
+                android:textStyle="bold"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/lsclock9_a"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=" hh"
+                android:format24Hour=" HH" />
+            <TextClock
+                android:textSize="20.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/lsclock9_b"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=" "
+                android:format24Hour=" " />
+            <TextClock
+                android:textSize="45.0dip"
+                android:textStyle="bold"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/lsclock9_c"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=" mm"
+                android:format24Hour=" mm" />
+        </LinearLayout>
+    </FrameLayout>
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-30.0dip">
+        <TextClock
+            android:textSize="15.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_d"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=" MMMM dd "
+            android:format24Hour=" MMMM dd " />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="5.0dip"
+            android:layout_height="16.0dip" />
+        <TextClock
+            android:textSize="15.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_e"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=" EEEE"
+            android:format24Hour=" EEEE" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_wallet.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_wallet.xml
new file mode 100644
index 0000000000000..b3d3db354eb5c
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clock_wallet.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="0.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="-20.0dip" />
+    <FrameLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <com.airbnb.lottie.LottieAnimationView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:clickable="false"
+            android:layout_width="250.0dip"
+            android:layout_height="250.0dip"
+            android:layout_marginStart="0.0dip"
+            app:lottie_autoPlay="true"
+            app:lottie_rawRes="@raw/wallet"
+            app:lottie_loop="true" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0.0dip">
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="40.0dip" />
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:paddingBottom="6.0dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5.0dip">
+                <TextClock
+                    android:textSize="14.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:id="@+id/lsclock9_d"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" MMMM dd "
+                    android:format24Hour=" MMMM dd " />
+                <LinearLayout
+                    android:layout_gravity="center"
+                    android:background="@drawable/anci_dot_bg"
+                    android:layout_width="5.0dip"
+                    android:layout_height="16.0dip" />
+                <TextClock
+                    android:textSize="14.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:id="@+id/lsclock9_e"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" EEEE"
+                    android:format24Hour=" EEEE" />
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="30.0dip" />
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0.0dip">
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/system_accent1_100"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_a"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour=" hh"
+                        android:format24Hour=" HH" />
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="#00000000"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour=" mm"
+                        android:format24Hour=" mm" />
+                </LinearLayout>
+                <TextClock
+                    android:textSize="0.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:id="@+id/lsclock9_b"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour=" "
+                    android:format24Hour=" " />
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="#00000000"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour=" hh"
+                        android:format24Hour=" hh" />
+                    <TextClock
+                        android:textSize="45.0dip"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/system_accent1_100"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:id="@+id/lsclock9_c"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:format12Hour=" mm"
+                        android:format24Hour=" mm" />
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="20.0dip" />
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_clavicula.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_clavicula.xml
new file mode 100644
index 0000000000000..b40aa01d4684f
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_clavicula.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="20.0dip" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock10_a"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour="EEEE "
+                android:format24Hour="EEEE " />
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock10_c"
+                android:background="@drawable/anci_dot_bg_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:paddingStart="10.0dip"
+                android:paddingEnd="15.0dip"
+                android:format12Hour="dd"
+                android:format24Hour="dd" />
+        </LinearLayout>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock10_d"
+                android:background="@drawable/anci_dot_bg_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:paddingStart="15.0dip"
+                android:paddingEnd="15.0dip"
+                android:format12Hour="MMM"
+                android:format24Hour="MMM" />
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock10_e"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=" hh:mm"
+                android:format24Hour=" HH:mm" />
+            <TextClock
+                android:textSize="20.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock10_b"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour="a"
+                android:format24Hour=" " />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="150.0dip"
+            android:layout_height="5.0dip"
+            android:layout_marginTop="15.0dip" />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="100.0dip"
+            android:layout_height="3.649994dip"
+            android:layout_marginTop="5.0dip" />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="70.0dip"
+            android:layout_height="2.5dip"
+            android:layout_marginTop="5.0dip" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_kln.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_kln.xml
new file mode 100644
index 0000000000000..63a65b2aca98e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_kln.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <FrameLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+        <ImageView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ls_bg_ribbon" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextClock
+                    android:textSize="17.0dip"
+                    android:textStyle="bold"
+                    android:textColor="#00000000"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="1.0dip"
+                    android:singleLine="true"
+                    android:format12Hour="   "
+                    android:format24Hour="   " />
+                <TextClock
+                    android:textSize="17.0dip"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:id="@+id/anci_analog_clockdate13"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="1.0dip"
+                    android:singleLine="true"
+                    android:format12Hour="k:mm"
+                    android:format24Hour="k:mm" />
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextClock
+                    android:textSize="17.0dip"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1.0dip"
+                    android:singleLine="true"
+                    android:format12Hour="EEE dd"
+                    android:format24Hour="EEE dd" />
+                <TextClock
+                    android:textSize="17.0dip"
+                    android:textStyle="bold"
+                    android:textColor="#00000000"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1.0dip"
+                    android:singleLine="true"
+                    android:format12Hour="   "
+                    android:format24Hour="   " />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_miring.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_miring.xml
new file mode 100644
index 0000000000000..58ea0a0d9339c
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_miring.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="0.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <FrameLayout
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+        <ImageView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ls_bg_kotak2" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextClock
+                    android:textSize="40.0dip"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour="hh"
+                    android:format24Hour="HH" />
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:layout_width="30.0dip"
+                    android:layout_height="wrap_content" />
+                <TextClock
+                    android:textSize="40.0dip"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour="mm"
+                    android:format24Hour="mm" />
+            </LinearLayout>
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="10.0dip" />
+            <TextClock
+            android:paddingTop="7.5dip"
+                android:textSize="20.0dip"
+                android:textStyle="bold"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour="EEE dd"
+                android:format24Hour="EEE dd" />
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_scapula.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_scapula.xml
new file mode 100644
index 0000000000000..0c868cdfd0ec8
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_scapula.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="5.0dip"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="50.0dip" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-20.0dip">
+            <TextClock
+                android:textSize="90.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/lsclock8_a"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:layout_alignParentStart="true"
+                android:format12Hour="hh"
+                android:format24Hour="HH" />
+            <TextClock
+                android:textSize="50.0dip"
+                android:textColor="#00000000"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="-20.0dip"
+                android:singleLine="true"
+                android:layout_alignParentStart="true"
+                android:format12Hour="hh"
+                android:format24Hour="HH" />
+        </LinearLayout>
+        <TextClock
+            android:textSize="90.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:gravity="end"
+            android:layout_gravity="end"
+            android:id="@+id/lsclock8_b"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour="mm"
+            android:format24Hour="mm" />
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="20.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock8_d"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour="MMMM dd"
+                android:format24Hour="MMMM dd" />
+            <TextClock
+                android:textSize="20.0dip"
+                android:textColor="@android:color/system_accent1_100"
+                android:id="@+id/lsclock8_e"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:format12Hour=", yyy"
+                android:format24Hour=", yyy" />
+        </LinearLayout>
+        <TextClock
+            android:textSize="20.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/lsclock8_c"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour="EEEE"
+            android:format24Hour="EEEE" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_sternum.xml b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_sternum.xml
new file mode 100644
index 0000000000000..0f9469145835a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_anci_clockdate_sternum.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="end"
+    android:layout_gravity="end"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="50.0dip" />
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextClock
+            android:textSize="24.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_d"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour="MMMM dd "
+            android:format24Hour="MMMM dd " />
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@drawable/anci_dot_bg"
+            android:layout_width="5.0dip"
+            android:layout_height="25.0dip" />
+        <TextClock
+            android:textSize="24.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_e"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=" EEEE"
+            android:format24Hour=" EEEE" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextClock
+            android:textSize="100.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_a"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour="hh"
+            android:format24Hour="HH" />
+        <TextClock
+            android:textSize="100.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_b"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour=":"
+            android:format24Hour=":" />
+        <TextClock
+            android:textSize="100.0dip"
+            android:textColor="@android:color/system_accent1_100"
+            android:id="@+id/lsclock9_c"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:format12Hour="mm"
+            android:format24Hour="mm" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_aod_style.xml b/packages/SystemUI/res-keyguard/layout/keyguard_aod_style.xml
new file mode 100644
index 0000000000000..659f966e7147f
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_aod_style.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.systemui.clocks.AODStyle
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:id="@+id/aod_style_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/below_clock_padding_start"
+        android:layout_marginTop="@dimen/custom_clock_frame_margin_top">
+        <ImageView
+            android:id="@+id/custom_aod_image_view"
+            android:layout_width="@dimen/custom_aod_image_size"
+            android:layout_height="@dimen/custom_aod_image_size"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="20dp"
+            android:scaleType="centerCrop"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</com.android.systemui.clocks.AODStyle>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
index 90851e2a921c6..5be464eede176 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
@@ -38,13 +38,18 @@
         android:orientation="horizontal"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginTop="30dp">
+        android:layout_marginTop="24dp"
+        android:gravity="center">
       <TextView
           style="@style/Bouncer.UserSwitcher.Spinner.Header"
           android:clickable="false"
           android:id="@+id/user_switcher_header"
           android:textDirection="locale"
-          android:layout_width="@dimen/bouncer_user_switcher_width"
+          android:gravity="center"
+          android:layout_gravity="center"
+          android:textAlignment="center"
+          android:minWidth="@dimen/bouncer_user_switcher_width"
+          android:layout_width="wrap_content"
           android:layout_height="match_parent" />
     </com.android.keyguard.KeyguardUserSwitcherAnchor>
 
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_a9.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_a9.xml
new file mode 100644
index 0000000000000..ae8523cb50918
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_a9.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:tag="accent1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="70dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="EEEE, MMMM dd"
+            android:format24Hour="EEEE, dd MMMM"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_accent.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_accent.xml
new file mode 100644
index 0000000000000..00a29a8f2254e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_accent.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="accent2|nolineheight"
+            android:text="·"
+            android:textColor="@android:color/system_accent1_600"
+            android:textSize="40sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tag="accent3|nolineheight"
+            android:text="·"
+            android:textColor="@android:color/system_accent2_600"
+            android:textSize="40sp" />
+
+    </LinearLayout>
+
+    <TextClock
+        android:id="@+id/day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-20dp"
+        android:fontFamily="@*android:string/config_clockFontFamily"
+        android:format12Hour="EEEE"
+        android:format24Hour="EEEE"
+        android:tag="text1|nolineheight"
+        android:textColor="#FFFFFF"
+        android:textSize="40sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <TextClock
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM"
+            android:format24Hour="dd MMM"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:inputType="text|textCapCharacters"
+            android:tag="accent1"
+            android:textColor="@android:color/system_accent1_300"
+            android:textSize="28sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:text="x"
+            android:textColor="@android:color/white"
+            android:textSize="28sp" />
+
+        <TextClock
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="hh:mm"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format24Hour="HH:mm"
+            android:tag="text2"
+            android:textColor="#FFFFFF"
+            android:textSize="28sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_analog.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_analog.xml
new file mode 100644
index 0000000000000..cbab58a67ec90
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_analog.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <!-- Analog Clock Custom View -->
+    <com.android.systemui.clocks.AnalogClockView
+        android:id="@+id/analog_clock"
+        android:layout_width="280dp"
+        android:layout_height="280dp"
+        android:layout_gravity="center"/>
+
+    <TextClock
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="EEE, MMM d"
+        android:format24Hour="EEE, MMM d"
+        android:gravity="center"
+        android:singleLine="true"
+        android:tag="text1|nolineheight"
+        android:textAlignment="center"
+        android:layout_marginTop="5dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@*android:string/config_clockFontFamily"
+        android:textSize="22dp" />
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_big1.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big1.xml
new file mode 100644
index 0000000000000..ae59dfae6eac2
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big1.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextClock
+        android:id="@+id/date_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textSize="20sp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Bebas"
+        android:singleLine="true"
+        android:textAllCaps="true"
+        android:gravity="center"
+        android:textAlignment="center"
+        android:format12Hour="EEEE, MMMM d"
+        android:format24Hour="EEEE, MMMM d"/>
+
+    <TextClock
+        android:id="@+id/hour_text"
+        android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+        android:layout_marginTop="-6dp"
+        android:textSize="200dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Hollow2"
+        android:layout_gravity="center"
+        android:format12Hour="hh"
+        android:format24Hour="HH"/>
+
+    <TextClock
+        android:id="@+id/minute_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="200dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Gobold"
+        android:layout_gravity="center"
+        android:format12Hour="mm"
+        android:format24Hour="mm"/>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_big2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big2.xml
new file mode 100644
index 0000000000000..29b84c8a0b51a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextClock
+        android:id="@+id/hour_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textSize="200dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Hollow2"
+        android:layout_gravity="center"
+        android:singleLine="true"
+        android:format12Hour="hh"
+        android:format24Hour="HH"/>
+
+    <TextClock
+        android:id="@+id/minute_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="200dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Hollow2"
+        android:layout_gravity="center"
+        android:singleLine="true"
+        android:format12Hour="mm"
+        android:format24Hour="mm"/>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_big3.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big3.xml
new file mode 100644
index 0000000000000..7266f10c6dd4f
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_big3.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextClock
+        android:id="@+id/date_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Bebas"
+        android:singleLine="true"
+        android:textAllCaps="true"
+        android:gravity="center"
+        android:textAlignment="center"
+        android:format12Hour="EEEE, MMMM d"
+        android:format24Hour="EEEE, MMMM d"/>
+
+    <TextClock
+        android:id="@+id/hour_text"
+        android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:textSize="140dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Blackout"
+        android:layout_gravity="center"
+        android:format12Hour="hh"
+        android:format24Hour="HH"/>
+
+    <TextClock
+        android:id="@+id/minute_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:layout_marginTop="8dp"
+        android:textSize="140dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/Blackout"
+        android:layout_gravity="center"
+        android:singleLine="true"
+        android:format12Hour="mm"
+        android:format24Hour="mm"/>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_block.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_block.xml
new file mode 100644
index 0000000000000..b5c678d217f42
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_block.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="0dp"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal|top"
+        android:gravity="center_horizontal|top"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:layout_marginBottom="-20dp"
+                android:fontFamily="@font/bebasneue"
+                android:format12Hour="hh"
+                android:format24Hour="HH"
+                android:gravity="center"
+                android:layout_marginEnd="20dp"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textColor="@android:color/system_accent1_50"
+                android:textSize="200sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginTop="60dp"
+                android:rotation="90"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="-0dp">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:rotation="0"
+                    android:layout_marginTop="90dp"
+                    android:fontFamily="@font/bebasneue_bold"
+                    android:format12Hour="yyyy"
+                    android:format24Hour="yyyy"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:letterSpacing="0.3"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/white"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-100dp">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="100dp"
+                android:layout_marginEnd="-0dp"
+                android:orientation="vertical"
+                android:rotation="-90">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:letterSpacing="0.3"
+                    android:format12Hour="EEE"
+                    android:format24Hour="EEE"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/white"
+                    android:fontFamily="@font/bebasneue"
+                    android:textSize="15sp" />
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:format12Hour="dd - MMM"
+                    android:format24Hour="dd - MMM"
+                    android:letterSpacing="0.3"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:textAlignment="center"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/white"
+                    android:fontFamily="@font/bebasneue"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:fontFamily="@font/bebasneue"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:gravity="center_horizontal"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textColor="@android:color/system_accent2_200"
+                android:textSize="250sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_bubble.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_bubble.xml
new file mode 100644
index 0000000000000..1511329a4c1c3
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_bubble.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/clock_bubble_3"
+            android:layout_marginTop="60dp"
+            android:layout_marginStart="50dp"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/clock_bubble_1"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="hh"
+                android:textColor="@android:color/system_accent1_900"
+                android:format24Hour="HH"
+                android:textSize="111sp"
+                android:textStyle="bold" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="mm"
+                android:format24Hour="MM"
+                android:fontFamily="@font/general_sans"
+                android:textSize="47sp"
+                android:textColor="@android:color/system_accent1_900"
+                android:textStyle="bold"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="23dp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="140dp"
+            android:layout_marginTop="270dp"
+            android:gravity="center"
+            android:background="@drawable/clock_bubble_2"
+            android:tag="accent2">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="dd MMM"
+                android:gravity="center"
+                android:textAllCaps="true"
+                android:textColor="@android:color/system_accent2_900"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginStart="270dp"
+            android:layout_marginTop="121dp"
+            android:background="@drawable/clock_bubble_2"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/general_sans"
+                android:format12Hour="ss"
+                android:gravity="center"
+                android:textAllCaps="true"
+                android:textColor="@android:color/system_accent2_50"
+                android:textSize="20sp" />
+
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_center.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_center.xml
new file mode 100644
index 0000000000000..4049853d7a7fb
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_center.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+            <TextClock
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="EEE, MMM d"
+                android:format24Hour="EEE, d MMM"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1|nolineheight"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textSize="20dp" />
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone" />
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:textSize="20dp"
+                android:visibility="gone" />
+        </LinearLayout>
+        <TextClock
+            android:id="@+id/clock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:alpha="0.9"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="100dp"
+            android:textStyle="bold" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_encode.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_encode.xml
new file mode 100644
index 0000000000000..0e625c9621477
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_encode.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:orientation="vertical"
+    android:gravity="center|top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- Hour Text (Dynamic) -->
+    <TextClock
+        android:id="@+id/hour_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="100dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/EncodeSansBold"
+        android:layout_gravity="center"
+        android:format12Hour="hh"
+        android:format24Hour="HH"/>
+
+    <!-- Minute Text (Dynamic) -->
+    <TextClock
+        android:id="@+id/minute_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="101dp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/EncodeSansLight"
+        android:layout_marginTop="2dp"
+        android:layout_gravity="center"
+        android:format12Hour="mm"
+        android:format24Hour="mm"/>
+
+    <!-- AM/PM Text (Dynamic) -->
+    <TextClock
+        android:id="@+id/am_pm_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="24sp"
+        android:textColor="@android:color/white"
+        android:fontFamily="@font/EncodeSansLight"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="center"
+        android:format12Hour="a - EEE, MMM d"
+        android:format24Hour="a - EEE, MMM d"/>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_gateway.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_gateway.xml
new file mode 100644
index 0000000000000..9452ec5c7be4f
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_gateway.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/general_sans"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Getaway"
+            android:layout_marginTop="-6dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="130dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ide.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ide.xml
new file mode 100644
index 0000000000000..137a2e933a5ae
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ide.xml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start|top">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_gravity="start|top"
+        android:gravity="start"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|top"
+            android:gravity="start"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textInclude"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="#include  "
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\u003Cstring\u003E"
+                    android:textColor="#3DDB86"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textUsingNamespace"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="using namespace  "
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textStd"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="std;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textIntMain"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="int main  "
+                    android:textSize="16sp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="()"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="{"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textTimeDateDayMonth"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\tstring time, date, day, month, weather;"
+                    android:textSize="16sp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\ttime =  \u0022"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextClock
+                    android:id="@+id/clockTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:format12Hour="hh:mm"
+                    android:format24Hour="kk:mm"
+                    android:letterSpacing="0.03"
+                    android:textColor="#3DDB86"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:paddingStart="-0.5dip"
+                    android:text="\u0022;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\tday =  \u0022"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextClock
+                    android:id="@+id/clockDay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:format12Hour="EEEE"
+                    android:format24Hour="EEEE"
+                    android:gravity="center"
+                    android:letterSpacing="0.3"
+                    android:textAllCaps="true"
+                    android:textColor="#3DDB86"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:paddingStart="-0.5dip"
+                    android:text="\u0022;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\tdate =  \u0022"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextClock
+                    android:id="@+id/clockDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:format12Hour="yyyy.MM.dd"
+                    android:format24Hour="yyyy.MM.dd"
+                    android:textColor="#0040ff"
+                    android:letterSpacing="0.03"
+                    android:singleLine="true"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:paddingStart="-0.5dip"
+                    android:text="\u0022;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\tmonth =  \u0022"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextClock
+                    android:id="@+id/clockMonth"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:format12Hour="MMMM"
+                    android:format24Hour="MMMM"
+                    android:gravity="center"
+                    android:letterSpacing="0.3"
+                    android:textColor="#ff0000"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:paddingStart="-0.5dip"
+                    android:text="\u0022;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+            
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\tweather =  \u0022"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <com.android.systemui.weather.WeatherTextView
+                    android:id="@+id/clockWeather"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:gravity="center"
+                    android:letterSpacing="0.3"
+                    android:textColor="#ff0000"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    android:textSize="16sp"
+                    app:weatherText="@string/clock_ide_weather_data_unavailable" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:paddingStart="-0.5dip"
+                    android:text="\u0022;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="\treturn 0;"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:gravity="start"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@*android:string/config_clockFontFamily"
+                    android:text="}"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios.xml
new file mode 100644
index 0000000000000..eb2ed397f1a24
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="EEE, MM dd"
+            android:format24Hour="EEE, dd MM"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" 
+            android:textStyle="bold" />
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/tallclock"
+            android:layout_marginTop="4dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="280dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios10.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios10.xml
new file mode 100644
index 0000000000000..e7e3989277754
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios10.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Bebas"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:layout_marginBottom="-5dp"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-5dp"
+                android:fontFamily="@font/Longest"
+                android:format12Hour="hh"
+                android:format24Hour="HH"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="#ffffff"
+                android:textSize="390dp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-5dp"
+                android:fontFamily="@font/Longest"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="390dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios11.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios11.xml
new file mode 100644
index 0000000000000..c87a1155498ff
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios11.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Kenyen"
+            android:layout_marginBottom="-10dp"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="130dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="16dp" 
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios12.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios12.xml
new file mode 100644
index 0000000000000..7f5cabc9b1c26
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios12.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" 
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Gobold"
+            android:layout_marginTop="-6dp"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="130dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios2.xml
new file mode 100644
index 0000000000000..9f08185723023
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios2.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" 
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Gobold"
+            android:layout_marginTop="-6dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="130dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios3.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios3.xml
new file mode 100644
index 0000000000000..96f69905b89ba
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios3.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" 
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Hollow"
+            android:layout_marginTop="-5dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="150dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios4.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios4.xml
new file mode 100644
index 0000000000000..1355248be129b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios4.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Longest"
+            android:layout_marginTop="10dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="320dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios5.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios5.xml
new file mode 100644
index 0000000000000..c954c69ba90f9
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios5.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" 
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Quartilla"
+            android:layout_marginTop="5dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="400dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios6.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios6.xml
new file mode 100644
index 0000000000000..b5d79ad17e83b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios6.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:fontFamily="@font/samsung7"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:layout_marginBottom="-10dp"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Kenyen"
+            android:layout_marginTop="-30dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="230dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios7.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios7.xml
new file mode 100644
index 0000000000000..3c1b695351533
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios7.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/Quartilla"
+                android:format12Hour="hh"
+                android:format24Hour="HH"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="#f9f9f9"
+                android:textSize="390dp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/Quartilla"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="390dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios8.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios8.xml
new file mode 100644
index 0000000000000..dea0b120c274e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios8.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Kenyen"
+            android:layout_marginBottom="-10dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="140dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="16dp" 
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios9.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios9.xml
new file mode 100644
index 0000000000000..d93cc9fc800f8
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_ios9.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="#f9f9f9"
+            android:textSize="20dp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/Ayame"
+                android:format12Hour="hh"
+                android:format24Hour="HH"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="240dp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/Ayame"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textAlignment="center"
+                android:textColor="#f9f9f9"
+                android:textSize="240dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_label.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_label.xml
new file mode 100644
index 0000000000000..f726f23a70edb
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_label.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:gravity="start|center"
+    android:layout_gravity="start|center"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/clock_frame"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_marginTop="60.0dip"
+        android:layout_height="wrap_content">
+        
+        <TextClock
+            android:textSize="54.0dip"
+            android:textColor="@android:color/white"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:format12Hour="EEEE"
+            android:format24Hour="EEEE"/>
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        </LinearLayout>
+        
+        <FrameLayout
+            android:layout_gravity="start"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+            <TextClock
+                android:textSize="54.0dip"
+                android:textColor="@android:color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:singleLine="true"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"/>
+            
+            <TextClock
+                android:textSize="54.0dip"
+                android:textColor="@android:color/system_accent1_300"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:singleLine="true"
+                android:maxLength="1"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"/>
+        </FrameLayout>
+
+        <TextClock
+            android:id="@+id/oos_date"
+            android:textSize="19dp"
+            android:textColor="@android:color/white"
+            android:layout_marginStart="7dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:format12Hour="MMMM dd"
+            android:format24Hour="MMMM dd"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_marginTop="5.0dip"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="start|center">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:visibility="gone"
+                android:layout_marginEnd="4dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="19dp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_life.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_life.xml
new file mode 100644
index 0000000000000..d9f206edb256d
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_life.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <!-- LIFE Text -->
+    <TextView
+        android:id="@+id/life_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="LIFE"
+        android:fontFamily="@font/PlayfairDisplay"
+        android:textColor="@android:color/white"
+        android:includeFontPadding="false"
+        android:textSize="100sp"
+        android:letterSpacing="0.4"
+        android:layout_marginBottom="125dp" />
+
+    <!-- Date Layout -->
+    <TextClock
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="d/M"
+        android:format24Hour="d/M"
+        android:fontFamily="@font/Cotta"
+        android:textColor="@android:color/white"
+        android:textSize="35sp"
+        android:layout_marginBottom="7dp" />
+
+    <!-- Time Layout -->
+    <TextClock
+        android:id="@+id/clock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="hh:mm"
+        android:format24Hour="HH:mm"
+        android:fontFamily="@font/Cotta"
+        android:textColor="@android:color/white"
+        android:textSize="65sp"
+        android:layout_marginBottom="8dp" />
+
+    <!-- Day Text -->
+    <TextClock
+        android:id="@+id/day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="EEE"
+        android:format24Hour="EEE"
+        android:fontFamily="@font/Cotta"
+        android:textColor="@android:color/white"
+        android:textSize="30sp" />
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui.xml
new file mode 100644
index 0000000000000..f71e37fe86c47
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:gravity="start|center"
+    android:layout_gravity="start|center"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <TextClock
+            android:textSize="100.0dip"
+            android:textColor="@android:color/white"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"/>
+        <TextClock
+            android:textSize="60.0dip"
+            android:textColor="@android:color/white"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-15.0dip"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:textAllCaps="true"
+            android:format12Hour="EEE"
+            android:format24Hour="EEE"/>
+        <TextClock
+            android:id="@+id/miui_date"
+            android:textSize="60.0dip"
+            android:textColor="@android:color/white"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-10.0dip"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format12Hour="MM/dd"
+            android:format24Hour="MM/dd"/>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|center">
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/miui_weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone" />
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/miui_weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:textSize="20dp"
+                android:visibility="gone"
+                android:textAllCaps="true" />
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui2.xml
new file mode 100644
index 0000000000000..6553165c0c247
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_miui2.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:gravity="top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-70dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/Neumatic"
+                android:format12Hour="hh"
+                android:format24Hour="HH"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textColor="@android:color/white"
+                android:textSize="340dp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/Neumatic"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textColor="#fefefe"
+                android:textSize="340dp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextClock
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="22dp"
+        android:layout_marginTop="-50dp"
+        android:fontFamily="@font/general_sans"
+        android:format12Hour="EEE, dd/MM"
+        android:format24Hour="EEE, dd/MM"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        android:textAllCaps="true"
+        android:textColor="#fefefe"
+        android:textSize="16dp" />
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_mont.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_mont.xml
new file mode 100644
index 0000000000000..aa10df8f3c885
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_mont.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:alpha="0.5"
+                android:fontFamily="@font/montserrat_bold"
+                android:format12Hour="hh mm"
+                android:format24Hour="HH mm"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="96sp"
+                android:textStyle="bold" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:fontFamily="@font/montserrat_bold"
+                android:format12Hour="EEEE"
+                android:format24Hour="EEEE"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="42sp"
+                android:textStyle="bold" />
+
+        </FrameLayout>
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="-20dp"
+            android:fontFamily="@font/montserrat_bold"
+            android:format12Hour="dd MMMM yyyy"
+            android:format24Hour="dd MMMM yyyy"
+            android:includeFontPadding="false"
+            android:tag="text1"
+            android:textColor="#FFFFFF"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_moto.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_moto.xml
new file mode 100644
index 0000000000000..5b0247ba0047e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_moto.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:id="@+id/clock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:alpha="0.9"
+            android:layout_marginBottom="8dp"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="100dp"
+            android:textStyle="bold" />
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+            
+            <TextClock
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="EEE, MMM d"
+                android:format24Hour="EEE, d MMM"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1|nolineheight"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textSize="20dp" />
+            
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone" />
+            
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:textSize="20dp"
+                android:visibility="gone" />
+        </LinearLayout>
+        
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos1.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos1.xml
new file mode 100644
index 0000000000000..26d238364be9e
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos1.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+            <TextClock
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="EEE, d MMM"
+                android:format24Hour="EEE, d MMM"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1|nolineheight"
+                android:includeFontPadding="false"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="20dp" />
+
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:textColor="@android:color/white"
+                android:textSize="20dp"
+                android:visibility="gone" />
+
+        </LinearLayout>
+        <TextClock
+            android:id="@+id/clock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:alpha="0.9"
+            android:layout_marginTop="7dp"
+            android:fontFamily="@font/subway"
+            android:includeFontPadding="false"
+            android:format12Hour="hmm"
+            android:format24Hour="Hmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="150dp"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos2.xml
new file mode 100644
index 0000000000000..6650c59897d1a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos2.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center">
+            <TextClock
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="EEE, d MMM"
+                android:format24Hour="EEE, d MMM"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1|nolineheight"
+                android:includeFontPadding="false"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="22dp" />
+
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:textColor="@android:color/white"
+                android:textSize="22dp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <!-- Time Layout -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="-12dp"
+            android:gravity="center">
+
+            <!-- Hour TextClock -->
+            <TextClock
+                android:id="@+id/clock_hour"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/ntype82"
+                android:format12Hour="h"
+                android:format24Hour="H"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="100dp" />
+
+            <!-- Colon TextView -->
+            <TextView
+                android:id="@+id/clock_colon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:singleLine="true"
+                android:text=":"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="94dp" />
+
+            <!-- Minute TextClock -->
+            <TextClock
+                android:id="@+id/clock_minute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/ntype82" 
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:gravity="center"
+                android:singleLine="true"
+                android:tag="text1"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="100dp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
+
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos3.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos3.xml
new file mode 100644
index 0000000000000..98e2a0bd98b52
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_nos3.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center" >
+
+    <!-- Date display -->
+    <TextClock
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="EEE, d MMM"
+        android:format24Hour="EEE, d MMM"
+        android:gravity="center"
+        android:singleLine="true"
+        android:includeFontPadding="false"
+        android:layout_marginBottom="16dp"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="22dp" />
+
+    <!-- Rectangular Analog Clock -->
+    <com.android.systemui.clocks.NothingAnalogClockView
+        android:id="@+id/analog_clock"
+        android:layout_width="300dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center" />
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_num.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_num.xml
new file mode 100644
index 0000000000000..0c2eb2edcf17c
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_num.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="20dp"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:gravity="center_horizontal|top"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:layout_marginBottom="-10dp"
+            android:format12Hour="hh"
+            android:format24Hour="HH"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textColor="@android:color/white"
+            android:textSize="70sp"
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:layout_marginTop="-10dp"
+            android:format12Hour="mm"
+            android:format24Hour="mm"
+            android:gravity="center_horizontal"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textColor="@android:color/white"
+            android:textSize="70sp"
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:layout_marginTop="-12dp"
+            android:format12Hour="EEE"
+            android:format24Hour="EEE"
+            android:gravity="center_horizontal"
+            android:maxLines="2"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            android:textColor="@android:color/system_accent1_200"
+            android:textSize="40sp" />
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="MMMM"
+            android:format24Hour="MMMM"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:singleLine="true"
+            android:tag="accent1"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:textSize="12sp" />
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="dd - yyy"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:format24Hour="dd - yyy"
+            android:singleLine="true"
+            android:tag="text1"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:textSize="12sp" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos.xml
new file mode 100644
index 0000000000000..06ba1627098aa
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:gravity="start|center"
+    android:layout_gravity="start|center"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/clock_frame"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        
+        <TextClock
+            android:textSize="36.0dip"
+            android:textColor="@android:color/white"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:format12Hour="EEEE"
+            android:format24Hour="EEEE"/>
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+            <TextView
+                android:textSize="30sp"
+                android:textColor="@android:color/white"
+                android:id="@+id/summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:text="𝗡𝗘𝗩𝗘𝗥 𝘚𝘌𝘛𝘛𝘓𝘌"
+                android:singleLine="true"
+                android:textAlignment="viewStart"/>
+        </LinearLayout>
+        
+        <FrameLayout
+            android:layout_gravity="start"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:singleLine="true"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"/>
+            
+            <TextClock
+                android:textSize="40.0dip"
+                android:textColor="@android:color/system_accent1_600"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:singleLine="true"
+                android:maxLength="1"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"/>
+        </FrameLayout>
+
+        <TextClock
+            android:id="@+id/oos_date"
+            android:textSize="20dp"
+            android:textColor="@android:color/white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:format12Hour="MMMM dd"
+            android:format24Hour="MMMM dd"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="start|center">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:visibility="gone"
+                android:layout_marginEnd="4dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="8dp"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="20dp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos2.xml
new file mode 100644
index 0000000000000..46fedcece5676
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_oos2.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:gravity="start"
+    android:layout_gravity="start"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="0dp"
+    android:id="@+id/clock_frame"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:gravity="start"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="0dp">
+
+        <TextClock
+            android:textSize="30dp"
+            android:textColor="@android:color/white"
+            android:fontFamily="@font/SlateForOnePlus-Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:includeFontPadding="false"
+            android:letterSpacing="0"
+            android:paddingStart="8dp"
+            android:layout_marginBottom="-2dp"
+            android:format12Hour="EEEE"
+            android:format24Hour="EEEE"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:orientation="horizontal"
+            android:gravity="start|bottom"
+            android:paddingStart="0dp">
+
+            <TextClock
+                android:textSize="96dp"
+                android:textColor="@android:color/holo_red_light"
+                android:fontFamily="@font/SlateForOnePlus-Bold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAlignment="viewStart"
+                android:includeFontPadding="false"
+                android:letterSpacing="0"
+                android:paddingStart="0dp"
+                android:format12Hour="h"
+                android:format24Hour="H"/>
+
+            <TextClock
+                android:textSize="96dp"
+                android:textColor="@android:color/white"
+                android:fontFamily="@font/SlateForOnePlus-Bold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAlignment="viewStart"
+                android:includeFontPadding="false"
+                android:letterSpacing="0"
+                android:paddingStart="0dp"
+                android:format12Hour=":mm"
+                android:format24Hour=":mm"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:orientation="horizontal"
+            android:gravity="start|center_vertical"
+            android:paddingStart="8dp">
+
+            <TextClock
+                android:textSize="20dp"
+                android:textColor="@android:color/white"
+                android:fontFamily="@font/SlateForOnePlus-Regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAlignment="viewStart"
+                android:letterSpacing="0"
+                android:paddingStart="0dp"
+                android:format12Hour="MMM dd "
+                android:format24Hour="MMM dd "/>
+
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="4dp"/>
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:fontFamily="@font/SlateForOnePlus-Regular"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="21dp"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_pixel.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_pixel.xml
new file mode 100644
index 0000000000000..b82935db14ec2
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_pixel.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/LightPixel"
+            android:layout_marginBottom="-6dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="130dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/GoldenAge"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_samurai.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_samurai.xml
new file mode 100644
index 0000000000000..e1738f358f5a1
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_samurai.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/general_sans"
+            android:layout_marginBottom="-5dp"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Electroharmonix"
+            android:layout_marginTop="-6dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="150dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_simple.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_simple.xml
new file mode 100644
index 0000000000000..0f2515caa83b8
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_simple.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <TextClock
+        android:id="@+id/clock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:fontFamily="@*android:string/config_clockFontFamily"
+        android:format12Hour="hh:mm"
+        android:format24Hour="HH:mm"
+        android:gravity="end|center_vertical"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <TextClock
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:format12Hour="EEE, d MMM"
+            android:format24Hour="EEE, d MMM"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:textSize="20sp" />
+
+        <com.android.systemui.weather.WeatherImageView
+            android:id="@+id/weather_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:visibility="gone" />
+
+        <com.android.systemui.weather.WeatherTextView
+            android:id="@+id/weather_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:textColor="@android:color/white"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:visibility="gone"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_style.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_style.xml
new file mode 100644
index 0000000000000..c983fc3a05a7d
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_style.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.systemui.clocks.ClockStyle
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:id="@+id/clock_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/below_clock_padding_start"
+        android:layout_marginTop="@dimen/custom_clock_frame_margin_top">
+        <ViewStub
+            android:id="@+id/clock_view_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </RelativeLayout>
+</com.android.systemui.clocks.ClockStyle>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish.xml
new file mode 100644
index 0000000000000..04066ac4a5d98
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|top">
+
+    <LinearLayout
+        android:id="@+id/overlap_layer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:foregroundGravity="center"
+        android:layout_marginTop="-40dp"
+        android:orientation="vertical">
+
+        <TextClock
+            android:id="@+id/text_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:fontFamily="@font/BR_SC"
+            android:textColor="@android:color/white"
+            android:textSize="200sp"
+            android:format12Hour="dd"/>
+
+        <TextClock
+            android:id="@+id/text_day"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/FontsFree-Net-Carthart"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:textSize="140sp"
+            android:textColor="#FFFD1540"
+            android:layout_marginTop="-120dp"
+            android:layout_marginRight="30dp"
+            android:format12Hour="EEE"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-10dp"
+            android:layout_gravity="center"
+            android:orientation="vertical">
+
+            <TextClock
+                android:id="@+id/text_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/Sans_Bold"
+                android:textSize="27sp"
+                android:textAllCaps="true"
+                android:layout_gravity="center_horizontal"
+                android:textStyle="bold"
+                android:textColor="@android:color/white"
+                android:format12Hour="hh:mm a"/>
+
+            <View
+                android:id="@+id/bottom_bar"
+                android:layout_width="140dp"
+                android:layout_height="6dp"
+                android:layout_gravity="center_horizontal"
+                android:background="#FFFD1540"
+                android:layout_marginTop="5dp"/>
+                
+            <LinearLayout
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center"
+		    android:layout_marginTop="10dp"
+		    android:orientation="horizontal">
+
+		    <com.android.systemui.weather.WeatherImageView
+			    android:id="@+id/weather_image"
+			    android:layout_width="20dp"
+			    android:layout_height="20dp"
+			    android:layout_marginEnd="4dp"
+		            android:adjustViewBounds="true" />
+			    
+		    <com.android.systemui.weather.WeatherTextView
+			    android:id="@+id/weather_text"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_marginStart="4dp"
+			    android:layout_marginEnd="8dp"
+			    android:fontFamily="@font/Sans_Bold"
+			    android:textColor="@android:color/white"
+			    android:textSize="20sp" />            
+		</LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish10.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish10.xml
new file mode 100644
index 0000000000000..3d61a6e78551b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish10.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <FrameLayout
+            android:layout_width="165dp"
+            android:layout_height="165dp"
+            android:layout_gravity="top|center"
+            android:background="@drawable/lockscreen_clock_49_bg"
+            android:tag="text1">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:format12Hour="hh • mm"
+                android:format24Hour="HH • mm"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+        </FrameLayout>
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|center"
+            android:format12Hour="MMM dd | EEE"
+            android:format24Hour="dd MMM | EEE"
+            android:includeFontPadding="false"
+            android:letterSpacing="0.1"
+            android:tag="text1"
+            android:textAllCaps="true"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+            
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_gravity="center">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:visibility="gone"
+                android:layout_marginEnd="2dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:letterSpacing="0.1"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish2.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish2.xml
new file mode 100644
index 0000000000000..03cf5314a5711
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish2.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center"
+    android:layout_gravity="start|center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:tag="text1|nolineheight"
+            android:text="Have a great"
+            android:textColor="#FFFFFF"
+            android:textSize="35sp"
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="EEEE !"
+            android:format24Hour="EEEE !"
+            android:layout_marginTop="4dp"
+            android:includeFontPadding="false"
+            android:tag="text1"
+            android:textColor="#FFFFFF"
+            android:textSize="22sp"
+            android:textStyle="bold" />
+            
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:visibility="gone"
+                android:layout_marginEnd="4dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@*android:string/config_clockFontFamily"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/lockscreen_clock_41_time_bg"
+                android:minWidth="44dp"
+                android:minHeight="44dp"
+                android:paddingHorizontal="8dp"
+                android:paddingVertical="4dp">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:format12Hour="hh"
+                    android:format24Hour="HH"
+                    android:includeFontPadding="false"
+                    android:tag="text2|nolineheight"
+                    android:textColor="#000000"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+            </FrameLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="8dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+                    android:layout_gravity="top|center"
+                    android:background="@drawable/lockscreen_clock_41_time_bg"
+                    android:orientation="vertical" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="16dp" />
+
+                <LinearLayout
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+                    android:layout_gravity="bottom|center"
+                    android:background="@drawable/lockscreen_clock_41_time_bg"
+                    android:orientation="vertical" />
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/lockscreen_clock_41_time_bg"
+                android:minWidth="44dp"
+                android:minHeight="44dp"
+                android:paddingHorizontal="8dp"
+                android:paddingVertical="4dp">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:format12Hour="mm"
+                    android:format24Hour="mm"
+                    android:includeFontPadding="false"
+                    android:tag="text2|nolineheight"
+                    android:textColor="#000000"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/lockscreen_clock_41_day_bg"
+                android:minHeight="44dp"
+                android:paddingHorizontal="12dp"
+                android:paddingVertical="4dp">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:format12Hour="MMMM dd"
+                    android:format24Hour="dd MMMM"
+                    android:includeFontPadding="false"
+                    android:tag="text1|nolineheight"
+                    android:textColor="#ffffff"
+                    android:textSize="22sp"
+                    android:textStyle="normal" />
+
+            </FrameLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish3.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish3.xml
new file mode 100644
index 0000000000000..ce882cb0779a5
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish3.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|center">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:alpha="0.5"
+                android:fontFamily="@font/montserrat_bold"
+                android:format12Hour="hh mm"
+                android:format24Hour="HH mm"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="100sp"
+                android:textStyle="bold" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:fontFamily="@font/montserrat_bold"
+                android:format12Hour="EEEE"
+                android:format24Hour="EEEE"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="42sp"
+                android:textStyle="bold" />
+
+        </FrameLayout>
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="-20dp"
+            android:fontFamily="@font/montserrat_bold"
+            android:format12Hour="dd MMMM yyyy"
+            android:format24Hour="dd MMMM yyyy"
+            android:includeFontPadding="false"
+            android:tag="text1"
+            android:textColor="#FFFFFF"
+            android:textStyle="bold" />
+            
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_gravity="center">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:visibility="gone"
+                android:layout_marginEnd="4dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:fontFamily="@font/montserrat_bold"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish4.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish4.xml
new file mode 100644
index 0000000000000..b6533bfac2c19
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish4.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="310dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center"
+        android:background="@drawable/lockscreen_clock_29_bg"
+        tools:ignore="UselessParent">
+
+        <ImageView
+            android:id="@+id/user_profile_icon"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="end"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="40dp"
+            android:scaleType="centerCrop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/lockscreen_clock_27_logo"
+            android:tag="profile_picture" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="22dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:includeFontPadding="false"
+                android:tag="accent1|nolineheight|username"
+                android:text="Onii-Chan!!"
+                android:textColor="@android:color/system_accent1_300"
+                android:textSize="22sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="2dp"
+                android:tag="text1"
+                android:text="Now It's"
+                android:textColor="#FFFFFF"
+                android:textSize="16sp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="hh • mm a"
+                android:format24Hour="kk • mm a"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="2dp"
+                android:tag="accent1"
+                android:textColor="@android:color/system_accent1_200"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="2dp"
+                android:tag="text1"
+                android:text="Today is"
+                android:textColor="#FFFFFF"
+                android:textSize="16sp" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:format12Hour="EEEE dd MMMM"
+                android:format24Hour="EEEE dd MMMM"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="2dp"
+                android:tag="accent1"
+                android:textColor="@android:color/system_accent1_200"
+                android:textSize="14sp" />
+                
+            <LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="start|center">
+		        
+		<com.android.systemui.weather.WeatherImageView
+		   android:id="@+id/weather_image"
+		   android:layout_width="15dp"
+		   android:layout_height="15dp"
+		   android:visibility="gone"
+		   android:layout_marginEnd="4dp" />
+
+		<com.android.systemui.weather.WeatherTextView
+		   android:id="@+id/weather_text"
+		   android:layout_width="wrap_content"
+		   android:layout_height="wrap_content"
+		   android:layout_marginStart="4dp"
+		   android:layout_marginEnd="8dp"
+		   android:fontFamily="@*android:string/config_clockFontFamily"
+		   android:textColor="@android:color/white"
+		   android:visibility="gone"
+		   android:textSize="14sp" />
+	    </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish5.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish5.xml
new file mode 100644
index 0000000000000..47b05c72ec78c
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish5.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:background="@drawable/lockscreen_clock_32_bg_filled"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingHorizontal="20dp"
+                android:paddingVertical="16dp">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="12dp"
+                    android:background="@drawable/lockscreen_clock_32_ic_date"
+                    android:importantForAccessibility="no"
+                    android:tag="text2"
+                    app:tint="#000000" />
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:format12Hour="dd MMMM"
+                    android:format24Hour="dd MMMM"
+                    android:includeFontPadding="false"
+                    android:tag="text2|nolineheight"
+                    android:textColor="#000000"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/lockscreen_clock_32_bg_outline"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingHorizontal="20dp"
+                android:paddingVertical="16dp">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="12dp"
+                    android:background="@drawable/lockscreen_clock_32_ic_time"
+                    android:importantForAccessibility="no"
+                    android:tag="text1"
+                    app:tint="#FFFFFF" />
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:format12Hour="EEEE"
+                    android:format24Hour="EEEE"
+                    android:includeFontPadding="false"
+                    android:tag="text1|nolineheight"
+                    android:textColor="#FFFFFF"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:orientation="horizontal">
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center_vertical"
+                android:format12Hour="hh:mm"
+                android:format24Hour="HH:mm"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:layout_marginStart="8dp"
+                android:textSize="25sp"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|center"
+                android:layout_marginHorizontal="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:includeFontPadding="false"
+                    android:textStyle="bold"
+                    android:tag="text1|nolineheight|username"
+                    android:text="Username"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#FFFFFF" />
+
+                <TextView
+                    android:id="@+id/device_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="4dp"
+                    android:includeFontPadding="false"
+                    android:textStyle="bold"
+                    android:tag="text1|device_name"
+                    android:text="Device Name"
+                    android:textAlignment="viewEnd"
+                    android:textColor="#FFFFFF" />
+		        
+		<LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="4dp">
+
+                    <com.android.systemui.weather.WeatherImageView
+                        android:id="@+id/weather_image"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:visibility="gone"
+                        android:layout_marginEnd="2dp" />
+
+                    <com.android.systemui.weather.WeatherTextView
+                        android:id="@+id/weather_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/white"
+                        android:visibility="gone"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/user_profile_icon"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_gravity="end|center"
+                android:importantForAccessibility="no"
+                android:scaleType="centerCrop"
+                android:src="@drawable/lockscreen_clock_32_logo"
+                android:tag="profile_picture" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish6.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish6.xml
new file mode 100644
index 0000000000000..c18a38b195208
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish6.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center_vertical"
+    android:layout_gravity="start"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:gravity="start|center_vertical"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:tag="text1|nolineheight"
+            android:text="Hello !"
+            android:textColor="#FFFFFF"
+            android:textSize="22sp"
+            android:textStyle="bold" />
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="MMMM • dd • yyyy"
+            android:format24Hour="dd • MMMM • yyyy"
+            android:includeFontPadding="false"
+            android:tag="text1"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+            
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+                
+            <com.android.systemui.weather.WeatherImageView
+                android:id="@+id/weather_image"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:visibility="gone"
+                android:layout_marginEnd="2dp" />
+
+            <com.android.systemui.weather.WeatherTextView
+                android:id="@+id/weather_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:textStyle="bold"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="200dp"
+            android:layout_height="58dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="end|bottom"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@android:color/system_accent1_600"
+                android:tag="accent1" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:background="#FFFFFF">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:format12Hour="EEEE"
+                    android:format24Hour="EEEE"
+                    android:includeFontPadding="false"
+                    android:tag="text2|nolineheight"
+                    android:textColor="#000000"
+                    android:textSize="24sp"
+                    android:textStyle="bold" />
+
+            </FrameLayout>
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:paddingStart="4dp"
+            tools:ignore="RtlSymmetry">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="2dp"
+                android:layout_weight="1"
+                android:background="#FFFFFF"
+                android:tag="text1" />
+
+            <TextClock
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:format12Hour="hh • mm"
+                android:format24Hour="HH • mm"
+                android:includeFontPadding="false"
+                android:tag="text1|nolineheight"
+                android:textColor="#FFFFFF"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish7.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish7.xml
new file mode 100644
index 0000000000000..03a0f5eef7f27
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish7.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/lockscreen_clock_37_content_bg" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="-160dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="4dp"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <FrameLayout
+                        android:layout_width="75dp"
+                        android:layout_height="75dp"
+                        android:background="@drawable/lockscreen_clock_37_logo_bg">
+
+                        <ImageView
+                            android:id="@+id/user_profile_icon"
+                            android:layout_width="64dp"
+                            android:layout_height="64dp"
+                            android:layout_gravity="center"
+                            android:importantForAccessibility="no"
+                            android:scaleType="centerCrop"
+                            android:src="@drawable/lockscreen_clock_37_logo"
+                            android:tag="profile_picture" />
+
+                    </FrameLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:includeFontPadding="false"
+                        android:tag="text1|nolineheight"
+                        android:text=" ಠᴥಠ "
+                        android:textColor="#FFFFFF"
+                        android:textSize="14sp"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|center"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="40dp"
+                    android:layout_marginEnd="20dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="2dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="start|center"
+                        android:background="#FFFFFF" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginTop="8dp"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <TextClock
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:format12Hour="hh • mm"
+                            android:format24Hour="HH • mm"
+                            android:includeFontPadding="false"
+                            android:tag="text1|nolineheight"
+                            android:textColor="#FFFFFF"
+                            android:textSize="34sp"
+                            android:textStyle="bold" />
+
+                        <TextClock
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:format12Hour="MMMM dd"
+                            android:format24Hour="MMMM dd"
+                            android:includeFontPadding="false"
+                            android:tag="text1"
+                            android:textColor="#FFFFFF"
+                            android:textSize="16sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|center"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/lockscreen_clock_37_day_bg"
+                android:paddingHorizontal="12dp"
+                android:paddingVertical="6dp">
+
+                <LinearLayout
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:orientation="vertical"
+		    android:layout_gravity="center">
+
+			<TextClock
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_gravity="center"
+			    android:format12Hour="EEEE"
+			    android:format24Hour="EEEE"
+			    android:includeFontPadding="false"
+			    android:letterSpacing="0.2"
+			    android:tag="accent1|nolineheight"
+			    android:textAllCaps="true"
+			    android:textColor="@android:color/system_accent1_600"
+			    android:textSize="26sp"
+			    android:textStyle="bold" />
+
+			<LinearLayout
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:orientation="horizontal"
+			    android:gravity="center_vertical"
+			    android:layout_gravity="center">
+
+			    <com.android.systemui.weather.WeatherImageView
+				android:id="@+id/weather_image"
+				android:layout_width="20dp"
+				android:layout_height="20dp"
+				android:visibility="gone"
+				android:layout_marginEnd="4dp" />
+
+			    <com.android.systemui.weather.WeatherTextView
+				android:id="@+id/weather_text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="4dp"
+				android:layout_marginEnd="8dp"
+				android:textStyle="bold"
+				android:letterSpacing="0.2"
+			        android:tag="accent1|nolineheight"
+				android:textColor="@android:color/system_accent1_600"
+				android:visibility="gone"
+				android:textSize="18sp" />
+		    </LinearLayout>
+		</LinearLayout>
+            </FrameLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish8.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish8.xml
new file mode 100644
index 0000000000000..9ece84c8f37a6
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish8.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:fontFamily="@font/astthillabeltaden"
+            android:format12Hour=" EEEE "
+            android:format24Hour=" EEEE "
+            android:includeFontPadding="false"
+            android:tag="text1|nolineheight"
+            android:textColor="#FFFFFF"
+            android:textSize="120sp" />
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-20dp">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:format12Hour="hh : mm | MMM dd"
+                    android:format24Hour="HH : mm | dd MMM"
+                    android:includeFontPadding="false"
+                    android:tag="text1"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="center">
+
+                    <com.android.systemui.weather.WeatherImageView
+                        android:id="@+id/weather_image"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:visibility="gone"
+                        android:layout_marginEnd="2dp" />
+
+                    <com.android.systemui.weather.WeatherTextView
+                        android:id="@+id/weather_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:textColor="@android:color/white"
+                        android:visibility="gone"
+                        android:textSize="20sp" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish9.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish9.xml
new file mode 100644
index 0000000000000..557310ba8b322
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_stylish9.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        tools:ignore="UselessParent">
+
+        <LinearLayout
+            android:layout_width="300dp"
+            android:layout_height="100dp"
+            android:layout_gravity="top|center"
+            android:tag="custom_image1"
+            android:background="@drawable/lockscreen_clock_40_bg"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="10dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="start|center">
+
+                <TextClock
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center"
+                    android:layout_marginStart="12dp"
+                    android:fontFamily="@font/japanese3017"
+                    android:format12Hour="hh : mm"
+                    android:format24Hour="HH : mm"
+                    android:includeFontPadding="false"
+                    android:letterSpacing="0.05"
+                    android:tag="text|nolineheight"
+                    android:textColor="#FFFFFF"
+                    android:textSize="32sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="start|center"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="4dp">
+
+                    <com.android.systemui.weather.WeatherImageView
+                        android:id="@+id/weather_image"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:visibility="gone"
+                        android:layout_marginEnd="2dp" />
+
+                    <com.android.systemui.weather.WeatherTextView
+                        android:id="@+id/weather_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:fontFamily="@font/japanese3017"
+                        android:textColor="@android:color/white"
+                        android:visibility="gone"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>     
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:layout_marginTop="64dp"
+            android:fontFamily="@font/cattyabrown"
+            android:format12Hour="EEEE"
+            android:format24Hour="EEEE"
+            android:includeFontPadding="false"
+            android:shadowColor="#000000"
+            android:shadowRadius="7"
+            android:singleLine="true"
+            android:tag="text|nolineheight"
+            android:textColor="#FFFFFF"
+            android:textSize="38sp"
+            android:textStyle="bold" />
+    </FrameLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_sweet.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_sweet.xml
new file mode 100644
index 0000000000000..b1c454994efda
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_sweet.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+        
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/general_sans"
+            android:format12Hour="dd MMM yyyy"
+            android:format24Hour="dd MMM yyyy"
+            android:gravity="center"
+            android:singleLine="true"
+            android:tag="text1|nolineheight"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="20dp" />
+
+        <TextClock
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/Fontarian"
+            android:layout_marginTop="-2dp"
+            android:format12Hour="hhmm"
+            android:format24Hour="HHmm"
+            android:gravity="center"
+            android:singleLine="true"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="150dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
new file mode 100644
index 0000000000000..797f28c81783c
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Dummy layout preserving IDs for ROM compatibility
+** Original functionality removed but IDs maintained for existing features
+**
+** Copyright 2025, The RisingOS Revived Project by ATI
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Dummy view maintaining IDs for ROM compatibility -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/keyguard_clock_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|top"
+    android:visibility="gone">
+    
+    <!-- Dummy clock views -->
+    <View
+        android:id="@+id/lockscreen_clock_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+        
+    <View
+        android:id="@+id/lockscreen_clock_view_large"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+
+    <!-- Dummy status area -->
+    <LinearLayout
+        android:id="@+id/keyguard_status_area"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <!-- Dummy includes - replace with empty views -->
+        <View
+            android:id="@+id/keyguard_slice_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <View
+            android:id="@+id/keyguard_weather"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <View
+            android:id="@+id/aod_ls"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <View
+            android:id="@+id/clock_ls"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <View
+            android:id="@+id/keyguard_info_widgets"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <!-- Dummy notification container -->
+        <View
+            android:id="@+id/left_aligned_notification_icon_container"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+            
+    </LinearLayout>
+</FrameLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_taden.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_taden.xml
new file mode 100644
index 0000000000000..b0140f5440351
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_taden.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clock_frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:fontFamily="@font/astthillabeltaden"
+            android:format12Hour=" EEEE "
+            android:format24Hour=" EEEE "
+            android:includeFontPadding="false"
+            android:tag="text1|nolineheight"
+            android:textColor="#FFFFFF"
+            android:textSize="100sp" />
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:format12Hour="hh : mm | MMM dd"
+            android:format24Hour="HH : mm | dd MMM"
+            android:includeFontPadding="false"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:tag="text1"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+        
+        <com.android.systemui.weather.WeatherTextView
+            android:id="@+id/weather_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:visibility="gone"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_widgets.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_widgets.xml
new file mode 100644
index 0000000000000..baab1b46d4a3b
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_widgets.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.systemui.lockscreen.LockScreenWidgets
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:systemui="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/keyguard_widgets"
+  android:gravity="center"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  android:layout_gravity="center_horizontal"
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/main_widgets_container"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/kg_widget_margin_vertical"
+        android:gravity="center_horizontal">
+
+        <com.android.systemui.animation.view.LaunchableFAB
+            android:id="@+id/main_kg_item_placeholder1"
+            android:layout_width="@dimen/kg_widget_main_width"
+            android:layout_height="@dimen/kg_widget_main_height"
+            android:singleLine="true" 
+            android:ellipsize="end"
+            android:marqueeRepeatLimit ="marquee_forever"
+            android:scrollHorizontally="true"
+            android:textAllCaps="false"
+            android:clickable="true"
+            android:gravity="center"
+            android:padding="@dimen/kg_main_widgets_icon_padding"
+            android:theme="@style/Theme.LockscreenWidgets.SystemUI"
+            android:layout_marginStart="@dimen/kg_widgets_main_margin_start"
+            android:layout_marginEnd="@dimen/kg_widgets_main_margin_end"
+            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+            systemui:shapeAppearanceOverlay="@style/LockscreenWidgetsBackgroundOverlay"/>
+
+        <com.android.systemui.animation.view.LaunchableFAB
+            android:id="@+id/main_kg_item_placeholder2"
+            android:layout_width="@dimen/kg_widget_main_width"
+            android:layout_height="@dimen/kg_widget_main_height"
+            android:singleLine="true" 
+            android:ellipsize="end"
+            android:marqueeRepeatLimit ="marquee_forever"
+            android:scrollHorizontally="true"
+            android:textAllCaps="false"
+            android:clickable="true"
+            android:gravity="center"
+            android:padding="@dimen/kg_main_widgets_icon_padding"
+            android:theme="@style/Theme.LockscreenWidgets.SystemUI"
+            android:layout_marginStart="@dimen/kg_widgets_main_margin_start"
+            android:layout_marginEnd="@dimen/kg_widgets_main_margin_end"
+            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+            systemui:shapeAppearanceOverlay="@style/LockscreenWidgetsBackgroundOverlay"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+    	android:id="@+id/secondary_widgets_container"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/kg_widget_margin_vertical"
+        android:layout_marginBottom="@dimen/kg_widget_margin_bottom" >
+
+        <com.android.systemui.animation.view.LaunchableImageView
+            android:gravity="center"
+            android:id="@+id/kg_item_placeholder1"
+            android:padding="@dimen/kg_widgets_icon_padding"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="@dimen/kg_widget_circle_size"
+            android:layout_height="@dimen/kg_widget_circle_size"
+            android:layout_marginHorizontal="@dimen/kg_widgets_margin_horizontal" />
+
+        <com.android.systemui.animation.view.LaunchableImageView
+            android:gravity="center"
+            android:id="@+id/kg_item_placeholder2"
+            android:padding="@dimen/kg_widgets_icon_padding"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="@dimen/kg_widget_circle_size"
+            android:layout_height="@dimen/kg_widget_circle_size"
+            android:layout_marginHorizontal="@dimen/kg_widgets_margin_horizontal" />
+
+        <com.android.systemui.animation.view.LaunchableImageView
+            android:gravity="center"
+            android:id="@+id/kg_item_placeholder3"
+            android:padding="@dimen/kg_widgets_icon_padding"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="@dimen/kg_widget_circle_size"
+            android:layout_height="@dimen/kg_widget_circle_size"
+            android:layout_marginHorizontal="@dimen/kg_widgets_margin_horizontal" />
+
+        <com.android.systemui.animation.view.LaunchableImageView
+            android:gravity="center"
+            android:id="@+id/kg_item_placeholder4"
+            android:padding="@dimen/kg_widgets_icon_padding"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="@dimen/kg_widget_circle_size"
+            android:layout_height="@dimen/kg_widget_circle_size"
+            android:layout_marginHorizontal="@dimen/kg_widgets_margin_horizontal" />
+
+    </LinearLayout>
+
+</com.android.systemui.lockscreen.LockScreenWidgets>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_word.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_word.xml
new file mode 100644
index 0000000000000..6b295877b6b80
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_word.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="start|center_vertical" >
+
+        <!-- "It's" Text -->
+        <TextView
+            android:id="@+id/its_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="It's"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:textSize="62sp"
+            android:textColor="@android:color/system_accent1_300" />
+
+        <!-- Custom Word Clock -->
+        <com.android.systemui.clocks.WordClockView
+            android:id="@+id/word_clock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="8dp"
+            android:textSize="64sp"
+            android:fontFamily="@*android:string/config_clockFontFamily"
+            android:textAlignment="viewStart"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_info_widgets.xml b/packages/SystemUI/res-keyguard/layout/keyguard_info_widgets.xml
new file mode 100644
index 0000000000000..e54599eb02206
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_info_widgets.xml
@@ -0,0 +1,59 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <com.android.systemui.util.ProgressImageView
+        android:layout_marginTop="12dp"
+        android:id="@+id/battery_progress"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginEnd="12dp"
+        android:adjustViewBounds="true"
+        android:alpha="0.9"
+        android:src="@drawable/arc_progress"
+        systemui:tint="@android:color/white"
+        systemui:typeface="@*android:string/config_clockFontFamily" />
+
+    <com.android.systemui.util.ProgressImageView
+        android:layout_marginTop="12dp"
+        android:id="@+id/memory_progress"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:adjustViewBounds="true"
+        android:alpha="0.9"
+        android:src="@drawable/arc_progress"
+        systemui:tint="@android:color/white"
+        systemui:typeface="@*android:string/config_clockFontFamily" />
+
+    <com.android.systemui.util.ProgressImageView
+        android:layout_marginTop="12dp"
+        android:id="@+id/temperature_progress"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:adjustViewBounds="true"
+        android:alpha="0.9"
+        android:src="@drawable/arc_progress"
+        systemui:tint="@android:color/white"
+        systemui:typeface="@*android:string/config_clockFontFamily" />
+
+    <com.android.systemui.util.ProgressImageView
+        android:layout_marginTop="12dp"
+        android:id="@+id/volume_progress"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="12dp"
+        android:adjustViewBounds="true"
+        android:alpha="0.9"
+        android:src="@drawable/arc_progress"
+        systemui:tint="@android:color/white"
+        systemui:typeface="@*android:string/config_clockFontFamily" />
+
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
index d789505138d89..e6cba028abd3e 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
@@ -33,12 +33,13 @@
               android:visibility="gone"
               android:textColor="?attr/wallpaperTextColor"
               android:theme="@style/TextAppearance.Keyguard"
+              android:paddingVertical="@dimen/header_title_vertical_padding"
     />
     <view class="com.android.keyguard.KeyguardSliceView$Row"
               android:id="@+id/row"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:orientation="horizontal"
+              android:orientation="vertical"
               android:gravity="start"
     />
 </com.android.keyguard.KeyguardSliceView>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sparkCircle.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sparkCircle.xml
new file mode 100644
index 0000000000000..5a121ca86a8a1
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_sparkCircle.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="center"
+    android:layout_gravity="center"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+        <LinearLayout
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        android:id="@+id/clock_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layoutDirection="ltr">
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="start|center"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <FrameLayout
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="100.0dip"
+                android:layout_height="150.0dip">
+                <ImageView
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:src="@drawable/SparkCircleClock_bg"
+                    android:alpha="0.5" />
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+                    <TextClock
+                        android:textSize="30.0sp"
+                        android:textStyle="bold"
+                        android:textColor="?android:textColorPrimary"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textAllCaps="true"
+                        android:format12Hour="EEE"
+                        android:format24Hour="EEE" />
+                    <TextClock
+                        android:textSize="30.0sp"
+                        android:textStyle="bold"
+                        android:textColor="?android:textColorPrimary"
+                        android:gravity="center"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textAllCaps="true"
+                        android:format12Hour="dd"
+                        android:format24Hour="dd" />
+                </LinearLayout>
+            </FrameLayout>
+            <View
+                android:layout_width="6.0dip"
+                android:layout_height="0.0dip" />
+            <LinearLayout
+                android:gravity="center"
+                android:layout_gravity="start|center"
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextClock
+                    android:textSize="26.0sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="start|center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    android:format12Hour="MMMM"
+                    android:format24Hour="MMMM" />
+                <TextClock
+                    android:textSize="26.0sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent1_100"
+                    android:gravity="center"
+                    android:layout_gravity="start|center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour="yyyy"
+                    android:format24Hour="yyyy" />
+                <TextClock
+                    android:textSize="23.0sp"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/system_accent2_100"
+                    android:gravity="center"
+                    android:layout_gravity="start|center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:format12Hour="hh:mm"
+                    android:format24Hour="kk:mm" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sparkList.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sparkList.xml
new file mode 100644
index 0000000000000..a0d9956dd39b5
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_sparkList.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:id="@+id/clock_frame"
+    android:gravity="top"
+    android:layout_gravity="top"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+        <LinearLayout
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        android:id="@+id/clock_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layoutDirection="ltr">
+        <LinearLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextClock
+                android:textSize="120.0sp"
+                android:textStyle="normal"
+                android:textColor="#d9ffffff"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/timeclock1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAllCaps="true"
+                android:format12Hour="hh"
+                android:format24Hour="kk"
+                android:letterSpacing="0.05" />
+            <ImageView
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="48.0dip"
+                android:layout_height="16.0dip"
+                android:src="@drawable/sparkls1_bg1"
+                android:alpha="0.5" />
+            <TextClock
+                android:textSize="120.0sp"
+                android:textStyle="normal"
+                android:textColor="#d9ffffff"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/timeclock2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAllCaps="true"
+                android:format12Hour="mm"
+                android:format24Hour="mm"
+                android:letterSpacing="0.05" />
+        </LinearLayout>
+        <FrameLayout
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            android:layout_width="128.0dip"
+            android:layout_height="38.0dip">
+            <ImageView
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:src="@drawable/sparkls1_bg2"
+                android:alpha="1.0" />
+            <ImageView
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:paddingTop="4.0dip"
+                android:paddingBottom="4.0dip"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:src="@drawable/sparkls1_bg1"
+                android:alpha="0.5"
+                android:paddingStart="4.0dip"
+                android:paddingEnd="4.0dip" />
+            <TextClock
+                android:textSize="18.0sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/system_accent1_100"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAllCaps="false"
+                android:format12Hour="EEE, MMM dd"
+                android:format24Hour="EEE, MMM dd" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_weather.xml b/packages/SystemUI/res-keyguard/layout/keyguard_weather.xml
new file mode 100644
index 0000000000000..cdf4a2ada9e80
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_weather.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="start|center"
+        android:layout_marginStart="@dimen/clock_padding_start"
+        android:layout_gravity="start">
+        <com.android.systemui.weather.WeatherImageView
+            android:id="@+id/default_weather_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_marginEnd="8dp" />
+        <com.android.systemui.weather.WeatherTextView
+            android:id="@+id/default_weather_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="8dp"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            android:textSize="16dp" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_weather_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_weather_area.xml
new file mode 100644
index 0000000000000..8fa1eaafcf83a
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_weather_area.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.systemui.weather.WeatherInfoView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/keyguard_weather_area"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp">
+
+    <!-- Weather Info -->
+    <ImageView
+        android:id="@+id/weather_icon"
+        android:layout_width="@dimen/weather_image_max_size"
+        android:layout_height="@dimen/weather_image_max_size"
+        android:visibility="gone"
+        systemui:layout_constraintStart_toStartOf="parent"
+        systemui:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/weather_temp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.Keyguard.Secondary"
+        android:textColor="?attr/wallpaperTextColor"
+        android:visibility="gone"
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:scrollHorizontally="true"
+        android:freezesText="true"
+        systemui:layout_constraintStart_toEndOf="@id/weather_icon"
+        systemui:layout_constraintTop_toTopOf="@id/weather_icon"
+        systemui:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="24dp" />
+
+</com.android.systemui.weather.WeatherInfoView>
diff --git a/packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml b/packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml
index 07ec0563fa2ae..14e0b5bed493f 100644
--- a/packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml
+++ b/packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml
@@ -67,9 +67,9 @@
                 />
         </FrameLayout>
         <Space
-            android:id="@+id/mobile_roaming_space"
+            android:id="@+id/mobile_hd_space"
             android:layout_height="match_parent"
-            android:layout_width="@dimen/roaming_icon_start_padding"
+            android:layout_width="2.5dp"
             android:visibility="gone"
             />
         <FrameLayout
@@ -85,13 +85,14 @@
                 />
             <!-- TODO(b/314812750): this can be removed once the flag is rolled out -->
             <ImageView
-                android:id="@+id/mobile_roaming"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/status_bar_mobile_roam_size"
+                android:id="@+id/mobile_hd"
+                android:layout_width="12dp"
+                android:layout_height="8dp"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="start|top"
+                android:src="@drawable/ic_hd_calling"
                 android:adjustViewBounds="true"
-                android:layout_gravity="top|start"
-                android:src="@drawable/stat_sys_roaming"
-                android:contentDescription="@string/data_connection_roaming"
+                android:gravity="start|top"
                 android:visibility="gone" />
         </FrameLayout>
         <ImageView
diff --git a/packages/SystemUI/res-keyguard/raw/ovalium.json b/packages/SystemUI/res-keyguard/raw/ovalium.json
new file mode 100644
index 0000000000000..72b6c5d0cbfa0
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/raw/ovalium.json
@@ -0,0 +1 @@
+{"v":"5.6.5","fr":30,"ip":0,"op":155,"w":150,"h":150,"nm":"mouse scroll interaction","ddd":0,"assets":[],"fonts":{"list":[{"fName":"Roboto-Regular","fFamily":"Roboto","fStyle":"Regular","ascent":75}]},"layers":[{"ddd":0,"ind":1,"ty":5,"nm":"Scroll Down","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":35,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":75,"s":[100]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":90,"s":[100]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":96.111,"s":[100]},{"t":145,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[77.753,97.248,0],"ix":2},"a":{"a":0,"k":[108.442,232.156,0],"ix":1},"s":{"a":0,"k":[188.916,188.916,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"n","pt":{"a":0,"k":{"i":[[0,-13.531],[0,0],[13.531,0],[0,13.531],[0,0],[-13.531,0]],"o":[[0,0],[0,13.531],[-13.531,0],[0,0],[0,-13.531],[13.531,0]],"v":[[132.929,217.464],[132.929,250.464],[108.429,274.964],[83.929,250.464],[83.929,217.464],[108.429,192.964]],"c":true},"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"t":{"d":{"k":[{"s":{"s":12,"f":"Roboto-Regular","t":"  ","j":0,"tr":70,"lh":14.4,"ls":0,"fc":[0.922,0.922,0.922]},"t":0}]},"p":{"m":0,"f":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":35,"s":[-32]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":75,"s":[-75]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":90,"s":[-75]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":96,"s":[-66]},{"t":145,"s":[-137.5]}],"ix":5},"l":{"a":0,"k":0,"ix":6},"a":0,"p":1,"r":0},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":25,"ix":7},"ne":{"a":0,"k":85,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":2,"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":35,"s":[-100]},{"t":66,"s":[100]}],"ix":3},"r":1},"a":{"a":{"a":0,"k":[11,1,0],"ix":1},"s":{"a":0,"k":[36,36,100],"ix":3}}},{"nm":"Animator 2","s":{"t":0,"xe":{"a":0,"k":30,"ix":7},"ne":{"a":0,"k":80,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":3,"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":96.111,"s":[-100]},{"t":135,"s":[100]}],"ix":3},"r":1},"a":{"s":{"a":0,"k":[0,0,100],"ix":3}}}]},"ip":0,"op":1950,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":45,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":63,"s":[100]},{"i":{"x":[0.26],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":100.185,"s":[100]},{"i":{"x":[0.26],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105.617,"s":[100]},{"t":117.8388671875,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[78.315,109.608,0],"ix":2},"a":{"a":0,"k":[4.25,17.125,0],"ix":1},"s":{"a":0,"k":[78,78,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.25,-59.375],[4.25,62]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.34901960784313724,0.11372549019607843,0.6627450980392157,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.0196078431372549,0.09803921568627451,0.3764705882352941,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.41],"y":[0]},"t":45,"s":[10]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.41],"y":[0]},"t":63,"s":[35]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.2],"y":[0]},"t":96.111,"s":[35]},{"t":116.4814453125,"s":[99]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.41],"y":[0]},"t":49,"s":[10]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.41],"y":[0]},"t":66,"s":[36]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.2],"y":[0]},"t":100.185,"s":[36]},{"t":120.5556640625,"s":[99]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":45,"s":[-33]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":63,"s":[-33]},{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.25],"y":[0]},"t":90,"s":[-33]},{"t":96.111328125,"s":[-66]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":1950,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"mouse line 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[78.53,97.116,0],"ix":2},"a":{"a":0,"k":[-13.5,454,0],"ix":1},"s":{"a":0,"k":[117.179,117.179,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":3,"s":{"a":0,"k":[49,82],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":24.5,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.47058823529411764,0.6392156862745098,0.9215686274509803,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-13.5,454],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":17.5,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":55,"s":[100]},{"t":100,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":100,"s":[0]},{"t":139,"s":[100]}],"ix":2},"o":{"a":0,"k":66,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":-310,"op":528,"st":-310,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"mouse line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[78.53,97.116,0],"ix":2},"a":{"a":0,"k":[-13.5,454,0],"ix":1},"s":{"a":0,"k":[117.179,117.179,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":3,"s":{"a":0,"k":[49,82],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":24.5,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.984313725490196,0.7607843137254902,0.9215686274509803,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-13.5,454],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":11.25,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":48.75,"s":[100]},{"t":100,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":105,"s":[0]},{"t":144,"s":[100]}],"ix":2},"o":{"a":0,"k":66,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":-315,"op":528,"st":-315,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"mouse line 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[78.53,97.116,0],"ix":2},"a":{"a":0,"k":[-13.5,454,0],"ix":1},"s":{"a":0,"k":[117.179,117.179,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":3,"s":{"a":0,"k":[49,82],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":24.5,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.796078431372549,0.596078431372549,0.9294117647058824,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-13.5,454],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":5,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":42.5,"s":[100]},{"t":110,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.15],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":110,"s":[0]},{"t":149,"s":[100]}],"ix":2},"o":{"a":0,"k":66,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":-320,"op":528,"st":-320,"bm":0}],"markers":[],"chars":[{"ch":"S","size":12,"style":"Regular","w":59.33,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.441,-1.904],[0,-3.483],[2.637,-2.018],[4.948,0],[3.174,2.49],[0,4.297],[0,0],[-2.295,-3.255],[-4.232,-1.871],[-4.883,0],[-4.492,3.467],[0,5.762],[1.611,2.67],[3.336,2.002],[5.908,1.663],[2.457,2.006],[0,2.903],[-2.588,2.039],[-4.623,0],[-2.734,-2.466],[0,-4.312],[0,0],[2.1,3.32],[3.825,1.888],[4.883,0],[4.475,-3.662],[0,-5.598],[-3.662,-3.369],[-8.041,-2.311]],"o":[[2.441,1.904],[0,3.484],[-2.637,2.019],[-5.306,0],[-3.174,-2.49],[0,0],[0,4.134],[2.295,3.255],[4.231,1.871],[7.52,0],[4.492,-3.467],[0,-3.613],[-1.611,-2.669],[-3.337,-2.002],[-5.908,-1.663],[-2.458,-2.005],[0,-3.619],[2.588,-2.039],[4.98,0],[2.734,2.467],[0,0],[0,-3.938],[-2.1,-3.32],[-3.825,-1.888],[-7.162,0],[-4.476,3.662],[0,4.948],[3.662,3.369],[6.413,1.855]],"v":[[42.48,-26.05],[46.143,-17.969],[42.188,-9.717],[30.811,-6.689],[18.091,-10.425],[13.33,-20.605],[3.906,-20.605],[7.349,-9.521],[17.139,-1.831],[30.811,0.977],[48.828,-4.224],[55.566,-18.066],[53.149,-27.49],[45.728,-34.497],[31.86,-39.995],[19.312,-45.498],[15.625,-52.86],[19.507,-61.346],[30.322,-64.404],[41.895,-60.705],[45.996,-50.537],[55.42,-50.537],[52.271,-61.426],[43.384,-69.238],[30.322,-72.07],[12.866,-66.577],[6.152,-52.686],[11.646,-40.21],[29.199,-31.689]],"c":true},"ix":2},"nm":"S","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"S","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"c","size":12,"style":"Regular","w":52.34,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.506,3.288],[0,6.087],[0,0],[-2.523,3.304],[-4.59,0],[-2.328,-2.197],[-0.261,-3.418],[0,0],[3.922,3.548],[5.924,0],[3.532,-2.213],[1.888,-4.004],[0,-5.143],[0,0],[-4.248,-4.801],[-7.195,0],[-3.207,1.627],[-1.921,2.734],[-0.163,3.027],[0,0],[2.409,-1.953],[3.223,0]],"o":[[-2.507,-3.288],[0,0],[0,-6.25],[2.522,-3.304],[3.418,0],[2.327,2.197],[0,0],[-0.261,-5.664],[-3.923,-3.548],[-4.818,0],[-3.532,2.214],[-1.888,4.004],[0,0],[0,8.334],[4.248,4.802],[3.58,0],[3.206,-1.627],[1.92,-2.734],[0,0],[-0.261,2.93],[-2.409,1.953],[-4.655,0]],"v":[[17.285,-11.328],[13.525,-25.391],[13.525,-27.1],[17.31,-41.431],[27.979,-46.387],[36.597,-43.091],[40.479,-34.668],[49.023,-34.668],[42.749,-48.486],[27.979,-53.809],[15.454,-50.488],[7.324,-41.162],[4.492,-27.441],[4.492,-25.928],[10.864,-6.226],[28.027,0.977],[38.208,-1.465],[45.898,-8.008],[49.023,-16.65],[40.479,-16.65],[36.475,-9.326],[28.027,-6.396]],"c":true},"ix":2},"nm":"c","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"c","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"r","size":12,"style":"Regular","w":33.84,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.758,0],[2.962,-4.72],[0,0],[0,0],[0,0],[0,0],[0,0],[-5.925,0],[-1.367,-0.227]],"o":[[-0.912,-0.455],[-5.437,0],[0,0],[0,0],[0,0],[0,0],[0,0],[2.116,-5.045],[1.595,0],[0,0]],"v":[[32.373,-53.125],[28.369,-53.809],[15.771,-46.729],[15.625,-52.832],[6.836,-52.832],[6.836,0],[15.869,0],[15.869,-37.5],[27.93,-45.068],[32.373,-44.727]],"c":true},"ix":2},"nm":"r","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"r","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"o","size":12,"style":"Regular","w":57.03,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-4.443,-4.98],[-7.162,0],[-3.662,2.279],[-1.97,4.086],[0,5.144],[0,0],[4.443,4.98],[7.194,0],[3.629,-2.246],[2.034,-4.134],[0,-5.176]],"o":[[0,8.203],[4.443,4.98],[4.752,0],[3.662,-2.278],[1.969,-4.085],[0,0],[0,-8.268],[-4.443,-4.98],[-4.655,0],[-3.63,2.246],[-2.035,4.134],[0,0]],"v":[[4.443,-26.27],[11.108,-6.494],[28.516,0.977],[41.138,-2.441],[49.585,-11.987],[52.539,-25.83],[52.539,-26.465],[45.874,-46.338],[28.418,-53.809],[15.991,-50.439],[7.495,-40.869],[4.443,-26.904]],"c":true},"ix":2},"nm":"o","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-2.734,3.548],[-4.46,0],[-2.751,-3.596],[0,-5.794],[2.702,-3.596],[4.59,0],[2.718,3.548],[0,5.859]],"o":[[2.734,-3.548],[4.557,0],[2.75,3.597],[0,6.478],[-2.702,3.597],[-4.558,0],[-2.718,-3.548],[0,-6.608]],"v":[[17.627,-41.064],[28.418,-46.387],[39.38,-40.991],[43.506,-26.904],[39.453,-11.792],[28.516,-6.396],[17.603,-11.719],[13.525,-25.83]],"c":true},"ix":2},"nm":"o","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"o","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"l","size":12,"style":"Regular","w":24.27,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[16.65,-75],[7.617,-75],[7.617,0],[16.65,0]],"c":true},"ix":2},"nm":"l","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"l","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":" ","size":12,"style":"Regular","w":24.76,"data":{},"fFamily":"Roboto"},{"ch":"D","size":12,"style":"Regular","w":65.58,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-4.802,2.702],[-2.588,5.046],[0,6.706],[0,0],[2.588,5.046],[4.752,2.734],[6.184,0],[0,0],[0,0]],"o":[[6.38,-0.065],[4.801,-2.702],[2.588,-5.045],[0,0],[-0.033,-6.543],[-2.588,-5.045],[-4.753,-2.734],[0,0],[0,0],[0,0]],"v":[[27.93,0],[44.702,-4.15],[55.786,-15.771],[59.668,-33.398],[59.668,-37.939],[55.737,-55.322],[44.727,-66.992],[28.32,-71.094],[8.252,-71.094],[8.252,0]],"c":true},"ix":2},"nm":"D","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-3.793,-4.48],[0,-8.08],[0,0],[4.02,-4.496],[7.227,0],[0,0],[0,0]],"o":[[6.966,0.066],[3.792,4.48],[0,0],[0,8.308],[-4.021,4.496],[0,0],[0,0],[0,0]],"v":[[28.564,-63.428],[44.702,-56.61],[50.391,-37.771],[50.391,-33.617],[44.36,-14.41],[27.49,-7.666],[17.627,-7.666],[17.627,-63.428]],"c":true},"ix":2},"nm":"D","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"D","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"w","size":12,"style":"Regular","w":75.15,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[41.064,-52.832],[33.789,-52.832],[21.484,-13.281],[11.084,-52.832],[2.1,-52.832],[17.432,0],[24.756,0],[37.256,-40.039],[50.098,0],[57.422,0],[72.803,-52.832],[63.77,-52.832],[53.613,-12.451]],"c":true},"ix":2},"nm":"w","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"w","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"},{"ch":"n","size":12,"style":"Regular","w":55.18,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[-2.214,1.563],[-2.93,0],[-1.709,-1.823],[-0.033,-3.809],[0,0],[0,0],[0,0],[11.165,0],[4.036,-5.078],[0,0]],"o":[[0,0],[0,0],[0,0],[1.237,-2.539],[2.213,-1.563],[3.613,0],[1.709,1.823],[0,0],[0,0],[0,0],[-0.098,-12.598],[-6.511,0],[0,0],[0,0]],"v":[[6.836,-52.832],[6.836,0],[15.869,0],[15.869,-37.646],[21.045,-43.799],[28.76,-46.143],[36.743,-43.408],[39.355,-34.961],[39.355,0],[48.389,0],[48.389,-34.912],[31.494,-53.809],[15.674,-46.191],[15.381,-52.832]],"c":true},"ix":2},"nm":"n","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"n","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Roboto"}]}
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/raw/rectangle.json b/packages/SystemUI/res-keyguard/raw/rectangle.json
new file mode 100644
index 0000000000000..4de918cefefc4
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/raw/rectangle.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":29.9700012207031,"ip":0,"op":180.00000733155,"w":1000,"h":1000,"nm":"Rectangle Loding 2","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 5 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[692.608,500,0],"ix":2},"a":{"a":0,"k":[17.323,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.428,0],[0,9.43],[-9.43,0]],"o":[[0,9.43],[-9.43,0],[0,-9.43],[9.428,0]],"v":[[17.074,0],[0,17.074],[-17.074,0],[0,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.980392156863,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.323,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":56,"s":[0]},{"i":{"x":[0.791],"y":[1]},"o":{"x":[0.157],"y":[0]},"t":64,"s":[100]},{"i":{"x":[0.674],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":83,"s":[100]},{"t":96.0000039101602,"s":[0]}],"ix":2},"o":{"a":0,"k":310,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 4 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[524.829,500,0],"ix":2},"a":{"a":0,"k":[17.324,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.429,0],[0,9.43],[-9.43,0]],"o":[[0,9.43],[-9.43,0],[0,-9.43],[9.429,0]],"v":[[17.074,0],[0,17.074],[-17.074,0],[0,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.980392156863,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.323,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":45,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":113,"s":[100]},{"t":130.000005295009,"s":[0]}],"ix":2},"o":{"a":0,"k":-45,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[342.103,500,0],"ix":2},"a":{"a":0,"k":[17.324,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.43,0],[0,9.43],[-9.429,0]],"o":[[0,9.43],[-9.429,0],[0,-9.43],[9.43,0]],"v":[[17.074,0],[-0.001,17.074],[-17.074,0],[-0.001,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.980392156863,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.324,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":20,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":146,"s":[100]},{"t":160.000006516934,"s":[0]}],"ix":2},"o":{"a":0,"k":202,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[515.945,500,0],"ix":2},"a":{"a":0,"k":[181.663,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5,5],[358.327,5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.980392156863,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.202],"y":[0.214]},"o":{"x":[0.169],"y":[0]},"t":19,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[4.871]},"t":35,"s":[47]},{"i":{"x":[0.106],"y":[0.795]},"o":{"x":[0.203],"y":[0]},"t":45,"s":[47]},{"i":{"x":[0.799],"y":[1]},"o":{"x":[0.157],"y":[5.46]},"t":57,"s":[95]},{"i":{"x":[0.659],"y":[0.98]},"o":{"x":[0.167],"y":[0]},"t":95,"s":[95]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[-0.27]},"t":116,"s":[47]},{"i":{"x":[0.394],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":128,"s":[47]},{"t":149.000006068894,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 9 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[528.603,500,0],"ix":2},"a":{"a":0,"k":[301.451,301.451,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,276.451],[-276.451,0],[0,-276.451],[276.451,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.980392156863,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":12,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[301.451,301.451],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.182],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":72,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":83,"s":[100]},{"t":165.000006720588,"s":[0]}],"ix":2},"o":{"a":0,"k":178.6,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Back","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2},"a":{"a":0,"k":[500,500,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":1000,"h":1000,"ip":0,"op":180.00000733155,"st":0,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 5 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[692.608,500,0],"ix":2},"a":{"a":0,"k":[17.323,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.428,0],[0,9.43],[-9.43,0]],"o":[[0,9.43],[-9.43,0],[0,-9.43],[9.428,0]],"v":[[17.074,0],[0,17.074],[-17.074,0],[0,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.796078431373,0.796078431373,0.796078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.323,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 4 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[524.829,500,0],"ix":2},"a":{"a":0,"k":[17.324,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.429,0],[0,9.43],[-9.43,0]],"o":[[0,9.43],[-9.43,0],[0,-9.43],[9.429,0]],"v":[[17.074,0],[0,17.074],[-17.074,0],[0,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.796078491211,0.796078491211,0.796078491211,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.323,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[342.103,500,0],"ix":2},"a":{"a":0,"k":[17.324,17.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-9.43],[9.43,0],[0,9.43],[-9.429,0]],"o":[[0,9.43],[-9.429,0],[0,-9.43],[9.43,0]],"v":[[17.074,0],[-0.001,17.074],[-17.074,0],[-0.001,-17.074]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.796078431373,0.796078431373,0.796078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[17.324,17.324],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[515.945,500,0],"ix":2},"a":{"a":0,"k":[181.663,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5,5],[358.327,5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.796078431373,0.796078431373,0.796078431373,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 2 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[528.228,500,0],"ix":2},"a":{"a":0,"k":[283.522,283.522,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,276.451],[-276.451,0.001],[0,-276.45],[276.451,0.001]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.796078431373,0.796078431373,0.796078431373,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":12,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[283.522,283.522],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180.00000733155,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Rectangle Loding","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2},"a":{"a":0,"k":[500,500,0],"ix":1},"s":{"a":0,"k":[126,126,100],"ix":6}},"ao":0,"w":1000,"h":1000,"ip":0,"op":180.00000733155,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/raw/wallet.json b/packages/SystemUI/res-keyguard/raw/wallet.json
new file mode 100644
index 0000000000000..578708d633b68
--- /dev/null
+++ b/packages/SystemUI/res-keyguard/raw/wallet.json
@@ -0,0 +1 @@
+{"v":"5.7.13","fr":30,"ip":0,"op":150,"w":2000,"h":2000,"nm":"Beezpay Logo for Animation","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Circle Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1526.956,1280.483,0],"ix":2,"l":2},"a":{"a":0,"k":[377.5,377.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.73,0.73,0.73],"y":[0.83,0.83,1]},"o":{"x":[0.6,0.6,0.6],"y":[-0.05,-0.05,0]},"t":63,"s":[0,0,100]},{"i":{"x":[0.32,0.32,0.32],"y":[1.063,1.063,1]},"o":{"x":[0.17,0.17,0.17],"y":[0.207,0.207,0]},"t":69,"s":[620,620,100]},{"t":75,"s":[577,577,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.284],[8.284,0],[0,8.284],[-8.284,0]],"o":[[0,8.284],[-8.284,0],[0,-8.284],[8.284,0]],"v":[[15,0],[0,15],[-15,0],[0,-15]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[377.5,377.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.188235297799,0.188235297799,0.188235297799,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"H Rod Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[988.135,451.691,0],"ix":2,"l":2},"a":{"a":0,"k":[603.461,72.505,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.73,0.73,0.73],"y":[0.04,0.04,1]},"o":{"x":[0.6,0.6,0.6],"y":[-0.28,-0.28,0]},"t":49,"s":[0,0,100]},{"i":{"x":[0.32,0.32,0.32],"y":[1.27,1.27,1]},"o":{"x":[0.17,0.17,0.17],"y":[0.89,0.89,0]},"t":56,"s":[110,110,100]},{"t":63,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-530.961,-0.005],[556.961,0.005]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.188235294118,0.188235294118,0.188235294118,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":145,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[603.461,72.505],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Main Path Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[995.379,993.13,0],"ix":2,"l":2},"a":{"a":0,"k":[1205.08,1200.282,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.972,17.383],[25.829,68.089],[64.54,45.155],[25.873,0.247],[0,0],[53.967,-255.676],[-190.197,11.971],[-189.852,-9.432],[-69.813,-66.819],[0.219,-17.264],[-2.087,-175.826],[77.882,-82.729],[21.131,-1.484],[0,0],[70.207,74.434],[3.029,52.477],[-1.043,303.913]],"o":[[-2.028,-18.617],[-10.578,-27.887],[-66.715,-46.676],[0,0],[0,0],[-21.365,153.832],[485.977,9.623],[47.911,2.381],[84.315,80.698],[2.087,175.826],[0.387,19.863],[-74.196,78.813],[0,0],[-70.574,0],[-79.986,-84.801],[1.043,-303.913],[0,0]],"v":[[832.65,-479.513],[816.751,-635.086],[712.667,-771.675],[552.354,-822.709],[-523.082,-819.965],[-821.215,-582.106],[-523.051,-262.796],[535.718,-257.869],[747.882,-182.738],[832.403,19.175],[838.664,546.653],[761.051,748.601],[572.578,837.783],[-498.03,837.783],[-724.987,728.218],[-822.03,482.479],[-822.9,-509.26]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.988235294118,0.78431372549,0.090196078431,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":145,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[1205.08,1200.282],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":30,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":29.990234375,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shadow Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[431.413,1282.913,0],"ix":2,"l":2},"a":{"a":0,"k":[499.087,905.63,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-273.174,-72.783]],"o":[[0,0],[0,0],[0,0]],"v":[[-119.326,-543.13],[-119.326,151.044],[136.587,543.13]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.886274509804,0.898039215686,0.905882352941,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":145,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[499.087,905.63],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":31,"s":[0]},{"t":46,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":31,"op":150,"st":31,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
index 7409d84458266..7e65aaaab7ee6 100644
--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -52,7 +52,7 @@
     <dimen name="keyguard_security_view_top_margin">8dp</dimen>
 
     <!-- Minimum bottom margin under the security view -->
-    <dimen name="keyguard_security_view_bottom_margin">60dp</dimen>
+    <dimen name="keyguard_security_view_bottom_margin">24dp</dimen>
 
     <!-- Margin above the ambient indication container -->
     <dimen name="ambient_indication_container_margin_top">0dp</dimen>
@@ -64,6 +64,7 @@
     <dimen name="widget_title_font_size">20dp</dimen>
     <dimen name="widget_title_line_height">24dp</dimen>
     <dimen name="header_icon_size">16dp</dimen>
+    <dimen name="header_title_vertical_padding">4dp</dimen>
     <!-- Slice subtitle -->
     <dimen name="widget_label_font_size">16dp</dimen>
     <dimen name="widget_label_line_height">20dp</dimen>
@@ -139,28 +140,29 @@
     <dimen name="security_shift_animation_translation">120dp</dimen>
 
 
-    <dimen name="bouncer_user_switcher_header_text_size">20sp</dimen>
-    <dimen name="bouncer_user_switcher_item_text_size">20sp</dimen>
-    <dimen name="bouncer_user_switcher_item_line_height">24sp</dimen>
-    <dimen name="bouncer_user_switcher_item_icon_size">28dp</dimen>
+    <dimen name="bouncer_user_switcher_header_text_size">15sp</dimen>
+    <dimen name="bouncer_user_switcher_item_text_size">15sp</dimen>
+    <dimen name="bouncer_user_switcher_item_line_height">20sp</dimen>
+    <dimen name="bouncer_user_switcher_item_icon_size">24dp</dimen>
     <dimen name="bouncer_user_switcher_item_icon_padding">12dp</dimen>
-    <dimen name="bouncer_user_switcher_width">248dp</dimen>
+    <dimen name="bouncer_user_switcher_width">160dp</dimen>
     <dimen name="bouncer_user_switcher_popup_header_height">12dp</dimen>
     <dimen name="bouncer_user_switcher_popup_divider_height">4dp</dimen>
     <dimen name="bouncer_user_switcher_popup_items_divider_height">2dp</dimen>
-    <dimen name="bouncer_user_switcher_item_padding_vertical">10dp</dimen>
-    <dimen name="bouncer_user_switcher_item_padding_horizontal">12dp</dimen>
-    <dimen name="bouncer_user_switcher_header_padding_end">44dp</dimen>
-    <dimen name="bouncer_user_switcher_y_trans">80dp</dimen>
+    <dimen name="bouncer_user_switcher_item_padding_vertical">6dp</dimen>
+    <dimen name="bouncer_user_switcher_item_padding_horizontal">6dp</dimen>
+    <dimen name="bouncer_user_switcher_header_padding_start">24dp</dimen>
+    <dimen name="bouncer_user_switcher_header_padding_end">48dp</dimen>
+    <dimen name="bouncer_user_switcher_y_trans">24dp</dimen>
 
     <!-- 2 * the margin + size should equal the plus_margin -->
     <dimen name="user_switcher_icon_large_margin">16dp</dimen>
-    <dimen name="bouncer_user_switcher_icon_size">190dp</dimen>
-    <dimen name="bouncer_user_switcher_icon_size_plus_margin">222dp</dimen>
+    <dimen name="bouncer_user_switcher_icon_size">120dp</dimen>
+    <dimen name="bouncer_user_switcher_icon_size_plus_margin">152dp</dimen>
 
     <dimen name="user_switcher_fullscreen_horizontal_gap">64dp</dimen>
     <dimen name="user_switcher_icon_selected_width">8dp</dimen>
-    <dimen name="user_switcher_fullscreen_button_text_size">14sp</dimen>
+    <dimen name="user_switcher_fullscreen_button_text_size">13sp</dimen>
     <dimen name="user_switcher_fullscreen_button_padding">12dp</dimen>
 
     <!-- Translation y for appear animation -->
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index e9a8459445e83..86e7585c04fb6 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -152,7 +152,7 @@
     </style>
 
     <style name="TextAppearance.Keyguard.BottomArea">
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">12sp</item>
         <item name="android:maxLines">1</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">?attr/wallpaperTextColor</item>
@@ -204,4 +204,5 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:colorBackground">@android:color/transparent</item>
     </style>
+
 </resources>
diff --git a/packages/SystemUI/res/color/bg_card_gradient1_end.xml b/packages/SystemUI/res/color/bg_card_gradient1_end.xml
new file mode 100644
index 0000000000000..227d859e69db5
--- /dev/null
+++ b/packages/SystemUI/res/color/bg_card_gradient1_end.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="@androidprv:color/materialColorPrimary" android:alpha="0.2" />
+</selector>
diff --git a/packages/SystemUI/res/color/bg_card_gradient1_start.xml b/packages/SystemUI/res/color/bg_card_gradient1_start.xml
new file mode 100644
index 0000000000000..854520e0ea88b
--- /dev/null
+++ b/packages/SystemUI/res/color/bg_card_gradient1_start.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="@androidprv:color/materialColorPrimaryContainer" android:alpha="0.2" />
+</selector>
diff --git a/packages/SystemUI/res/color/bg_card_solid.xml b/packages/SystemUI/res/color/bg_card_solid.xml
new file mode 100644
index 0000000000000..45c966f89e991
--- /dev/null
+++ b/packages/SystemUI/res/color/bg_card_solid.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#ff000000" android:alpha="0.4" />
+</selector>
diff --git a/packages/SystemUI/res/values-h411dp/dimens.xml b/packages/SystemUI/res/color/qs_footer_power_button_overlay_color.xml
similarity index 61%
rename from packages/SystemUI/res/values-h411dp/dimens.xml
rename to packages/SystemUI/res/color/qs_footer_power_button_overlay_color.xml
index 6b21353d0e556..a8abd793bd007 100644
--- a/packages/SystemUI/res/values-h411dp/dimens.xml
+++ b/packages/SystemUI/res/color/qs_footer_power_button_overlay_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2022 The Android Open Source Project
+  ~ 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.
@@ -14,6 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<resources>
-    <dimen name="volume_row_slider_height">137dp</dimen>
-</resources>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="?attr/onShadeActive" android:alpha="0.12" />
+    <item android:state_hovered="true" android:color="?attr/onShadeActive" android:alpha="0.09" />
+    <item android:color="@color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png
index a93916f993574..bf9f1c288ffd4 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png and b/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png
index 7ae60792c199c..d89746e21d5b2 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png and b/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-xhdpi/ic_notification_overlay.9.png
index aae807b72ff89..3655b75984df6 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notification_overlay.9.png and b/packages/SystemUI/res/drawable-xhdpi/ic_notification_overlay.9.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notification_overlay.9.png
index fa7de0ed0d87f..b47ba5882de8f 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_notification_overlay.9.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_notification_overlay.9.png differ
diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_notification_overlay.9.png
new file mode 100644
index 0000000000000..7f403ca1000d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxxhdpi/ic_notification_overlay.9.png differ
diff --git a/packages/SystemUI/res/drawable/bg_air_quality_chip.xml b/packages/SystemUI/res/drawable/bg_air_quality_chip.xml
new file mode 100644
index 0000000000000..8be4332c041b8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_air_quality_chip.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/air_quality_chip_corner_radius" />
+    <solid android:color="@*android:color/material_grey_600" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_flight_qr_code.xml b/packages/SystemUI/res/drawable/bg_flight_qr_code.xml
new file mode 100644
index 0000000000000..d77f3124c3ee7
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_flight_qr_code.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffffff" />
+    <corners android:radius="20.0dp" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_image_generic.xml b/packages/SystemUI/res/drawable/bg_image_generic.xml
new file mode 100644
index 0000000000000..0450c43cc0ecc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_image_generic.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="4dp" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_non_remoteviews_card.xml b/packages/SystemUI/res/drawable/bg_non_remoteviews_card.xml
new file mode 100644
index 0000000000000..b54399309020f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_non_remoteviews_card.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="?backgroundCornerRadius" />
+            <gradient android:startColor="@color/bg_card_gradient1_end" android:endColor="@color/bg_card_gradient1_start" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="?backgroundCornerRadius" />
+            <gradient android:startColor="@color/bg_card_gradient1_start" android:endColor="@color/bg_card_gradient1_end" />
+        </shape>
+    </item>
+    <item android:id="@+id/solid">
+        <shape android:shape="rectangle">
+            <corners android:radius="?backgroundCornerRadius" />
+            <solid android:color="@color/bg_card_solid" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/bg_non_remoteviews_card_outline.xml b/packages/SystemUI/res/drawable/bg_non_remoteviews_card_outline.xml
new file mode 100644
index 0000000000000..a092b0cae6bb5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_non_remoteviews_card_outline.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="?backgroundCornerRadius" />
+    <stroke android:width="0.5dip" android:color="#52ffffff" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_rounded_secondary_card.xml b/packages/SystemUI/res/drawable/bg_rounded_secondary_card.xml
new file mode 100644
index 0000000000000..2d6bdd47ea018
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_rounded_secondary_card.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffffff" />
+    <corners android:radius="@dimen/enhanced_smartspace_secondary_card_corner_radius" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_smartspace_combination_sub_card.xml b/packages/SystemUI/res/drawable/bg_smartspace_combination_sub_card.xml
new file mode 100644
index 0000000000000..12f1182090e07
--- /dev/null
+++ b/packages/SystemUI/res/drawable/bg_smartspace_combination_sub_card.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:shape="rectangle">
+    <solid android:color="?androidprv:attr/colorAccentPrimary" />
+    <corners android:radius="@dimen/enhanced_smartspace_combination_sub_card_corner_radius" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/bg_smartspace_media_item.xml b/packages/SystemUI/res/drawable/bg_smartspace_media_item.xml
index 33c68bf1f6acb..1ec9643c8fd6f 100644
--- a/packages/SystemUI/res/drawable/bg_smartspace_media_item.xml
+++ b/packages/SystemUI/res/drawable/bg_smartspace_media_item.xml
@@ -18,4 +18,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@android:color/transparent" />
     <corners android:radius="@dimen/qs_media_album_radius" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/packages/SystemUI/res/drawable/color_accent_alpha.xml b/packages/SystemUI/res/drawable/color_accent_alpha.xml
new file mode 100644
index 0000000000000..7d5fc37a3160b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/color_accent_alpha.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.25" android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_middle_bg.xml b/packages/SystemUI/res/drawable/dialog_tri_state_middle_bg.xml
new file mode 100644
index 0000000000000..20343d5086ad3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dialog_tri_state_middle_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item>
+        <shape>
+            <solid android:color="?androidprv:attr/colorSurface" />
+            <corners
+                android:topLeftRadius="@dimen/tri_state_mid_top_left_radius"
+                android:topRightRadius="@dimen/tri_state_mid_top_right_radius"
+                android:bottomLeftRadius="@dimen/tri_state_mid_bottom_left_radius"
+                android:bottomRightRadius="@dimen/tri_state_mid_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_navigation_bg.xml b/packages/SystemUI/res/drawable/dialog_tri_state_navigation_bg.xml
new file mode 100644
index 0000000000000..93011a323a5bb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dialog_tri_state_navigation_bg.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#e6208de3" />
+            <corners
+                android:topLeftRadius="10.0dip"
+                android:topRightRadius="10.0dip"
+                android:bottomLeftRadius="10.0dip"
+                android:bottomRightRadius="10.0dip" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_triangle_right.xml b/packages/SystemUI/res/drawable/dialog_tri_state_triangle_right.xml
new file mode 100644
index 0000000000000..ab90683bea54a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dialog_tri_state_triangle_right.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/shape_id" android:height="42.0px">
+        <rotate android:layout_width="fill_parent" android:layout_height="wrap_content" android:fromDegrees="45.0" android:pivotX="0.0%" android:pivotY="0.0%">
+            <shape android:shape="rectangle">
+                <solid android:color="#ff000000" />
+                <size android:height="29.695984px" android:width="29.695984px" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_triangle_top.xml b/packages/SystemUI/res/drawable/dialog_tri_state_triangle_top.xml
new file mode 100644
index 0000000000000..e8566465d61b2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dialog_tri_state_triangle_top.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/shape_id" android:width="42.0px">
+        <rotate android:layout_width="fill_parent" android:layout_height="wrap_content" android:fromDegrees="45.0" android:pivotX="0.0%" android:pivotY="100.0%">
+            <shape android:shape="rectangle">
+                <solid android:color="#ff000000" />
+                <size android:height="29.695984px" android:width="29.695984px" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/face_not_verified.xml b/packages/SystemUI/res/drawable/face_not_verified.xml
new file mode 100644
index 0000000000000..03b0566d6f043
--- /dev/null
+++ b/packages/SystemUI/res/drawable/face_not_verified.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,9.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8.5,9.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c-2.33,0 -4.32,1.45 -5.12,3.5h1.67c0.69,-1.19 1.97,-2 3.45,-2s2.75,0.81 3.45,2h1.67c-0.8,-2.05 -2.79,-3.5 -5.12,-3.5zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/face_scanning.xml b/packages/SystemUI/res/drawable/face_scanning.xml
new file mode 100644
index 0000000000000..27de6c80ef20c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/face_scanning.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.25,13c0,0.69 -0.56,1.25 -1.25,1.25S7.75,13.69 7.75,13s0.56,-1.25 1.25,-1.25 1.25,0.56 1.25,1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM22,12c0,5.52 -4.48,10 -10,10S2,17.52 2,12 6.48,2 12,2s10,4.48 10,10zM10.66,4.12C12.06,6.44 14.6,8 17.5,8c0.46,0 0.91,-0.05 1.34,-0.12C17.44,5.56 14.9,4 12,4c-0.46,0 -0.91,0.05 -1.34,0.12zM4.42,9.47c1.71,-0.97 3.03,-2.55 3.66,-4.44C6.37,6 5.05,7.58 4.42,9.47zM20,12c0,-0.78 -0.12,-1.53 -0.33,-2.24 -0.7,0.15 -1.42,0.24 -2.17,0.24 -3.13,0 -5.92,-1.44 -7.76,-3.69C8.69,8.87 6.6,10.88 4,11.86c0.01,0.04 0,0.09 0,0.14 0,4.41 3.59,8 8,8s8,-3.59 8,-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/face_success.xml b/packages/SystemUI/res/drawable/face_success.xml
new file mode 100644
index 0000000000000..ad63e1b1f1b7e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/face_success.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_5g_toggle.xml b/packages/SystemUI/res/drawable/ic_5g_toggle.xml
new file mode 100644
index 0000000000000..1c0e9f1df7742
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_5g_toggle.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2025-2026 AxionOS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <group
+        android:translateX="1.5"
+        android:translateY="4.0">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M5.3,13.22c-0.57,0 -1.1,-0.11 -1.58,-0.34c-0.48,-0.22 -0.87,-0.55 -1.18,-0.98C2.24,11.47 2.06,10.93 2,10.3l1.48,-0.2c0.07,0.5 0.25,0.92 0.56,1.25c0.32,0.32 0.74,0.48 1.26,0.48c0.57,0 1.02,-0.18 1.34,-0.55c0.33,-0.37 0.49,-0.87 0.49,-1.48c0,-0.61 -0.16,-1.09 -0.49,-1.46C6.32,7.96 5.88,7.78 5.32,7.78C5,7.78 4.7,7.85 4.42,8C4.15,8.14 3.93,8.33 3.76,8.56L2.28,7.92l0.6,-4.94h5.26v1.36H4.1L3.72,7.02l0.08,0.03C4,6.87 4.25,6.73 4.55,6.62c0.3,-0.12 0.63,-0.18 1.01,-0.18c0.6,0 1.13,0.14 1.6,0.41C7.62,7.11 7.98,7.5 8.24,8c0.27,0.5 0.41,1.1 0.41,1.79c0,0.66 -0.14,1.26 -0.43,1.78c-0.28,0.51 -0.67,0.92 -1.18,1.22C6.55,13.08 5.97,13.22 5.3,13.22z" />
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M14.51,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83C10.19,9.95 10,9.03 10,7.99c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6H17.6v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.85,13.07 15.24,13.22 14.51,13.22z" />
+    </group>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_access_alarms_big.xml b/packages/SystemUI/res/drawable/ic_access_alarms_big.xml
new file mode 100644
index 0000000000000..d19ffb6947cf7
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_access_alarms_big.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="18.0dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="18.0dp">
+    <path android:fillColor="@android:color/white" android:pathData="M21.35,6.49c-0.35,0.42 -0.98,0.47 -1.4,0.12l-3.07,-2.57a1,1 0,1 1,1.29 -1.53l3.07,2.57c0.42,0.35 0.47,0.98 0.11,1.41zM7.24,2.63a1,1 0,0 0,-1.41 -0.13L2.77,5.07A0.996,0.996 0,1 0,4.05 6.6l3.06,-2.57c0.43,-0.35 0.48,-0.98 0.13,-1.4zM11.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v4.68c0,0.35 0.18,0.68 0.49,0.86l3.65,2.19c0.34,0.2 0.78,0.1 0.98,-0.24a0.71,0.71 0,0 0,-0.25 -0.99l-3.37,-2v-4.5c0,-0.41 -0.34,-0.75 -0.75,-0.75zM12,5.9c-3.91,0 -7.1,3.18 -7.1,7.1s3.19,7.1 7.1,7.1 7.1,-3.18 7.1,-7.1 -3.19,-7.1 -7.1,-7.1M12,4a9,9 0,1 1,-0.001 18.001A9,9 0,0 1,12 4z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_adidas.xml b/packages/SystemUI/res/drawable/ic_adidas.xml
new file mode 100644
index 0000000000000..803c937b3d962
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_adidas.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 0.332031 17.332031 L 4.933594 14.667969 L 7.398438 18.933594 L 1.199219 18.933594 Z M 17.464844 18.933594 L 11.066406 7.734375 L 15.667969 5.066406 L 23.667969 18.933594 Z M 5.734375 12.601562 L 10.398438 9.933594 L 15.535156 18.933594 L 9.398438 18.933594 Z M 5.734375 12.601562" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_alien.xml b/packages/SystemUI/res/drawable/ic_alien.xml
new file mode 100644
index 0000000000000..cddba38b1e486
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_alien.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M10.31 10.93C11.33 12.57 11.18 14.5 9.96 15.28C8.74 16.04 6.92 15.33 5.89 13.69C4.87 12.05 5.03 10.1 6.25 9.34C7.47 8.58 9.29 9.29 10.31 10.93M12 17.75C14 17.75 14.5 17 14.5 17C14.5 17 14 19 12 19C10 19 9.5 17.03 9.5 17C9.5 17 10 17.75 12 17.75M17.75 9.34C18.97 10.1 19.13 12.05 18.11 13.69C17.08 15.33 15.26 16.04 14.04 15.28C12.82 14.5 12.67 12.57 13.69 10.93C14.71 9.29 16.53 8.58 17.75 9.34M12 20C14.5 20 20 14.86 20 11C20 7.14 16.41 4 12 4C7.59 4 4 7.14 4 11C4 14.86 9.5 20 12 20M12 2C17.5 2 22 6.04 22 11C22 15.08 16.32 22 12 22C7.68 22 2 15.08 2 11C2 6.04 6.5 2 12 2Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ambient_battery.xml b/packages/SystemUI/res/drawable/ic_ambient_battery.xml
new file mode 100644
index 0000000000000..85372b6a6e70c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ambient_battery.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M347.82,840Q333.77,840 324.58,830.71Q315.38,821.42 315.38,807.69L315.38,211.54Q315.38,197.81 324.67,188.52Q333.96,179.23 347.69,179.23L412.31,179.23L412.31,120L547.69,120L547.69,179.23L612.47,179.23Q626.23,179.23 635.42,188.52Q644.62,197.81 644.62,211.54L644.62,807.69Q644.62,821.42 635.33,830.71Q626.04,840 612.31,840L347.82,840Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ambient_cpu.xml b/packages/SystemUI/res/drawable/ic_ambient_cpu.xml
new file mode 100644
index 0000000000000..117f3a6724ec0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ambient_cpu.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M360,600L360,360L600,360L600,600L360,600ZM440,520L520,520L520,440L440,440L440,520ZM360,840L360,760L280,760Q247,760 223.5,736.5Q200,713 200,680L200,600L120,600L120,520L200,520L200,440L120,440L120,360L200,360L200,280Q200,247 223.5,223.5Q247,200 280,200L360,200L360,120L440,120L440,200L520,200L520,120L600,120L600,200L680,200Q713,200 736.5,223.5Q760,247 760,280L760,360L840,360L840,440L760,440L760,520L840,520L840,600L760,600L760,680Q760,713 736.5,736.5Q713,760 680,760L600,760L600,840L520,840L520,760L440,760L440,840L360,840ZM680,680Q680,680 680,680Q680,680 680,680L680,280Q680,280 680,280Q680,280 680,280L280,280Q280,280 280,280Q280,280 280,280L280,680Q280,680 280,680Q280,680 280,680L680,680ZM480,480L480,480L480,480L480,480Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ambient_temperature.xml b/packages/SystemUI/res/drawable/ic_ambient_temperature.xml
new file mode 100644
index 0000000000000..4e6ec6489eafe
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ambient_temperature.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,880Q397,880 338.5,821.5Q280,763 280,680Q280,632 301,590.5Q322,549 360,520L360,200Q360,150 395,115Q430,80 480,80Q530,80 565,115Q600,150 600,200L600,520Q638,549 659,590.5Q680,632 680,680Q680,763 621.5,821.5Q563,880 480,880ZM440,440L520,440L520,400L480,400L480,360L520,360L520,280L480,280L480,240L520,240L520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200L440,440Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_amogus.xml b/packages/SystemUI/res/drawable/ic_amogus.xml
new file mode 100644
index 0000000000000..5fe12e24a13c3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_amogus.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8.2480469 0.00390625C7.8863325 0.019172452 7.5296067 0.064615865 7.1933594 0.14257812C5.497916 0.53635172 4.8706679 1.2602244 4.2089844 2.078125C3.9131792 2.4440979 3.6841919 2.9903696 3.5 3.4980469C2.7868638 3.8795212 2.2134667 4.6192705 2.2128906 5.6601562C2.2128906 6.3353581 2.5507193 6.7974652 3 7.1367188L3 10.771484C3 11.313713 3.062599 11.804848 3.125 12.201172C3.187401 12.597495 3.2457426 12.921702 3.25 13.021484L4.25 12.978516C4.2382574 12.7033 4.1718803 12.417098 4.1132812 12.044922C4.0546822 11.672745 4 11.236255 4 10.771484L4 7.6621094C4.8471078 7.9465337 5.6773826 7.9749057 5.6757812 7.9746094C5.9102113 8.0181184 6.1382197 8.009465 6.5253906 7.984375C6.9125616 7.9592759 7.3907499 7.9013141 7.8730469 7.7734375C8.3553438 7.6455609 8.8450988 7.4531863 9.2519531 7.1230469C9.6588074 6.7929075 9.9739946 6.2864019 9.9921875 5.6757812C10.010478 5.0616625 9.9153414 4.5520565 9.6835938 4.140625C9.451846 3.7291935 9.0821888 3.4456567 8.6777344 3.28125C7.8688255 2.9524366 6.9138229 2.9944249 5.8808594 3.0039062C5.5307021 3.0071647 5.1537638 3.0280763 4.7753906 3.0878906C4.8582115 2.9255789 4.9456015 2.7574187 4.9863281 2.7070312C5.6542789 1.8813839 5.9036281 1.4673337 7.4179688 1.1152344C7.9444741 0.99315887 8.6139777 0.96969476 9.21875 1.0371094C9.8235223 1.1045244 10.372289 1.2767901 10.626953 1.4453125C10.920803 1.6397913 11.37581 2.5503847 11.626953 3.6621094C11.878096 4.773834 12 6.0671613 12 7.0253906C12 7.7536277 11.93492 9.1821498 11.869141 10.449219C11.836251 11.082753 11.803567 11.679138 11.779297 12.134766C11.755027 12.590393 11.735241 12.838632 11.738281 13.009766L12.738281 12.990234C12.738826 13.020864 12.753154 12.641622 12.777344 12.1875C12.801534 11.733378 12.834207 11.137419 12.867188 10.501953C12.933169 9.2310199 13 7.8121536 13 7.0253906C13 6.5138205 12.96765 5.9284323 12.904297 5.3242188C12.942892 5.3315431 12.976134 5.3317634 13.013672 5.3398438C13.281581 5.397513 13.491474 5.5031007 13.519531 5.5097656C13.53217 5.5317355 13.553963 5.5663196 13.570312 5.6171875C13.607112 5.731653 13.647812 5.9044529 13.6875 6.1113281C13.76688 6.5250786 13.84042 7.0784333 13.894531 7.6699219C14.002754 8.8528991 14.035611 10.210037 13.953125 10.931641C13.917935 11.239756 13.815123 11.683751 13.71875 12.066406C13.67056 12.257734 13.62397 12.434772 13.587891 12.583984C13.551811 12.733197 13.518395 12.805238 13.515625 12.992188L14.515625 13.007812C14.514325 13.093262 14.526024 12.953052 14.558594 12.818359C14.591164 12.683665 14.638064 12.506844 14.6875 12.310547C14.78638 11.917952 14.898502 11.454807 14.945312 11.044922C15.045832 10.165525 15.003155 8.8081478 14.890625 7.578125C14.834379 6.9631207 14.759012 6.3862495 14.669922 5.921875C14.625377 5.6896877 14.578089 5.4866283 14.521484 5.3105469C14.465051 5.1349984 14.432651 4.9915991 14.251953 4.8125C13.939862 4.5036481 13.588933 4.4417043 13.224609 4.3632812C13.055118 4.3267971 12.9251 4.319595 12.765625 4.296875C12.717953 4.008444 12.664677 3.7207932 12.601562 3.4414062C12.329455 2.236881 11.986885 1.1468493 11.177734 0.61132812C10.687398 0.2868505 10.037306 0.12180415 9.3300781 0.04296875C8.9764643 0.00355105 8.6097613 -0.011359952 8.2480469 0.00390625zM5.890625 4.0039062C6.9276614 3.9943862 7.8076901 4.0065963 8.3007812 4.2070312C8.5473225 4.3072497 8.6977476 4.4271346 8.8125 4.6308594C8.9272524 4.8345841 9.006897 5.1526032 8.9921875 5.6464844C8.9828804 5.9588638 8.8633801 6.1506863 8.6230469 6.3457031C8.3827137 6.54072 8.0121874 6.7013922 7.6152344 6.8066406C7.2182813 6.9118891 6.7974541 6.9645166 6.4609375 6.9863281C6.1244209 7.0081397 5.8034919 6.9821783 5.8574219 6.9921875C5.1305853 6.8576625 3.2151892 6.7980904 3.2128906 5.6621094L3.2128906 5.6601562C3.213934 4.9221014 3.5038147 4.6065515 4.0019531 4.3554688C4.5006405 4.1041093 5.2303546 4.0100505 5.890625 4.0039062zM13.542969 5.5195312C13.542732 5.5192076 13.549279 5.5219309 13.548828 5.5214844L13.548828 5.5234375C13.542271 5.5169633 13.547737 5.5242655 13.542969 5.5195312z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_android_logo.xml b/packages/SystemUI/res/drawable/ic_android_logo.xml
new file mode 100644
index 0000000000000..0ab89c5dbc4cb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_android_logo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M16.61 15.15C16.15 15.15 15.77 14.78 15.77 14.32S16.15 13.5 16.61 13.5H16.61C17.07 13.5 17.45 13.86 17.45 14.32C17.45 14.78 17.07 15.15 16.61 15.15M7.41 15.15C6.95 15.15 6.57 14.78 6.57 14.32C6.57 13.86 6.95 13.5 7.41 13.5H7.41C7.87 13.5 8.24 13.86 8.24 14.32C8.24 14.78 7.87 15.15 7.41 15.15M16.91 10.14L18.58 7.26C18.67 7.09 18.61 6.88 18.45 6.79C18.28 6.69 18.07 6.75 18 6.92L16.29 9.83C14.95 9.22 13.5 8.9 12 8.91C10.47 8.91 9 9.24 7.73 9.82L6.04 6.91C5.95 6.74 5.74 6.68 5.57 6.78C5.4 6.87 5.35 7.08 5.44 7.25L7.1 10.13C4.25 11.69 2.29 14.58 2 18H22C21.72 14.59 19.77 11.7 16.91 10.14H16.91Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_app_volume.xml b/packages/SystemUI/res/drawable/ic_app_volume.xml
new file mode 100644
index 0000000000000..7b2a88fc15395
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_app_volume.xml
@@ -0,0 +1,32 @@
+<!--
+    Copyright (C) 2022 The LibreMobileOS Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:pathData="M 10.001 3 C 9.448 3 9 3.448 9.001 4.001 L 9.01 13.55 C 8.41 13.21 7.73 13 7.01 13 C 4.79 13 3 14.79 3 17 C 3 19.21 4.79 21 7.01 21 C 9.23 21 11 19.21 11 17 L 11 7 L 14 7 C 14.552 7 15 6.552 15 6 L 15 4 C 15 3.448 14.552 3 14 3 L 10.001 3 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M 14 10 L 15 10 C 15.265 10 15.52 10.105 15.707 10.293 C 15.895 10.48 16 10.735 16 11 L 16 12 C 16 12.265 15.895 12.52 15.707 12.707 C 15.52 12.895 15.265 13 15 13 L 14 13 C 13.735 13 13.48 12.895 13.293 12.707 C 13.105 12.52 13 12.265 13 12 L 13 11 C 13 10.735 13.105 10.48 13.293 10.293 C 13.48 10.105 13.735 10 14 10 M 14 15 L 15 15 C 15.265 15 15.52 15.105 15.707 15.293 C 15.895 15.48 16 15.735 16 16 L 16 17 C 16 17.265 15.895 17.52 15.707 17.707 C 15.52 17.895 15.265 18 15 18 L 14 18 C 13.735 18 13.48 17.895 13.293 17.707 C 13.105 17.52 13 17.265 13 17 L 13 16 C 13 15.735 13.105 15.48 13.293 15.293 C 13.48 15.105 13.735 15 14 15 M 19 10 L 20 10 C 20.265 10 20.52 10.105 20.707 10.293 C 20.895 10.48 21 10.735 21 11 L 21 12 C 21 12.265 20.895 12.52 20.707 12.707 C 20.52 12.895 20.265 13 20 13 L 19 13 C 18.735 13 18.48 12.895 18.293 12.707 C 18.105 12.52 18 12.265 18 12 L 18 11 C 18 10.735 18.105 10.48 18.293 10.293 C 18.48 10.105 18.735 10 19 10 M 19 15 L 20 15 C 20.265 15 20.52 15.105 20.707 15.293 C 20.895 15.48 21 15.735 21 16 L 21 17 C 21 17.265 20.895 17.52 20.707 17.707 C 20.52 17.895 20.265 18 20 18 L 19 18 C 18.735 18 18.48 17.895 18.293 17.707 C 18.105 17.52 18 17.265 18 17 L 18 16 C 18 15.735 18.105 15.48 18.293 15.293 C 18.48 15.105 18.735 15 19 15"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_apple_logo.xml b/packages/SystemUI/res/drawable/ic_apple_logo.xml
new file mode 100644
index 0000000000000..fdac2f742b12c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_apple_logo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16.0dp"
+        android:height="16.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18.71,19.5C17.88,20.74 17,21.95 15.66,21.97C14.32,22 13.89,21.18 12.37,21.18C10.84,21.18 10.37,21.95 9.1,22C7.79,22.05 6.8,20.68 5.96,19.47C4.25,17 2.94,12.45 4.7,9.39C5.57,7.87 7.13,6.91 8.82,6.88C10.1,6.86 11.32,7.75 12.11,7.75C12.89,7.75 14.37,6.68 15.92,6.84C16.57,6.87 18.39,7.1 19.56,8.82C19.47,8.88 17.39,10.1 17.41,12.63C17.44,15.65 20.06,16.66 20.09,16.67C20.06,16.74 19.67,18.11 18.71,19.5M13,3.5C13.73,2.67 14.94,2.04 15.94,2C16.07,3.17 15.6,4.35 14.9,5.19C14.21,6.04 13.07,6.7 11.95,6.61C11.8,5.46 12.36,4.26 13,3.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_assistant.xml b/packages/SystemUI/res/drawable/ic_assistant.xml
new file mode 100644
index 0000000000000..78c9b663e5bb8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_assistant.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,2L5,2c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM19,18h-4.83l-0.59,0.59L12,20.17l-1.59,-1.59 -0.58,-0.58L5,18L5,4h14v14zM12,17l1.88,-4.12L18,11l-4.12,-1.88L12,5l-1.88,4.12L6,11l4.12,1.88z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_avatar_guest_user.xml b/packages/SystemUI/res/drawable/ic_avatar_guest_user.xml
index e3a83a29b764a..581e4a9c4bdda 100644
--- a/packages/SystemUI/res/drawable/ic_avatar_guest_user.xml
+++ b/packages/SystemUI/res/drawable/ic_avatar_guest_user.xml
@@ -21,7 +21,7 @@
 
     <path
         android:pathData="M23.9998,10.667C16.6398,10.667 10.6665,16.6403 10.6665,24.0003C10.6665,31.3603 16.6398,37.3337 23.9998,37.3337C31.3598,37.3337 37.3332,31.3603 37.3332,24.0003C37.3332,16.6403 31.3598,10.667 23.9998,10.667ZM17.4265,32.3737C17.9998,31.1737 21.4932,30.0003 23.9998,30.0003C26.5065,30.0003 30.0132,31.1737 30.5732,32.3737C28.7598,33.8137 26.4798,34.667 23.9998,34.667C21.5198,34.667 19.2398,33.8137 17.4265,32.3737ZM23.9998,27.3337C25.9465,27.3337 30.5732,28.1203 32.4798,30.4403C33.8398,28.6537 34.6665,26.427 34.6665,24.0003C34.6665,18.1203 29.8798,13.3337 23.9998,13.3337C18.1198,13.3337 13.3332,18.1203 13.3332,24.0003C13.3332,26.427 14.1598,28.6537 15.5198,30.4403C17.4265,28.1203 22.0532,27.3337 23.9998,27.3337ZM23.9998,16.0003C21.4132,16.0003 19.3332,18.0803 19.3332,20.667C19.3332,23.2537 21.4132,25.3337 23.9998,25.3337C26.5865,25.3337 28.6665,23.2537 28.6665,20.667C28.6665,18.0803 26.5865,16.0003 23.9998,16.0003ZM21.9998,20.667C21.9998,21.7737 22.8932,22.667 23.9998,22.667C25.1065,22.667 25.9998,21.7737 25.9998,20.667C25.9998,19.5603 25.1065,18.667 23.9998,18.667C22.8932,18.667 21.9998,19.5603 21.9998,20.667Z"
-        android:fillColor="#ffffff"
+        android:fillColor="?android:attr/colorAccent"
         android:fillType="evenOdd"/>
 
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_avatar_user.xml b/packages/SystemUI/res/drawable/ic_avatar_user.xml
index b4a4a88bf1554..6b755a2fb9480 100644
--- a/packages/SystemUI/res/drawable/ic_avatar_user.xml
+++ b/packages/SystemUI/res/drawable/ic_avatar_user.xml
@@ -21,7 +21,7 @@
 
     <path
         android:pathData="M23.9998,10.667C16.6398,10.667 10.6665,16.6403 10.6665,24.0003C10.6665,31.3603 16.6398,37.3337 23.9998,37.3337C31.3598,37.3337 37.3332,31.3603 37.3332,24.0003C37.3332,16.6403 31.3598,10.667 23.9998,10.667ZM32.4798,30.4403C30.5732,28.1203 25.9465,27.3337 23.9998,27.3337C22.0532,27.3337 17.4265,28.1203 15.5198,30.4403C14.1598,28.6537 13.3332,26.427 13.3332,24.0003C13.3332,18.1203 18.1198,13.3337 23.9998,13.3337C29.8798,13.3337 34.6665,18.1203 34.6665,24.0003C34.6665,26.427 33.8398,28.6537 32.4798,30.4403ZM19.3332,20.667C19.3332,18.0803 21.4132,16.0003 23.9998,16.0003C26.5865,16.0003 28.6665,18.0803 28.6665,20.667C28.6665,23.2537 26.5865,25.3337 23.9998,25.3337C21.4132,25.3337 19.3332,23.2537 19.3332,20.667Z"
-        android:fillColor="#ffffff"
+        android:fillColor="?android:attr/colorAccent"
         android:fillType="evenOdd"/>
 
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_avengers.xml b/packages/SystemUI/res/drawable/ic_avengers.xml
new file mode 100644
index 0000000000000..e78a6bc73afed
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_avengers.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 12.867188 2.601562 C 12.398438 3.601562 12.199219 3.867188 12.066406 3.933594 C 11.933594 3.933594 11.398438 4 10.933594 4.066406 C 7.066406 4.464844 4 7.265625 3.066406 11.066406 C 2.535156 13.132812 2.933594 16.601562 4.265625 18.332031 L 4.464844 18.601562 L 4.867188 17.867188 L 5.265625 17.132812 L 5 16.667969 C 2.867188 12.464844 5.398438 7 9.933594 5.734375 C 10.601562 5.601562 11.535156 5.464844 11.535156 5.601562 C 11.535156 5.601562 9.667969 9.398438 7.332031 14.066406 L 3.199219 22.601562 L 3.535156 22.667969 C 3.734375 22.734375 4.464844 22.734375 5.265625 22.734375 L 6.601562 22.734375 L 7.933594 19.667969 C 8.667969 18 9.332031 16.601562 9.332031 16.601562 C 9.398438 16.535156 10.332031 16.535156 11.535156 16.535156 L 13.601562 16.535156 L 13.667969 17.066406 L 13.667969 17.667969 L 15.132812 16.535156 C 16 15.933594 16.667969 15.332031 16.667969 15.332031 C 16.667969 15.265625 16 14.667969 15.199219 13.933594 L 13.800781 12.601562 L 13.734375 13.132812 L 13.734375 13.667969 L 10.535156 13.667969 L 10.601562 13.464844 C 10.933594 12.601562 13.601562 6.464844 13.667969 6.398438 C 13.734375 6.332031 13.734375 7.398438 13.734375 9.066406 L 13.734375 11.800781 L 15 12.933594 L 16.199219 14.066406 L 16.265625 10.535156 C 16.332031 7.867188 16.332031 6.933594 16.464844 6.933594 C 16.601562 6.867188 18.132812 8.464844 18.601562 9.199219 C 18.800781 9.601562 19.132812 10.332031 19.332031 10.800781 C 19.734375 12.066406 19.800781 14.265625 19.398438 15.464844 C 18.667969 17.667969 17.265625 19.332031 15.332031 20.265625 C 13.535156 21.132812 11.535156 21.332031 9.601562 20.667969 C 9.066406 20.464844 8.601562 20.265625 8.464844 20.265625 C 8.332031 20.199219 8.265625 20.265625 8 20.800781 C 7.867188 21.199219 7.734375 21.464844 7.734375 21.535156 C 7.734375 21.601562 9.132812 22.132812 9.867188 22.332031 C 10.933594 22.601562 13.332031 22.535156 14.464844 22.199219 C 16.933594 21.464844 19 19.800781 20.132812 17.601562 C 21.132812 15.601562 21.535156 12.734375 20.800781 10.601562 C 20.132812 8.398438 18.667969 6.535156 17 5.464844 L 16.398438 5.066406 L 16.398438 1.265625 L 13.535156 1.265625 Z M 14.933594 17.464844 L 13.734375 18.535156 L 14.933594 18.535156 C 15.667969 18.535156 16.199219 18.535156 16.265625 18.535156 C 16.265625 18.535156 16.265625 18 16.265625 17.398438 L 16.199219 16.332031 Z M 14.933594 17.464844" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_batman.xml b/packages/SystemUI/res/drawable/ic_batman.xml
new file mode 100644
index 0000000000000..be1b63d8aa6f6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_batman.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 12.667969 7.535156 L 12.398438 7.535156 C 12.199219 7.535156 12 7.464844 11.867188 7.535156 L 11.398438 7.535156 C 11.398438 7.535156 11.398438 7.535156 11.332031 7.535156 C 11.332031 7.535156 11.265625 7.464844 11.265625 7.464844 C 11.265625 7.398438 11.265625 7.398438 11.199219 7.332031 C 11.199219 7.265625 10.933594 6.800781 10.867188 6.800781 C 10.734375 6.800781 10.667969 7.332031 10.667969 7.398438 C 10.667969 7.535156 10.601562 7.800781 10.601562 7.867188 C 10.667969 8.265625 10.601562 8.667969 10.535156 9.066406 C 10.464844 9.199219 10.464844 9.332031 10.398438 9.398438 C 10.332031 9.464844 10.332031 9.535156 10.332031 9.601562 C 10.265625 9.601562 10.265625 9.667969 10.199219 9.734375 C 9.933594 10.199219 9.464844 10.464844 8.933594 10.464844 C 8.667969 10.464844 8.398438 10.398438 8.199219 10.332031 C 7.933594 10.199219 7.601562 10.066406 7.398438 9.867188 C 7.265625 9.800781 7.265625 9.800781 7.132812 9.667969 C 6.933594 9.265625 6.933594 8.800781 7.066406 8.398438 C 7.132812 8.265625 7.199219 8.066406 7.332031 7.933594 C 7.332031 7.867188 7.398438 7.800781 7.464844 7.734375 C 7.535156 7.667969 7.601562 7.601562 7.667969 7.464844 L 7.867188 7.265625 C 7.933594 7.199219 7.933594 7.199219 7.933594 7.132812 C 7.800781 7.132812 6.667969 7.535156 6.464844 7.601562 C 6.332031 7.667969 6.132812 7.734375 5.933594 7.800781 L 5.398438 8 C 5.332031 8 5.265625 8.066406 5.265625 8.066406 L 5 8.132812 C 4.933594 8.199219 4.867188 8.199219 4.867188 8.199219 L 4.734375 8.265625 C 4.667969 8.265625 4.667969 8.332031 4.667969 8.332031 L 4.332031 8.464844 L 4.199219 8.535156 C 4.132812 8.535156 4.132812 8.601562 4.066406 8.601562 C 4.066406 8.601562 4 8.667969 3.933594 8.667969 L 3.734375 8.800781 C 3.535156 8.933594 3.332031 9 3.132812 9.132812 C 3.066406 9.199219 3.066406 9.199219 3 9.199219 C 3 9.265625 3 9.265625 2.933594 9.265625 C 2.734375 9.398438 2.464844 9.667969 2.265625 9.800781 C 2.265625 9.800781 2.265625 9.867188 2.199219 9.867188 L 2.132812 9.933594 C 2.132812 9.933594 2 10 2 10.066406 L 1.933594 10.132812 C 1.933594 10.132812 1.867188 10.199219 1.867188 10.199219 L 1.601562 10.464844 C 1.464844 10.667969 1.332031 10.867188 1.265625 11.066406 C 1.132812 11.265625 1.066406 11.535156 1 11.800781 C 0.933594 11.933594 0.933594 12.132812 0.933594 12.265625 C 0.933594 12.464844 0.933594 12.601562 0.933594 12.734375 C 1 13 1.066406 13.265625 1.199219 13.464844 C 1.332031 13.867188 1.535156 14.199219 1.800781 14.464844 L 2.199219 14.933594 L 2.667969 15.332031 C 2.667969 15.398438 2.734375 15.398438 2.734375 15.398438 C 2.800781 15.464844 2.800781 15.464844 2.867188 15.464844 C 2.867188 15.535156 2.933594 15.535156 2.933594 15.535156 C 3.132812 15.734375 3.332031 15.800781 3.535156 15.933594 L 3.933594 16.199219 C 3.933594 16.199219 4 16.199219 4 16.265625 C 4.132812 16.265625 4.199219 16.332031 4.332031 16.398438 C 4.332031 16.398438 4.398438 16.464844 4.398438 16.464844 C 4.464844 16.464844 4.535156 16.464844 4.535156 16.535156 L 5.464844 16.867188 C 5.667969 17 5.933594 17.066406 6.132812 17.132812 C 6.199219 17.132812 6.464844 17.265625 6.398438 17.132812 L 6.199219 16.933594 C 6.132812 16.933594 6.132812 16.933594 6.132812 16.933594 L 6 16.734375 C 5.867188 16.535156 5.734375 16.398438 5.601562 16.199219 C 5.601562 16.199219 5.601562 16.199219 5.601562 16.132812 C 5.535156 16.066406 5.464844 15.933594 5.398438 15.867188 C 5.398438 15.800781 5.332031 15.734375 5.332031 15.667969 C 5.265625 15.535156 5.199219 15.332031 5.132812 15.132812 C 5.066406 14.734375 5.066406 14.332031 5.332031 13.933594 C 5.398438 13.867188 5.535156 13.734375 5.601562 13.667969 C 5.734375 13.601562 6 13.601562 6.199219 13.601562 C 6.332031 13.601562 6.464844 13.601562 6.601562 13.667969 C 6.734375 13.667969 6.867188 13.734375 6.933594 13.734375 C 7.066406 13.800781 7.199219 13.867188 7.332031 13.933594 C 7.601562 14.066406 7.800781 14.199219 8 14.398438 C 8.132812 14.464844 8.265625 14.601562 8.398438 14.667969 C 8.464844 14.667969 8.464844 14.734375 8.464844 14.734375 L 8.535156 14.800781 C 8.601562 14.800781 8.601562 14.867188 8.601562 14.867188 C 8.667969 14.867188 8.667969 14.933594 8.667969 14.933594 C 8.734375 14.800781 8.867188 14.601562 8.933594 14.535156 C 9.066406 14.332031 9.332031 14.066406 9.535156 14.066406 C 9.601562 14.066406 9.601562 14.066406 9.601562 14.066406 C 9.667969 14.066406 9.667969 14.066406 9.667969 14.066406 C 10.066406 14.066406 10.535156 14.667969 10.800781 15 L 11.332031 15.933594 C 11.398438 16 11.398438 16 11.398438 16.066406 C 11.535156 16.265625 11.734375 16.667969 11.867188 16.933594 C 11.867188 16.933594 11.867188 16.933594 11.867188 17 C 11.867188 17 11.933594 17.199219 12 17.199219 C 12 17.199219 12.066406 17.199219 12.066406 17.132812 L 12.332031 16.535156 C 12.398438 16.464844 12.398438 16.398438 12.464844 16.332031 C 12.464844 16.265625 12.535156 16.132812 12.535156 16.066406 C 12.867188 15.535156 13.066406 15.132812 13.464844 14.667969 C 13.464844 14.667969 13.464844 14.667969 13.535156 14.601562 L 13.667969 14.464844 C 13.867188 14.265625 14.066406 14.066406 14.332031 14.066406 C 14.398438 14.066406 14.332031 14.066406 14.398438 14.066406 C 14.464844 14.066406 14.464844 14.066406 14.535156 14.066406 C 14.667969 14.132812 14.800781 14.199219 14.933594 14.332031 C 15 14.398438 15 14.398438 15.066406 14.464844 L 15.199219 14.734375 C 15.265625 14.800781 15.265625 14.867188 15.332031 14.867188 C 15.332031 14.867188 15.332031 14.867188 15.398438 14.867188 L 15.398438 14.800781 C 15.667969 14.601562 15.867188 14.398438 16.132812 14.265625 C 16.332031 14.132812 16.535156 14 16.800781 13.867188 L 17 13.800781 C 17.265625 13.667969 17.535156 13.601562 17.933594 13.601562 C 18.132812 13.601562 18.332031 13.601562 18.464844 13.734375 C 18.535156 13.800781 18.601562 13.867188 18.667969 13.933594 C 18.734375 14 18.800781 14.132812 18.867188 14.265625 C 19 14.734375 18.867188 15.265625 18.667969 15.667969 C 18.535156 15.867188 18.398438 16.132812 18.265625 16.332031 C 18.265625 16.398438 18.265625 16.398438 18.265625 16.398438 L 17.667969 17.132812 C 17.601562 17.132812 17.601562 17.199219 17.601562 17.199219 C 17.667969 17.199219 17.667969 17.199219 17.734375 17.199219 C 17.933594 17.132812 18.132812 17.066406 18.332031 17 L 18.800781 16.800781 C 18.867188 16.734375 19 16.734375 19.132812 16.667969 C 19.132812 16.601562 19.199219 16.601562 19.265625 16.601562 C 19.332031 16.601562 19.332031 16.535156 19.332031 16.535156 C 19.398438 16.535156 19.398438 16.535156 19.464844 16.535156 C 19.667969 16.398438 19.800781 16.332031 20 16.199219 C 20.398438 16.066406 20.933594 15.667969 21.265625 15.398438 L 21.535156 15.199219 C 21.667969 15.066406 21.867188 14.867188 22 14.734375 C 22.132812 14.601562 22.332031 14.398438 22.398438 14.199219 C 22.464844 14.132812 22.535156 14 22.601562 13.933594 C 22.667969 13.800781 22.800781 13.667969 22.800781 13.464844 C 22.867188 13.332031 22.933594 13.199219 23 13 C 23 12.933594 23 12.867188 23.066406 12.734375 C 23.066406 12.601562 23.066406 12.464844 23.066406 12.265625 C 23.066406 12.199219 23.066406 12.132812 23.066406 12.066406 C 23.066406 12.066406 23.066406 12 23.066406 11.933594 C 23 11.601562 22.867188 11.332031 22.734375 11.066406 C 22.734375 11 22.734375 11 22.667969 10.933594 L 22.535156 10.734375 C 22.464844 10.535156 22.332031 10.398438 22.199219 10.265625 C 22.066406 10.132812 21.867188 9.933594 21.734375 9.800781 C 21.734375 9.800781 21.734375 9.800781 21.667969 9.800781 L 21.535156 9.667969 C 21.066406 9.265625 20.800781 9.066406 20.265625 8.800781 L 19.667969 8.464844 C 19.601562 8.464844 19.601562 8.464844 19.601562 8.464844 L 19.265625 8.265625 C 19.265625 8.265625 19.265625 8.265625 19.199219 8.265625 C 19.199219 8.265625 19.199219 8.199219 19.132812 8.199219 L 18.734375 8.066406 C 18.601562 8 18.398438 7.933594 18.199219 7.867188 C 18.132812 7.800781 18.132812 7.800781 18.066406 7.800781 C 18 7.734375 18 7.734375 17.933594 7.734375 L 17.464844 7.535156 C 17.398438 7.535156 17.398438 7.535156 17.398438 7.535156 C 17.332031 7.535156 17.332031 7.535156 17.332031 7.535156 C 17.265625 7.535156 17.265625 7.464844 17.199219 7.464844 C 17.199219 7.464844 17.132812 7.464844 17.066406 7.464844 C 16.933594 7.398438 16.132812 7.132812 16.066406 7.132812 C 16.066406 7.199219 16.066406 7.199219 16.132812 7.265625 L 16.265625 7.398438 C 16.265625 7.398438 16.265625 7.398438 16.332031 7.464844 C 16.464844 7.601562 16.601562 7.800781 16.734375 7.933594 C 17.066406 8.464844 17.265625 9.066406 16.867188 9.667969 C 16.800781 9.734375 16.667969 9.867188 16.601562 9.933594 L 16.398438 10.066406 C 16.132812 10.265625 15.800781 10.464844 15.464844 10.601562 C 15.265625 10.667969 15 10.667969 14.800781 10.601562 C 14.601562 10.535156 14.398438 10.398438 14.199219 10.265625 C 14.066406 10.199219 13.933594 9.933594 13.867188 9.867188 C 13.800781 9.734375 13.734375 9.667969 13.667969 9.535156 L 13.601562 9.332031 C 13.535156 9.199219 13.464844 9.066406 13.398438 8.867188 C 13.398438 8.800781 13.398438 8.734375 13.398438 8.667969 C 13.332031 8.464844 13.332031 8.265625 13.332031 8.066406 C 13.332031 8 13.398438 7.933594 13.398438 7.867188 C 13.332031 7.601562 13.332031 7.398438 13.265625 7.199219 C 13.265625 7.132812 13.199219 6.800781 13.132812 6.800781 C 13.132812 6.734375 13.066406 6.800781 13.066406 6.867188 C 13 6.933594 12.933594 7.066406 12.867188 7.199219 C 12.800781 7.265625 12.667969 7.464844 12.667969 7.535156 Z M 12.667969 7.535156" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_batman_tdk.xml b/packages/SystemUI/res/drawable/ic_batman_tdk.xml
new file mode 100644
index 0000000000000..daa06bae76e3c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_batman_tdk.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 15.734375 8.066406 C 15.734375 8.066406 15.667969 8.867188 15.199219 9.332031 C 14.800781 9.734375 14.464844 9.734375 13.933594 9.800781 C 13.667969 9.867188 13 9.933594 12.867188 9.800781 C 12.800781 9.734375 12.800781 9.132812 12.734375 8.933594 C 12.734375 8.734375 12.734375 8.398438 12.667969 8.398438 C 12.667969 8.464844 12.601562 8.734375 12.601562 8.800781 C 12.535156 8.867188 12.464844 9.132812 12.464844 9.199219 C 12.332031 9.199219 12.132812 9.199219 12 9.199219 C 11.867188 9.199219 11.667969 9.199219 11.535156 9.199219 C 11.535156 9.132812 11.464844 8.867188 11.398438 8.800781 C 11.398438 8.734375 11.332031 8.464844 11.332031 8.398438 C 11.265625 8.398438 11.265625 8.734375 11.199219 8.933594 C 11.199219 9.132812 11.199219 9.734375 11.132812 9.800781 C 11 9.933594 10.332031 9.867188 10.066406 9.800781 C 9.535156 9.734375 9.199219 9.734375 8.800781 9.332031 C 8.332031 8.867188 8.265625 8.066406 8.265625 8.066406 L 0.800781 8.066406 C 0.800781 8.066406 2.933594 8.800781 3.800781 10.199219 C 4.265625 11.066406 4.199219 12 4.066406 12.535156 C 6 12.398438 7.601562 12.398438 9.199219 13 C 11.332031 13.800781 11.800781 15.332031 12 15.933594 C 12.199219 15.332031 12.667969 13.800781 14.800781 13 C 16.398438 12.398438 18 12.398438 19.933594 12.535156 C 19.800781 12 19.734375 11.066406 20.199219 10.199219 C 21.066406 8.800781 23.199219 8.066406 23.199219 8.066406 Z M 15.734375 8.066406" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_beats.xml b/packages/SystemUI/res/drawable/ic_beats.xml
new file mode 100644
index 0000000000000..4b755d185f79b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_beats.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16.5dp"
+    android:width="16.5dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7C10.87,7 9.84,7.37 9,8V2.46C9.95,2.16 10.95,2 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12C2,8.3 4,5.07 7,3.34V12M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_biohazard.xml b/packages/SystemUI/res/drawable/ic_biohazard.xml
new file mode 100644
index 0000000000000..02b4335713401
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_biohazard.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18.0dp"
+        android:height="18.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M23,16.06C23,16.29 23,16.5 22.96,16.7C22.78,14.14 20.64,12.11 18,12.11C17.63,12.11 17.27,12.16 16.92,12.23C16.96,12.5 17,12.73 17,13C17,15.35 15.31,17.32 13.07,17.81C13.42,20.05 15.31,21.79 17.65,21.96C17.43,22 17.22,22 17,22C14.92,22 13.07,20.94 12,19.34C10.93,20.94 9.09,22 7,22C6.78,22 6.57,22 6.35,21.96C8.69,21.79 10.57,20.06 10.93,17.81C8.68,17.32 7,15.35 7,13C7,12.73 7.04,12.5 7.07,12.23C6.73,12.16 6.37,12.11 6,12.11C3.36,12.11 1.22,14.14 1.03,16.7C1,16.5 1,16.29 1,16.06C1,12.85 3.59,10.24 6.81,10.14C6.3,9.27 6,8.25 6,7.17C6,4.94 7.23,3 9.06,2C7.81,2.9 7,4.34 7,6C7,7.35 7.56,8.59 8.47,9.5C9.38,8.59 10.62,8.04 12,8.04C13.37,8.04 14.62,8.59 15.5,9.5C16.43,8.59 17,7.35 17,6C17,4.34 16.18,2.9 14.94,2C16.77,3 18,4.94 18,7.17C18,8.25 17.7,9.27 17.19,10.14C20.42,10.24 23,12.85 23,16.06M9.27,10.11C10.05,10.62 11,10.92 12,10.92C13,10.92 13.95,10.62 14.73,10.11C14,9.45 13.06,9.03 12,9.03C10.94,9.03 10,9.45 9.27,10.11M12,14.47C12.82,14.47 13.5,13.8 13.5,13A1.5,1.5 0 0,0 12,11.5A1.5,1.5 0 0,0 10.5,13C10.5,13.8 11.17,14.47 12,14.47M10.97,16.79C10.87,14.9 9.71,13.29 8.05,12.55C8.03,12.7 8,12.84 8,13C8,14.82 9.27,16.34 10.97,16.79M15.96,12.55C14.29,13.29 13.12,14.9 13,16.79C14.73,16.34 16,14.82 16,13C16,12.84 15.97,12.7 15.96,12.55Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_blackberry.xml b/packages/SystemUI/res/drawable/ic_blackberry.xml
new file mode 100644
index 0000000000000..1cb638f216c3a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_blackberry.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16.0dp"
+        android:height="16.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.45,10.28C6.4,10.28 7.5,11.05 7.5,12C7.5,12.95 6.4,13.72 5.45,13.72H2L2.69,10.28H5.45M6.14,4.76C7.09,4.76 8.21,5.53 8.21,6.5C8.21,7.43 7.09,8.21 6.14,8.21H2.69L3.38,4.76H6.14M13.03,4.76C14,4.76 15.1,5.53 15.1,6.5C15.1,7.43 14,8.21 13.03,8.21H9.41L10.1,4.76H13.03M12.34,10.28C13.3,10.28 14.41,11.05 14.41,12C14.41,12.95 13.3,13.72 12.34,13.72H8.72L9.41,10.28H12.34M10.97,15.79C11.92,15.79 13.03,16.57 13.03,17.5C13.03,18.47 11.92,19.24 10.97,19.24H7.5L8.21,15.79H10.97M18.55,13.72C19.5,13.72 20.62,14.5 20.62,15.45C20.62,16.4 19.5,17.17 18.55,17.17H15.1L15.79,13.72H18.55M19.93,8.21C20.88,8.21 22,9 22,9.93C22,10.88 20.88,11.66 19.93,11.66H16.5L17.17,8.21H19.93Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_bolt.xml b/packages/SystemUI/res/drawable/ic_bolt.xml
new file mode 100644
index 0000000000000..a0d39bc5934af
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_bolt.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 the risingOS Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="?attr/chargingAnimColor"
+      android:pathData="M14.69,2.21L4.33,11.49c-0.64,0.58 -0.28,1.65 0.58,1.73L13,14l-4.85,6.76c-0.22,0.31 -0.19,0.74 0.08,1.01h0c0.3,0.3 0.77,0.31 1.08,0.02l10.36,-9.28c0.64,-0.58 0.28,-1.65 -0.58,-1.73L11,10l4.85,-6.76c0.22,-0.31 0.19,-0.74 -0.08,-1.01l0,0C15.47,1.93 15,1.92 14.69,2.21z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_calculator.xml b/packages/SystemUI/res/drawable/ic_calculator.xml
new file mode 100644
index 0000000000000..4b454aeffc9de
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_calculator.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6.25,7.72h5v1.5h-5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,15.75h5v1.5h-5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,13.25h5v1.5h-5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,18l1.5,0l0,-2l2,0l0,-1.5l-2,0l0,-2l-1.5,0l0,2l-2,0l0,1.5l2,0z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.09,10.95l1.41,-1.41l1.41,1.41l1.06,-1.06l-1.41,-1.42l1.41,-1.41l-1.06,-1.06l-1.41,1.41l-1.41,-1.41l-1.06,1.06l1.41,1.41l-1.41,1.42z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_camera.xml b/packages/SystemUI/res/drawable/ic_camera.xml
index ef1406c1c58ad..fac551cf4a632 100644
--- a/packages/SystemUI/res/drawable/ic_camera.xml
+++ b/packages/SystemUI/res/drawable/ic_camera.xml
@@ -1,10 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (C) 2019 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.
+   You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,42Q5.8,42 4.9,41.1Q4,40.2 4,39V13.35Q4,12.15 4.9,11.25Q5.8,10.35 7,10.35H14.35L18,6H30L33.65,10.35H41Q42.2,10.35 43.1,11.25Q44,12.15 44,13.35V39Q44,40.2 43.1,41.1Q42.2,42 41,42ZM7,39H41Q41,39 41,39Q41,39 41,39V13.35Q41,13.35 41,13.35Q41,13.35 41,13.35H7Q7,13.35 7,13.35Q7,13.35 7,13.35V39Q7,39 7,39Q7,39 7,39ZM7,39Q7,39 7,39Q7,39 7,39V13.35Q7,13.35 7,13.35Q7,13.35 7,13.35Q7,13.35 7,13.35Q7,13.35 7,13.35V39Q7,39 7,39Q7,39 7,39ZM24,34.7Q27.5,34.7 30,32.225Q32.5,29.75 32.5,26.2Q32.5,22.7 30,20.2Q27.5,17.7 24,17.7Q20.45,17.7 17.975,20.2Q15.5,22.7 15.5,26.2Q15.5,29.75 17.975,32.225Q20.45,34.7 24,34.7ZM24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Q24,26.2 24,26.2Z"/>
-</vector>
+    android:height="17dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="17dp" >
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4h-3.17L15,2H9L7.17,4H4C2.9,4,2,4.9,2,6v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V6C22,4.9,21.1,4,20,4z M12,17 c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S14.76,17,12,17z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_cannabis.xml b/packages/SystemUI/res/drawable/ic_cannabis.xml
new file mode 100644
index 0000000000000..366712e553193
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_cannabis.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18.0dp"
+    android:height="18.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.5,22V17.35C11,18.13 10,19.09 8.03,19.81C8.03,19.81 8.53,18.1 9.94,16.95C8.64,17.23 6.68,17.19 4,16C4,16 6.47,14.59 9.28,14.97C7.69,14 5.7,12.08 4.17,8.11C4.17,8.11 8.67,9.34 10.91,13.14C8.88,8.24 12,2 12,2C14.43,7.47 13.91,11.1 13.12,13.1C15.37,9.33 19.83,8.11 19.83,8.11C18.3,12.08 16.31,14 14.72,14.97C17.53,14.59 20,16 20,16C17.32,17.19 15.36,17.23 14.06,16.95C15.47,18.1 15.97,19.81 15.97,19.81C14,19.09 13,18.13 12.5,17.35V22H11.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_captain_america.xml b/packages/SystemUI/res/drawable/ic_captain_america.xml
new file mode 100644
index 0000000000000..53fda77f41553
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_captain_america.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2023-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12 2C6.488281 2 2 6.488281 2 12C2 17.511719 6.488281 22 12 22C17.511719 22 22 17.511719 22 12C22 6.488281 17.511719 2 12 2ZM12 4C16.429688 4 20 7.570313 20 12C20 16.429688 16.429688 20 12 20C7.570313 20 4 16.429688 4 12C4 7.570313 7.570313 4 12 4ZM12 6C8.699219 6 6 8.699219 6 12C6 15.300781 8.699219 18 12 18C15.300781 18 18 15.300781 18 12C18 8.699219 15.300781 6 12 6ZM12 8C14.222656 8 16 9.777344 16 12C16 14.222656 14.222656 16 12 16C9.777344 16 8 14.222656 8 12C8 9.777344 9.777344 8 12 8ZM12 8.40625L10.90625 10.5L8.59375 10.90625L10.3125 12.59375L9.90625 14.90625L12 13.8125L14.09375 14.90625L13.6875 12.59375L15.40625 10.90625L13.09375 10.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_emoticon_cool.xml b/packages/SystemUI/res/drawable/ic_emoticon_cool.xml
new file mode 100644
index 0000000000000..1e0522e930da5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_emoticon_cool.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19,10C19,11.38 16.88,12.5 15.5,12.5C14.12,12.5 12.75,11.38 12.75,10H11.25C11.25,11.38 9.88,12.5 8.5,12.5C7.12,12.5 5,11.38 5,10H4.25C4.09,10.64 4,11.31 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12C20,11.31 19.91,10.64 19.75,10H19M12,4C9.04,4 6.45,5.61 5.07,8H18.93C17.55,5.61 14.96,4 12,4M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M12,17.23C10.25,17.23 8.71,16.5 7.81,15.42L9.23,14C9.68,14.72 10.75,15.23 12,15.23C13.25,15.23 14.32,14.72 14.77,14L16.19,15.42C15.29,16.5 13.75,17.23 12,17.23Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_emoticon_devil.xml b/packages/SystemUI/res/drawable/ic_emoticon_devil.xml
new file mode 100644
index 0000000000000..b63c0974e160b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_emoticon_devil.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M1.5,2.09C2.4,3 3.87,3.73 5.69,4.25C7.41,2.84 9.61,2 12,2C14.39,2 16.59,2.84 18.31,4.25C20.13,3.73 21.6,3 22.5,2.09C22.47,3.72 21.65,5.21 20.28,6.4C21.37,8 22,9.92 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12C2,9.92 2.63,8 3.72,6.4C2.35,5.21 1.53,3.72 1.5,2.09M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M10.5,10C10.5,10.8 9.8,11.5 9,11.5C8.2,11.5 7.5,10.8 7.5,10V8.5L10.5,10M16.5,10C16.5,10.8 15.8,11.5 15,11.5C14.2,11.5 13.5,10.8 13.5,10L16.5,8.5V10M12,17.23C10.25,17.23 8.71,16.5 7.81,15.42L9.23,14C9.68,14.72 10.75,15.23 12,15.23C13.25,15.23 14.32,14.72 14.77,14L16.19,15.42C15.29,16.5 13.75,17.23 12,17.23Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_fire.xml b/packages/SystemUI/res/drawable/ic_fire.xml
new file mode 100644
index 0000000000000..e30370056521a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_fire.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="18.0dp"
+    android:width="18.0dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M17.55,11.2C17.32,10.9 17.05,10.64 16.79,10.38C16.14,9.78 15.39,9.35 14.76,8.72C13.3,7.26 13,4.85 13.91,3C13,3.23 12.16,3.75 11.46,4.32C8.92,6.4 7.92,10.07 9.12,13.22C9.16,13.32 9.2,13.42 9.2,13.55C9.2,13.77 9.05,13.97 8.85,14.05C8.63,14.15 8.39,14.09 8.21,13.93C8.15,13.88 8.11,13.83 8.06,13.76C6.96,12.33 6.78,10.28 7.53,8.64C5.89,10 5,12.3 5.14,14.47C5.18,14.97 5.24,15.47 5.41,15.97C5.55,16.57 5.81,17.17 6.13,17.7C7.17,19.43 9,20.67 10.97,20.92C13.07,21.19 15.32,20.8 16.93,19.32C18.73,17.66 19.38,15 18.43,12.72L18.3,12.46C18.1,12 17.83,11.59 17.5,11.21L17.55,11.2M14.45,17.5C14.17,17.74 13.72,18 13.37,18.1C12.27,18.5 11.17,17.94 10.5,17.28C11.69,17 12.39,16.12 12.59,15.23C12.76,14.43 12.45,13.77 12.32,13C12.2,12.26 12.22,11.63 12.5,10.94C12.67,11.32 12.87,11.7 13.1,12C13.86,13 15.05,13.44 15.3,14.8C15.34,14.94 15.36,15.08 15.36,15.23C15.39,16.05 15.04,16.95 14.44,17.5H14.45Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_flash.xml b/packages/SystemUI/res/drawable/ic_flash.xml
new file mode 100644
index 0000000000000..cb99fa83b4d3f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_flash.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2023-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12 2C7.898438 2 5 5.300781 5 10L4 10L4 5L2 5L2 10C2 11.101563 2.898438 12 4 12L5.09375 12C5.59375 16.5 7.601563 22 12 22C16.398438 22 18.40625 16.5 18.90625 12L20 12C21.101563 12 22 11.101563 22 10L22 5L20 5L20 10L19 10C19 5.300781 16.101563 2 12 2ZM7.09375 9L11 10L11 11.3125L7.6875 12.59375L7.1875 12.09375C7.085938 11.394531 6.992188 9.300781 7.09375 9ZM16.90625 9C17.007813 9.300781 16.914063 11.386719 16.8125 12.1875L16.3125 12.6875L13 11.3125L13 10ZM12.09375 13.09375L16.40625 14.8125C15.605469 17.613281 14.199219 20 12 20C9.800781 20 8.386719 17.613281 7.6875 14.8125ZM10 16L10 17L14 17L14 16Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_force_stop.xml b/packages/SystemUI/res/drawable/ic_force_stop.xml
new file mode 100644
index 0000000000000..4385b3e4c52e9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_force_stop.xml
@@ -0,0 +1,25 @@
+<!--
+  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.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM330,840L120,630L120,330L330,120L630,120L840,330L840,630L630,840L330,840ZM364,760L596,760L760,596L760,364L596,200L364,200L200,364L200,596L364,760ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_gender_female.xml b/packages/SystemUI/res/drawable/ic_gender_female.xml
new file mode 100644
index 0000000000000..970c1d858dd68
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_gender_female.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,4A6,6 0 0,1 18,10C18,12.97 15.84,15.44 13,15.92V18H15V20H13V22H11V20H9V18H11V15.92C8.16,15.44 6,12.97 6,10A6,6 0 0,1 12,4M12,6A4,4 0 0,0 8,10A4,4 0 0,0 12,14A4,4 0 0,0 16,10A4,4 0 0,0 12,6Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_gender_male.xml b/packages/SystemUI/res/drawable/ic_gender_male.xml
new file mode 100644
index 0000000000000..bf3dad2f0d25d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_gender_male.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,9C10.29,9 11.5,9.41 12.47,10.11L17.58,5H13V3H21V11H19V6.41L13.89,11.5C14.59,12.5 15,13.7 15,15A6,6 0 0,1 9,21A6,6 0 0,1 3,15A6,6 0 0,1 9,9M9,11A4,4 0 0,0 5,15A4,4 0 0,0 9,19A4,4 0 0,0 13,15A4,4 0 0,0 9,11Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_gender_male_female.xml b/packages/SystemUI/res/drawable/ic_gender_male_female.xml
new file mode 100644
index 0000000000000..aac470ca8930d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_gender_male_female.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17.58,4H14V2H21V9H19V5.41L15.17,9.24C15.69,10.03 16,11 16,12C16,14.42 14.28,16.44 12,16.9V19H14V21H12V23H10V21H8V19H10V16.9C7.72,16.44 6,14.42 6,12A5,5 0 0,1 11,7C12,7 12.96,7.3 13.75,7.83L17.58,4M11,9A3,3 0 0,0 8,12A3,3 0 0,0 11,15A3,3 0 0,0 14,12A3,3 0 0,0 11,9Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ghost.xml b/packages/SystemUI/res/drawable/ic_ghost.xml
new file mode 100644
index 0000000000000..5790e9ed67f12
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ghost.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2A9,9 0 0,0 3,11V22L6,19L9,22L12,19L15,22L18,19L21,22V11A9,9 0 0,0 12,2M9,8A2,2 0 0,1 11,10A2,2 0 0,1 9,12A2,2 0 0,1 7,10A2,2 0 0,1 9,8M15,8A2,2 0 0,1 17,10A2,2 0 0,1 15,12A2,2 0 0,1 13,10A2,2 0 0,1 15,8Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_hd_calling.xml b/packages/SystemUI/res/drawable/ic_hd_calling.xml
new file mode 100644
index 0000000000000..0a3bddf6e8ffc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_hd_calling.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="8dp"
+    android:viewportWidth="12"
+    android:viewportHeight="8">
+    <path
+        android:pathData="M 5.402 7.6 L 4.225 7.6 L 4.225 4.401 L 1.182 4.401 L 1.182 7.6 L 0 7.6 L 0 0.4 L 1.182 0.4 L 1.182 3.396 L 4.225 3.396 L 4.225 0.4 L 5.402 0.4 L 5.402 7.6 Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M 6.924 7.6 L 6.924 0.4 L 8.934 0.4 C 9.535 0.4 10.068 0.542 10.532 0.825 C 10.999 1.109 11.362 1.511 11.617 2.032 C 11.872 2.553 12 3.149 12 3.822 L 12 4.182 C 12 4.865 11.87 5.465 11.612 5.982 C 11.357 6.501 10.991 6.899 10.513 7.18 C 10.04 7.46 9.497 7.6 8.882 7.6 L 6.924 7.6 Z M 8.107 1.409 L 8.107 6.602 L 8.878 6.602 C 9.498 6.602 9.973 6.396 10.303 5.988 C 10.637 5.576 10.807 4.985 10.813 4.217 L 10.813 3.818 C 10.813 3.035 10.652 2.439 10.332 2.027 C 10.01 1.614 9.545 1.409 8.934 1.409 L 8.107 1.409 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_heart.xml b/packages/SystemUI/res/drawable/ic_heart.xml
new file mode 100644
index 0000000000000..5ff9372a6747e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_heart.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_human_female.xml b/packages/SystemUI/res/drawable/ic_human_female.xml
new file mode 100644
index 0000000000000..868fcbf5c5e76
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_human_female.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2A2,2 0 0,1 14,4A2,2 0 0,1 12,6A2,2 0 0,1 10,4A2,2 0 0,1 12,2M10.5,22V16H7.5L10.09,8.41C10.34,7.59 11.1,7 12,7C12.9,7 13.66,7.59 13.91,8.41L16.5,16H13.5V22H10.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_human_male.xml b/packages/SystemUI/res/drawable/ic_human_male.xml
new file mode 100644
index 0000000000000..34ba882d4fa3c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_human_male.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2A2,2 0 0,1 14,4A2,2 0 0,1 12,6A2,2 0 0,1 10,4A2,2 0 0,1 12,2M10.5,7H13.5A2,2 0 0,1 15.5,9V14.5H14V22H10V14.5H8.5V9A2,2 0 0,1 10.5,7Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_human_male_female.xml b/packages/SystemUI/res/drawable/ic_human_male_female.xml
new file mode 100644
index 0000000000000..c0f62f61ff58a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_human_male_female.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.5,2A2,2 0 0,1 9.5,4A2,2 0 0,1 7.5,6A2,2 0 0,1 5.5,4A2,2 0 0,1 7.5,2M6,7H9A2,2 0 0,1 11,9V14.5H9.5V22H5.5V14.5H4V9A2,2 0 0,1 6,7M16.5,2A2,2 0 0,1 18.5,4A2,2 0 0,1 16.5,6A2,2 0 0,1 14.5,4A2,2 0 0,1 16.5,2M15,22V16H12L14.59,8.41C14.84,7.59 15.6,7 16.5,7C17.4,7 18.16,7.59 18.41,8.41L21,16H18V22H15Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ironman.xml b/packages/SystemUI/res/drawable/ic_ironman.xml
new file mode 100644
index 0000000000000..86b62674cb0dd
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ironman.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2023-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9 1A1.0001 1.0001 0 0 0 8.2929688 1.2929688L5.2929688 4.2929688A1.0001 1.0001 0 0 0 5 5L5 8.7636719L4.1054688 10.552734A1.0001 1.0001 0 0 0 4.0507812 11.316406L5.03125 14.257812L6.0195312 19.195312A1.0001 1.0001 0 0 0 6.4453125 19.832031L9.4453125 21.832031A1.0001 1.0001 0 0 0 10 22L12 22L14 22A1.0001 1.0001 0 0 0 14.554688 21.832031L17.554688 19.832031A1.0001 1.0001 0 0 0 17.980469 19.195312L18.96875 14.257812L19.949219 11.316406A1.0001 1.0001 0 0 0 19.894531 10.552734L19 8.7636719L19 5A1.0001 1.0001 0 0 0 18.707031 4.2929688L15.707031 1.2929688A1.0001 1.0001 0 0 0 15 1L9 1zM8.6347656 3.7792969L10.072266 7.3710938A1.0001 1.0001 0 0 0 11 8L13 8A1.0001 1.0001 0 0 0 13.927734 7.3710938L15.365234 3.7792969L17 5.4140625L17 9A1.0001 1.0001 0 0 0 17.105469 9.4472656L17.919922 11.076172L17.050781 13.683594A1.0001 1.0001 0 0 0 17.019531 13.804688L16.101562 18.398438L14.925781 19.181641L13.595703 18.197266A1.0001 1.0001 0 0 0 13 18L11 18A1.0001 1.0001 0 0 0 10.404297 18.197266L9.0742188 19.181641L7.8984375 18.398438L6.9804688 13.804688A1.0001 1.0001 0 0 0 6.9492188 13.683594L6.0800781 11.076172L6.8945312 9.4472656A1.0001 1.0001 0 0 0 7 9L7 5.4140625L8.6347656 3.7792969zM7.2421875 10.029297L6.7578125 11.970703L10.757812 12.970703L11.242188 11.029297L7.2421875 10.029297zM16.757812 10.029297L12.757812 11.029297L13.242188 12.970703L17.242188 11.970703L16.757812 10.029297z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock_onthego.xml b/packages/SystemUI/res/drawable/ic_lock_onthego.xml
new file mode 100644
index 0000000000000..ea8294dd109a3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_lock_onthego.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5,5.5A2,2 0 0,0 18.5,3.5A2,2 0 0,0 16.5,1.5A2,2 0 0,0 14.5,3.5A2,2
+        0 0,0 16.5,5.5M12.9,19.4L13.9,15L16,17V23H18V15.5L15.9,13.5L16.5,10.5C17.89,12.09 19.89,13
+        22,13V11C20.24,11.03 18.6,10.11 17.7,8.6L16.7,7C16.34,6.4 15.7,6 15,6C14.7,6 14.5,6.1
+        14.2,6.1L9,8.3V13H11V9.6L12.8,8.9L11.2,17L6.3,16L5.9,18L12.9,19.4M4,9A1,1 0 0,1 3,8A1,1
+        0 0,1 4,7H7V9H4M5,5A1,1 0 0,1 4,4A1,1 0 0,1 5,3H10V5H5M3,13A1,1 0 0,1 2,12A1,1 0 0,1 3,11H7V13H3Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_matrixx_logo.xml b/packages/SystemUI/res/drawable/ic_matrixx_logo.xml
new file mode 100644
index 0000000000000..bd2416707bfe4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_matrixx_logo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+	android:tint="?android:attr/colorControlNormal">    
+  <path
+      android:pathData="M3.36,20.883C2.707,20.038 2.175,19.095 1.789,18.08L8.986,9.162L11.999,13.228L12,13.226L12.001,13.228L15.014,9.162L22.211,18.08C21.779,19.218 21.162,20.265 20.397,21.184L14.882,13.812L12,17.193L9.117,13.812L3.36,20.883Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M1.789,17.602C1.333,16.4 1.083,15.095 1.083,13.733C1.083,7.707 5.975,2.816 12,2.816C18.026,2.816 22.917,7.707 22.917,13.733C22.917,15.095 22.667,16.4 22.211,17.602L20.468,15.443C20.579,14.89 20.638,14.318 20.638,13.733C20.638,8.966 16.767,5.095 12,5.095C7.233,5.095 3.362,8.966 3.362,13.733C3.362,14.318 3.421,14.89 3.532,15.443L1.789,17.602Z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_media_pause.xml b/packages/SystemUI/res/drawable/ic_media_pause.xml
new file mode 100644
index 0000000000000..1acd49d552206
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_media_pause.xml
@@ -0,0 +1,92 @@
+<?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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+                 xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="24dp"
+                android:width="24dp"
+                android:viewportHeight="24"
+                android:viewportWidth="24">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_1_G"
+                       android:translateX="12"
+                       android:translateY="12.125">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="#ffffff"
+                          android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "/>
+                </group>
+                <group android:name="_R_G_L_0_G"
+                       android:translateX="12"
+                       android:translateY="12.125">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="#ffffff"
+                          android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "/>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData"
+                                android:duration="333"
+                                android:startOffset="0"
+                                android:valueFrom="M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
+                                android:valueTo="M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData"
+                                android:duration="333"
+                                android:startOffset="0"
+                                android:valueFrom="M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "
+                                android:valueTo="M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX"
+                                android:duration="517"
+                                android:startOffset="0"
+                                android:valueFrom="0"
+                                android:valueTo="1"
+                                android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
+
diff --git a/packages/SystemUI/res/drawable/ic_media_play.xml b/packages/SystemUI/res/drawable/ic_media_play.xml
new file mode 100644
index 0000000000000..0794c084efbe2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_media_play.xml
@@ -0,0 +1,92 @@
+<?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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+                 xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="24dp"
+                android:width="24dp"
+                android:viewportHeight="24"
+                android:viewportWidth="24">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_1_G"
+                       android:translateX="12"
+                       android:translateY="12.125">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="#ffffff"
+                          android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "/>
+                </group>
+                <group android:name="_R_G_L_0_G"
+                       android:translateX="12"
+                       android:translateY="12.125">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="#ffffff"
+                          android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "/>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData"
+                                android:duration="333"
+                                android:startOffset="0"
+                                android:valueFrom="M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
+                                android:valueTo="M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData"
+                                android:duration="333"
+                                android:startOffset="0"
+                                android:valueFrom="M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "
+                                android:valueTo="M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX"
+                                android:duration="517"
+                                android:startOffset="0"
+                                android:valueFrom="0"
+                                android:valueTo="1"
+                                android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
+
diff --git a/packages/SystemUI/res/drawable/ic_mint_logo.xml b/packages/SystemUI/res/drawable/ic_mint_logo.xml
new file mode 100644
index 0000000000000..33ec5a9be3dab
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_mint_logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20.0dp"
+        android:height="20.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2,3.23V6.8H3.5C4.59,6.8 4.78,7.53 4.78,8.55V14.86C4.78,18.12 7.65,20.77 11.18,20.77H19.9C21,20.77 22,20.07 22,19V9.2C22,5.93 19.13,3.28 15.6,3.28H11.93V3.27L2,3.23V3.23M6.62,5.46H8.37V14.45C8.37,15.65 9.19,16.59 10.16,16.59L16.13,16.61C17.38,16.61 18.35,15.75 18.35,14.73L18.34,9.96C18.34,9.65 18.24,9.41 18,9.19C17.79,8.96 17.56,8.86 17.25,8.86C16.94,8.86 16.71,8.96 16.5,9.19C16.27,9.41 16.16,9.65 16.16,9.96V14.05H14.31V9.96C14.31,9.65 14.21,9.41 14,9.19C13.77,8.96 13.54,8.86 13.22,8.86C12.92,8.86 12.68,8.96 12.46,9.19C12.24,9.41 12.14,9.65 12.14,9.96V14.05H10.29V9.96C10.29,9.15 10.58,8.44 11.15,7.86C11.72,7.29 12.43,7 13.22,7C14,7 14.68,7.28 15.24,7.82C15.79,7.28 16.47,7 17.25,7C18.05,7 18.76,7.29 19.32,7.86C19.89,8.44 20.19,9.15 20.19,9.96L20.2,15.06C20.11,15.91 19.75,16.67 19.13,17.31V17.31C18.4,18.04 17.5,18.42 16.5,18.42H9.83C9,18.34 8.29,17.95 7.69,17.36C7,16.65 6.62,15.79 6.62,14.79V5.46H6.62Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_mobiledata_off_24.xml b/packages/SystemUI/res/drawable/ic_mobiledata_off_24.xml
new file mode 100644
index 0000000000000..a945c9e910a5d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_mobiledata_off_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,7l3,0l-4,-4l-4,4l3,0l0,4.17l2,2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2.81,2.81l-1.42,1.41l6.61,6.61l0,6.18l-3,0.01l4,3.98l4,-4l-3,0.01l0,-4.18l9.78,9.78l1.41,-1.42z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_music_note_24dp.xml b/packages/SystemUI/res/drawable/ic_music_note_24dp.xml
new file mode 100644
index 0000000000000..2a2bfb6faca22
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_music_note_24dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_nike.xml b/packages/SystemUI/res/drawable/ic_nike.xml
new file mode 100644
index 0000000000000..af5f0f5653ab4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_nike.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 3.667969 8.332031 C 2.199219 10.066406 0.800781 12.132812 0.800781 13.734375 C 0.800781 14.332031 1 14.867188 1.398438 15.265625 C 2.066406 15.867188 2.800781 16.066406 3.535156 16.066406 C 4.601562 16.066406 5.667969 15.601562 6.464844 15.265625 C 7.867188 14.734375 23.132812 8.066406 23.132812 8.066406 C 23.265625 8 23.265625 7.933594 23.066406 8 C 23 8 6.398438 12.464844 6.398438 12.464844 C 6.132812 12.601562 5.800781 12.601562 5.464844 12.601562 C 4.199219 12.601562 3.066406 11.933594 3.066406 10.398438 C 3.066406 9.867188 3.265625 9.132812 3.667969 8.332031 Z M 3.667969 8.332031" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ninja.xml b/packages/SystemUI/res/drawable/ic_ninja.xml
new file mode 100644
index 0000000000000..94998858e5803
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ninja.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.75,13C7.74,12.65 7.9,12.31 8.17,12.08C8.92,12.24 9.62,12.55 10.25,13C10.25,13.68 9.69,14.24 9,14.24C8.31,14.24 7.76,13.69 7.75,13M13.75,13C14.38,12.56 15.08,12.25 15.83,12.09C16.1,12.32 16.26,12.66 16.25,13C16.25,13.7 15.69,14.26 15,14.26C14.31,14.26 13.75,13.7 13.75,13V13M12,9C9.23,8.96 6.5,9.65 4.07,11L4,12C4,13.23 4.29,14.44 4.84,15.54C7.21,15.18 9.6,15 12,15C14.4,15 16.79,15.18 19.16,15.54C19.71,14.44 20,13.23 20,12L19.93,11C17.5,9.65 14.77,8.96 12,9M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_pac_man.xml b/packages/SystemUI/res/drawable/ic_pac_man.xml
new file mode 100644
index 0000000000000..fd8f25d75bca1
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_pac_man.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16.0dp"
+    android:width="16.0dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12,12L19.07,19.07C15.17,23 8.83,23 4.93,19.07C1,15.17 1,8.84 4.93,4.93C8.83,1 15.16,1 19.07,4.93L12,12M19,10A2,2 0 0,0 17,12A2,2 0 0,0 19,14A2,2 0 0,0 21,12A2,2 0 0,0 19,10Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_puma.xml b/packages/SystemUI/res/drawable/ic_puma.xml
new file mode 100644
index 0000000000000..bc896100c7e54
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_puma.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 2 6.066406 C 2 6.332031 2.398438 6.667969 2.601562 6.867188 C 3.332031 7.601562 2.800781 6.867188 4.332031 7.199219 C 4.332031 8.199219 4.535156 7.867188 2.933594 7.867188 C 0.332031 7.867188 2.464844 10.933594 2.933594 9 C 3.601562 9.066406 4.199219 9.601562 5.066406 9.734375 C 6.667969 10.066406 6.464844 9.332031 7.265625 9.265625 C 7.601562 10.398438 10.199219 11.535156 11.867188 11.667969 C 12.800781 11.734375 14 11.535156 14.734375 13.398438 C 14.933594 13.800781 14.933594 13.933594 15.066406 14.265625 C 15.734375 15.535156 16.601562 16.601562 17.800781 17.398438 C 17.800781 19.265625 17.933594 20.066406 19.265625 20.066406 L 19.332031 18.464844 C 19.265625 18.066406 19.066406 18.132812 18.933594 17.464844 C 18.800781 16.132812 18.265625 16.867188 17.867188 15.800781 C 17.601562 15.199219 18 13.867188 17.332031 12.199219 C 17.132812 11.601562 17.132812 11.734375 16.800781 11.265625 C 17.132812 10.867188 17.800781 10.800781 18.265625 9.734375 C 18.800781 8.464844 19.332031 6.933594 20.800781 6.199219 C 22.265625 5.464844 22.464844 5.199219 22.199219 4.066406 C 21.265625 3.800781 20.464844 4.265625 19.867188 5 C 18.601562 6.601562 18.332031 8.265625 17.667969 9.132812 C 17.398438 9.332031 17.066406 9.667969 16.800781 9.867188 C 13.265625 12.132812 9.265625 4.601562 4.933594 4.601562 C 4.867188 4.265625 4.800781 4.265625 4.734375 3.933594 C 4.265625 4 4.265625 4.066406 4.132812 4.398438 C 3.800781 4.132812 3.867188 4.066406 3.464844 3.933594 C 2.800781 5.199219 3.199219 4.535156 2.667969 4.933594 Z M 2 6.066406" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_caffeine.xml b/packages/SystemUI/res/drawable/ic_qs_caffeine.xml
index 2c3ba974a7e1b..274e423b89055 100644
--- a/packages/SystemUI/res/drawable/ic_qs_caffeine.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_caffeine.xml
@@ -23,5 +23,5 @@
 
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M2,21H20V19H2M20,8H18V5H20M20,3H4V13A4,4 0 0,0 8,17H14A4,4 0 0,0 18,13V10H20A2,2 0 0,0 22,8V5C22,3.89 21.1,3 20,3Z" />
+        android:pathData="M15.723 13H8.277L8.095 11H15.905L15.723 13ZM8.913 20L8.731 18H15.269L15.087 20H8.913ZM8.721 4H15.279L15.613 5H8.387L8.721 4ZM7 7H17V9H7V7ZM18 5H17.721L16.949 2.684C16.812 2.275 16.431 2 16 2H8C7.569 2 7.187 2.275 7.051 2.684L6.279 5H6C5.448 5 5 5.448 5 6V10C5 10.526 5.383 11 6.086 11L7.004 21.091C7.051 21.605 7.483 22 8 22H16C16.517 22 16.949 21.605 16.996 21.091L17.914 11C18.617 11 19 10.526 19 10V6C19 5.448 18.552 5 18 5V5Z" />
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_compass.xml b/packages/SystemUI/res/drawable/ic_qs_compass.xml
new file mode 100644
index 0000000000000..faaccb9ef5636
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_compass.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2019-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M25.9,3.3l7.8,19.1c0.4,1,0.4,2.2,0,3.3l-7.8,19.1c-0.7,1.7-3.1,1.7-3.8,0l-7.8-19.1c-0.4-1-0.4-2.2,0-3.3
+l7.8-19.1C22.8,1.6,25.2,1.6,25.9,3.3Z
+M24,20c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4S26.2,20,24,20z
+M26,14v-4c0-1.1-0.9-2-2-2 s-2,0.9-2,2v4c0,1.1,0.9,2,2,2S26,15.1,26,14z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cpu_info.xml b/packages/SystemUI/res/drawable/ic_qs_cpu_info.xml
new file mode 100644
index 0000000000000..78738b142e9a3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_cpu_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15,9L9,9v6h6L15,9zM13,13h-2v-2h2v2zM21,11L21,9h-2L19,7c0,-1.1 -0.9,-2 -2,-2h-2L15,3h-2v2h-2L11,3L9,3v2L7,5c-1.1,0 -2,0.9 -2,2v2L3,9v2h2v2L3,13v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2h2zM17,17L7,17L7,7h10v10z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_data_switch_0.xml b/packages/SystemUI/res/drawable/ic_qs_data_switch_0.xml
new file mode 100644
index 0000000000000..81b58abe42b3b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_data_switch_0.xml
@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M19.99,4c0,-1.1 -0.89,-2 -1.99,-2h-7.17c-0.53,0 -1.04,0.21 -1.42,0.59L4.59,7.41C4.21,7.79 4,8.3 4,8.83L4,20c0,1.1 0.9,2 2,2h12.01c1.1,0 1.99,-0.9 1.99,-2l-0.01,-16zM8,19c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM16,19c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM8,15c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM12,19c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM12,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM16,15c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_data_switch_1.xml b/packages/SystemUI/res/drawable/ic_qs_data_switch_1.xml
new file mode 100644
index 0000000000000..dea973a4811d2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_data_switch_1.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,2H18C19.1,2 20,2.9 20,4V14H18V4H10.83L6,8.83V20H12V22H6C4.9,22 4,21.1 4,20V8L10,2Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15.4492,11H14.1289V6.7969L12.832,7.1758V6.1758L15.3281,5.3125H15.4492V11Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M14,20V16H18L14,20Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20,18L20,22L16,22L20,18Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_data_switch_2.xml b/packages/SystemUI/res/drawable/ic_qs_data_switch_2.xml
new file mode 100644
index 0000000000000..037e3f1085975
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_data_switch_2.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,2H18C19.1,2 20,2.9 20,4V14H18V4H10.83L6,8.83V20H12V22H6C4.9,22 4,21.1 4,20V8L10,2Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.5,11H12.5312V10.1406L14.3594,8.2188C14.8099,7.7057 15.0352,7.2982 15.0352,6.9961C15.0352,6.7513 14.9818,6.5651 14.875,6.4375C14.7682,6.3099 14.6133,6.2461 14.4102,6.2461C14.2096,6.2461 14.0469,6.332 13.9219,6.5039C13.7969,6.6732 13.7344,6.8854 13.7344,7.1406H12.4141C12.4141,6.7917 12.5013,6.47 12.6758,6.1758C12.8503,5.8789 13.0924,5.6471 13.4023,5.4805C13.7122,5.3138 14.0586,5.2305 14.4414,5.2305C15.056,5.2305 15.5286,5.3724 15.8594,5.6563C16.1927,5.9401 16.3594,6.3477 16.3594,6.8789C16.3594,7.1029 16.3177,7.3216 16.2344,7.5352C16.151,7.7461 16.0208,7.9688 15.8438,8.2031C15.6693,8.4349 15.3867,8.7461 14.9961,9.1367L14.2617,9.9844H16.5V11Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M14,20V16H18L14,20Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20,18L20,22L16,22L20,18Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_fps_info.xml b/packages/SystemUI/res/drawable/ic_qs_fps_info.xml
new file mode 100644
index 0000000000000..3fb9ccba74f03
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_fps_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M1 5h2v14H1zm4 0h2v14H5zm17 0H10c-0.55 0-1 0.45-1 1v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V6c0-0.55-0.45-1-1-1zm-1 12H11V7h10v10zm-3.57-4.38l-2 2.57L14 13.47l-2 2.52h8z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_locale.xml b/packages/SystemUI/res/drawable/ic_qs_locale.xml
new file mode 100644
index 0000000000000..b38cf4cd22fe8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_locale.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2
+11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84 .63 3.37 1.91 4.33
+3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76
+1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36 .26 -2h3.38c-.08 .66 -.14
+1.32-.14 2 0 .68 .06 1.34 .14 2H4.26zm.82 2h2.95c.32 1.25 .78 2.45 1.38
+3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81
+5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08
+2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68 .07 -1.35 .16
+-2h4.68c.09 .65 .16 1.32 .16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31
+1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66 .14 -1.32 .14 -2
+0-.68-.06-1.34-.14-2h3.38c.16 .64 .26 1.31 .26 2s-.1 1.36-.26 2h-3.38z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_locale_pending.xml b/packages/SystemUI/res/drawable/ic_qs_locale_pending.xml
new file mode 100644
index 0000000000000..4ead2cb64de78
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_locale_pending.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2
+11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84 .63 3.37 1.91 4.33
+3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76
+1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36 .26 -2h3.38c-.08 .66 -.14
+1.32-.14 2 0 .68 .06 1.34 .14 2H4.26zm.82 2h2.95c.32 1.25 .78 2.45 1.38
+3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81
+5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08
+2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68 .07 -1.35 .16
+-2h4.68c.09 .65 .16 1.32 .16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31
+1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66 .14 -1.32 .14 -2
+0-.68-.06-1.34-.14-2h3.38c.16 .64 .26 1.31 .26 2s-.1 1.36-.26 2h-3.38z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_nfc.xml b/packages/SystemUI/res/drawable/ic_qs_nfc.xml
index 2c080964b48ec..315d91135e4d1 100644
--- a/packages/SystemUI/res/drawable/ic_qs_nfc.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_nfc.xml
@@ -19,13 +19,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
-    <path
-        android:pathData="M4 20h16V4H4v16z" />
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0
-18H4V4h16v16zM18 6h-5c-1.1 0-2 .9-2 2v2.28c-.6 .35 -1 .98-1 1.72 0 1.1 .9 2 2
-2s2-.9 2-2c0-.74-.4-1.38-1-1.72V8h3v8H8V8h2V6H6v12h12V6z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
+        android:pathData="M10.59,7.66C10.59,7.66 11.19,7.39 11.57,7.82C11.95,8.26 12.92,9.94 12.92,11.62C12.92,13.3 12.5,15.09 12.05,15.68C11.62,16.28
+11.19,16.28 10.86,16.06C10.54,15.85 5.5,12 5.23,11.89C4.95,11.78 4.85,12.05 5.12,13.5C5.39,15 4.95,15.41 4.57,15.47C4.2,15.5 3.06,15.2 3,12.16C2.95,9.13
+3.76,8.64 4.14,8.64C4.85,8.64 10.27,13.5 10.64,13.46C10.97,13.41 11.13,11.35 10.5,9.72C9.78,7.96 10.59,7.66 10.59,7.66M19.3,4.63C21.12,8.24 21,11.66
+21,12C21,12.34 21.12,15.76 19.3,19.37C19.3,19.37 18.83,19.92 18.12,19.59C17.42,19.26 17.66,18.4 17.66,18.4C17.66,18.4 19.14,15.55 19.1,12.05V12C19.14,8.5
+17.66,5.6 17.66,5.6C17.66,5.6 17.42,4.74 18.12,4.41C18.83,4.08 19.3,4.63 19.3,4.63M15.77,6.25C17.26,8.96 17.16,11.66 17.14,12C17.16,12.34 17.26,14.92
+15.77,17.85C15.77,17.85 15.3,18.4 14.59,18.07C13.89,17.74 14.13,16.88 14.13,16.88C14.13,16.88 15.09,15.5 15.24,12.05V12C15.14,8.53 14.13,7.23
+14.13,7.23C14.13,7.23 13.89,6.36 14.59,6.04C15.3,5.71 15.77,6.25 15.77,6.25Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_qs_onthego.xml b/packages/SystemUI/res/drawable/ic_qs_onthego.xml
new file mode 100644
index 0000000000000..d05649849b512
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_onthego.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.5,5.5A2,2 0 0,0 18.5,3.5A2,2 0 0,0 16.5,1.5A2,2 0 0,0
+14.5,3.5A2,2 0 0,0 16.5,5.5M12.9,19.4L13.9,15L16,17V23H18V15.5L15.9,13.5L16.5,10.5C17.89,12.09
+19.89,13 22,13V11C20.24,11.03 18.6,10.11 17.7,8.6L16.7,7C16.34,6.4 15.7,6 15,6C14.7,6 14.5,6.1
+14.2,6.1L9,8.3V13H11V9.6L12.8,8.9L11.2,17L6.3,16L5.9,18L12.9,19.4M4,9A1,1 0 0,1 3,8A1,1 0 0,1
+4,7H7V9H4M5,5A1,1 0 0,1 4,4A1,1 0 0,1 5,3H10V5H5M3,13A1,1 0 0,1 2,12A1,1 0 0,1 3,11H7V13H3Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_powershare.xml b/packages/SystemUI/res/drawable/ic_qs_powershare.xml
index a9798bf308933..314b231a7823a 100644
--- a/packages/SystemUI/res/drawable/ic_qs_powershare.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_powershare.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2020 The LineageOS Project
+    Copyright (C) 2022 PixysOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#ffffff"
-        android:pathData="M19.77,7.23l0.01,-0.01 -3.72,-3.72L15,4.56l2.11,2.11c-0.94,0.36 -1.61,1.26 -1.61,2.33 0,1.38 1.12,2.5 2.5,2.5 0.36,0 0.69,-0.08 1,-0.21v7.21c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V14c0,-1.1 -0.9,-2 -2,-2h-1V5c0,-1.1 -0.9,-2 -2,-2H6c-1.1,0 -2,0.9 -2,2v16h10v-7.5h1.5v5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V9c0,-0.69 -0.28,-1.32 -0.73,-1.77zM18,10c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM8,18v-4.5H6L10,6v5h2l-4,7z" />
-
+        android:fillColor="#f0f2f2"
+        android:pathData="M11,20V17.0024C11.1787,16.9009 11.3618,16.8075 11.5497,16.7218C11.9876,16.5221 12.4679,16.3565 13,16.2284V21C13,21.55 12.55,22 12,22H4C3.45,22 3,21.55 3,21V5C3,4.45 3.45,4 4,4H6V2H10V4H12C12.55,4 13,4.45 13,5V7.8488C12.2813,8.097 11.6154,8.3981 11,8.7459V6H5V20H11ZM13,14.1814C12.2839,14.323 11.6194,14.5218 11,14.7799V14.7792C9.4028,15.4448 8.1061,16.5053 7,18C7.8438,13.9875 10.1688,9.9937 16,9.1875V6L22,11.5875L16,17.1938V13.9125C14.9075,13.9125 13.9119,14.0003 13,14.1807V14.1814Z" />
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_preferred_network.xml b/packages/SystemUI/res/drawable/ic_qs_preferred_network.xml
new file mode 100644
index 0000000000000..4d641409ea3d8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_preferred_network.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#000" android:pathData="M12,2A8,8 0 0,0 4,10C4,14.03 7,17.42 11,17.93V19H10A1,1 0 0,0 9,20H2V22H9A1,1 0 0,0 10,23H14A1,1 0 0,0 15,22H22V20H15A1,1 0 0,0 14,19H13V17.93C17,17.43 20,14.03 20,10A8,8 0 0,0 12,2M12,4C12,4 12.74,5.28 13.26,7H10.74C11.26,5.28 12,4 12,4M9.77,4.43C9.5,4.93 9.09,5.84 8.74,7H6.81C7.5,5.84 8.5,4.93 9.77,4.43M14.23,4.44C15.5,4.94 16.5,5.84 17.19,7H15.26C14.91,5.84 14.5,4.93 14.23,4.44M6.09,9H8.32C8.28,9.33 8.25,9.66 8.25,10C8.25,10.34 8.28,10.67 8.32,11H6.09C6.03,10.67 6,10.34 6,10C6,9.66 6.03,9.33 6.09,9M10.32,9H13.68C13.72,9.33 13.75,9.66 13.75,10C13.75,10.34 13.72,10.67 13.68,11H10.32C10.28,10.67 10.25,10.34 10.25,10C10.25,9.66 10.28,9.33 10.32,9M15.68,9H17.91C17.97,9.33 18,9.66 18,10C18,10.34 17.97,10.67 17.91,11H15.68C15.72,10.67 15.75,10.34 15.75,10C15.75,9.66 15.72,9.33 15.68,9M6.81,13H8.74C9.09,14.16 9.5,15.07 9.77,15.56C8.5,15.06 7.5,14.16 6.81,13M10.74,13H13.26C12.74,14.72 12,16 12,16C12,16 11.26,14.72 10.74,13M15.26,13H17.19C16.5,14.16 15.5,15.07 14.23,15.57C14.5,15.07 14.91,14.16 15.26,13Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml
new file mode 100644
index 0000000000000..29741577c039c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml
new file mode 100644
index 0000000000000..6db508cd31e8b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16,16L2.81,2.81L1.39,4.22l4.85,4.85C6.09,9.68 6,10.33 6,11v6H4v2h12.17l3.61,3.61l1.41,-1.41L16,16zM8,17c0,0 0.01,-6.11 0.01,-6.16L14.17,17H8z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,6.5c2.49,0 4,2.02 4,4.5v2.17l2,2V11c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.72,4.86 9.05,5.2 8.46,5.63L9.93,7.1C10.51,6.73 11.2,6.5 12,6.5z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml
new file mode 100644
index 0000000000000..c87b595a20f21
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1,9h2v6H1V9zM4,17h2V7H4V17zM21,9v6h2V9H21zM18,17h2V7h-2V17zM17,5.5v13c0,0.83 -0.67,1.5 -1.5,1.5h-7C7.67,20 7,19.33 7,18.5v-13C7,4.67 7.67,4 8.5,4h7C16.33,4 17,4.67 17,5.5zM15,6H9v12h6V6z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_volume_panel.xml b/packages/SystemUI/res/drawable/ic_qs_volume_panel.xml
new file mode 100644
index 0000000000000..e7c51d2a61cae
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_volume_panel.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2017 The LineageOS Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,10v4c0,0.55,0.45,1,1,1h3l3.29,3.29c0.63,0.63,1.71,0.18,1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L7,9H4 C3.45,9,3,9.45,3,10z M16.5,12c0-1.77-1.02-3.29-2.5-4.03v8.05C15.48,15.29,16.5,13.77,16.5,12z M14,4.45v0.2 c0,0.38,0.25,0.71,0.6,0.85C17.18,6.53,19,9.06,19,12s-1.82,5.47-4.4,6.5c-0.36,0.14-0.6,0.47-0.6,0.85v0.2 c0,0.63,0.63,1.07,1.21,0.85C18.6,19.11,21,15.84,21,12s-2.4-7.11-5.79-8.4C14.63,3.37,14,3.82,14,4.45z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_vpn_tethering.xml b/packages/SystemUI/res/drawable/ic_qs_vpn_tethering.xml
new file mode 100644
index 0000000000000..e732c98f747b8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_vpn_tethering.xml
@@ -0,0 +1,28 @@
+<!--
+     Copyright (C) 2022 The LibreMobileOS Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,7.868c-1.034,0 -1.879,0.828 -1.879,1.84 0,1.012 0.846,1.84 1.879,1.84 1.034,0 1.879,-0.828 1.879,-1.84 0,-1.012 -0.846,-1.84 -1.879,-1.84zM17.638,9.708c0,-3.046 -2.528,-5.521 -5.638,-5.521 -3.11,0 -5.638,2.475 -5.638,5.521 0,2.043 1.137,3.818 2.819,4.775L10.121,12.883C9.003,12.239 8.241,11.07 8.241,9.708c0,-2.033 1.682,-3.68 3.759,-3.68 2.077,0 3.759,1.647 3.759,3.68 0,1.362 -0.761,2.53 -1.879,3.174l0.94,1.601c1.682,-0.957 2.819,-2.733 2.819,-4.775zM12,0.507c-5.187,0 -9.397,4.122 -9.397,9.201 0,3.404 1.889,6.367 4.689,7.959L8.232,16.076C5.996,14.797 4.483,12.432 4.483,9.708c0,-4.067 3.364,-7.361 7.517,-7.361 4.153,0 7.517,3.294 7.517,7.361 0,2.724 -1.513,5.088 -3.759,6.367l0.94,1.592c2.81,-1.592 4.698,-4.555 4.698,-7.959 0,-5.079 -4.21,-9.201 -9.397,-9.201z"
+      android:strokeWidth="0.929833"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12.314,19.738C12.087,19.091 11.47,18.627 10.745,18.627 9.825,18.627 9.078,19.374 9.078,20.293c0,0.919 0.747,1.667 1.667,1.667 0.725,0 1.342,-0.464 1.569,-1.111L13.523,20.849l0,1.111l1.111,0l0,-1.111l0.556,0L15.189,19.738ZM10.745,20.849c-0.306,0 -0.556,-0.25 -0.556,-0.556 0,-0.306 0.25,-0.556 0.556,-0.556 0.306,0 0.556,0.25 0.556,0.556 0,0.306 -0.25,0.556 -0.556,0.556z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_weather.xml b/packages/SystemUI/res/drawable/ic_qs_weather.xml
new file mode 100644
index 0000000000000..edd144fcef824
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_weather.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+<path
+    android:fillColor="#FFFFFFFF"
+    android:pathData="M12.74,5.47C15.1,6.5 16.35,9.03 15.92,11.46C17.19,12.56 18,14.19 18,16V16.17C18.31,16.06 18.65,16 19,16A3,3 0 0,1 22,19A3,3 0 0,1 19,22H6A4,4 0 0,1 2,18A4,4 0 0,1 6,14H6.27C5,12.45 4.6,10.24 5.5,8.26C6.72,5.5 9.97,4.24 12.74,5.47M11.93,7.3C10.16,6.5 8.09,7.31 7.31,9.07C6.85,10.09 6.93,11.22 7.41,12.13C8.5,10.83 10.16,10 12,10C12.7,10 13.38,10.12 14,10.34C13.94,9.06 13.18,7.86 11.93,7.3M13.55,3.64C13,3.4 12.45,3.23 11.88,3.12L14.37,1.82L15.27,4.71C14.76,4.29 14.19,3.93 13.55,3.64M6.09,4.44C5.6,4.79 5.17,5.19 4.8,5.63L4.91,2.82L7.87,3.5C7.25,3.71 6.65,4.03 6.09,4.44M18,9.71C17.91,9.12 17.78,8.55 17.59,8L19.97,9.5L17.92,11.73C18.03,11.08 18.05,10.4 18,9.71M3.04,11.3C3.11,11.9 3.24,12.47 3.43,13L1.06,11.5L3.1,9.28C3,9.93 2.97,10.61 3.04,11.3M19,18H16V16A4,4 0 0,0 12,12A4,4 0 0,0 8,16H6A2,2 0 0,0 4,18A2,2 0 0,0 6,20H19A1,1 0 0,0 20,19A1,1 0 0,0 19,18Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_refresh_rate.xml b/packages/SystemUI/res/drawable/ic_refresh_rate.xml
new file mode 100644
index 0000000000000..80abf8eb6ad89
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_refresh_rate.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="951.2999"
+    android:viewportHeight="951.5828">
+  <path
+      android:pathData="M236.1,815.6C249.8,824.3 263,833.3 276.8,841.2C299.1,854 322.8,863.7 347.2,871.6C365.5,877.5 384,882.7 403,885.3C416.3,887.1 429.6,889 443,890.2C454.8,891.4 466.7,891.6 478.5,892.4C497.1,893.6 511.5,914.9 502.7,933.6C497.2,945.4 487.8,950.7 475.7,951.2C464.3,951.6 452.9,951.3 441.6,950.2C426.7,948.8 411.9,946.3 397.1,944.3C369.7,940.8 343.3,933.3 317.5,924.1C299.8,917.8 282.7,909.8 265.6,902C243.5,891.9 222.9,878.9 202.9,865.2C190.8,856.8 179.6,847.1 168.3,837.7C158.8,829.7 149.4,821.6 140.6,812.9C131.5,803.8 123,794 114.8,784.1C105.7,773.3 96.9,762.3 88.6,751C80.8,740.2 73.1,729.2 66.5,717.6C57.7,702.2 49.1,686.5 42.1,670.3C33.9,651.2 26.8,631.5 20.6,611.7C15.4,595.4 11.9,578.5 8.5,561.7C6.1,550.1 4.7,538.2 3.4,526.3C2.3,516.6 1.8,506.9 1.4,497.2C0.9,485.5 0,473.7 0.5,462.1C1.1,447.1 2.7,432.1 4.4,417.2C6,404.2 7.9,391.1 10.5,378.2C12.9,366 15.9,353.9 19.4,342C26.8,316.9 36.1,292.5 47.5,269.1C59.2,245.2 72.8,222.2 88.5,200.6C102.5,181.3 117.5,163.1 134.1,145.9C148.2,131.3 162.9,117.3 179.1,105.1C192.4,95.1 205.7,85.1 219.5,75.8C230.4,68.6 241.8,62.2 253.3,56C279.9,41.5 307.7,29.7 336.9,21.4C352.8,16.9 368.8,12.8 385,9.5C398.3,6.7 411.9,5.1 425.5,3.4C434.8,2.3 444.2,1.8 453.6,1.4C466,0.8 478.4,0 490.7,0.5C505.4,1.1 520,2.5 534.5,4.5C550.7,6.6 566.9,8.8 582.7,12.6C600.9,16.9 618.9,22.4 636.5,28.5C652.4,34 667.9,40.7 683,47.8C695.2,53.5 707.1,60 718.5,67.2C733.6,76.7 748.4,87 763,97.4C771.4,103.5 779.5,110.2 787.4,117C795.2,123.7 803,130.5 810.2,137.9C819.7,147.7 828.9,157.9 837.8,168.4C846.6,178.9 855.2,189.7 863.2,200.9C871,211.8 878.5,223.1 885.2,234.8C893.4,248.9 901.6,263.2 908.1,278.3C916.7,298.3 924.4,318.9 931.1,339.7C936.3,356 939.8,372.9 943.2,389.7C945.6,401.8 946.9,414.2 948.3,426.6C949.3,435.8 949.7,445 950.3,454.2C950.7,460.9 951.3,467.6 951.3,474.3C951.2,492.3 938.5,506.1 919.6,505.3C908.1,504.7 895.6,495.4 893.4,483.4C892.2,476.7 891.9,469.7 891.3,462.9C890,447.3 888.9,431.7 887.3,416.1C884.8,391 878.1,366.9 870.3,343.1C862.9,320.7 853.8,298.9 842.1,278.3C832.3,260.9 821.4,244 809.9,227.7C801.5,215.9 791.3,205.3 781.7,194.3C776,187.8 770.2,181.1 763.7,175.4C752,165 740.1,154.8 727.6,145.3C715,135.7 702.1,126.1 688.3,118.2C670.9,108.3 652.7,99.9 634.5,91.5C623.7,86.5 612.5,82.3 601.2,78.9C587.7,74.8 573.9,71.5 560,68.4C548.8,65.9 537.4,64.3 526,62.4C523.2,61.9 520.3,61.5 517.5,61.4C510.6,60.9 503.7,60.7 496.9,60.3C490.3,60 483.7,59.2 477.1,59.4C462.9,59.8 448.6,59.9 434.5,61.5C414.8,63.7 395.3,67.2 375.9,72C356.1,76.8 336.8,82.9 318.1,90.6C301.3,97.5 285.1,106.2 269.3,115.2C255.3,123.1 241.9,132.2 228.7,141.4C220.1,147.4 212.1,154.2 204.3,161C195,169.1 185.6,177.2 177.3,186.2C166,198.4 155.5,211.4 145,224.3C126.1,247.2 111.4,272.8 98.8,299.6C88.6,321.2 80,343.6 74.3,367C71.3,379.7 68,392.4 65.5,405.3C63.8,413.6 63,422.1 62.4,430.5C61.2,446.5 59.8,462.4 59.5,478.4C59.3,491.4 59.9,504.4 61.5,517.2C64,536.9 66.3,556.7 72.2,575.8C77.7,593.3 81.8,611.4 88.7,628.5C96.1,647 105.5,664.9 115.2,682.4C123.1,696.6 132.3,710.1 141.4,723.6C146.6,731.1 152.5,738.1 158.6,745C167.8,755.3 176.8,765.8 186.9,775.1C198.8,786.3 211.7,796.3 224.3,806.7C228,809.8 232,812.5 236.1,815.6"
+      android:strokeLineJoin="round"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M458.3,486.3C458.3,532.2 458.3,577.5 458.4,622.8C458.4,636.3 447.1,647.4 434.9,646.4C426.9,645.8 416.8,638 415.4,630.1C414.7,626.3 414.4,622.4 414.4,618.5C414.3,580.5 414.3,542.5 414.4,504.5C414.4,499.8 412.8,498.3 408.1,498.2C389.9,498.1 371.7,497.5 353.5,497.4C333.5,497.2 313.5,497.3 293.5,497.3C292.6,497.3 291.8,497.3 291,497.3C283.6,497.7 282.3,499 282.3,506.2C282.3,545.2 282.4,584.2 282.3,623.2C282.3,631.6 279.2,638.9 271.8,643.2C259.1,650.8 243.3,645.7 239.4,629.9C238.6,626.6 238.4,623.1 238.4,619.8C238.3,522.8 238.3,425.8 238.4,328.8C238.4,315.7 247.2,305.2 260.2,305.4C273.9,305.6 282.2,314.6 282.3,327.5C282.5,367.2 282.3,406.8 282.3,446.5C282.3,452.9 282.8,453.3 289,453.3C327.8,453.3 366.6,453.3 405.5,453.3C413.3,453.3 417.2,448.2 415.2,440.7C414.8,439.2 414.4,437.6 414.4,436.1C414.3,400.9 414.2,365.7 414.4,330.6C414.5,318.4 419.6,309.1 431.3,306C442.2,303 453.8,308.7 457.2,320.3C458.2,323.5 458.3,327 458.3,330.3C458.4,382.2 458.3,434 458.3,486.3"
+      android:strokeLineJoin="round"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M629.3,438.3C600.8,438.3 572.8,438.4 544.9,438.3C535.5,438.3 529.2,433.2 525.4,425.2C521.7,417.4 522.8,410 528.1,403C532.8,396.8 539,394.3 546.4,394.3C595.1,394.3 643.8,394.5 692.4,394.2C701.9,394.2 713.8,403.9 713.7,415.1C713.6,425.5 707.5,432.1 702.5,439.6C694.9,450.7 687.1,461.6 679.3,472.5C669,487.1 658.5,501.5 648.1,516.1C641.1,526 634.3,536 627.3,546C615.4,562.9 603.5,579.7 591.6,596.7C590.5,598.1 590.1,600 589.3,601.7C590.9,601.9 592.4,602.3 594,602.3C626.2,602.3 658.3,602.3 690.5,602.4C704.5,602.4 711.6,610.5 713.1,619.8C715.1,631.9 710.2,641.8 697.3,645.8C696,646.2 694.5,646.3 693.1,646.3C643.6,646.3 594.1,646.3 544.6,646.4C535.4,646.4 526,637.9 524,628.9C521.8,619.1 527,612.6 531.6,605.7C539.2,594.4 547.6,583.7 555.5,572.6C565.9,558 576,543.1 586.4,528.4C599,510.5 611.8,492.6 624.4,474.7C632.1,463.9 639.5,453 647.1,442.1C649,439.2 648.7,438 644.8,438.3C639.8,438.6 634.8,438.3 629.3,438.3"
+      android:strokeLineJoin="round"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_restart_systemui.xml b/packages/SystemUI/res/drawable/ic_restart_systemui.xml
new file mode 100644
index 0000000000000..65065705b1956
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_restart_systemui.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Dirty Unicorns Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.000000dp"
+    android:height="24.000000dp"
+    android:viewportWidth="512.000000"
+    android:viewportHeight="512.000000"
+    android:tint="?android:attr/colorControlNormal">
+
+    <group
+            android:translateY="512.000000"
+            android:scaleX="0.100000"
+            android:scaleY="-0.100000">
+        <path
+            android:fillColor="#FF000000"
+            android:strokeWidth="1"
+            android:pathData="M1455 3827 c-38 -48 -37 -59 5 -152 8 -18 96 -248 114 -300 4 -11 6 -21 4 -21 -2
+-1 4 -10 13 -20 9 -11 33 -64 53 -119 21 -55 45 -117 54 -138 17 -42 16 -43 -66
+-105 -28 -20 -215 -205 -256 -253 -41 -48 -179 -239 -194 -269 -7 -14 -22 -41 -34
+-60 -41 -67 -80 -145 -114 -230 -19 -47 -44 -104 -55 -128 -75 -163 -146 -529 -165
+-840 l-7 -122 1789 2 1789 3 -3 135 c-3 147 -10 218 -41 385 -30 168 -80 349 -119
+436 -12 24 -37 83 -56 131 -37 90 -105 223 -137 270 -11 14 -19 29 -19 32 0 14
+-183 256 -237 312 -32 34 -67 73 -78 85 -25 29 -130 120 -153 133 -52 30 -54 37
+-28 112 33 92 64 171 82 205 8 16 14 32 13 35 0 4 3 10 8 13 5 3 14 22 20 41 6 19
+37 102 67 184 31 82 56 158 56 168 0 10 -7 34 -14 53 -13 29 -20 35 -46 35 -30 0
+-33 -5 -81 -105 -27 -58 -49 -107 -49 -110 0 -10 -112 -292 -129 -325 -9 -19 -29
+-64 -42 -99 -13 -35 -29 -65 -36 -68 -13 -5 -125 46 -131 60 -2 4 -11 7 -21 7 -9 0
+-34 9 -55 19 -21 11 -52 23 -69 27 -18 3 -36 10 -42 14 -5 4 -34 13 -64 19 -30 6
+-59 16 -65 20 -15 12 -210 31 -323 31 -120 0 -280 -17 -318 -34 -16 -8 -51 -17 -77
+-20 -27 -4 -48 -11 -48 -15 0 -5 -20 -12 -45 -15 -25 -4 -45 -11 -45 -16 0 -6 -20
+-15 -45 -21 -25 -6 -45 -15 -45 -19 0 -4 -12 -11 -27 -15 -16 -3 -35 -13 -44 -21
+-9 -8 -29 -16 -45 -17 -25 -2 -30 3 -50 53 -13 30 -32 75 -43 100 -11 25 -50 122
+-87 215 -36 94 -84 207 -105 253 -36 79 -39 82 -71 82 -18 -1 -37 -6 -43 -13z m371
+-1477 c60 -21 99 -124 82 -217 -5 -26 -9 -54 -10 -62 -1 -7 -16 -28 -33 -47 -28
+-30 -38 -34 -82 -34 -89 0 -135 61 -135 179 0 143 74 217 178 181z m1640 0 c81 -28
+115 -181 66 -290 -25 -56 -48 -70 -110 -70 -50 0 -58 3 -89 36 -19 20 -32 39 -29
+42 3 3 2 10 -3 16 -15 19 -20 87 -11 137 21 109 89 159 176 129z" />
+    </group>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ring_volume_24.xml b/packages/SystemUI/res/drawable/ic_ring_volume_24.xml
new file mode 100644
index 0000000000000..19043b682f23a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ring_volume_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18.6,17.22c0.66,0.37 1.28,0.79 1.87,1.27l1.07,-1.07c-0.91,-0.75 -1.9,-1.38 -2.94,-1.9v1.7zM3.53,18.5c0.58,-0.47 1.21,-0.89 1.87,-1.27v-1.71c-1.05,0.51 -2.03,1.15 -2.95,1.9l1.08,1.08z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,12C7.46,12 3.34,13.78 0.29,16.67c-0.18,0.18 -0.29,0.43 -0.29,0.71 0,0.28 0.11,0.53 0.29,0.71l2.48,2.48c0.18,0.18 0.43,0.29 0.71,0.29 0.27,0 0.52,-0.11 0.7,-0.28 0.79,-0.74 1.69,-1.36 2.66,-1.85 0.33,-0.16 0.56,-0.5 0.56,-0.9v-3.1c1.45,-0.48 3,-0.73 4.6,-0.73 1.6,0 3.15,0.25 4.6,0.72v3.1c0,0.39 0.23,0.74 0.56,0.9 0.98,0.49 1.87,1.12 2.66,1.85 0.18,0.18 0.43,0.28 0.7,0.28 0.28,0 0.53,-0.11 0.71,-0.29l2.48,-2.48c0.18,-0.18 0.29,-0.43 0.29,-0.71 0,-0.27 -0.11,-0.52 -0.29,-0.7C20.66,13.78 16.54,12 12,12zM5.4,17.23c-0.66,0.37 -1.29,0.8 -1.87,1.27l-1.07,-1.07c0.91,-0.75 1.9,-1.39 2.95,-1.9v1.7zM20.47,18.49c-0.59,-0.48 -1.21,-0.9 -1.87,-1.27v-1.7c1.04,0.51 2.03,1.15 2.94,1.9l-1.07,1.07zM16.19,8.4l1.41,1.41s3.45,-3.52 3.56,-3.55l-1.41,-1.41 -3.56,3.55zM11,2h2v5h-2zM6.4,9.81L7.81,8.4 4.26,4.84 2.84,6.26c0.11,0.03 3.56,3.55 3.56,3.55z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_robot.xml b/packages/SystemUI/res/drawable/ic_robot.xml
new file mode 100644
index 0000000000000..bab7b0c0bb1cb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_robot.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2A2,2 0 0,1 14,4C14,4.74 13.6,5.39 13,5.73V7H14A7,7 0 0,1 21,14H22A1,1 0 0,1 23,15V18A1,1 0 0,1 22,19H21V20A2,2 0 0,1 19,22H5A2,2 0 0,1 3,20V19H2A1,1 0 0,1 1,18V15A1,1 0 0,1 2,14H3A7,7 0 0,1 10,7H11V5.73C10.4,5.39 10,4.74 10,4A2,2 0 0,1 12,2M7.5,13A2.5,2.5 0 0,0 5,15.5A2.5,2.5 0 0,0 7.5,18A2.5,2.5 0 0,0 10,15.5A2.5,2.5 0 0,0 7.5,13M16.5,13A2.5,2.5 0 0,0 14,15.5A2.5,2.5 0 0,0 16.5,18A2.5,2.5 0 0,0 19,15.5A2.5,2.5 0 0,0 16.5,13Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_rog.xml b/packages/SystemUI/res/drawable/ic_rog.xml
new file mode 100644
index 0000000000000..c3c17a26697b6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_rog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2021 BananaDroid
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M 14.265625 7.066406 C 14.265625 7.066406 14.199219 7.066406 14.199219 7.066406 C 14.199219 7.132812 14.132812 7.132812 14.132812 7.132812 C 14.066406 7.199219 14 7.265625 13.933594 7.265625 C 13.667969 7.535156 13.332031 7.867188 13.066406 8.132812 C 12.667969 8.535156 12.265625 8.867188 11.867188 9.265625 C 11.132812 10 10.265625 10.867188 9.535156 11.601562 C 8.867188 12.199219 8.332031 12.667969 7.734375 13.265625 C 7.464844 13.535156 7.265625 13.734375 6.933594 13.734375 C 6.398438 13.734375 5.667969 13.265625 5.265625 13.066406 C 4.933594 12.867188 4.066406 12.332031 3.667969 12.332031 L 4 12.734375 C 4.199219 13.066406 4.535156 13.800781 4.734375 14.199219 C 5.332031 15.398438 6.199219 16.667969 7.265625 17.535156 C 7.535156 17.734375 7.734375 17.933594 8.066406 18.132812 C 8.265625 18.265625 8.398438 18.332031 8.535156 18.398438 C 8.601562 18.464844 9 18.601562 9.066406 18.601562 C 8.933594 18.535156 8.867188 18.398438 8.734375 18.265625 C 8.332031 17.800781 7.464844 16.867188 7.199219 16.398438 C 7 16.066406 6.933594 15.800781 7.199219 15.398438 C 7.464844 14.933594 8.132812 14.398438 8.535156 14.066406 C 9.535156 13.199219 10.464844 12.398438 11.535156 11.535156 C 12.066406 11.132812 12.535156 10.734375 13.132812 10.398438 C 13.601562 10 14.132812 9.667969 14.734375 9.265625 L 15.535156 8.734375 C 15.667969 8.667969 16.398438 8.265625 16.398438 8.199219 L 17.132812 7.800781 C 17.398438 7.667969 17.667969 7.535156 17.933594 7.398438 C 18.667969 7 20.265625 6.332031 21.132812 6 C 21.398438 5.867188 21.667969 5.800781 22 5.667969 L 22.867188 5.398438 C 22.800781 5.398438 21.800781 5.398438 21.667969 5.398438 C 20.933594 5.398438 20.464844 5.398438 19.800781 5.464844 C 19.265625 5.464844 18.265625 5.601562 17.800781 5.734375 C 17.734375 5.734375 17.601562 5.734375 17.535156 5.734375 C 17.332031 5.800781 17.199219 5.867188 17 5.867188 C 16.667969 6 16.332031 6.066406 16 6.132812 C 15.667969 6.265625 15.332031 6.398438 15.066406 6.535156 C 14.867188 6.601562 14.332031 6.933594 14.265625 7.066406 Z M 21.332031 8.800781 L 22 8.464844 C 22.199219 8.332031 22.398438 8.199219 22.667969 8.132812 C 23.066406 7.933594 23.332031 7.265625 23.265625 6.800781 C 23.199219 6.800781 22.933594 6.933594 22.867188 7 C 22.800781 7 22.734375 7.066406 22.667969 7.066406 C 22.265625 7.199219 21.800781 7.398438 21.398438 7.601562 C 21.332031 7.601562 21.199219 7.667969 21.132812 7.734375 C 21.066406 7.734375 20.867188 7.800781 20.800781 7.867188 C 20.734375 7.867188 18.398438 9 18.066406 9.132812 C 17.667969 9.398438 17.199219 9.601562 16.800781 9.867188 C 16.734375 9.867188 15.535156 10.535156 15.464844 10.601562 C 15.398438 10.601562 14.535156 11.066406 14.398438 11.132812 C 12.800781 12.066406 11 13.265625 9.398438 14.265625 C 9 14.601562 8.398438 15 8 15.332031 L 7.601562 15.601562 C 7.601562 15.601562 7.535156 15.601562 7.535156 15.667969 C 7.667969 15.800781 8.734375 16.199219 8.933594 16.332031 C 10.332031 16.800781 11.667969 17.199219 13.132812 17.398438 L 14 17.535156 L 14.734375 17.601562 L 14.132812 17.601562 C 14.265625 17.601562 14.398438 17.601562 14.464844 17.601562 C 14.667969 17.601562 14.800781 17.667969 15 17.667969 C 15.332031 17.667969 15.667969 17.734375 16 17.734375 C 16.398438 17.734375 16.601562 17.734375 16.933594 17.601562 C 17.199219 17.464844 17.398438 17.332031 17.601562 17.199219 C 18.398438 16.601562 19.066406 15.734375 19.601562 14.867188 C 20.199219 14 20.667969 13.066406 21.132812 12.132812 C 21.332031 11.601562 21.535156 11.132812 21.734375 10.601562 C 21.867188 10.332031 21.933594 10.066406 22 9.800781 C 22.066406 9.667969 22.265625 9.066406 22.265625 8.933594 C 22.066406 9 18.464844 10.933594 18.066406 11.132812 C 17.601562 11.398438 17.199219 11.667969 16.734375 11.867188 C 16.265625 12.132812 15.800781 12.398438 15.398438 12.667969 C 14.464844 13.132812 13.601562 13.734375 12.667969 14.199219 C 12.535156 14.332031 11.398438 15 11.332031 15 C 11.464844 15 15.066406 13.464844 15.132812 13.398438 C 15.265625 13.332031 18.800781 11.867188 18.867188 11.867188 C 18.867188 11.933594 18.667969 12.332031 18.601562 12.464844 C 18.464844 12.667969 18.398438 12.867188 18.265625 13.066406 C 17.734375 14.199219 17.066406 15.535156 15.867188 16.066406 L 15.800781 16.066406 C 15.734375 16.066406 15.535156 16.199219 15.464844 16.199219 C 15.332031 16.199219 15.199219 16.265625 15.066406 16.265625 C 14.535156 16.398438 13.667969 16.332031 13.066406 16.265625 C 12.398438 16.132812 11.867188 16 11.265625 15.867188 C 11.066406 15.800781 9.933594 15.464844 9.867188 15.464844 C 9.933594 15.398438 10.535156 15 10.601562 14.933594 C 11.867188 14.066406 14 12.734375 15.332031 12 C 15.464844 11.933594 15.601562 11.800781 15.734375 11.734375 C 15.867188 11.667969 16.066406 11.601562 16.132812 11.535156 L 16.800781 11.199219 C 17 11.066406 17.199219 10.933594 17.398438 10.800781 C 17.867188 10.601562 18.265625 10.398438 18.734375 10.132812 C 18.800781 10.066406 21.199219 8.800781 21.332031 8.800781 Z M 4.933594 15.398438 C 4.933594 15.332031 4.464844 14.867188 4.398438 14.800781 C 3.867188 14.199219 3.332031 13.601562 2.734375 12.933594 C 2.398438 12.535156 2 12.132812 1.734375 11.734375 C 1.535156 11.535156 0.800781 10.601562 0.734375 10.398438 C 0.667969 10.464844 0.867188 11.199219 0.933594 11.332031 C 0.933594 11.464844 1 11.601562 1 11.800781 C 1.464844 13.332031 1.867188 13.933594 3.332031 14.667969 C 3.535156 14.734375 4.867188 15.398438 4.933594 15.398438 Z M 4.933594 15.398438" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_screenshot_lens.xml b/packages/SystemUI/res/drawable/ic_screenshot_lens.xml
new file mode 100644
index 0000000000000..58e3da5840a4a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_screenshot_lens.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M6,2H18A4,4 0 0,1 22,6V12H20V6A2,2 0 0,0 18,4H6A2,2 0 0,0 4,6V18A2,2 0 0,0 6,20H12V22H6A4,4 0 0,1 2,18V6A4,4 0 0,1 6,2M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M18,16A2,2 0 0,1 20,18A2,2 0 0,1 18,20A2,2 0 0,1 16,18A2,2 0 0,1 18,16Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_settings_dns.xml b/packages/SystemUI/res/drawable/ic_settings_dns.xml
new file mode 100644
index 0000000000000..be1e554ea931d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_settings_dns.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_signal.xml b/packages/SystemUI/res/drawable/ic_signal.xml
new file mode 100644
index 0000000000000..4e26d9af94076
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_signal.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,21H6V18H3M8,21H11V14H8M13,21H16V9H13M18,21H21V3H18V21Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_signal_cellular_alt_24.xml b/packages/SystemUI/res/drawable/ic_signal_cellular_alt_24.xml
new file mode 100644
index 0000000000000..9368f4983bd55
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_signal_cellular_alt_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,4h3v16h-3L17,4zM5,14h3v6L5,20v-6zM11,9h3v11h-3L11,9z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_sleep.xml b/packages/SystemUI/res/drawable/ic_sleep.xml
new file mode 100644
index 0000000000000..4c8d58d8ca396
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_sleep.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_speaker_group_24dp.xml b/packages/SystemUI/res/drawable/ic_speaker_group_24dp.xml
new file mode 100644
index 0000000000000..37475e52010ae
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_speaker_group_24dp.xml
@@ -0,0 +1,22 @@
+<!--
+  Copyright (C) 2020-2022 The Android Open Source Project
+
+  SPDX-License-Identifier: Apache-2.0
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorBackgroundFloating">
+    <path
+        android:pathData="M18.2,1L9.8,1C8.81,1 8,1.81 8,2.8v14.4c0,0.99 0.81,1.79 1.8,1.79l8.4,0.01c0.99,0 1.8,-0.81 1.8,-1.8L20,2.8c0,-0.99 -0.81,-1.8 -1.8,-1.8zM14,3c1.1,0 2,0.89 2,2s-0.9,2 -2,2 -2,-0.89 -2,-2 0.9,-2 2,-2zM14,16.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"
+        android:fillColor="@android:color/white"/>
+    <path
+        android:pathData="M14,12.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
+        android:fillColor="@android:color/white"/>
+    <path
+        android:pathData="M6,5H4v16c0,1.1 0.89,2 2,2h10v-2H6V5z"
+        android:fillColor="@android:color/white"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_spiderman.xml b/packages/SystemUI/res/drawable/ic_spiderman.xml
new file mode 100644
index 0000000000000..a10f86dee1c89
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_spiderman.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2023-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16dp"
+    android:width="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12 2C7.601563 2 5 5.101563 5 10C5 14.898438 7.398438 22 12 22C16.601563 22 19 14.898438 19 10C19 5.101563 16.398438 2 12 2ZM8 15C6 12 6.199219 9.398438 7 7C7.699219 10.101563 11 12 11 12ZM13 12C13 12 16.300781 10.101563 17 7C17.800781 9.398438 18 12 16 15Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_data_disabled.xml b/packages/SystemUI/res/drawable/ic_statusbar_data_disabled.xml
new file mode 100644
index 0000000000000..99a469fa1851c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_data_disabled.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2017 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.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0,0h24v24H0V0z" />
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M22,13h-9v9H2L22,2V13z M21,15.41L19.59,14l-2.09,2.09L15.41,14L14,15.41l2.09,2.09L14,19.59L15.41,21l2.09-2.08L19.59,21 L21,19.59l-2.08-2.09L21,15.41z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_data_saver.xml b/packages/SystemUI/res/drawable/ic_statusbar_data_saver.xml
new file mode 100644
index 0000000000000..e559d551fa8b4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_data_saver.xml
@@ -0,0 +1,25 @@
+<!--
+     Copyright (C) 2015 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,8v3L8,11v2h3v3h2v-3h3v-2h-3L13,8zM13,2.05v3.03c3.39,0.49 6,3.39 6,6.92 0,0.9 -0.18,1.75 -0.48,2.54l2.6,1.53c0.56,-1.24 0.88,-2.62 0.88,-4.07 0,-5.18 -3.95,-9.45 -9,-9.95zM12,19c-3.87,0 -7,-3.13 -7,-7 0,-3.53 2.61,-6.43 6,-6.92L11,2.05c-5.06,0.5 -9,4.76 -9,9.95 0,5.52 4.47,10 9.99,10 3.31,0 6.24,-1.61 8.06,-4.09l-2.6,-1.53C16.17,17.98 14.21,19 12,19z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_fourg.xml b/packages/SystemUI/res/drawable/ic_statusbar_fourg.xml
new file mode 100644
index 0000000000000..12188bd480046
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_fourg.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2017-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M22,16.5V10.5H17.5V13.5H19V16.5H16V7.5H22V4.5H16A3,3 0 0,0 13,7.5V16.5A3,3 0 0,0 16,19.5H19A3,3 0 0,0 22,16.5M8,19.5H11V4.5H8V10.5H5V4.5H2V13.5H8V19.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_hd_calling.xml b/packages/SystemUI/res/drawable/ic_statusbar_hd_calling.xml
new file mode 100644
index 0000000000000..c97a9d45efa71
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_hd_calling.xml
@@ -0,0 +1,17 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M 22 2 L 2 22 L 22 22 L 22 2 L 22 2 Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M 5.402 8.2 L 4.225 8.2 L 4.225 5.001 L 1.182 5.001 L 1.182 8.2 L 0 8.2 L 0 1 L 1.182 1 L 1.182 3.996 L 4.225 3.996 L 4.225 1 L 5.402 1 L 5.402 8.2 Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M 6.924 8.2 L 6.924 1 L 8.934 1 C 9.535 1 10.068 1.142 10.532 1.425 C 10.999 1.709 11.362 2.111 11.617 2.632 C 11.872 3.153 12 3.749 12 4.422 L 12 4.782 C 12 5.465 11.87 6.065 11.612 6.582 C 11.357 7.101 10.991 7.499 10.513 7.78 C 10.04 8.06 9.497 8.2 8.882 8.2 L 6.924 8.2 Z M 8.107 2.009 L 8.107 7.202 L 8.878 7.202 C 9.498 7.202 9.973 6.996 10.303 6.588 C 10.637 6.176 10.807 5.585 10.813 4.817 L 10.813 4.418 C 10.813 3.635 10.652 3.039 10.332 2.627 C 10.01 2.214 9.545 2.009 8.934 2.009 L 8.107 2.009 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_nfc.xml b/packages/SystemUI/res/drawable/ic_statusbar_nfc.xml
new file mode 100644
index 0000000000000..4e7af00a22c1a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_nfc.xml
@@ -0,0 +1,31 @@
+<!--
+     Copyright (C) 2015 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10.59,7.66C10.59,7.66 11.19,7.39 11.57,7.82C11.95,8.26 12.92,9.94 12.92,11.62C12.92,13.3 12.5,15.09 12.05,15.68C11.62,16.28
+11.19,16.28 10.86,16.06C10.54,15.85 5.5,12 5.23,11.89C4.95,11.78 4.85,12.05 5.12,13.5C5.39,15 4.95,15.41 4.57,15.47C4.2,15.5 3.06,15.2 3,12.16C2.95,9.13
+3.76,8.64 4.14,8.64C4.85,8.64 10.27,13.5 10.64,13.46C10.97,13.41 11.13,11.35 10.5,9.72C9.78,7.96 10.59,7.66 10.59,7.66M19.3,4.63C21.12,8.24 21,11.66
+21,12C21,12.34 21.12,15.76 19.3,19.37C19.3,19.37 18.83,19.92 18.12,19.59C17.42,19.26 17.66,18.4 17.66,18.4C17.66,18.4 19.14,15.55 19.1,12.05V12C19.14,8.5
+17.66,5.6 17.66,5.6C17.66,5.6 17.42,4.74 18.12,4.41C18.83,4.08 19.3,4.63 19.3,4.63M15.77,6.25C17.26,8.96 17.16,11.66 17.14,12C17.16,12.34 17.26,14.92
+15.77,17.85C15.77,17.85 15.3,18.4 14.59,18.07C13.89,17.74 14.13,16.88 14.13,16.88C14.13,16.88 15.09,15.5 15.24,12.05V12C15.14,8.53 14.13,7.23
+14.13,7.23C14.13,7.23 13.89,6.36 14.59,6.04C15.3,5.71 15.77,6.25 15.77,6.25Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_phone.xml b/packages/SystemUI/res/drawable/ic_statusbar_phone.xml
new file mode 100644
index 0000000000000..f0b84b5d1e302
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_phone.xml
@@ -0,0 +1,25 @@
+<!--
+     Copyright (C) 2015 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_roaming.xml b/packages/SystemUI/res/drawable/ic_statusbar_roaming.xml
new file mode 100644
index 0000000000000..25e0303d16f70
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_roaming.xml
@@ -0,0 +1,30 @@
+<!--
+     Copyright (C) 2021 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M 22 2 L 2 22 L 22 22 L 22 2 L 22 2 Z M 16 15 L 22 15 L 22 22 L 16 22 L 16 15"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M 19.436 19.688 L 18.152 19.688 L 18.152 22 L 17 22 L 17 16 L 19.332 16 C 20.097 16 20.687 16.155 21.103 16.466 C 21.519 16.776 21.727 17.225 21.727 17.813 C 21.727 18.214 21.619 18.551 21.403 18.823 C 21.191 19.092 20.893 19.299 20.511 19.445 L 22 21.946 L 22 22 L 20.766 22 L 19.436 19.688 Z M 18.152 18.852 L 19.336 18.852 C 19.725 18.852 20.028 18.764 20.247 18.588 C 20.465 18.409 20.575 18.166 20.575 17.859 C 20.575 17.537 20.473 17.288 20.27 17.113 C 20.069 16.937 19.769 16.846 19.368 16.841 L 18.152 16.841 L 18.152 18.852 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_statusbar_vowifi.xml b/packages/SystemUI/res/drawable/ic_statusbar_vowifi.xml
new file mode 100644
index 0000000000000..35191a2d9eb3c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_statusbar_vowifi.xml
@@ -0,0 +1,14 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M 21.996 4.95 C 21.787 4.779 19.666 2.999 16.497 2.999 C 13.318 2.999 11.208 4.779 10.999 4.95 L 16.497 11.998 L 21.996 4.95 Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M 19.997 15.507 C 18.756 15.507 17.548 15.308 16.427 14.938 C 16.077 14.818 15.678 14.907 15.407 15.178 L 13.208 17.377 C 10.378 15.928 8.059 13.618 6.62 10.788 L 8.819 8.589 C 9.098 8.309 9.178 7.919 9.069 7.569 C 8.699 6.45 8.498 5.25 8.498 3.999 C 8.498 3.45 8.049 2.999 7.499 2.999 L 3.999 2.999 C 3.45 2.999 2.999 3.45 2.999 3.999 C 2.999 13.388 10.608 20.997 19.997 20.997 C 20.547 20.997 20.997 20.547 20.997 19.997 L 20.997 16.508 C 20.997 15.957 20.547 15.507 19.997 15.507 Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_superman.xml b/packages/SystemUI/res/drawable/ic_superman.xml
new file mode 100644
index 0000000000000..37c1e39937e00
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_superman.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2023-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17 3L7 3L2 9.101563L12 21L22 9.101563ZM16 5L19.601563 9L17 11.898438C16.800781 10.699219 16 9.101563 13 9C10.800781 8.898438 8 9.398438 8 8C8 6.800781 10.101563 5.898438 12 6C14.101563 6.101563 14.800781 7.199219 15 8L18 8C17.898438 6.398438 15.898438 5 12 5ZM8 5L12 5C9.699219 5 6.300781 5.300781 5.699219 8.601563C5.101563 11.5 7.800781 12 11 12C11.5 12 12.601563 12 13 12C14 12 14.898438 12.398438 15 13C15.199219 14.898438 11.101563 16 10 14L8.800781 14L4.398438 9ZM10.398438 15.800781C11.398438 16.101563 12.5 16.101563 13.601563 15.898438L12 17.699219Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_brightness_auto.xml b/packages/SystemUI/res/drawable/ic_tristate_brightness_auto.xml
new file mode 100644
index 0000000000000..c02b0eb6618fe
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_brightness_auto.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.3,16L13.6,14H10.4L9.7,16H7.8L11,7H13L16.2,16H14.3M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69M10.85,12.65H13.15L12,9L10.85,12.65Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_brightness_bright.xml b/packages/SystemUI/res/drawable/ic_tristate_brightness_bright.xml
new file mode 100644
index 0000000000000..5bcaaee69be26
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_brightness_bright.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_brightness_dark.xml b/packages/SystemUI/res/drawable/ic_tristate_brightness_dark.xml
new file mode 100644
index 0000000000000..f23a2d10cd5d4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_brightness_dark.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,18C11.11,18 10.26,17.8 9.5,17.45C11.56,16.5 13,14.42 13,12C13,9.58 11.56,7.5 9.5,6.55C10.26,6.2 11.11,6 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_flashlight.xml b/packages/SystemUI/res/drawable/ic_tristate_flashlight.xml
new file mode 100644
index 0000000000000..b64964a32ba90
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_flashlight.xml
@@ -0,0 +1,11 @@
+<!-- drawable/flashlight.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,10L6,5H18L15,10H9M18,4H6V2H18V4M9,22V11H15V22H9M12,13A1,1 0 0,0 11,14A1,1 0 0,0 12,15A1,1 0 0,0 13,14A1,1 0 0,0 12,13Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_flashlight_off.xml b/packages/SystemUI/res/drawable/ic_tristate_flashlight_off.xml
new file mode 100644
index 0000000000000..42c27bf340c2a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_flashlight_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L15,18.27V22H9V12.27L2,5.27M18,5L15,10H11.82L6.82,5H18M18,4H6V2H18V4M15,11V13.18L12.82,11H15Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_rotate_auto.xml b/packages/SystemUI/res/drawable/ic_tristate_rotate_auto.xml
new file mode 100644
index 0000000000000..dbed7f58555a9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_rotate_auto.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.5,21.5C4.25,19.94 1.91,16.76 1.55,13H0.05C0.56,19.16 5.71,24 12,24L12.66,23.97L8.85,20.16M14.83,21.19L2.81,9.17L9.17,2.81L21.19,14.83M10.23,1.75C9.64,1.16 8.69,1.16 8.11,1.75L1.75,8.11C1.16,8.7 1.16,9.65 1.75,10.23L13.77,22.25C14.36,22.84 15.31,22.84 15.89,22.25L22.25,15.89C22.84,15.3 22.84,14.35 22.25,13.77L10.23,1.75M16.5,2.5C19.75,4.07 22.09,7.24 22.45,11H23.95C23.44,4.84 18.29,0 12,0L11.34,0.03L15.15,3.84L16.5,2.5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_rotate_landscape.xml b/packages/SystemUI/res/drawable/ic_tristate_rotate_landscape.xml
new file mode 100644
index 0000000000000..6ffe5e328e261
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_rotate_landscape.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,1H3A2,2 0 0,0 1,3V16A2,2 0 0,0 3,18H9A2,2 0 0,0 11,16V3A2,2 0 0,0 9,1M9,15H3V3H9V15M21,13H13V15H21V21H9V20H6V21A2,2 0 0,0 8,23H21A2,2 0 0,0 23,21V15A2,2 0 0,0 21,13M23,10L19,8L20.91,7.09C19.74,4.31 17,2.5 14,2.5V1A9,9 0 0,1 23,10Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tristate_rotate_portrait.xml b/packages/SystemUI/res/drawable/ic_tristate_rotate_portrait.xml
new file mode 100644
index 0000000000000..55cc144738d1e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tristate_rotate_portrait.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,1H3A2,2 0 0,0 1,3V16A2,2 0 0,0 3,18H4V15H3V3H9V11H11V3A2,2 0 0,0 9,1M23,21V15A2,2 0 0,0 21,13H8A2,2 0 0,0 6,15V21A2,2 0 0,0 8,23H21A2,2 0 0,0 23,21M9,21V15H21V21H9M23,10H21.5C21.5,7 19.69,4.27 16.92,3.09L16,5L14,1A9,9 0 0,1 23,10Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_tux_logo.xml b/packages/SystemUI/res/drawable/ic_tux_logo.xml
new file mode 100644
index 0000000000000..8e8c415e32e52
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_tux_logo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20.0dp"
+        android:height="20.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,16C19,17.72 18.37,19.3 17.34,20.5C17.75,20.89 18,21.41 18,22H6C6,21.41 6.25,20.89 6.66,20.5C5.63,19.3 5,17.72 5,16H3C3,14.75 3.57,13.64 4.46,12.91L4.47,12.89C6,11.81 7,10 7,8V7A5,5 0 0,1 12,2A5,5 0 0,1 17,7V8C17,10 18,11.81 19.53,12.89L19.54,12.91C20.43,13.64 21,14.75 21,16H19M16,16A4,4 0 0,0 12,12A4,4 0 0,0 8,16A4,4 0 0,0 12,20A4,4 0 0,0 16,16M10,9L12,10.5L14,9L12,7.5L10,9M10,5A1,1 0 0,0 9,6A1,1 0 0,0 10,7A1,1 0 0,0 11,6A1,1 0 0,0 10,5M14,5A1,1 0 0,0 13,6A1,1 0 0,0 14,7A1,1 0 0,0 15,6A1,1 0 0,0 14,5Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_ubuntu_logo.xml b/packages/SystemUI/res/drawable/ic_ubuntu_logo.xml
new file mode 100644
index 0000000000000..10827961e42c3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_ubuntu_logo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20.0dp"
+        android:height="20.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M14.34,7.74C14.92,8.07 15.65,7.87 16,7.3C16.31,6.73 16.12,6 15.54,5.66C14.97,5.33 14.23,5.5 13.9,6.1C13.57,6.67 13.77,7.41 14.34,7.74M11.88,15.5C11.35,15.5 10.85,15.39 10.41,15.18L9.57,16.68C10.27,17 11.05,17.22 11.88,17.22C12.37,17.22 12.83,17.15 13.28,17.03C13.36,16.54 13.64,16.1 14.1,15.84C14.56,15.57 15.08,15.55 15.54,15.72C16.43,14.85 17,13.66 17.09,12.33L15.38,12.31C15.22,14.1 13.72,15.5 11.88,15.5M11.88,8.5C13.72,8.5 15.22,9.89 15.38,11.69L17.09,11.66C17,10.34 16.43,9.15 15.54,8.28C15.08,8.45 14.55,8.42 14.1,8.16C13.64,7.9 13.36,7.45 13.28,6.97C12.83,6.85 12.37,6.78 11.88,6.78C11.05,6.78 10.27,6.97 9.57,7.32L10.41,8.82C10.85,8.61 11.35,8.5 11.88,8.5M8.37,12C8.37,10.81 8.96,9.76 9.86,9.13L9,7.65C7.94,8.36 7.15,9.43 6.83,10.69C7.21,11 7.45,11.47 7.45,12C7.45,12.53 7.21,13 6.83,13.31C7.15,14.56 7.94,15.64 9,16.34L9.86,14.87C8.96,14.24 8.37,13.19 8.37,12M14.34,16.26C13.77,16.59 13.57,17.32 13.9,17.9C14.23,18.47 14.97,18.67 15.54,18.34C16.12,18 16.31,17.27 16,16.7C15.65,16.12 14.92,15.93 14.34,16.26M5.76,10.8C5.1,10.8 4.56,11.34 4.56,12C4.56,12.66 5.1,13.2 5.76,13.2C6.43,13.2 6.96,12.66 6.96,12C6.96,11.34 6.43,10.8 5.76,10.8Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_vibration_24.xml b/packages/SystemUI/res/drawable/ic_vibration_24.xml
new file mode 100644
index 0000000000000..9367158dfe399
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_vibration_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,5h8v14H8z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,7h2v10h-2zM22,9h2v6h-2zM0,9h2v6L0,15zM16.5,3h-9C6.67,3 6,3.67 6,4.5v15c0,0.83 0.67,1.5 1.5,1.5h9c0.83,0 1.5,-0.67 1.5,-1.5v-15c0,-0.83 -0.67,-1.5 -1.5,-1.5zM16,19L8,19L8,5h8v14zM3,7h2v10L3,17z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_vowifi.xml b/packages/SystemUI/res/drawable/ic_vowifi.xml
new file mode 100644
index 0000000000000..d91a92c96d7aa
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_vowifi.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 2024, The LibreMobileOS Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15sp"
+    android:height="15sp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.393,21C17.31,21 15.252,20.546 13.218,19.638C11.185,18.729 9.335,17.442 7.668,15.775C6.002,14.108 4.714,12.258 3.806,10.225C2.897,8.192 2.443,6.133 2.443,4.05C2.443,3.75 2.543,3.5 2.743,3.3C2.943,3.1 3.193,3 3.493,3H7.543C7.777,3 7.985,3.079 8.168,3.237C8.352,3.396 8.46,3.583 8.493,3.8L9.143,7.3C9.177,7.567 9.168,7.792 9.118,7.975C9.068,8.158 8.977,8.317 8.843,8.45L6.418,10.9C6.752,11.517 7.147,12.113 7.606,12.688C8.064,13.262 8.568,13.817 9.118,14.35C9.635,14.867 10.177,15.346 10.743,15.788C11.31,16.229 11.91,16.633 12.543,17L14.893,14.65C15.043,14.5 15.239,14.387 15.481,14.313C15.722,14.238 15.96,14.217 16.193,14.25L19.643,14.95C19.876,15.017 20.068,15.137 20.218,15.313C20.368,15.488 20.443,15.683 20.443,15.9V19.95C20.443,20.25 20.343,20.5 20.143,20.7C19.943,20.9 19.693,21 19.393,21ZM15.243,9.8L11.268,5.825C11.035,5.592 10.935,5.317 10.968,5C11.002,4.683 11.16,4.442 11.443,4.275C12.143,3.842 12.877,3.521 13.643,3.313C14.41,3.104 15.177,3 15.943,3C16.693,3 17.443,3.108 18.193,3.325C18.943,3.542 19.677,3.867 20.393,4.3C20.677,4.483 20.839,4.729 20.881,5.037C20.922,5.346 20.826,5.617 20.593,5.85L16.643,9.8C16.443,10 16.21,10.1 15.943,10.1C15.677,10.1 15.443,10 15.243,9.8Z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_vowifi_dual.xml b/packages/SystemUI/res/drawable/ic_vowifi_dual.xml
new file mode 100644
index 0000000000000..128daef003310
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_vowifi_dual.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 2024, The LibreMobileOS Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20sp"
+    android:height="15sp"
+    android:viewportWidth="32"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.393,21C17.31,21 15.252,20.546 13.218,19.638C11.185,18.729 9.335,17.442 7.668,15.775C6.002,14.108 4.714,12.258 3.806,10.225C2.897,8.192 2.443,6.133 2.443,4.05C2.443,3.75 2.543,3.5 2.743,3.3C2.943,3.1 3.193,3 3.493,3H7.543C7.777,3 7.985,3.079 8.168,3.237C8.352,3.396 8.46,3.583 8.493,3.8L9.143,7.3C9.177,7.567 9.168,7.792 9.118,7.975C9.068,8.158 8.977,8.317 8.843,8.45L6.418,10.9C6.752,11.517 7.147,12.113 7.606,12.688C8.064,13.262 8.568,13.817 9.118,14.35C9.635,14.867 10.177,15.346 10.743,15.788C11.31,16.229 11.91,16.633 12.543,17L14.893,14.65C15.043,14.5 15.239,14.387 15.481,14.313C15.722,14.238 15.96,14.217 16.193,14.25L19.643,14.95C19.876,15.017 20.068,15.137 20.218,15.313C20.368,15.488 20.443,15.683 20.443,15.9V19.95C20.443,20.25 20.343,20.5 20.143,20.7C19.943,20.9 19.693,21 19.393,21ZM15.243,9.8L11.268,5.825C11.035,5.592 10.935,5.317 10.968,5C11.002,4.683 11.16,4.442 11.443,4.275C12.143,3.842 12.877,3.521 13.643,3.313C14.41,3.104 15.177,3 15.943,3C16.693,3 17.443,3.108 18.193,3.325C18.943,3.542 19.677,3.867 20.393,4.3C20.677,4.483 20.839,4.729 20.881,5.037C20.922,5.346 20.826,5.617 20.593,5.85L16.643,9.8C16.443,10 16.21,10.1 15.943,10.1C15.677,10.1 15.443,10 15.243,9.8Z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M23.135,10.765C23.298,10.922 23.494,11 23.723,11H28.723C28.953,11 29.149,10.922 29.312,10.765C29.475,10.608 29.557,10.42 29.557,10.2V3.8C29.557,3.58 29.475,3.392 29.312,3.235C29.149,3.078 28.953,3 28.723,3H25.734C25.623,3 25.517,3.02 25.416,3.06C25.316,3.1 25.227,3.157 25.151,3.23L23.13,5.17C23.053,5.243 22.994,5.328 22.953,5.425C22.911,5.522 22.89,5.623 22.89,5.73V10.2C22.89,10.42 22.972,10.608 23.135,10.765ZM25.364,4.4V5.32H26.056V9.6H27.083V4.4H25.364Z"
+      android:fillColor="@android:color/white"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M23.135,20.765C23.298,20.922 23.494,21 23.723,21H28.723C28.953,21 29.149,20.922 29.312,20.765C29.475,20.608 29.557,20.42 29.557,20.2V13.8C29.557,13.58 29.475,13.392 29.312,13.235C29.149,13.078 28.953,13 28.723,13H25.734C25.623,13 25.517,13.02 25.416,13.06C25.316,13.1 25.227,13.157 25.151,13.23L23.13,15.17C23.053,15.243 22.994,15.328 22.953,15.425C22.911,15.522 22.89,15.623 22.89,15.73V20.2C22.89,20.42 22.972,20.608 23.135,20.765ZM25.93,17.612C25.661,17.862 25.3,18.176 24.847,18.553L24.479,18.864V19.6H27.975V18.779H25.887C26.298,18.43 26.63,18.133 26.885,17.888C27.14,17.638 27.366,17.346 27.564,17.011C27.762,16.676 27.861,16.324 27.861,15.957C27.861,15.49 27.718,15.115 27.43,14.832C27.142,14.544 26.729,14.4 26.192,14.4C25.701,14.4 25.295,14.546 24.975,14.839C24.659,15.131 24.491,15.56 24.472,16.126H25.435C25.439,15.853 25.505,15.638 25.633,15.482C25.76,15.322 25.942,15.242 26.177,15.242C26.413,15.242 26.588,15.31 26.701,15.447C26.814,15.584 26.871,15.773 26.871,16.013C26.871,16.277 26.781,16.546 26.602,16.82C26.423,17.093 26.199,17.357 25.93,17.612Z"
+      android:fillColor="@android:color/white"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_vowifi_one.xml b/packages/SystemUI/res/drawable/ic_vowifi_one.xml
new file mode 100644
index 0000000000000..baa13ba42e2b5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_vowifi_one.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 2024, The LibreMobileOS Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20sp"
+    android:height="15sp"
+    android:viewportWidth="32"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.393,21C17.31,21 15.252,20.546 13.218,19.638C11.185,18.729 9.335,17.442 7.668,15.775C6.002,14.108 4.714,12.258 3.806,10.225C2.897,8.192 2.443,6.133 2.443,4.05C2.443,3.75 2.543,3.5 2.743,3.3C2.943,3.1 3.193,3 3.493,3H7.543C7.777,3 7.985,3.079 8.168,3.237C8.352,3.396 8.46,3.583 8.493,3.8L9.143,7.3C9.177,7.567 9.168,7.792 9.118,7.975C9.068,8.158 8.977,8.317 8.843,8.45L6.418,10.9C6.752,11.517 7.147,12.113 7.606,12.688C8.064,13.262 8.568,13.817 9.118,14.35C9.635,14.867 10.177,15.346 10.743,15.788C11.31,16.229 11.91,16.633 12.543,17L14.893,14.65C15.043,14.5 15.239,14.387 15.481,14.313C15.722,14.238 15.96,14.217 16.193,14.25L19.643,14.95C19.876,15.017 20.068,15.137 20.218,15.313C20.368,15.488 20.443,15.683 20.443,15.9V19.95C20.443,20.25 20.343,20.5 20.143,20.7C19.943,20.9 19.693,21 19.393,21ZM15.243,9.8L11.268,5.825C11.035,5.592 10.935,5.317 10.968,5C11.002,4.683 11.16,4.442 11.443,4.275C12.143,3.842 12.877,3.521 13.643,3.313C14.41,3.104 15.177,3 15.943,3C16.693,3 17.443,3.108 18.193,3.325C18.943,3.542 19.677,3.867 20.393,4.3C20.677,4.483 20.839,4.729 20.881,5.037C20.922,5.346 20.826,5.617 20.593,5.85L16.643,9.8C16.443,10 16.21,10.1 15.943,10.1C15.677,10.1 15.443,10 15.243,9.8Z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M23.135,20.765C23.298,20.922 23.494,21 23.723,21H28.723C28.953,21 29.149,20.922 29.312,20.765C29.475,20.608 29.557,20.42 29.557,20.2V13.8C29.557,13.58 29.475,13.392 29.312,13.235C29.149,13.078 28.953,13 28.723,13H25.734C25.623,13 25.517,13.02 25.416,13.06C25.316,13.1 25.227,13.157 25.151,13.23L23.13,15.17C23.053,15.243 22.994,15.328 22.953,15.425C22.911,15.522 22.89,15.623 22.89,15.73V20.2C22.89,20.42 22.972,20.608 23.135,20.765ZM25.364,14.4V15.32H26.056V19.6H27.083V14.4H25.364Z"
+      android:fillColor="@android:color/white"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_vowifi_two.xml b/packages/SystemUI/res/drawable/ic_vowifi_two.xml
new file mode 100644
index 0000000000000..5c83164338164
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_vowifi_two.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright 2024, The LibreMobileOS Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20sp"
+    android:height="15sp"
+    android:viewportWidth="32"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.393,21C17.31,21 15.252,20.546 13.218,19.638C11.185,18.729 9.335,17.442 7.668,15.775C6.002,14.108 4.714,12.258 3.806,10.225C2.897,8.192 2.443,6.133 2.443,4.05C2.443,3.75 2.543,3.5 2.743,3.3C2.943,3.1 3.193,3 3.493,3H7.543C7.777,3 7.985,3.079 8.168,3.237C8.352,3.396 8.46,3.583 8.493,3.8L9.143,7.3C9.177,7.567 9.168,7.792 9.118,7.975C9.068,8.158 8.977,8.317 8.843,8.45L6.418,10.9C6.752,11.517 7.147,12.113 7.606,12.688C8.064,13.262 8.568,13.817 9.118,14.35C9.635,14.867 10.177,15.346 10.743,15.788C11.31,16.229 11.91,16.633 12.543,17L14.893,14.65C15.043,14.5 15.239,14.387 15.481,14.313C15.722,14.238 15.96,14.217 16.193,14.25L19.643,14.95C19.876,15.017 20.068,15.137 20.218,15.313C20.368,15.488 20.443,15.683 20.443,15.9V19.95C20.443,20.25 20.343,20.5 20.143,20.7C19.943,20.9 19.693,21 19.393,21ZM15.243,9.8L11.268,5.825C11.035,5.592 10.935,5.317 10.968,5C11.002,4.683 11.16,4.442 11.443,4.275C12.143,3.842 12.877,3.521 13.643,3.313C14.41,3.104 15.177,3 15.943,3C16.693,3 17.443,3.108 18.193,3.325C18.943,3.542 19.677,3.867 20.393,4.3C20.677,4.483 20.839,4.729 20.881,5.037C20.922,5.346 20.826,5.617 20.593,5.85L16.643,9.8C16.443,10 16.21,10.1 15.943,10.1C15.677,10.1 15.443,10 15.243,9.8Z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M23.135,20.765C23.298,20.922 23.494,21 23.723,21H28.723C28.953,21 29.149,20.922 29.312,20.765C29.475,20.608 29.557,20.42 29.557,20.2V13.8C29.557,13.58 29.475,13.392 29.312,13.235C29.149,13.078 28.953,13 28.723,13H25.734C25.623,13 25.517,13.02 25.416,13.06C25.316,13.1 25.227,13.157 25.151,13.23L23.13,15.17C23.053,15.243 22.994,15.328 22.953,15.425C22.911,15.522 22.89,15.623 22.89,15.73V20.2C22.89,20.42 22.972,20.608 23.135,20.765ZM25.93,17.612C25.661,17.862 25.3,18.176 24.847,18.553L24.479,18.864V19.6H27.975V18.779H25.887C26.298,18.43 26.63,18.133 26.885,17.888C27.14,17.638 27.366,17.346 27.564,17.011C27.762,16.676 27.861,16.324 27.861,15.957C27.861,15.49 27.718,15.115 27.43,14.832C27.142,14.544 26.729,14.4 26.192,14.4C25.701,14.4 25.295,14.546 24.975,14.839C24.659,15.131 24.491,15.56 24.472,16.126H25.435C25.439,15.853 25.505,15.638 25.633,15.482C25.76,15.322 25.942,15.242 26.177,15.242C26.413,15.242 26.588,15.31 26.701,15.447C26.814,15.584 26.871,15.773 26.871,16.013C26.871,16.277 26.781,16.546 26.602,16.82C26.423,17.093 26.199,17.357 25.93,17.612Z"
+      android:fillColor="@android:color/white"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_weather.xml b/packages/SystemUI/res/drawable/ic_weather.xml
new file mode 100644
index 0000000000000..1e4e1ae192e56
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_weather.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,12H7A5,5 0 0,1 12,7A5,5 0 0,1 17,12H21A1,1 0 0,1 22,13A1,1 0 0,1 21,14H3A1,1 0 0,1 2,13A1,1 0 0,1 3,12M5,16H19A1,1 0 0,1 20,17A1,1 0 0,1 19,18H5A1,1 0 0,1 4,17A1,1 0 0,1 5,16M17,20A1,1 0 0,1 18,21A1,1 0 0,1 17,22H7A1,1 0 0,1 6,21A1,1 0 0,1 7,20H17M15,12A3,3 0 0,0 12,9A3,3 0 0,0 9,12H15M12,2L14.39,5.42C13.65,5.15 12.84,5 12,5C11.16,5 10.35,5.15 9.61,5.42L12,2M3.34,7L7.5,6.65C6.9,7.16 6.36,7.78 5.94,8.5C5.5,9.24 5.25,10 5.11,10.79L3.34,7M20.65,7L18.88,10.79C18.74,10 18.47,9.23 18.05,8.5C17.63,7.78 17.1,7.15 16.5,6.64L20.65,7Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_24.xml b/packages/SystemUI/res/drawable/ic_wifi_24.xml
new file mode 100644
index 0000000000000..b390c0d9ccabc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_off_24.xml b/packages/SystemUI/res/drawable/ic_wifi_off_24.xml
new file mode 100644
index 0000000000000..4ad5e601dbfa7
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,11l2,-2c-3.73,-3.73 -8.87,-5.15 -13.7,-4.31l2.58,2.58c3.3,-0.02 6.61,1.22 9.12,3.73zM19,13c-1.08,-1.08 -2.36,-1.85 -3.72,-2.33l3.02,3.02 0.7,-0.69zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM3.41,1.64L2,3.05 5.05,6.1C3.59,6.83 2.22,7.79 1,9l2,2c1.23,-1.23 2.65,-2.16 4.17,-2.78l2.24,2.24C7.79,10.89 6.27,11.74 5,13l2,2c1.35,-1.35 3.11,-2.04 4.89,-2.06l7.08,7.08 1.41,-1.41L3.41,1.64z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_standard_4.xml b/packages/SystemUI/res/drawable/ic_wifi_standard_4.xml
new file mode 100644
index 0000000000000..87258f8231d5e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_standard_4.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Project Kaleidoscope
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M0.4,19.79L0.4,19l3.76,-5.39h1v5.21L6.27,18.82v1L5.18,19.82v1.79L4,21.61L4,19.79ZM1.69,18.79L4,18.79v-3.2Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_standard_5.xml b/packages/SystemUI/res/drawable/ic_wifi_standard_5.xml
new file mode 100644
index 0000000000000..be6c555e4d13d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_standard_5.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Project Kaleidoscope
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1.54,19.55a2,2 0,0 0,0.68 0.85,1.67 1.67,0 0,0 1,0.3 1.61,1.61 0,0 0,0.84 -0.21,1.44 1.44,0 0,0 0.54,-0.58A2,2 0,0 0,4.79 19a2,2 0,0 0,-0.2 -0.89A1.38,1.38 0,0 0,4 17.57a1.58,1.58 0,0 0,-0.82 -0.2,1.48 1.48,0 0,0 -0.78,0.19A1.26,1.26 0,0 0,2 18l-1,-0.25 0.55,-4.22H5.65v1H2.51l-0.28,2.06a2.65,2.65 0,0 1,1.22 -0.28,2.68 2.68,0 0,1 1.34,0.32 2.28,2.28 0,0 1,0.9 0.92A2.83,2.83 0,0 1,6 19a2.8,2.8 0,0 1,-0.36 1.44,2.39 2.39,0 0,1 -1,0.94 3.32,3.32 0,0 1,-1.48 0.32,2.93 2.93,0 0,1 -1.68,-0.46A2.24,2.24 0,0 1,0.57 20Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_standard_6.xml b/packages/SystemUI/res/drawable/ic_wifi_standard_6.xml
new file mode 100644
index 0000000000000..f9889a5bf7554
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_standard_6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Project Kaleidoscope
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M0.52,19a4.41,4.41 0,0 1,0.3 -1.6,8.21 8.21,0 0,1 1,-1.76l1.49,-2.1L4.79,13.54L3,16a10.64,10.64 0,0 0,-0.66 1,2.63 2.63,0 0,1 0.6,-0.25 2.54,2.54 0,0 1,0.68 -0.09,2.5 2.5,0 0,1 1.26,0.31 2.1,2.1 0,0 1,0.88 0.89,2.72 2.72,0 0,1 0.31,1.33 2.48,2.48 0,0 1,-0.36 1.33,2.35 2.35,0 0,1 -1,0.89 3.12,3.12 0,0 1,-1.42 0.31,3.1 3.1,0 0,1 -1.45,-0.33 2.38,2.38 0,0 1,-1 -0.93A2.7,2.7 0,0 1,0.52 19ZM1.8,19.13a1.5,1.5 0,0 0,0.41 1.11,1.49 1.49,0 0,0 1.09,0.4 1.46,1.46 0,0 0,1.09 -0.41,1.7 1.7,0 0,0 0,-2.2 1.46,1.46 0,0 0,-1.1 -0.41,1.55 1.55,0 0,0 -0.8,0.19 1.22,1.22 0,0 0,-0.52 0.51A1.73,1.73 0,0 0,1.8 19.16Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_wifi_standard_7.xml b/packages/SystemUI/res/drawable/ic_wifi_standard_7.xml
new file mode 100644
index 0000000000000..776e5db5efdb3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_wifi_standard_7.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 The LibreMobileOS Foundation
+
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M0.639,15.061L4.909,15.061L4.909,15.42L2.498,21.3L1.559,21.3L3.828,15.771L0.639,15.771Z"
+      android:strokeWidth="1"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_windows.xml b/packages/SystemUI/res/drawable/ic_windows.xml
new file mode 100644
index 0000000000000..543732f40d0ac
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_windows.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017-2025 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16.0dp"
+        android:height="16.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,12V6.75L9,5.43V11.91L3,12M20,3V11.75L10,11.9V5.21L20,3M3,13L9,13.09V19.9L3,18.75V13M20,13.25V22L10,20.09V13.1L20,13.25Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_xbox.xml b/packages/SystemUI/res/drawable/ic_xbox.xml
new file mode 100644
index 0000000000000..9cb3226127ff6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_xbox.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 Havoc-OS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="16.0dp"
+    android:width="16.0dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M6.43,3.72C6.5,3.66 6.57,3.6 6.62,3.56C8.18,2.55 10,2 12,2C13.88,2 15.64,2.5 17.14,3.42C17.25,3.5 17.54,3.69 17.7,3.88C16.25,2.28 12,5.7 12,5.7C10.5,4.57 9.17,3.8 8.16,3.5C7.31,3.29 6.73,3.5 6.46,3.7M19.34,5.21C19.29,5.16 19.24,5.11 19.2,5.06C18.84,4.66 18.38,4.56 18,4.59C17.61,4.71 15.9,5.32 13.8,7.31C13.8,7.31 16.17,9.61 17.62,11.96C19.07,14.31 19.93,16.16 19.4,18.73C21,16.95 22,14.59 22,12C22,9.38 21,7 19.34,5.21M15.73,12.96C15.08,12.24 14.13,11.21 12.86,9.95C12.59,9.68 12.3,9.4 12,9.1C12,9.1 11.53,9.56 10.93,10.17C10.16,10.94 9.17,11.95 8.61,12.54C7.63,13.59 4.81,16.89 4.65,18.74C4.65,18.74 4,17.28 5.4,13.89C6.3,11.68 9,8.36 10.15,7.28C10.15,7.28 9.12,6.14 7.82,5.35L7.77,5.32C7.14,4.95 6.46,4.66 5.8,4.62C5.13,4.67 4.71,5.16 4.71,5.16C3.03,6.95 2,9.35 2,12A10,10 0 0,0 12,22C14.93,22 17.57,20.74 19.4,18.73C19.4,18.73 19.19,17.4 17.84,15.5C17.53,15.07 16.37,13.69 15.73,12.96Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/keyguard_background_color.xml b/packages/SystemUI/res/drawable/keyguard_background_color.xml
new file mode 100644
index 0000000000000..e750317108b6e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/keyguard_background_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.55" android:color="?androidprv:attr/colorSurface" />
+</selector>
diff --git a/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
index 6ad46d837acd5..17a049591bf7c 100644
--- a/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
+++ b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
@@ -20,7 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-  <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
+  <solid android:color="@drawable/keyguard_background_color"/>
   <size
       android:width="@dimen/keyguard_affordance_fixed_width"
       android:height="@dimen/keyguard_affordance_fixed_height"/>
diff --git a/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml b/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml
new file mode 100644
index 0000000000000..bdc35775bb5c3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/left_tri_state_down_top_left_radius"
+                android:topRightRadius="@dimen/left_tri_state_down_top_right_radius"
+                android:bottomLeftRadius="@dimen/left_tri_state_down_bottom_left_radius"
+                android:bottomRightRadius="@dimen/left_tri_state_down_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml b/packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml
new file mode 100644
index 0000000000000..119471caf169b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/left_tri_state_up_top_left_radius"
+                android:topRightRadius="@dimen/left_tri_state_up_top_right_radius"
+                android:bottomLeftRadius="@dimen/left_tri_state_up_bottom_left_radius"
+                android:bottomRightRadius="@dimen/left_tri_state_up_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/lockscreen_widget_background_circle.xml b/packages/SystemUI/res/drawable/lockscreen_widget_background_circle.xml
new file mode 100644
index 0000000000000..61b50c3ff5128
--- /dev/null
+++ b/packages/SystemUI/res/drawable/lockscreen_widget_background_circle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    android:color="@*android:color/system_accent1_400"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@android:id/mask">
+        <shape
+            android:shape="rectangle">
+            <solid
+                android:color="@android:color/white" />
+            <corners
+                android:radius="100dp" />
+        </shape>
+    </item>
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid
+                android:color="@color/card_surface_color" />
+            <corners
+                android:radius="100dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/packages/SystemUI/res/drawable/lockscreen_widget_background_circle_aod.xml b/packages/SystemUI/res/drawable/lockscreen_widget_background_circle_aod.xml
new file mode 100644
index 0000000000000..99d14ff6bde42
--- /dev/null
+++ b/packages/SystemUI/res/drawable/lockscreen_widget_background_circle_aod.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="2dp"
+        android:color="#4DFFFFFF" />
+    <corners android:radius="100dp" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/lockscreen_widget_background_square.xml b/packages/SystemUI/res/drawable/lockscreen_widget_background_square.xml
new file mode 100644
index 0000000000000..51c2851a724ce
--- /dev/null
+++ b/packages/SystemUI/res/drawable/lockscreen_widget_background_square.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    android:color="@*android:color/system_accent1_400"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@android:id/mask">
+        <shape
+            android:shape="rectangle">
+            <solid
+                android:color="@android:color/white" />
+            <corners
+                android:radius="22dp" />
+        </shape>
+    </item>
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid
+                android:color="@color/card_surface_color" />
+            <corners
+                android:radius="22dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/packages/SystemUI/res/drawable/lockscreen_widget_background_square_aod.xml b/packages/SystemUI/res/drawable/lockscreen_widget_background_square_aod.xml
new file mode 100644
index 0000000000000..4262b73eeff7b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/lockscreen_widget_background_square_aod.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="2dp"
+        android:color="#4DFFFFFF" />
+    <corners android:radius="22dp" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml b/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml
index 592217bb0e8fc..4da675a271fb1 100644
--- a/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml
+++ b/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml
@@ -26,14 +26,6 @@
                 android:height="@dimen/media_output_dialog_item_height"/>
         </shape>
     </item>
-    <item android:id="@+id/contrast_dot" android:right="8dp" android:gravity="center_vertical|end">
-        <shape android:shape="oval">
-            <solid android:color="@color/media_dialog_seekbar_progress" />
-            <size
-                android:width="4dp"
-                android:height="4dp" />
-        </shape>
-    </item>
     <item android:id="@android:id/progress">
         <clip>
             <shape>
diff --git a/packages/SystemUI/res/drawable/media_seekbar_thumb.xml b/packages/SystemUI/res/drawable/media_seekbar_thumb.xml
index 5eb2bfdbee39e..2d3500a66139c 100644
--- a/packages/SystemUI/res/drawable/media_seekbar_thumb.xml
+++ b/packages/SystemUI/res/drawable/media_seekbar_thumb.xml
@@ -17,19 +17,18 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
                  xmlns:aapt="http://schemas.android.com/aapt">
     <aapt:attr name="android:drawable">
-        <vector android:height="16dp"
-                android:width="4dp"
-                android:viewportHeight="16"
-                android:viewportWidth="4">
+        <vector android:height="10dp"
+                android:width="20dp"
+                android:viewportHeight="10"
+                android:viewportWidth="20">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_0_G"
-                       android:translateX="2"
-                       android:translateY="8">
+                <group android:name="_R_G_L_0_G">
                     <path android:name="_R_G_L_0_G_D_0_P_0"
                           android:fillColor="#ffffff"
-                          android:fillAlpha="1"
+                          android:strokeLineJoin="miter"
+                          android:strokeLineCap="square"
                           android:fillType="nonZero"
-                          android:pathData=" M2 -6 C2,-6 2,6 2,6 C2,7.1 1.1,8 0,8 C0,8 0,8 0,8 C-1.1,8 -2,7.1 -2,6 C-2,6 -2,-6 -2,-6 C-2,-7.1 -1.1,-8 0,-8 C0,-8 0,-8 0,-8 C1.1,-8 2,-7.1 2,-6c "/>
+                          android:pathData="M5.44,0.77L14.52,0.77A4.28 4.28 0 0 1 18.81,5.05L18.81,5.05A4.28 4.28 0 0 1 14.52,9.33L5.44,9.33A4.28 4.28 0 0 1 1.16,5.05L1.16,5.05A4.28 4.28 0 0 1 5.44,0.77z"/>
                 </group>
             </group>
             <group android:name="time_group"/>
diff --git a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
index e1e60920ab01b..61996f7e1bc9b 100644
--- a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
+++ b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
@@ -29,7 +29,7 @@
                 <!-- TODO(b/294830092): Update to the blur surface effect color token when
                                         the resource workaround is resolved and
                                         notification_shade_blur is enabled. -->
-                <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh" />
+                <solid android:color="@androidprv:color/materialColorSurfaceBright" />
             </shape>
         </inset>
     </item>
diff --git a/packages/SystemUI/res/drawable/notification_guts_bg.xml b/packages/SystemUI/res/drawable/notification_guts_bg.xml
index 200976b1fb31d..69cdba5e3b21e 100644
--- a/packages/SystemUI/res/drawable/notification_guts_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_guts_bg.xml
@@ -17,7 +17,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh" />
+    <solid android:color="@androidprv:color/materialColorSurfaceBright" />
     <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
     <corners android:radius="1dp" />
 </shape>
diff --git a/packages/SystemUI/res/drawable/notification_material_bg.xml b/packages/SystemUI/res/drawable/notification_material_bg.xml
index db3b969cca395..089898aa84205 100644
--- a/packages/SystemUI/res/drawable/notification_material_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_material_bg.xml
@@ -20,7 +20,7 @@
         android:color="?android:attr/colorControlHighlight">
     <item>
         <shape>
-            <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh" />
+            <solid android:color="@androidprv:color/materialColorSurfaceBright" />
         </shape>
     </item>
     <item>
diff --git a/packages/SystemUI/res/drawable/nt_charge_glare.png b/packages/SystemUI/res/drawable/nt_charge_glare.png
new file mode 100644
index 0000000000000..ca6c16bb50fa0
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_glare.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_01.png b/packages/SystemUI/res/drawable/nt_charge_ripple_01.png
new file mode 100644
index 0000000000000..e3ebf23a55f3d
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_01.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_02.png b/packages/SystemUI/res/drawable/nt_charge_ripple_02.png
new file mode 100644
index 0000000000000..a2b95ba2b65a5
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_02.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_03.png b/packages/SystemUI/res/drawable/nt_charge_ripple_03.png
new file mode 100644
index 0000000000000..0dedee7cf2f84
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_03.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_04.png b/packages/SystemUI/res/drawable/nt_charge_ripple_04.png
new file mode 100644
index 0000000000000..a97171bb3fc5f
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_04.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_05.png b/packages/SystemUI/res/drawable/nt_charge_ripple_05.png
new file mode 100644
index 0000000000000..05192a293efa5
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_05.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_06.png b/packages/SystemUI/res/drawable/nt_charge_ripple_06.png
new file mode 100644
index 0000000000000..d9107767f45e2
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_06.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_07.png b/packages/SystemUI/res/drawable/nt_charge_ripple_07.png
new file mode 100644
index 0000000000000..f1947a671c74d
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_07.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_08.png b/packages/SystemUI/res/drawable/nt_charge_ripple_08.png
new file mode 100644
index 0000000000000..ad2e5de20fa75
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_08.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_09.png b/packages/SystemUI/res/drawable/nt_charge_ripple_09.png
new file mode 100644
index 0000000000000..1f8bcf3b843a0
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_09.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_10.png b/packages/SystemUI/res/drawable/nt_charge_ripple_10.png
new file mode 100644
index 0000000000000..6e4209de3b6da
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_10.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_11.png b/packages/SystemUI/res/drawable/nt_charge_ripple_11.png
new file mode 100644
index 0000000000000..a4a03f1ef5eb1
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_11.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_12.png b/packages/SystemUI/res/drawable/nt_charge_ripple_12.png
new file mode 100644
index 0000000000000..b41d33194f225
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_12.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_13.png b/packages/SystemUI/res/drawable/nt_charge_ripple_13.png
new file mode 100644
index 0000000000000..b1a52b0eaf9fd
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_13.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_14.png b/packages/SystemUI/res/drawable/nt_charge_ripple_14.png
new file mode 100644
index 0000000000000..5417ffb52c086
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_14.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_15.png b/packages/SystemUI/res/drawable/nt_charge_ripple_15.png
new file mode 100644
index 0000000000000..60c4a9bde2d33
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_15.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_16.png b/packages/SystemUI/res/drawable/nt_charge_ripple_16.png
new file mode 100644
index 0000000000000..2abdcacee30f9
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_16.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_17.png b/packages/SystemUI/res/drawable/nt_charge_ripple_17.png
new file mode 100644
index 0000000000000..60d2cd07e37b6
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_17.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_18.png b/packages/SystemUI/res/drawable/nt_charge_ripple_18.png
new file mode 100644
index 0000000000000..f7b24942787b1
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_18.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_19.png b/packages/SystemUI/res/drawable/nt_charge_ripple_19.png
new file mode 100644
index 0000000000000..150065a204177
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_19.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_20.png b/packages/SystemUI/res/drawable/nt_charge_ripple_20.png
new file mode 100644
index 0000000000000..523c51dae3a10
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_20.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_21.png b/packages/SystemUI/res/drawable/nt_charge_ripple_21.png
new file mode 100644
index 0000000000000..07ff475c8d83a
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_21.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_22.png b/packages/SystemUI/res/drawable/nt_charge_ripple_22.png
new file mode 100644
index 0000000000000..6cd2cf5e34a68
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_22.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_23.png b/packages/SystemUI/res/drawable/nt_charge_ripple_23.png
new file mode 100644
index 0000000000000..68a5ccffceb84
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_23.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_24.png b/packages/SystemUI/res/drawable/nt_charge_ripple_24.png
new file mode 100644
index 0000000000000..dabc956b01a8d
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_24.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_25.png b/packages/SystemUI/res/drawable/nt_charge_ripple_25.png
new file mode 100644
index 0000000000000..bb058bee6b59d
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_25.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_26.png b/packages/SystemUI/res/drawable/nt_charge_ripple_26.png
new file mode 100644
index 0000000000000..b1c493df2f20c
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_26.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_27.png b/packages/SystemUI/res/drawable/nt_charge_ripple_27.png
new file mode 100644
index 0000000000000..eb9bc6619db4a
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_27.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_28.png b/packages/SystemUI/res/drawable/nt_charge_ripple_28.png
new file mode 100644
index 0000000000000..5818c6355e67f
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_28.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_29.png b/packages/SystemUI/res/drawable/nt_charge_ripple_29.png
new file mode 100644
index 0000000000000..0df05a9e3f20c
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_29.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_30.png b/packages/SystemUI/res/drawable/nt_charge_ripple_30.png
new file mode 100644
index 0000000000000..f97cf10f133bd
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_30.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_31.png b/packages/SystemUI/res/drawable/nt_charge_ripple_31.png
new file mode 100644
index 0000000000000..4bfa080c05f02
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_31.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_32.png b/packages/SystemUI/res/drawable/nt_charge_ripple_32.png
new file mode 100644
index 0000000000000..cab38a5f8da8e
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_32.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_33.png b/packages/SystemUI/res/drawable/nt_charge_ripple_33.png
new file mode 100644
index 0000000000000..234a75d7a4920
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_33.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_34.png b/packages/SystemUI/res/drawable/nt_charge_ripple_34.png
new file mode 100644
index 0000000000000..bbb8b09aa68b8
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_34.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_35.png b/packages/SystemUI/res/drawable/nt_charge_ripple_35.png
new file mode 100644
index 0000000000000..db52211da80b7
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_35.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_36.png b/packages/SystemUI/res/drawable/nt_charge_ripple_36.png
new file mode 100644
index 0000000000000..82f776d0b6b02
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_36.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_37.png b/packages/SystemUI/res/drawable/nt_charge_ripple_37.png
new file mode 100644
index 0000000000000..1ae786a66f52d
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_37.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_38.png b/packages/SystemUI/res/drawable/nt_charge_ripple_38.png
new file mode 100644
index 0000000000000..fbd375cc07008
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_38.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_39.png b/packages/SystemUI/res/drawable/nt_charge_ripple_39.png
new file mode 100644
index 0000000000000..d83fd23d2a8cd
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_39.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_40.png b/packages/SystemUI/res/drawable/nt_charge_ripple_40.png
new file mode 100644
index 0000000000000..e7c92d8e3b188
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_40.png differ
diff --git a/packages/SystemUI/res/drawable/nt_charge_ripple_41.png b/packages/SystemUI/res/drawable/nt_charge_ripple_41.png
new file mode 100644
index 0000000000000..8df09fd14bb58
Binary files /dev/null and b/packages/SystemUI/res/drawable/nt_charge_ripple_41.png differ
diff --git a/packages/SystemUI/res/drawable/nt_statusbar_icon_internet_speed.xml b/packages/SystemUI/res/drawable/nt_statusbar_icon_internet_speed.xml
new file mode 100644
index 0000000000000..f745f9172d6ed
--- /dev/null
+++ b/packages/SystemUI/res/drawable/nt_statusbar_icon_internet_speed.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6.321,10H5.207V4.618L3.564,5.18V4.236L6.179,3.274H6.321V10ZM13.158,10H8.651V9.231L10.884,6.796C11.206,6.437 11.435,6.137 11.57,5.898C11.708,5.656 11.777,5.413 11.777,5.171C11.777,4.851 11.686,4.594 11.505,4.397C11.327,4.201 11.086,4.103 10.782,4.103C10.42,4.103 10.139,4.213 9.94,4.434C9.74,4.655 9.641,4.957 9.641,5.341H8.522C8.522,4.933 8.614,4.566 8.798,4.241C8.985,3.912 9.251,3.658 9.595,3.476C9.941,3.295 10.34,3.205 10.792,3.205C11.442,3.205 11.955,3.369 12.329,3.697C12.707,4.023 12.896,4.474 12.896,5.051C12.896,5.385 12.8,5.737 12.61,6.105C12.423,6.47 12.114,6.886 11.685,7.353L10.046,9.107H13.158V10ZM14.778,8.821C14.987,8.821 15.148,8.881 15.262,9.001C15.375,9.118 15.432,9.265 15.432,9.443C15.432,9.618 15.375,9.764 15.262,9.88C15.148,9.994 14.987,10.051 14.778,10.051C14.579,10.051 14.421,9.994 14.304,9.88C14.188,9.767 14.129,9.621 14.129,9.443C14.129,9.265 14.186,9.118 14.3,9.001C14.413,8.881 14.573,8.821 14.778,8.821ZM19.815,7.196C19.441,7.592 19.003,7.79 18.503,7.79C17.914,7.79 17.444,7.585 17.094,7.173C16.744,6.759 16.569,6.216 16.569,5.544C16.569,5.102 16.658,4.701 16.836,4.342C17.014,3.983 17.268,3.704 17.596,3.504C17.924,3.305 18.305,3.205 18.738,3.205C19.413,3.205 19.948,3.456 20.344,3.96C20.74,4.463 20.938,5.137 20.938,5.981V6.294C20.938,7.503 20.665,8.425 20.119,9.061C19.573,9.696 18.758,10.018 17.674,10.028H17.541V9.102H17.702C18.362,9.093 18.868,8.935 19.221,8.628C19.574,8.318 19.772,7.841 19.815,7.196ZM18.738,6.915C18.962,6.915 19.172,6.851 19.368,6.722C19.565,6.593 19.717,6.415 19.824,6.188V5.751C19.824,5.257 19.723,4.859 19.52,4.558C19.318,4.258 19.055,4.107 18.733,4.107C18.411,4.107 18.153,4.241 17.96,4.508C17.769,4.772 17.674,5.106 17.674,5.511C17.674,5.932 17.771,6.271 17.964,6.529C18.158,6.787 18.416,6.915 18.738,6.915Z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6.038,14.973L7.488,18.826L8.935,14.973H10.064V20H9.194V18.343L9.28,16.126L7.796,20H7.171L5.689,16.129L5.776,18.343V20H4.906V14.973H6.038ZM11.1,20V14.973H12.823C13.392,14.973 13.824,15.087 14.121,15.314C14.418,15.542 14.567,15.882 14.567,16.333C14.567,16.563 14.505,16.77 14.38,16.955C14.256,17.139 14.074,17.281 13.835,17.383C14.106,17.456 14.316,17.596 14.463,17.801C14.613,18.003 14.688,18.247 14.688,18.532C14.688,19.004 14.536,19.367 14.232,19.62C13.93,19.873 13.498,20 12.934,20H11.1ZM11.974,17.732V19.302H12.944C13.218,19.302 13.432,19.235 13.586,19.099C13.74,18.963 13.817,18.774 13.817,18.532C13.817,18.01 13.55,17.743 13.016,17.732H11.974ZM11.974,17.089H12.83C13.101,17.089 13.313,17.028 13.465,16.906C13.62,16.782 13.697,16.607 13.697,16.381C13.697,16.133 13.625,15.953 13.483,15.843C13.342,15.732 13.122,15.677 12.823,15.677H11.974V17.089ZM15.717,20.432H15.057L17.035,14.973H17.695L15.717,20.432ZM20.371,18.985C20.371,18.835 20.309,18.721 20.184,18.643C20.063,18.565 19.859,18.496 19.573,18.436C19.288,18.376 19.05,18.3 18.859,18.208C18.44,18.005 18.23,17.712 18.23,17.327C18.23,17.005 18.366,16.736 18.638,16.52C18.909,16.303 19.254,16.195 19.673,16.195C20.12,16.195 20.48,16.306 20.754,16.526C21.03,16.747 21.169,17.034 21.169,17.386H20.33C20.33,17.225 20.27,17.092 20.15,16.986C20.03,16.878 19.871,16.823 19.673,16.823C19.489,16.823 19.338,16.866 19.221,16.951C19.106,17.036 19.049,17.15 19.049,17.293C19.049,17.422 19.103,17.522 19.211,17.593C19.319,17.665 19.538,17.737 19.867,17.811C20.196,17.882 20.454,17.969 20.64,18.07C20.829,18.169 20.968,18.288 21.058,18.429C21.15,18.569 21.196,18.74 21.196,18.94C21.196,19.276 21.057,19.549 20.778,19.758C20.5,19.965 20.135,20.069 19.684,20.069C19.378,20.069 19.105,20.014 18.865,19.903C18.626,19.793 18.44,19.641 18.306,19.448C18.173,19.254 18.106,19.046 18.106,18.823H18.921C18.932,19.021 19.007,19.174 19.145,19.282C19.283,19.388 19.466,19.441 19.694,19.441C19.915,19.441 20.083,19.399 20.198,19.316C20.313,19.231 20.371,19.121 20.371,18.985Z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/outline_rounded_secondary_card.xml b/packages/SystemUI/res/drawable/outline_rounded_secondary_card.xml
new file mode 100644
index 0000000000000..211f7dfaf477e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/outline_rounded_secondary_card.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="@dimen/enhanced_smartspace_secondary_card_corner_radius" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml b/packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml
index d7a9edcbc31f1..45efa41bab9a4 100644
--- a/packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml
+++ b/packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml
@@ -15,6 +15,6 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?android:attr/colorBackground"/>
-    <corners android:topLeftRadius="20dp"
-             android:topRightRadius="20dp" />
+    <corners android:topLeftRadius="?android:attr/dialogCornerRadius"
+             android:topRightRadius="?android:attr/dialogCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/qs_customizer_toolbar.xml b/packages/SystemUI/res/drawable/qs_customizer_toolbar.xml
index f1a24aa7af9d0..e138d094f8697 100644
--- a/packages/SystemUI/res/drawable/qs_customizer_toolbar.xml
+++ b/packages/SystemUI/res/drawable/qs_customizer_toolbar.xml
@@ -16,5 +16,6 @@
 <inset xmlns:android="http://schemas.android.com/apk/res/android">
     <shape>
         <solid android:color="?attr/underSurface"/>
+        <corners android:radius="?android:attr/dialogCornerRadius" />
     </shape>
 </inset>
diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml
new file mode 100644
index 0000000000000..b43ba9357107d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml
@@ -0,0 +1,43 @@
+<?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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="@dimen/qs_footer_action_inset">
+    <ripple
+        android:color="?android:attr/colorControlHighlight">
+        <item android:id="@android:id/mask">
+            <!-- We make this shape a rounded rectangle instead of a oval so that it can animate -->
+            <!-- properly into an app/dialog. -->
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="?attr/shadeActive"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+            </shape>
+        </item>
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="@color/qs_footer_power_button_overlay_color"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
+            </shape>
+        </item>
+
+    </ripple>
+</inset>
diff --git a/packages/SystemUI/res/drawable/qs_header_image_view_outline.xml b/packages/SystemUI/res/drawable/qs_header_image_view_outline.xml
new file mode 100644
index 0000000000000..12740c8429ae7
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_header_image_view_outline.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <corners android:radius="1dp" android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="@*android:dimen/rounded_corner_radius" android:bottomRightRadius="@*android:dimen/rounded_corner_radius" />
+</shape>
diff --git a/packages/SystemUI/res/drawable/qs_media_art_background.xml b/packages/SystemUI/res/drawable/qs_media_art_background.xml
index e59f82b77908e..a73f36bff37ad 100644
--- a/packages/SystemUI/res/drawable/qs_media_art_background.xml
+++ b/packages/SystemUI/res/drawable/qs_media_art_background.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#FF000000" />
-    <corners android:radius="@dimen/notification_corner_radius"/>
+    <corners android:radius="@dimen/media_notification_corner_radius"/>
 </shape>
diff --git a/packages/SystemUI/res/drawable/qs_media_background.xml b/packages/SystemUI/res/drawable/qs_media_background.xml
index 830c882e1010f..e0f7dc9d91c73 100644
--- a/packages/SystemUI/res/drawable/qs_media_background.xml
+++ b/packages/SystemUI/res/drawable/qs_media_background.xml
@@ -17,4 +17,4 @@
 <com.android.systemui.media.controls.ui.drawable.IlluminationDrawable
     xmlns:systemui="http://schemas.android.com/apk/res-auto"
     systemui:highlight="15"
-    systemui:cornerRadius="@dimen/notification_corner_radius" />
\ No newline at end of file
+    systemui:cornerRadius="@dimen/media_notification_corner_radius" />
diff --git a/packages/SystemUI/res/drawable/qs_media_outline_album_bg.xml b/packages/SystemUI/res/drawable/qs_media_outline_album_bg.xml
index ecd3876356bc0..fd627bbf76b4a 100644
--- a/packages/SystemUI/res/drawable/qs_media_outline_album_bg.xml
+++ b/packages/SystemUI/res/drawable/qs_media_outline_album_bg.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#FFFFFFFF" />
-    <corners android:radius="@dimen/notification_corner_radius"/>
+    <corners android:radius="@dimen/media_notification_corner_radius"/>
 </shape>
diff --git a/packages/SystemUI/res/drawable/qs_media_outline_layout_bg.xml b/packages/SystemUI/res/drawable/qs_media_outline_layout_bg.xml
index 4ba45c47f7fda..40feeebd8a7bd 100644
--- a/packages/SystemUI/res/drawable/qs_media_outline_layout_bg.xml
+++ b/packages/SystemUI/res/drawable/qs_media_outline_layout_bg.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#00000000" />
-    <corners android:radius="@dimen/notification_corner_radius"/>
+    <corners android:radius="@dimen/media_notification_corner_radius"/>
 </shape>
diff --git a/packages/SystemUI/res/drawable/qs_smart_pixels_icon_off.xml b/packages/SystemUI/res/drawable/qs_smart_pixels_icon_off.xml
new file mode 100644
index 0000000000000..1a7a98189f570
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_smart_pixels_icon_off.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,4.52 -3.13,8.69 -7,9.93C8.13,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/qs_smart_pixels_icon_on.xml b/packages/SystemUI/res/drawable/qs_smart_pixels_icon_on.xml
new file mode 100644
index 0000000000000..fa110b9c35490
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_smart_pixels_icon_on.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1z" />
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M7,6.5v9.5c0.95,1.32 2.14,2.44 3.5,3.28V6h-1.5C8.45,6 7.73,6.17 7,6.5z" />
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M11,5.17v14.08c0.33,0.09 0.66,0.17 1,0.23c0.34,-0.06 0.67,-0.14 1,-0.23V5.17c-0.33,-0.06 -0.66,-0.11 -1,-0.14C11.66,5.06 11.33,5.11 11,5.17z" />
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M15,6h-1.5v13.28c1.36,-0.84 2.55,-1.96 3.5,-3.28V6.5C16.27,6.17 15.55,6 15,6z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml b/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml
new file mode 100644
index 0000000000000..884974da2e5cc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/right_tri_state_down_top_left_radius"
+                android:topRightRadius="@dimen/right_tri_state_down_top_right_radius"
+                android:bottomLeftRadius="@dimen/right_tri_state_down_bottom_left_radius"
+                android:bottomRightRadius="@dimen/right_tri_state_down_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml b/packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml
new file mode 100644
index 0000000000000..1c26d6f6ad699
--- /dev/null
+++ b/packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/right_tri_state_up_top_left_radius"
+                android:topRightRadius="@dimen/right_tri_state_up_top_right_radius"
+                android:bottomLeftRadius="@dimen/right_tri_state_up_bottom_left_radius"
+                android:bottomRightRadius="@dimen/right_tri_state_up_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/rounded_ripple.xml b/packages/SystemUI/res/drawable/rounded_ripple.xml
index d9ed8233d8865..8557ed31f43bb 100644
--- a/packages/SystemUI/res/drawable/rounded_ripple.xml
+++ b/packages/SystemUI/res/drawable/rounded_ripple.xml
@@ -18,13 +18,13 @@
     <item android:id="@android:id/mask">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
             <solid android:color="#FFFFFFFF"/>
-            <corners android:radius="8dp"/>
+            <corners android:radius="?android:attr/dialogCornerRadius"/>
         </shape>
     </item>
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="?android:attr/colorBackgroundFloating"/>
-            <corners android:radius="8dp"/>
+            <corners android:radius="?android:attr/dialogCornerRadius"/>
         </shape>
     </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg.xml b/packages/SystemUI/res/drawable/sb_date_bg.xml
new file mode 100644
index 0000000000000..82b6bbd0af0e7
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/system_accent1_300"/>
+    <corners android:radius="28dp"/>
+</shape>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg1.xml b/packages/SystemUI/res/drawable/sb_date_bg1.xml
new file mode 100644
index 0000000000000..c7e606a688997
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/system_accent1_300"/>
+            <corners android:radius="@dimen/chip_corner_radius"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg10.xml b/packages/SystemUI/res/drawable/sb_date_bg10.xml
new file mode 100644
index 0000000000000..01f20a3342927
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg10.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleDark">
+        <item android:top="0dp" android:bottom="0dp">
+            <shape android:shape="rectangle">
+                <gradient
+                    android:angle="0.0"
+                    android:endColor="@android:color/system_accent1_300"
+                    android:startColor="@android:color/system_accent2_300" />
+                <corners android:radius="28dp" />
+            </shape>
+        </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg11.xml b/packages/SystemUI/res/drawable/sb_date_bg11.xml
new file mode 100644
index 0000000000000..f963ee34d6027
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg11.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleDark">
+        <item android:top="0dp" android:bottom="0dp">
+            <shape android:shape="rectangle">
+                <gradient
+                    android:angle="0.0"
+                    android:endColor="@android:color/system_accent1_300"
+                    android:startColor="@android:color/system_accent2_300" />
+                <corners
+                    android:bottomLeftRadius="8dp"
+                    android:bottomRightRadius="28dp"
+                    android:topLeftRadius="28dp"
+                    android:topRightRadius="8dp" />
+            </shape>
+        </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg12.xml b/packages/SystemUI/res/drawable/sb_date_bg12.xml
new file mode 100644
index 0000000000000..52706ea5b1581
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg12.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:top="0dp" android:bottom="0dp">
+            <shape>
+                <gradient
+                    android:angle="270.0"
+                    android:endColor="@android:color/system_accent1_300"
+                    android:startColor="@android:color/system_accent2_300" />
+                <corners android:radius="24.0dp" />
+            </shape>
+        </item>
+        <item
+            android:bottom="12.0dp"
+            android:end="2.0dp"
+            android:start="2.0dp"
+            android:top="2.0dp">
+            <shape>
+                <gradient
+                    android:angle="90.0"
+                    android:endColor="@android:color/system_accent1_300"
+                    android:startColor="@android:color/system_accent2_300" />
+                <corners android:radius="22.0dp" />
+            </shape>
+        </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg2.xml b/packages/SystemUI/res/drawable/sb_date_bg2.xml
new file mode 100644
index 0000000000000..5090aec6890d8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@android:color/system_accent1_300"/>
+            <corners android:radius="@dimen/chip_corner_radius"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg3.xml b/packages/SystemUI/res/drawable/sb_date_bg3.xml
new file mode 100644
index 0000000000000..e522f3680cb97
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg3.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape>
+            <gradient
+                android:type="linear"
+                android:angle="90"
+                android:startColor="@android:color/system_accent1_300"
+                android:endColor="@android:color/system_accent3_300" />
+            <corners android:radius="@dimen/chip_corner_radius"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg4.xml b/packages/SystemUI/res/drawable/sb_date_bg4.xml
new file mode 100644
index 0000000000000..50ce5a75dd179
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg4.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleDark">
+        <item android:top="0dp" android:bottom="0dp">
+            <shape android:shape="rectangle">
+                <gradient
+                    android:angle="0.0"
+                    android:endColor="@android:color/holo_green_light"
+                    android:startColor="@android:color/holo_blue_light" />
+                <corners
+                    android:bottomLeftRadius="16dp"
+                    android:bottomRightRadius="16dp"
+                    android:topLeftRadius="16dp"
+                    android:topRightRadius="16dp" />
+            </shape>
+        </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg5.xml b/packages/SystemUI/res/drawable/sb_date_bg5.xml
new file mode 100644
index 0000000000000..426e7090a618a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg5.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape>
+            <gradient
+                android:angle="0.0"
+                android:endColor="@android:color/holo_green_light"
+                android:startColor="@android:color/holo_blue_light" />
+            <corners android:radius="24.0dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="2.0dp"
+        android:end="2.0dp"
+        android:start="2.0dp"
+        android:top="2.0dp">
+        <shape>
+            <gradient
+                android:angle="270"
+                android:endColor="@color/neumorph_outline_end"
+                android:startColor="@color/neumorph_outline_start"
+                android:type="linear" />
+            <corners android:radius="22.0dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="4.0dp"
+        android:end="4.0dp"
+        android:start="4.0dp"
+        android:top="4.0dp">
+        <shape>
+            <gradient
+                android:angle="90"
+                android:endColor="@color/neumorph_outline_end"
+                android:startColor="@color/neumorph_outline_start"
+                android:type="linear" />
+            <corners android:radius="20.0dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg6.xml b/packages/SystemUI/res/drawable/sb_date_bg6.xml
new file mode 100644
index 0000000000000..f8557a89693d4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape>
+            <gradient
+                android:angle="270.0"
+                android:endColor="@android:color/holo_green_light"
+                android:startColor="@android:color/holo_blue_light" />
+            <corners android:radius="24.0dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="2.0dp"
+        android:end="2.0dp"
+        android:start="2.0dp"
+        android:top="2.0dp">
+        <shape>
+            <gradient
+                android:angle="90.0"
+                android:endColor="@android:color/holo_green_light"
+                android:startColor="@android:color/holo_blue_light" />
+            <corners android:radius="22.0dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg7.xml b/packages/SystemUI/res/drawable/sb_date_bg7.xml
new file mode 100644
index 0000000000000..172b309149031
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg7.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape>
+            <gradient
+                android:angle="0.0"
+                android:endColor="@android:color/holo_green_light"
+                android:startColor="@android:color/holo_blue_light" />
+            <corners android:radius="24.0dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#40000000" />
+            <corners android:radius="24.0dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="2.0dp"
+        android:end="2.0dp"
+        android:start="2.0dp"
+        android:top="2.0dp">
+        <shape>
+            <gradient
+                android:angle="0.0"
+                android:endColor="@android:color/holo_green_light"
+                android:startColor="@android:color/holo_blue_light" />
+            <corners android:radius="22.0dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg8.xml b/packages/SystemUI/res/drawable/sb_date_bg8.xml
new file mode 100644
index 0000000000000..c35ff8667c890
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg8.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleDark">
+        <item android:top="0dp" android:bottom="0dp">
+            <shape android:shape="rectangle">
+                <stroke
+                    android:width="2dp"
+                    android:color="@android:color/holo_blue_light" />
+                <corners
+                    android:bottomLeftRadius="8dp"
+                    android:bottomRightRadius="28dp"
+                    android:topLeftRadius="28dp"
+                    android:topRightRadius="8dp" />
+            </shape>
+        </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/sb_date_bg9.xml b/packages/SystemUI/res/drawable/sb_date_bg9.xml
new file mode 100644
index 0000000000000..2bd20dd9939f8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/sb_date_bg9.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:bottom="0dp">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorAccent"/>
+            <corners android:radius="28dp"/>
+        </shape>
+    </item>
+    <item android:top="0dp" android:bottom="0dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#40000000"/>
+            <corners android:radius="28dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_0.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_0.xml
index 3559e09db09b4..a5a5c7dd55d66 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_0.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_0.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,15.3V15.94h3V15.3Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V13.3167H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml
index 50c9438c707dc..7af2d7309adde 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,13.6V15.94h3V13.6Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V12.1833H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml
index 0c82aa5c65eda..f4c6655f54953 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,11.9V15.94h3V11.9Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V10.2H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0047,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0047,11.5388L7.9588,8.5L11.0047,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml
index 0f394873af2dc..af20c4ff350cd 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,10.2V15.94h3V10.2Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM16.5833,2.8333H15.1667V9.35H16.5833V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0047,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0047,11.5388L7.9588,8.5L11.0047,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml
index 6a613d9f625e5..04c5b18d55d31 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,8.5V15.94h3V8.5Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V7.0833H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml
index df0f93d9e0261..964d2e173fc00 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,6.8V15.94h3V6.8Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V6.2333H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_6.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_6.xml
index 4924deada67df..7599f9a89fafd 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_6.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_6.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,5.1V15.94h3V5.1Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V5.3833H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_7.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_7.xml
index 4c4ae035aa231..9017d36ad4f3d 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_7.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_7.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,3.4V15.94h3V3.4Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V4.5333H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0046,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0046,11.5388L7.9588,8.5L11.0046,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.3929,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.3929,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_8.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_8.xml
index 6ba978aee1119..06de4b3acd88a 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_8.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_8.xml
@@ -1,47 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#4DFFFFFF"/>
-        <path
-            android:pathData="M15.77,1.7V15.94h3V1.7Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M14.4583,1.4167C14.0671,1.4167 13.75,1.7338 13.75,2.125V14.875C13.75,15.2662 14.0671,15.5833 14.4583,15.5833H17.2917C17.6829,15.5833 18,15.2662 18,14.875V2.125C18,1.7338 17.6829,1.4167 17.2917,1.4167H14.4583ZM15.1667,2.8333H16.5833V3.6833H15.1667V2.8333Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.0047,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0047,11.5388L7.9588,8.5L11.0047,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.393,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.393,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_9.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_9.xml
index 26ff151418a64..a0595229d1188 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_9.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_9.xml
@@ -1,44 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2017, 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.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="17dp"
-        android:viewportWidth="21.0"
-        android:viewportHeight="18.0">
-    <group
-        android:scaleX="0.75"
-        android:scaleY="0.75">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-    </group>
-    <group
-        android:translateY="0.5"
-        android:translateX="0.5" >
-        <path
-            android:pathData="M15.77,1.064V15.94h3V1.064Z"
-            android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="20dp"
+    android:height="17dp"
+    android:viewportWidth="20"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M13.75,2.125C13.75,1.7338 14.0671,1.4167 14.4583,1.4167H17.2917C17.6829,1.4167 18,1.7338 18,2.125V14.875C18,15.2662 17.6829,15.5833 17.2917,15.5833H14.4583C14.0671,15.5833 13.75,15.2662 13.75,14.875V2.125Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M11.0047,5.4613L6.9601,1.4167H6.2517V6.7929L3.0005,3.5417L2.0017,4.5404L5.9613,8.5L2.0017,12.4596L3.0005,13.4583L6.2517,10.2071V15.5833H6.9601L11.0047,11.5388L7.9588,8.5L11.0047,5.4613ZM3.4184,7.7917C3.0272,7.4005 2.393,7.4005 2.0017,7.7917C1.6105,8.1829 1.6105,8.8171 2.0017,9.2083C2.393,9.5995 3.0272,9.5995 3.4184,9.2083C3.8096,8.8171 3.8096,8.1829 3.4184,7.7917ZM9.0001,5.4613L7.6684,4.1296V6.7929L9.0001,5.4613ZM9.0001,11.5388L7.6684,12.8704V10.2071L9.0001,11.5388ZM10.5017,7.7917C10.8929,7.4005 11.5272,7.4005 11.9184,7.7917C12.3096,8.1829 12.3096,8.8171 11.9184,9.2083C11.5272,9.5995 10.8929,9.5995 10.5017,9.2083C10.1105,8.8171 10.1105,8.1829 10.5017,7.7917Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_nfc.xml b/packages/SystemUI/res/drawable/stat_sys_nfc.xml
new file mode 100644
index 0000000000000..68d8eb08001c8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_nfc.xml
@@ -0,0 +1,36 @@
+<!--
+     Copyright (C) 2016 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="2.5dp"
+    android:insetRight="2.5dp">
+<vector
+    android:width="17dp"
+    android:height="17dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10.59,7.66C10.59,7.66 11.19,7.39 11.57,7.82C11.95,8.26 12.92,9.94 12.92,11.62C12.92,13.3
+12.5,15.09 12.05,15.68C11.62,16.28 11.19,16.28 10.86,16.06C10.54,15.85 5.5,12 5.23,11.89C4.95,11.78 4.85,12.05
+5.12,13.5C5.39,15 4.95,15.41 4.57,15.47C4.2,15.5 3.06,15.2 3,12.16C2.95,9.13 3.76,8.64 4.14,8.64C4.85,8.64 10.27,13.5
+10.64,13.46C10.97,13.41 11.13,11.35 10.5,9.72C9.78,7.96 10.59,7.66 10.59,7.66M19.3,4.63C21.12,8.24 21,11.66 21,12C21,12.34
+21.12,15.76 19.3,19.37C19.3,19.37 18.83,19.92 18.12,19.59C17.42,19.26 17.66,18.4 17.66,18.4C17.66,18.4 19.14,15.55 19.1,12.05V12C19.14,8.5
+17.66,5.6 17.66,5.6C17.66,5.6 17.42,4.74 18.12,4.41C18.83,4.08 19.3,4.63 19.3,4.63M15.77,6.25C17.26,8.96 17.16,11.66 17.14,12C17.16,12.34
+17.26,14.92 15.77,17.85C15.77,17.85 15.3,18.4 14.59,18.07C13.89,17.74 14.13,16.88 14.13,16.88C14.13,16.88 15.09,15.5 15.24,12.05V12C15.14,8.53
+14.13,7.23 14.13,7.23C14.13,7.23 13.89,6.36 14.59,6.04C15.3,5.71 15.77,6.25 15.77,6.25Z" />
+</vector>
+</inset>
diff --git a/packages/SystemUI/res/drawable/statusbar_chip_bg.xml b/packages/SystemUI/res/drawable/statusbar_chip_bg.xml
index d7de16d7c5bb7..551a0125eb12b 100644
--- a/packages/SystemUI/res/drawable/statusbar_chip_bg.xml
+++ b/packages/SystemUI/res/drawable/statusbar_chip_bg.xml
@@ -18,6 +18,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <solid android:color="?androidprv:attr/colorAccentPrimary" />
+    <solid android:color="@color/privacy_chip_background" />
     <corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
 </shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/videocam.xml b/packages/SystemUI/res/drawable/videocam.xml
new file mode 100644
index 0000000000000..d07f07a4bdb0d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/videocam.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:height="24.0dp"
+    android:tint="@androidprv:color/materialColorOnSurfaceVariant"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24.0dp">
+    <path android:fillColor="@android:color/white" android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H16Q16.825,4 17.413,4.588Q18,5.175 18,6V10.5L22,6.5V17.5L18,13.5V18Q18,18.825 17.413,19.413Q16.825,20 16,20ZM4,18H16Q16,18 16,18Q16,18 16,18V6Q16,6 16,6Q16,6 16,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/videocam_off.xml b/packages/SystemUI/res/drawable/videocam_off.xml
new file mode 100644
index 0000000000000..13d36b63c55d9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/videocam_off.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:height="24.0dp"
+    android:tint="@androidprv:color/materialColorOnSurfaceVariant"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24.0dp">
+    <path android:fillColor="@android:color/white" android:pathData="M22,17.5 L18,13.5V15.175L16,13.175V6Q16,6 16,6Q16,6 16,6H8.825L6.825,4H16Q16.825,4 17.413,4.588Q18,5.175 18,6V10.5L22,6.5ZM20.55,23.35 L16.95,19.75Q16.725,19.875 16.5,19.938Q16.275,20 16,20H4Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.725 2.062,5.5Q2.125,5.275 2.25,5.05L0.65,3.45L2.05,2.05L21.95,21.95ZM4,18H15.15Q15.15,18 15.15,18Q15.15,18 15.15,18L4,6.85Q4,6.85 4,6.85Q4,6.85 4,6.85V18Q4,18 4,18Q4,18 4,18ZM12.45,9.625Q12.45,9.625 12.45,9.625Q12.45,9.625 12.45,9.625ZM9.55,12.4Q9.55,12.4 9.55,12.4Q9.55,12.4 9.55,12.4Q9.55,12.4 9.55,12.4Q9.55,12.4 9.55,12.4Q9.55,12.4 9.55,12.4Q9.55,12.4 9.55,12.4Z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/volume_background.xml b/packages/SystemUI/res/drawable/volume_background.xml
new file mode 100644
index 0000000000000..671d45ce90066
--- /dev/null
+++ b/packages/SystemUI/res/drawable/volume_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2022 The LineageOS Project
+
+  SPDX-License-Identifier: Apache-2.0
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <size android:width="@dimen/volume_dialog_panel_width" />
+    <solid android:color="?androidprv:attr/colorSurface" />
+</shape>
diff --git a/packages/SystemUI/res/layout-land/volume_dialog_legacy.xml b/packages/SystemUI/res/layout-land/volume_dialog_legacy.xml
index de346db41252e..394c7946b1217 100644
--- a/packages/SystemUI/res/layout-land/volume_dialog_legacy.xml
+++ b/packages/SystemUI/res/layout-land/volume_dialog_legacy.xml
@@ -19,18 +19,17 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="right"
-    android:layout_gravity="right"
     android:background="@android:color/transparent"
     android:theme="@style/volume_dialog_theme">
 
     <!-- right-aligned to be physically near volume button -->
-    <LinearLayout
+    <com.android.systemui.animation.view.LaunchableLinearLayout
         android:id="@+id/volume_dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="right"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"
+        android:layout_marginLeft="@dimen/volume_dialog_panel_transparent_padding_horizontal"
+        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_horizontal"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
@@ -53,7 +52,6 @@
                 android:layout_height="@dimen/volume_dialog_ringer_size"
                 android:layout_marginBottom="@dimen/volume_dialog_spacer"
                 android:gravity="right"
-                android:layout_gravity="right"
                 android:translationZ="@dimen/volume_dialog_elevation"
                 android:clipToPadding="false"
                 android:background="@drawable/rounded_bg_full">
@@ -75,7 +73,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:layout_gravity="right"
                 android:orientation="vertical"
                 android:clipChildren="false"
                 android:clipToPadding="false" >
@@ -87,13 +84,30 @@
                     android:orientation="horizontal">
                     <!-- volume rows added and removed here! :-) -->
                 </LinearLayout>
+                <FrameLayout
+                    android:id="@+id/app_volume_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <com.android.keyguard.AlphaOptimizedImageButton
+                        android:id="@+id/app_volume"
+                        android:src="@drawable/ic_app_volume"
+                        android:layout_width="@dimen/volume_dialog_tap_target_size"
+                        android:layout_height="@dimen/volume_dialog_tap_target_size"
+                        android:layout_gravity="center"
+                        android:contentDescription="@string/accessibility_volume_settings"
+                        android:background="@drawable/ripple_drawable_20dp"
+                        android:tint="?androidprv:attr/colorAccent"
+                        android:soundEffectsEnabled="false" />
+                </FrameLayout>
                 <FrameLayout
                     android:id="@+id/settings_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/volume_background_bottom"
+                    android:background="@drawable/volume_background"
                     android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
-                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
                     android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
 
                     <com.android.keyguard.AlphaOptimizedImageButton
@@ -105,9 +119,41 @@
                         android:contentDescription="@string/accessibility_volume_settings"
                         android:scaleType="centerInside"
                         android:soundEffectsEnabled="false"
-                        android:src="@drawable/horizontal_ellipsis"
+                        android:src="@drawable/ic_speaker_group_24dp"
                         android:tint="?androidprv:attr/colorAccent" />
                 </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/expandable_indicator_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background_bottom"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <com.android.systemui.statusbar.phone.ExpandableIndicator
+                        android:id="@+id/expandable_indicator"
+                        android:layout_width="@dimen/volume_dialog_tap_target_size"
+                        android:layout_height="@dimen/volume_dialog_tap_target_size"
+                        android:layout_gravity="center"
+                        android:contentDescription="@string/accessibility_volume_settings"
+                        android:background="@drawable/ripple_drawable_20dp"
+                        android:tint="?androidprv:attr/colorAccent"
+                        android:soundEffectsEnabled="false"
+                        android:padding="10dp"
+                        android:rotation="90" />
+                </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/rounded_border_bottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background_bottom"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="32dp"
+                        android:background="@drawable/ripple_drawable_20dp"/>
+                </FrameLayout>
             </LinearLayout>
 
         </LinearLayout>
@@ -118,7 +164,6 @@
             android:layout_height="@dimen/volume_dialog_caption_size"
             android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"
             android:gravity="right"
-            android:layout_gravity="right"
             android:clipToPadding="false"
             android:clipToOutline="true"
             android:background="@drawable/volume_row_rounded_background">
@@ -132,7 +177,7 @@
                 android:layout_gravity="center"
                 android:soundEffectsEnabled="false" />
         </FrameLayout>
-    </LinearLayout>
+    </com.android.systemui.animation.view.LaunchableLinearLayout>
 
     <ViewStub
         android:id="@+id/odi_captions_tooltip_stub"
@@ -140,7 +185,8 @@
         android:layout="@layout/volume_tool_tip_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom | right"
-        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="@dimen/volume_tool_tip_horizontal_margin"
+        android:layout_marginRight="@dimen/volume_tool_tip_horizontal_margin"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
index 4dcbe78080d35..bd7549194be0b 100644
--- a/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
+++ b/packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
@@ -114,17 +114,17 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/bluetooth_toggle"
                 android:layout_width="wrap_content"
                 android:layout_height="68dp"
                 android:gravity="start|center_vertical"
                 android:paddingEnd="40dp"
                 android:contentDescription="@string/turn_on_bluetooth"
-                android:switchMinWidth="@dimen/settingslib_switch_track_width"
-                android:theme="@style/MainSwitch.Settingslib"
-                android:thumb="@drawable/settingslib_switch_thumb"
-                android:track="@drawable/settingslib_switch_track"
+                android:clickable="true"
+                android:focusable="true"
+                style="@style/SettingslibSwitchStyle.Expressive"
+                android:theme="@style/Theme.Material3.DynamicColors.DayNight"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/bluetooth_toggle_title"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -155,7 +155,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle_title" />
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/bluetooth_auto_on_toggle"
                 android:layout_width="wrap_content"
                 android:layout_height="68dp"
@@ -163,10 +163,10 @@
                 android:gravity="start|center_vertical"
                 android:paddingEnd="40dp"
                 android:contentDescription="@string/turn_on_bluetooth_auto_tomorrow"
-                android:switchMinWidth="@dimen/settingslib_switch_track_width"
-                android:theme="@style/MainSwitch.Settingslib"
-                android:thumb="@drawable/settingslib_switch_thumb"
-                android:track="@drawable/settingslib_switch_track"
+                android:clickable="true"
+                android:focusable="true"
+                style="@style/SettingslibSwitchStyle.Expressive"
+                android:theme="@style/Theme.Material3.DynamicColors.DayNight"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/bluetooth_auto_on_toggle_title"
                 app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle" />
diff --git a/packages/SystemUI/res/layout/date_plus_extras.xml b/packages/SystemUI/res/layout/date_plus_extras.xml
new file mode 100644
index 0000000000000..a2489aa0262ab
--- /dev/null
+++ b/packages/SystemUI/res/layout/date_plus_extras.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.DateSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/date_smartspace_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/date_weather_view_height"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/dnd_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+            android:focusable="true"
+            android:visibility="gone" />
+        <com.google.android.systemui.smartspace.IcuDateTextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+            android:focusable="true"
+            style="@style/DateWeatherText" />
+    </LinearLayout>
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/alarm_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:visibility="gone"
+        style="@style/DateWeatherText" />
+</com.google.android.systemui.smartspace.DateSmartspaceView>
diff --git a/packages/SystemUI/res/layout/date_plus_extras_large.xml b/packages/SystemUI/res/layout/date_plus_extras_large.xml
new file mode 100644
index 0000000000000..e291f193fa0e4
--- /dev/null
+++ b/packages/SystemUI/res/layout/date_plus_extras_large.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.DateSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/date_smartspace_view_large"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/date_weather_view_height"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@id/dnd_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+            android:focusable="true"
+            android:visibility="gone" />
+        <com.google.android.systemui.smartspace.IcuDateTextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+            android:focusable="true"
+            style="@style/DateWeatherText" />
+    </LinearLayout>
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/alarm_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:visibility="gone"
+        style="@style/DateWeatherText" />
+</com.google.android.systemui.smartspace.DateSmartspaceView>
diff --git a/packages/SystemUI/res/layout/internet_connectivity_details.xml b/packages/SystemUI/res/layout/internet_connectivity_details.xml
index f5ba4e2bdfa13..f4249bb2fb09e 100644
--- a/packages/SystemUI/res/layout/internet_connectivity_details.xml
+++ b/packages/SystemUI/res/layout/internet_connectivity_details.xml
@@ -56,6 +56,11 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/internet_extras_compose"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
index 67e97010ff22f..f28ec20833a13 100644
--- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
+++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml
@@ -85,6 +85,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/internet_extras_compose"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -174,19 +179,19 @@
                         android:layout_gravity="center_vertical"/>
 
                     <FrameLayout
-                        android:layout_width="@dimen/settingslib_switch_track_width"
+                        android:layout_width="wrap_content"
                         android:layout_height="48dp"
                         android:layout_gravity="end|center_vertical">
-                        <Switch
+                        <com.google.android.material.materialswitch.MaterialSwitch
                             android:id="@+id/mobile_toggle"
                             android:contentDescription="@string/mobile_data_settings_title"
-                            android:switchMinWidth="@dimen/settingslib_switch_track_width"
                             android:layout_gravity="center"
-                            android:layout_width="@dimen/settingslib_switch_track_width"
-                            android:layout_height="match_parent"
-                            android:track="@drawable/settingslib_track_selector"
-                            android:thumb="@drawable/settingslib_thumb_selector"
-                            android:theme="@style/MainSwitch.Settingslib"/>
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            style="@style/SettingslibSwitchStyle.Expressive"
+                            android:theme="@style/Theme.Material3.DynamicColors.DayNight"/>
                     </FrameLayout>
 
                 </LinearLayout>
@@ -229,20 +234,20 @@
                     </LinearLayout>
 
                     <FrameLayout
-                        android:layout_width="@dimen/settingslib_switch_track_width"
+                        android:layout_width="wrap_content"
                         android:layout_height="48dp"
                         android:layout_marginTop="10dp"
                         android:layout_marginBottom="10dp">
-                        <Switch
+                        <com.google.android.material.materialswitch.MaterialSwitch
                             android:id="@+id/wifi_toggle"
                             android:contentDescription="@string/turn_on_wifi"
-                            android:switchMinWidth="@dimen/settingslib_switch_track_width"
                             android:layout_gravity="center"
-                            android:layout_width="@dimen/settingslib_switch_track_width"
-                            android:layout_height="match_parent"
-                            android:track="@drawable/settingslib_track_selector"
-                            android:thumb="@drawable/settingslib_thumb_selector"
-                            android:theme="@style/MainSwitch.Settingslib"/>
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="true"
+                            android:focusable="true"
+                            style="@style/SettingslibSwitchStyle.Expressive"
+                            android:theme="@style/Theme.Material3.DynamicColors.DayNight"/>
                     </FrameLayout>
 
                 </LinearLayout>
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index e602d6c8848d8..3f86b3b873a1f 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -22,6 +22,26 @@
     android:layout_width="match_parent"
     android:outlineProvider="none" >
 
+    <LinearLayout
+        android:id="@+id/keyguard_indication_area_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/status_bar_height"
+        android:layout_gravity="top|center_horizontal"
+        android:orientation="vertical">
+
+        <com.android.systemui.statusbar.phone.FaceUnlockImageView
+            android:id="@+id/face_unlock_icon"
+            android:layout_height="24dp"
+            android:layout_width="24dp"
+            android:layout_marginTop="@dimen/face_unlock_icon_margin_top"
+            android:layout_gravity="center"
+            android:scaleType="fitCenter"
+            android:tint="@android:color/white"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@id/keyguard_indication_area"
         android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index e9cf524b826f5..1942a70b36794 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -62,6 +62,8 @@
         <ImageView android:id="@+id/multi_user_avatar"
             android:layout_width="@dimen/multi_user_avatar_keyguard_size"
             android:layout_height="@dimen/multi_user_avatar_keyguard_size"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="@dimen/status_bar_padding_end"
             android:layout_gravity="center"
             android:scaleType="centerInside"/>
     </LinearLayout>
@@ -78,7 +80,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingTop="@dimen/status_bar_padding_top"
-        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
+        android:paddingStart="@dimen/status_bar_padding_start"
         android:layout_toStartOf="@id/system_icons_container"
         android:gravity="center_vertical"
         android:ellipsize="marquee"
diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml
index 21c7b550af8c5..e0d09ec913bf9 100644
--- a/packages/SystemUI/res/layout/media_session_view.xml
+++ b/packages/SystemUI/res/layout/media_session_view.xml
@@ -288,7 +288,7 @@
         android:layout_width="0dp"
         android:layout_height="48dp"
         android:paddingTop="@dimen/qs_media_session_enabled_seekbar_vertical_padding"
-        android:paddingBottom="12dp"
+        android:paddingBottom="@dimen/qs_media_session_enabled_seekbar_vertical_padding_bottom"
         android:maxHeight="@dimen/qs_media_enabled_seekbar_height"
         android:splitTrack="false"
         android:layout_marginBottom="@dimen/qs_media_padding"
diff --git a/packages/SystemUI/res/layout/network_speed_view.xml b/packages/SystemUI/res/layout/network_speed_view.xml
new file mode 100644
index 0000000000000..7d963e507c758
--- /dev/null
+++ b/packages/SystemUI/res/layout/network_speed_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="center_vertical"
+    android:id="@+id/network_speed"
+    android:layout_width="@dimen/network_speed_view_width"
+    android:layout_height="match_parent"
+    android:paddingEnd="@dimen/network_speed_view_padding_end">
+    <TextView
+        android:textAppearance="@style/TextAppearance.StatusBar.Default"
+        android:textSize="@dimen/network_speed_text_size"
+        android:gravity="end|center_vertical"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/number"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/network_speed_margin_bottom"
+        android:maxLines="1"
+        android:includeFontPadding="false"
+        android:importantForAccessibility="no"
+        android:textAlignment="viewEnd"/>
+    <TextView
+        android:textAppearance="@style/TextAppearance.StatusBar.Default"
+        android:textSize="@dimen/network_speed_unit_text_size"
+        android:gravity="end|center_vertical"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/unit"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/network_speed_unit_margin_top"
+        android:maxLines="1"
+        android:includeFontPadding="false"
+        android:importantForAccessibility="no"
+        android:textAlignment="viewEnd"/>
+</com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedView>
diff --git a/packages/SystemUI/res/layout/notification_2025_conversation_info.xml b/packages/SystemUI/res/layout/notification_2025_conversation_info.xml
index d9ec42c68f817..2ce48c85bc05c 100644
--- a/packages/SystemUI/res/layout/notification_2025_conversation_info.xml
+++ b/packages/SystemUI/res/layout/notification_2025_conversation_info.xml
@@ -157,6 +157,17 @@
         </LinearLayout>
 
         <!-- end aligned fields -->
+        <ImageButton
+            android:id="@+id/force_stop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:background="@drawable/ripple_drawable"
+            android:contentDescription="@string/force_stop_dlg_title"
+            android:src="@drawable/ic_force_stop"
+            android:padding="@*android:dimen/notification_2025_margin"
+            android:tint="@androidprv:color/materialColorPrimary"/>
+
         <ImageButton
             android:id="@+id/feedback"
             android:layout_width="wrap_content"
diff --git a/packages/SystemUI/res/layout/notification_2025_info.xml b/packages/SystemUI/res/layout/notification_2025_info.xml
index 83d087b03a58c..f8bc21e90684c 100644
--- a/packages/SystemUI/res/layout/notification_2025_info.xml
+++ b/packages/SystemUI/res/layout/notification_2025_info.xml
@@ -83,6 +83,17 @@
 
         </LinearLayout>
 
+        <ImageButton
+            android:id="@+id/force_stop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:background="@drawable/ripple_drawable"
+            android:contentDescription="@string/force_stop_dlg_title"
+            android:src="@drawable/ic_force_stop"
+            android:padding="@*android:dimen/notification_2025_margin"
+            android:tint="@androidprv:color/materialColorPrimary"/>
+
         <!-- feedback for notificationassistantservice -->
         <ImageButton
             android:id="@+id/feedback"
diff --git a/packages/SystemUI/res/layout/notification_conversation_info.xml b/packages/SystemUI/res/layout/notification_conversation_info.xml
index 56660139f8238..83aa9a10b0782 100644
--- a/packages/SystemUI/res/layout/notification_conversation_info.xml
+++ b/packages/SystemUI/res/layout/notification_conversation_info.xml
@@ -166,6 +166,17 @@
         </LinearLayout>
 
         <!-- end aligned fields -->
+        <ImageButton
+            android:id="@+id/force_stop"
+            android:layout_width="@dimen/notification_importance_toggle_size"
+            android:layout_height="@dimen/notification_importance_toggle_size"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:background="@drawable/ripple_drawable"
+            android:contentDescription="@string/force_stop_dlg_title"
+            android:src="@drawable/ic_force_stop"
+            android:layout_alignParentEnd="true"
+            android:tint="@androidprv:color/materialColorPrimary"/>
         <ImageButton
             android:id="@+id/feedback"
             android:layout_width="@dimen/notification_importance_toggle_size"
diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index d4bd142d90897..90b6923dbe43b 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -91,6 +91,18 @@
         </LinearLayout>
 
         <!-- end aligned fields -->
+        <ImageButton
+            android:id="@+id/force_stop"
+            android:layout_width="@dimen/notification_importance_toggle_size"
+            android:layout_height="@dimen/notification_importance_toggle_size"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:background="@drawable/ripple_drawable"
+            android:contentDescription="@string/force_stop_dlg_title"
+            android:src="@drawable/ic_force_stop"
+            android:layout_toStartOf="@id/app_settings"
+            android:tint="@androidprv:color/materialColorPrimary"/>
+
         <!-- feedback for notificationassistantservice -->
         <ImageButton
             android:id="@+id/feedback"
diff --git a/packages/SystemUI/res/layout/qs_volume_dialog.xml b/packages/SystemUI/res/layout/qs_volume_dialog.xml
new file mode 100644
index 0000000000000..720f3c88f5a64
--- /dev/null
+++ b/packages/SystemUI/res/layout/qs_volume_dialog.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingHorizontal="0dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="8dp">
+
+    <TextView
+        android:id="@+id/volume_percentage_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.Dialog.Body.Message"
+        android:textSize="16sp"
+        android:text="@string/qs_volume_dialog_mute" />
+
+    <com.google.android.material.slider.Slider
+        style="@style/SystemUI.Material3.Slider"
+        android:id="@+id/volume_slider"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginVertical="3dp"
+        android:theme="@style/Theme.Material3.DynamicColors.DayNight"
+        app:labelBehavior="gone"
+        app:tickVisible="false"
+        app:trackCornerSize="12dp"
+        app:trackHeight="44dp"
+        app:thumbHeight="56dp"
+        app:trackIconSize="20dp"
+        app:trackStopIndicatorSize="0dp" />
+
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/quick_settings_onthego_dialog.xml b/packages/SystemUI/res/layout/quick_settings_onthego_dialog.xml
new file mode 100644
index 0000000000000..da23c1729c9db
--- /dev/null
+++ b/packages/SystemUI/res/layout/quick_settings_onthego_dialog.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/BrightnessDialogContainer">
+
+    <TextView
+        android:id="@+id/alpha_slider_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/onthego_transparency"
+        android:layout_alignParentTop="true" />
+
+    <SeekBar
+        android:id="@+id/alpha_slider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_below="@+id/alpha_slider_label"
+        android:max="65" />
+
+    <View
+        android:id="@+id/onthego_divider_0"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@android:color/transparent"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:layout_below="@+id/alpha_slider" />
+
+    <RelativeLayout
+        android:id="@+id/onthego_category_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/onthego_divider_0">
+
+        <Switch
+            android:id="@+id/onthego_camera_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/onthego_front_camera"
+            android:layout_alignParentRight="true" />
+
+        <View
+            android:id="@+id/onthego_divider_1"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@android:color/transparent"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:layout_below="@+id/onthego_camera_toggle" />
+
+        <Switch
+            android:id="@+id/onthego_service_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/onthego_divider_1"
+            android:text="@string/onthego_service_toggle"
+            android:layout_alignParentRight="true" />
+
+        <View
+            android:id="@+id/onthego_divider_2"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@android:color/transparent"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:layout_below="@+id/onthego_service_toggle" />
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/packages/SystemUI/res/layout/screen_record_options.xml b/packages/SystemUI/res/layout/screen_record_options.xml
index cb9f904072eab..53474b9b365c4 100644
--- a/packages/SystemUI/res/layout/screen_record_options.xml
+++ b/packages/SystemUI/res/layout/screen_record_options.xml
@@ -41,14 +41,14 @@
             android:dropDownWidth="274dp"
             android:importantForAccessibility="yes"/>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:layout_gravity="end"
             android:id="@+id/screenrecord_audio_switch"
             android:contentDescription="@string/screenrecord_audio_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
     <LinearLayout
@@ -76,13 +76,13 @@
             android:textAppearance="@style/TextAppearance.ScreenRecord.SwitchLabel"
             android:contentDescription="@string/screenrecord_taps_label"/>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:id="@+id/screenrecord_taps_switch"
             android:contentDescription="@string/screenrecord_taps_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
     <LinearLayout
@@ -123,13 +123,13 @@
                 android:textColor="?android:textColorSecondary"/>
         </LinearLayout>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:id="@+id/screenrecord_lowquality_switch"
             android:contentDescription="@string/screenrecord_lowquality_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
     <LinearLayout
@@ -170,13 +170,13 @@
                 android:textColor="?android:textColorSecondary"/>
         </LinearLayout>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:id="@+id/screenrecord_longer_timeout_switch"
             android:contentDescription="@string/screenrecord_longer_timeout_switch_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
     <LinearLayout
@@ -217,13 +217,13 @@
                 android:textColor="?android:textColorSecondary"/>
         </LinearLayout>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:id="@+id/screenrecord_skip_time_switch"
             android:contentDescription="@string/screenrecord_skip_time_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
     <LinearLayout
@@ -264,13 +264,13 @@
                 android:textColor="?android:textColorSecondary"/>
         </LinearLayout>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:minWidth="48dp"
             android:layout_height="48dp"
             android:id="@+id/screenrecord_hevc_switch"
             android:contentDescription="@string/screenrecord_hevc_switch_label"
-            style="@style/ScreenRecord.Switch"
+            android:theme="@style/Theme.Material3.DynamicColors.DayNight"
             android:importantForAccessibility="yes" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/smartspace_base_card_package_delivery.xml b/packages/SystemUI/res/layout/smartspace_base_card_package_delivery.xml
new file mode 100644
index 0000000000000..1bfcef0ee503b
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_base_card_package_delivery.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.systemui.smartspace.BcSmartspaceCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/secondary_card_group"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingEnd="@dimen/enhanced_smartspace_secondary_card_padding_end"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/secondary_card_group"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_title_subtitle_pane" />
+</com.google.android.systemui.smartspace.BcSmartspaceCard>
diff --git a/packages/SystemUI/res/layout/smartspace_base_template_card.xml b/packages/SystemUI/res/layout/smartspace_base_template_card.xml
new file mode 100644
index 0000000000000..7c7cd12d79fd2
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_base_template_card.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/enhanced_smartspace_card_height"
+    android:baselineAligned="false">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/secondary_card_group"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingEnd="@dimen/enhanced_smartspace_secondary_card_padding_end"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/secondary_card_group"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_title_subtitle_pane" />
+</com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_base_template_card_with_date.xml b/packages/SystemUI/res/layout/smartspace_base_template_card_with_date.xml
new file mode 100644
index 0000000000000..adbdfa5fe172d
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_base_template_card_with_date.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/base_template_card_with_date"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/enhanced_smartspace_card_height"
+    android:baselineAligned="false">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/text_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <com.google.android.systemui.smartspace.IcuDateTextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/smartspace_subtitle_group"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/EnhancedSmartspaceTextTitle" />
+        <com.google.android.systemui.smartspace.DoubleShadowTextView
+            android:id="@+id/title_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/enhanced_smartspace_base_action_icon_margin"
+            android:focusable="true"
+            app:layout_constraintBaseline_toBaselineOf="@+id/date"
+            app:layout_constraintStart_toEndOf="@+id/date"
+            style="@style/EnhancedSmartspaceTextTitle" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/smartspace_subtitle_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/enhanced_smartspace_subtitle_margin_top"
+            app:layout_constraintBottom_toTopOf="@+id/smartspace_extras_group"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/date">
+            <include
+                layout="@layout/smartspace_subtitle_aqi_chip" />
+            <include
+                layout="@layout/smartspace_subtitle_text" />
+            <include
+                android:layout_width="0.0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/enhanced_smartspace_base_action_icon_padding"
+                app:layout_constraintBaseline_toBaselineOf="@+id/subtitle_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/subtitle_text"
+                app:layout_constraintWidth_max="wrap"
+                app:layout_constraintWidth_min="0.0dp"
+                layout="@layout/smartspace_subtitle_supplemental" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <LinearLayout
+            android:id="@+id/smartspace_extras_group"
+            android:layout_width="wrap_content"
+            android:layout_height="0.0dp"
+            android:layout_marginTop="8.0dp"
+            android:gravity="top"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHeight_min="wrap"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/smartspace_subtitle_group">
+            <include
+                layout="@layout/smartspace_extras" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_card.xml b/packages/SystemUI/res/layout/smartspace_card.xml
new file mode 100644
index 0000000000000..efb2098cd5bf7
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/enhanced_smartspace_card_height"
+    android:baselineAligned="false">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/secondary_card_group"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingEnd="@dimen/enhanced_smartspace_secondary_card_padding_end"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <include
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/secondary_card_group"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_title_subtitle_pane" />
+</com.google.android.systemui.smartspace.BcSmartspaceCard>
diff --git a/packages/SystemUI/res/layout/smartspace_card_combination.xml b/packages/SystemUI/res/layout/smartspace_card_combination.xml
new file mode 100644
index 0000000000000..b8ce89c5f839b
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_combination.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardCombination
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+    <include
+        android:id="@+id/first_sub_card"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_combination_sub_card" />
+    <include
+        android:id="@+id/second_sub_card"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toEndOf="@+id/first_sub_card"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_combination_sub_card" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardCombination>
diff --git a/packages/SystemUI/res/layout/smartspace_card_combination_at_store.xml b/packages/SystemUI/res/layout/smartspace_card_combination_at_store.xml
new file mode 100644
index 0000000000000..80b667a8aa397
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_combination_at_store.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardCombinationAtStore
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+    <include
+        android:id="@+id/first_sub_card"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="8.0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/second_sub_card"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_card_shopping_list" />
+    <include
+        android:id="@+id/second_sub_card"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8.0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        layout="@layout/smartspace_combination_sub_card" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardCombinationAtStore>
diff --git a/packages/SystemUI/res/layout/smartspace_card_date.xml b/packages/SystemUI/res/layout/smartspace_card_date.xml
new file mode 100644
index 0000000000000..82f8c577b4a01
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_date.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.systemui.smartspace.BcSmartspaceCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/enhanced_smartspace_card_height"
+    android:baselineAligned="false">
+    <RelativeLayout
+        android:id="@+id/text_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <com.google.android.systemui.smartspace.IcuDateTextView
+            android:id="@+id/date"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentStart="true"
+            android:focusable="true"
+            style="@style/EnhancedSmartspaceTextTitle" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/smartspace_subtitle_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/date"
+            android:layout_marginTop="@dimen/enhanced_smartspace_subtitle_margin_top">
+            <include
+                layout="@layout/smartspace_subtitle_pane" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <LinearLayout
+            android:id="@+id/smartspace_extras_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/smartspace_subtitle_group"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
+            <include
+                layout="@layout/smartspace_extras" />
+        </LinearLayout>
+    </RelativeLayout>
+</com.google.android.systemui.smartspace.BcSmartspaceCard>
diff --git a/packages/SystemUI/res/layout/smartspace_card_doorbell.xml b/packages/SystemUI/res/layout/smartspace_card_doorbell.xml
new file mode 100644
index 0000000000000..b09823b3cbb15
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_doorbell.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardDoorbell
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipToPadding="false">
+    <FrameLayout
+        android:id="@+id/loading_screen"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_rounded_secondary_card"
+        android:clipToOutline="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <ProgressBar
+            android:id="@+id/indeterminateBar"
+            android:layout_width="40.0dp"
+            android:layout_height="40.0dp"
+            android:layout_gravity="center" />
+        <ImageView
+            android:id="@+id/loading_screen_icon"
+            android:layout_width="20.0dp"
+            android:layout_height="20.0dp"
+            android:layout_gravity="center"
+            android:src="@drawable/videocam" />
+    </FrameLayout>
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:scaleType="centerInside"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardDoorbell>
diff --git a/packages/SystemUI/res/layout/smartspace_card_flight.xml b/packages/SystemUI/res/layout/smartspace_card_flight.xml
new file mode 100644
index 0000000000000..85ef8696f6607
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_flight.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardFlight
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+    <ImageView
+        android:id="@+id/flight_qr_code"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_flight_qr_code"
+        android:contentDescription="@string/smartspace_flight_qr_code"
+        android:padding="10.0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardFlight>
diff --git a/packages/SystemUI/res/layout/smartspace_card_generic_image_with_bg.xml b/packages/SystemUI/res/layout/smartspace_card_generic_image_with_bg.xml
new file mode 100644
index 0000000000000..0524c8cdd6444
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_generic_image_with_bg.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_image_generic"
+        android:padding="4dp"
+        android:scaleType="centerInside"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage>
diff --git a/packages/SystemUI/res/layout/smartspace_card_generic_landscape_image.xml b/packages/SystemUI/res/layout/smartspace_card_generic_landscape_image.xml
new file mode 100644
index 0000000000000..6da37eb617843
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_generic_landscape_image.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <FrameLayout
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/outline_rounded_secondary_card"
+        android:clipToOutline="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="7:4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <ImageView
+            android:id="@+id/image_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+    </FrameLayout>
+</com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage>
diff --git a/packages/SystemUI/res/layout/smartspace_card_generic_portrait_image.xml b/packages/SystemUI/res/layout/smartspace_card_generic_portrait_image.xml
new file mode 100644
index 0000000000000..39367b57e08f1
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_generic_portrait_image.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/outline_rounded_secondary_card"
+        android:clipToOutline="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="4:7"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <ImageView
+            android:id="@+id/image_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+    </FrameLayout>
+</com.google.android.systemui.smartspace.BcSmartspaceCardGenericImage>
diff --git a/packages/SystemUI/res/layout/smartspace_card_loyalty.xml b/packages/SystemUI/res/layout/smartspace_card_loyalty.xml
new file mode 100644
index 0000000000000..d66a2d3f20bd1
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_loyalty.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardLoyalty
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="32.0dp"
+        android:layout_height="32.0dp"
+        android:layout_margin="4.0dp"
+        app:layout_constraintBottom_toTopOf="@+id/card_prompt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+    <TextView
+        android:id="@+id/card_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4.0dp"
+        android:gravity="center_horizontal"
+        android:lineHeight="20.0dp"
+        android:maxLines="2"
+        android:textSize="12.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_view"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/loyalty_program_logo"
+        android:layout_width="32.0dp"
+        android:layout_height="32.0dp"
+        android:layout_margin="4.0dp"
+        app:layout_constraintBottom_toTopOf="@+id/loyalty_program_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+    <TextView
+        android:id="@+id/loyalty_program_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4.0dp"
+        android:gravity="center_horizontal"
+        android:maxLines="1"
+        android:textSize="12.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loyalty_program_logo"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardLoyalty>
diff --git a/packages/SystemUI/res/layout/smartspace_card_shopping_list.xml b/packages/SystemUI/res/layout/smartspace_card_shopping_list.xml
new file mode 100644
index 0000000000000..78ed58643acee
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_shopping_list.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardShoppingList
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/card_prompt_icon"
+        android:layout_width="32.0dp"
+        android:layout_height="32.0dp"
+        android:layout_margin="3.0dp"
+        app:layout_constraintBottom_toTopOf="@+id/card_prompt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+    <TextView
+        android:id="@+id/card_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="3.0dp"
+        android:gravity="center_horizontal"
+        android:lineHeight="20.0dp"
+        android:maxLines="2"
+        android:textSize="12.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/card_prompt_icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/list_icon"
+        android:layout_width="20.0dp"
+        android:layout_height="20.0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/empty_list_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="4"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/list_item_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toTopOf="@+id/list_item_2"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/list_item_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toTopOf="@+id/list_item_3"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/list_item_1"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/list_item_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/list_item_2"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardShoppingList>
diff --git a/packages/SystemUI/res/layout/smartspace_card_sports.xml b/packages/SystemUI/res/layout/smartspace_card_sports.xml
new file mode 100644
index 0000000000000..a79017aa55c35
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_sports.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardSports
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingBottom="20.0dp"
+    android:paddingTop="12.0dp">
+    <TextView
+        android:id="@+id/match_time_summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/first_competitor_logo"
+        android:layout_width="0.0dp"
+        android:layout_height="0.0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@+id/first_competitor_score"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/match_time_summary"
+        app:tint="@androidprv:color/materialColorOnSurface" />
+    <ImageView
+        android:id="@+id/second_competitor_logo"
+        android:layout_width="0.0dp"
+        android:layout_height="0.0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/first_competitor_logo"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/second_competitor_score"
+        app:layout_constraintTop_toTopOf="@+id/first_competitor_logo"
+        app:tint="@androidprv:color/materialColorOnSurface" />
+    <TextView
+        android:id="@+id/first_competitor_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4.0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/first_competitor_logo"
+        app:layout_constraintEnd_toStartOf="@+id/second_competitor_score"
+        app:layout_constraintStart_toEndOf="@+id/first_competitor_logo"
+        app:layout_constraintTop_toTopOf="@+id/first_competitor_logo"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/second_competitor_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4.0dp"
+        android:layout_marginStart="12.0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/second_competitor_logo"
+        app:layout_constraintEnd_toStartOf="@+id/second_competitor_logo"
+        app:layout_constraintStart_toEndOf="@+id/first_competitor_score"
+        app:layout_constraintTop_toTopOf="@+id/second_competitor_logo"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.BcSmartspaceCardSports>
diff --git a/packages/SystemUI/res/layout/smartspace_card_weather_forecast.xml b/packages/SystemUI/res/layout/smartspace_card_weather_forecast.xml
new file mode 100644
index 0000000000000..bae062369649a
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_weather_forecast.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceCardWeatherForecast
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent" />
diff --git a/packages/SystemUI/res/layout/smartspace_card_weather_forecast_column.xml b/packages/SystemUI/res/layout/smartspace_card_weather_forecast_column.xml
new file mode 100644
index 0000000000000..6d2ee29c61e5d
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_card_weather_forecast_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="0.0dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintHorizontal_chainStyle="spread_inside"
+    app:layout_constraintTop_toTopOf="parent">
+    <TextView
+        android:id="@+id/temperature_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16.0dp"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toTopOf="@+id/weather_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/weather_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        app:layout_constraintBottom_toTopOf="@+id/timestamp"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/temperature_value" />
+    <TextView
+        android:id="@+id/timestamp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16.0dp"
+        android:textSize="12.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/weather_icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/SystemUI/res/layout/smartspace_carousel_column_template_card.xml b/packages/SystemUI/res/layout/smartspace_carousel_column_template_card.xml
new file mode 100644
index 0000000000000..55787f38fb64b
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_carousel_column_template_card.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="0.0dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintHorizontal_chainStyle="spread_inside"
+    app:layout_constraintTop_toTopOf="parent">
+    <TextView
+        android:id="@+id/upper_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16.0dp"
+        android:textSize="14.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/lower_text"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/upper_text" />
+    <TextView
+        android:id="@+id/lower_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16.0dp"
+        android:textSize="12.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/SystemUI/res/layout/smartspace_carousel_template_card.xml b/packages/SystemUI/res/layout/smartspace_carousel_template_card.xml
new file mode 100644
index 0000000000000..e437353a6a815
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_carousel_template_card.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.CarouselTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent" />
diff --git a/packages/SystemUI/res/layout/smartspace_combination_sub_card.xml b/packages/SystemUI/res/layout/smartspace_combination_sub_card.xml
new file mode 100644
index 0000000000000..1975746a74860
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_combination_sub_card.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/first_sub_card"
+    android:layout_width="0.0dp"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_smartspace_combination_sub_card"
+    android:padding="8.0dp">
+    <ImageView
+        android:id="@+id/sub_card_icon"
+        android:layout_width="22.0dp"
+        android:layout_height="22.0dp"
+        android:layout_margin="2.0dp"
+        app:layout_constraintBottom_toTopOf="@+id/sub_card_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/sub_card_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="2.0dp"
+        android:ellipsize="end"
+        android:gravity="center_horizontal"
+        android:maxLines="2"
+        android:textColor="@androidprv:color/materialColorOnPrimary"
+        android:textSize="14.0sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sub_card_icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/SystemUI/res/layout/smartspace_combined_cards_template_card.xml b/packages/SystemUI/res/layout/smartspace_combined_cards_template_card.xml
new file mode 100644
index 0000000000000..f01f9f1ce9aab
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_combined_cards_template_card.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.CombinedCardsTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="0.0dp"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/first_sub_card_container"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_smartspace_combination_sub_card"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@+id/second_sub_card_container"
+        app:layout_constraintStart_toStartOf="parent" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/second_sub_card_container"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8.0dp"
+        android:background="@drawable/bg_smartspace_combination_sub_card"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toEndOf="@+id/first_sub_card_container"
+        app:layout_constraintTop_toTopOf="parent" />
+</com.google.android.systemui.smartspace.uitemplate.CombinedCardsTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_enhanced.xml b/packages/SystemUI/res/layout/smartspace_enhanced.xml
new file mode 100644
index 0000000000000..f9e2eebbdf065
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_enhanced.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bc_smartspace_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <com.google.android.systemui.smartspace.InterceptingViewPager
+        android:id="@+id/smartspace_card_pager"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/enhanced_smartspace_height"
+        android:layout_gravity="center"
+        android:contentDescription="@string/smartspace_content_desc" />
+    <com.google.android.systemui.smartspace.PagerDots
+        android:id="@+id/smartspace_page_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom"
+        android:importantForAccessibility="no"
+        android:layoutDirection="ltr"
+        android:paddingTop="@dimen/page_indicator_padding_top"
+        android:visibility="visible" />
+</com.google.android.systemui.smartspace.BcSmartspaceView>
diff --git a/packages/SystemUI/res/layout/smartspace_enhanced2.xml b/packages/SystemUI/res/layout/smartspace_enhanced2.xml
new file mode 100644
index 0000000000000..f5331d4d9c86b
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_enhanced2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.BcSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bc_smartspace_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/smartspace_card_pager"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/enhanced_smartspace_height"
+        android:layout_gravity="center"
+        android:contentDescription="@string/smartspace_content_desc" />
+    <com.google.android.systemui.smartspace.PagerDots
+        android:id="@+id/smartspace_page_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom"
+        android:importantForAccessibility="no"
+        android:paddingTop="@dimen/page_indicator_padding_top"
+        android:visibility="visible" />
+</com.google.android.systemui.smartspace.BcSmartspaceView>
diff --git a/packages/SystemUI/res/layout/smartspace_extras.xml b/packages/SystemUI/res/layout/smartspace_extras.xml
new file mode 100644
index 0000000000000..def70107be074
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_extras.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/supplemental_line_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="4.0dp"
+        android:visibility="gone"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</merge>
diff --git a/packages/SystemUI/res/layout/smartspace_head_to_head_template_card.xml b/packages/SystemUI/res/layout/smartspace_head_to_head_template_card.xml
new file mode 100644
index 0000000000000..de5c88ad1406e
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_head_to_head_template_card.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.HeadToHeadTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingBottom="20.0dp"
+    android:paddingTop="12.0dp">
+    <TextView
+        android:id="@+id/head_to_head_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <ImageView
+        android:id="@+id/first_competitor_icon"
+        android:layout_width="0.0dp"
+        android:layout_height="0.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@+id/first_competitor_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/head_to_head_title"
+        app:tint="@androidprv:color/materialColorOnSurface" />
+    <ImageView
+        android:id="@+id/second_competitor_icon"
+        android:layout_width="0.0dp"
+        android:layout_height="0.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/first_competitor_icon"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/second_competitor_text"
+        app:layout_constraintTop_toTopOf="@+id/first_competitor_icon"
+        app:tint="@androidprv:color/materialColorOnSurface" />
+    <TextView
+        android:id="@+id/first_competitor_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/first_competitor_icon"
+        app:layout_constraintEnd_toStartOf="@+id/second_competitor_text"
+        app:layout_constraintStart_toEndOf="@+id/first_competitor_icon"
+        app:layout_constraintTop_toTopOf="@+id/first_competitor_icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/second_competitor_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4.0dp"
+        android:layout_marginStart="12.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/second_competitor_icon"
+        app:layout_constraintEnd_toStartOf="@+id/second_competitor_icon"
+        app:layout_constraintStart_toEndOf="@+id/first_competitor_text"
+        app:layout_constraintTop_toTopOf="@+id/second_competitor_icon"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.uitemplate.HeadToHeadTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_sub_card_template_card.xml b/packages/SystemUI/res/layout/smartspace_sub_card_template_card.xml
new file mode 100644
index 0000000000000..1bbb7a5d83d75
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_sub_card_template_card.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.SubCardTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="32.0dp"
+        android:layout_height="32.0dp"
+        android:layout_margin="4.0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/card_prompt"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+    <TextView
+        android:id="@+id/card_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="4.0dp"
+        android:gravity="center_horizontal"
+        android:lineHeight="20.0dp"
+        android:maxLines="2"
+        android:textSize="12.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_view"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.uitemplate.SubCardTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_sub_image_template_card.xml b/packages/SystemUI/res/layout/smartspace_sub_image_template_card.xml
new file mode 100644
index 0000000000000..db226622fedd5
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_sub_image_template_card.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.SubImageTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="0.0dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/outline_rounded_secondary_card"
+        android:clipToOutline="true"
+        android:scaleType="centerInside"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</com.google.android.systemui.smartspace.uitemplate.SubImageTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_sub_list_template_card.xml b/packages/SystemUI/res/layout/smartspace_sub_list_template_card.xml
new file mode 100644
index 0000000000000..c0a70ddefb0e2
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_sub_list_template_card.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.uitemplate.SubListTemplateCard
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/list_icon"
+        android:layout_width="20.0dp"
+        android:layout_height="20.0dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/list_item_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/list_item_2"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/list_item_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/list_item_3"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/list_item_1"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <TextView
+        android:id="@+id/list_item_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textSize="14.0sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/list_icon"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/list_item_2"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</com.google.android.systemui.smartspace.uitemplate.SubListTemplateCard>
diff --git a/packages/SystemUI/res/layout/smartspace_subtitle_aqi_chip.xml b/packages/SystemUI/res/layout/smartspace_subtitle_aqi_chip.xml
new file mode 100644
index 0000000000000..172c18f969894
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_subtitle_aqi_chip.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.DoubleShadowTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/bg_air_quality_chip"
+    android:id="@+id/subtitle_aqi_chip"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/enhanced_smartspace_base_action_icon_padding"
+    android:textColor="?android:textColorPrimary"
+    android:visibility="gone"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/subtitle_text"
+    app:layout_constraintHorizontal_bias="0.0"
+    app:layout_constraintHorizontal_chainStyle="packed"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    style="@style/EnhancedSmartspaceTextSubtitle" />
diff --git a/packages/SystemUI/res/layout/smartspace_subtitle_pane.xml b/packages/SystemUI/res/layout/smartspace_subtitle_pane.xml
new file mode 100644
index 0000000000000..b50532afa328b
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_subtitle_pane.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 Benzo Rom
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/subtitle_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/base_action_icon_subtitle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/base_action_icon_subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/enhanced_smartspace_base_action_icon_margin"
+        android:ellipsize="none"
+        android:focusable="true"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBaseline_toBaselineOf="@+id/subtitle_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/subtitle_text"
+        app:layout_constraintWidth_max="280dp"
+        app:layout_constraintWidth_min="wrap"
+        style="@style/EnhancedSmartspaceTextSubtitle" />
+</merge>
diff --git a/packages/SystemUI/res/layout/smartspace_subtitle_supplemental.xml b/packages/SystemUI/res/layout/smartspace_subtitle_supplemental.xml
new file mode 100644
index 0000000000000..85bd300e72fc3
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_subtitle_supplemental.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.DoubleShadowTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/base_action_icon_subtitle"
+    android:layout_width="0.0dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/enhanced_smartspace_base_action_icon_padding"
+    android:ellipsize="none"
+    android:padding="@dimen/enhanced_smartspace_base_action_icon_padding"
+    android:textColor="?android:textColorPrimary"
+    app:layout_constraintBaseline_toBaselineOf="@+id/subtitle_text"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toEndOf="@+id/subtitle_text"
+    app:layout_constraintWidth_min="wrap"
+    style="@style/EnhancedSmartspaceTextSubtitle" />
diff --git a/packages/SystemUI/res/layout/smartspace_subtitle_text.xml b/packages/SystemUI/res/layout/smartspace_subtitle_text.xml
new file mode 100644
index 0000000000000..0af7164ec758c
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_subtitle_text.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.DoubleShadowTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/subtitle_text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/enhanced_smartspace_base_action_icon_padding"
+    android:paddingTop="@dimen/enhanced_smartspace_base_action_icon_padding"
+    android:textColor="?android:textColorPrimary"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/base_action_icon_subtitle"
+    app:layout_constraintHorizontal_bias="0.0"
+    app:layout_constraintHorizontal_chainStyle="packed"
+    app:layout_constraintStart_toEndOf="@+id/subtitle_aqi_chip"
+    app:layout_constraintTop_toTopOf="parent"
+    style="@style/EnhancedSmartspaceTextSubtitle" />
diff --git a/packages/SystemUI/res/layout/smartspace_title_subtitle_pane.xml b/packages/SystemUI/res/layout/smartspace_title_subtitle_pane.xml
new file mode 100644
index 0000000000000..439abaebd7a65
--- /dev/null
+++ b/packages/SystemUI/res/layout/smartspace_title_subtitle_pane.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/text_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+        <com.google.android.systemui.smartspace.DoubleShadowTextView
+            android:id="@+id/title_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/smartspace_subtitle_group"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/EnhancedSmartspaceTextTitle" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/smartspace_subtitle_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/enhanced_smartspace_subtitle_margin_top"
+            app:layout_constraintBottom_toTopOf="@+id/smartspace_extras_group"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/title_text">
+            <include
+                layout="@layout/smartspace_subtitle_aqi_chip" />
+            <include
+                layout="@layout/smartspace_subtitle_text" />
+            <include
+                layout="@layout/smartspace_subtitle_supplemental" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <LinearLayout
+            android:id="@+id/smartspace_extras_group"
+            android:layout_width="wrap_content"
+            android:layout_height="0.0dp"
+            android:layout_marginTop="8.0dp"
+            android:gravity="top"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHeight_min="wrap"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/smartspace_subtitle_group">
+            <include
+                layout="@layout/smartspace_extras" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index 63c344cbfbd70..e53d0ffaece97 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -20,7 +20,7 @@
 <!--    android:background="@drawable/status_bar_closed_default_background" -->
 <com.android.systemui.statusbar.phone.PhoneStatusBarView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/status_bar_height"
     android:id="@+id/status_bar"
@@ -82,7 +82,7 @@
                 <LinearLayout
                     android:id="@+id/status_bar_start_side_except_heads_up"
                     android:layout_height="match_parent"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical|start"
                     android:clipChildren="false">
                     <ViewStub
@@ -91,6 +91,14 @@
                         android:layout_height="match_parent"
                         android:layout="@layout/operator_name" />
 
+                    <com.android.systemui.matrixx.logo.LogoImageView
+                        android:id="@+id/statusbar_logo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:scaleType="centerInside"
+                        android:visibility="gone" />
+
                     <com.android.systemui.statusbar.policy.Clock
                         android:id="@+id/clock"
                         android:layout_width="wrap_content"
@@ -102,6 +110,7 @@
                         android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
                         android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
                         android:gravity="center_vertical|start"
+                        systemui:isStatusBar="true"
                     />
 
                     <include layout="@layout/ongoing_activity_chip_primary"
@@ -197,6 +206,13 @@
                      android:layout_gravity="center_vertical"
                      android:layout_width="wrap_content"
                      android:layout_height="@dimen/status_bar_system_icons_height" />
+
+                <com.android.systemui.matrixx.logo.LogoImageViewRight
+                    android:id="@+id/statusbar_logo_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/status_bar_system_icons_height"
+                    android:scaleType="centerInside"
+                    android:visibility="gone" />
             </com.android.keyguard.AlphaOptimizedLinearLayout>
         </FrameLayout>
     </LinearLayout>
@@ -217,6 +233,7 @@
             android:singleLine="true"
             android:gravity="center"
             android:visibility="gone"
+            systemui:isStatusBar="true"
         />
 
         <com.android.systemui.statusbar.LineageStatusBarItemHolder
@@ -237,4 +254,9 @@
 
     </com.android.keyguard.AlphaOptimizedLinearLayout>
 
+    <com.android.systemui.matrixx.batterybar.BatteryBarController
+        android:id="@+id/battery_bar"
+        android:layout_width="match_parent"
+        android:layout_height="1dp" />
+
 </com.android.systemui.statusbar.phone.PhoneStatusBarView>
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 945170eef09ce..b38aca0dcaf2f 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -20,11 +20,43 @@
 <com.android.systemui.shade.NotificationPanelView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    xmlns:sysui="http://schemas.android.com/apk/res-auto"
     android:id="@+id/notification_panel"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent">
 
+    <!-- Header Image -->
+    <com.bosphere.fadingedgelayout.FadingEdgeLayout
+        android:id="@+id/layout_header"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/qs_header_image_height"
+        android:layout_marginLeft="-50dp"
+        android:layout_marginRight="-50dp"
+        android:background="#00000000"
+        sysui:fel_edge="bottom"
+        sysui:fel_size_bottom="@dimen/qs_header_image_fade_size" >
+
+        <LinearLayout
+          android:id="@+id/layout_inner_header"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:layout_marginLeft="0dp"
+          android:layout_marginRight="0dp"
+          android:background="#00000000" >
+
+          <ImageView
+              android:id="@+id/qs_header_image_view"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:scaleType="centerCrop"
+              android:visibility="gone"
+              android:background="@drawable/qs_header_image_view_outline" />
+
+        </LinearLayout>
+
+    </com.bosphere.fadingedgelayout.FadingEdgeLayout>
+
     <com.android.systemui.deviceentry.ui.view.UdfpsAccessibilityOverlayOverlappingTouchHandlingView
         android:id="@+id/keyguard_long_press"
         android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml b/packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml
index e8b8922a138d1..2b9dee3132be9 100644
--- a/packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml
+++ b/packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml
@@ -26,6 +26,15 @@
         android:gravity="center_vertical"
         android:layout_marginStart="2.5sp"
     >
+
+        <ImageView
+            android:id="@+id/vowifi"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="3dp"
+            android:scaleType="fitXY"
+            android:visibility="gone" />
+
         <FrameLayout
                 android:id="@+id/inout_container"
                 android:layout_height="@dimen/status_bar_wifi_inout_container_size"
@@ -57,6 +66,11 @@
                 android:id="@+id/wifi_signal"
                 android:layout_height="@dimen/status_bar_wifi_signal_size"
                 android:layout_width="@dimen/status_bar_wifi_signal_size" />
+            <com.android.systemui.statusbar.WifiStandardImageView
+                android:id="@+id/wifi_standard"
+                android:layout_gravity="bottom|start"
+                android:layout_height="@dimen/status_bar_wifi_signal_size"
+                android:layout_width="@dimen/status_bar_wifi_signal_size" />
         </FrameLayout>
 
         <View
diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml
index 0946d51563bf8..73d17402ddcc3 100644
--- a/packages/SystemUI/res/layout/system_icons.xml
+++ b/packages/SystemUI/res/layout/system_icons.xml
@@ -52,6 +52,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         >
         <com.android.systemui.statusbar.policy.Clock
             android:id="@+id/clock_right"
@@ -63,6 +64,8 @@
             android:paddingEnd="@dimen/status_bar_clock_end_padding"
             android:gravity="center_vertical"
             android:visibility="gone"
+            systemui:isStatusBar="true"
         />
+
     </com.android.keyguard.AlphaOptimizedLinearLayout>
 </LinearLayout>
diff --git a/packages/SystemUI/res/layout/text_toast.xml b/packages/SystemUI/res/layout/text_toast.xml
index a3fe8efa48bfd..e96f93bf8052a 100644
--- a/packages/SystemUI/res/layout/text_toast.xml
+++ b/packages/SystemUI/res/layout/text_toast.xml
@@ -41,9 +41,15 @@
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
+        android:textAlignment="center"
+        android:layout_gravity="center_vertical"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:scrollHorizontally="true"
         android:textAppearance="@*android:style/TextAppearance.Toast"/>
 </LinearLayout>
diff --git a/packages/SystemUI/res/layout/tri_state_dialog.xml b/packages/SystemUI/res/layout/tri_state_dialog.xml
new file mode 100644
index 0000000000000..6d9856cbc01b4
--- /dev/null
+++ b/packages/SystemUI/res/layout/tri_state_dialog.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020-2025 crDroid Android Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="@dimen/tri_state_dialog_padding"
+    android:paddingTop="@dimen/tri_state_dialog_padding"
+    android:paddingRight="@dimen/tri_state_dialog_padding"
+    android:paddingBottom="@dimen/tri_state_dialog_padding"
+    android:clipToPadding="false"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:theme="@style/qs_theme">
+
+    <LinearLayout
+        android:layout_gravity="center|right"
+        android:orientation="horizontal"
+        android:id="@+id/tri_state_layout"
+        android:background="@drawable/dialog_tri_state_middle_bg"
+        android:layout_width="wrap_content"
+        android:layout_height="48.0dip"
+        android:translationZ="@dimen/tri_state_dialog_elevation">
+
+        <FrameLayout
+            android:layout_width="54.0dip"
+            android:layout_height="fill_parent">
+
+            <ImageView
+                android:layout_gravity="center"
+                android:id="@+id/tri_state_icon"
+                android:layout_marginLeft="2.0dip"
+                android:layout_width="@dimen/tri_state_dialog_icon_size"
+                android:layout_height="@dimen/tri_state_dialog_icon_size"
+                android:tint="@color/accent_tint_color_selector" />
+        </FrameLayout>
+
+        <TextView
+            android:gravity="center_vertical"
+            android:id="@+id/tri_state_text"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:textSize="14.0sp"
+            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+            android:textColor="?android:attr/textColorPrimary" />
+
+        <FrameLayout
+            android:layout_width="18.0dip"
+            android:layout_height="fill_parent" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index 215300f71496a..9eb372e7c3b3d 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -45,7 +45,7 @@
         app:layout_constraintBottom_toTopOf="@id/volume_dialog_main_slider_container"
         app:layout_constraintEnd_toEndOf="@id/volume_dialog_background"
         app:layout_constraintHeight_default="spread"
-        app:layout_constraintStart_toStartOf="@id/volume_dialog_background"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_default="spread">
 
diff --git a/packages/SystemUI/res/layout/volume_dialog_bottom_section.xml b/packages/SystemUI/res/layout/volume_dialog_bottom_section.xml
index d92be5f66ca2e..b6be50e28d5f3 100644
--- a/packages/SystemUI/res/layout/volume_dialog_bottom_section.xml
+++ b/packages/SystemUI/res/layout/volume_dialog_bottom_section.xml
@@ -16,6 +16,17 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
+    <TextView
+        android:id="@+id/volume_percentage_text"
+        android:layout_width="@dimen/volume_dialog_button_size"
+        android:layout_height="@dimen/volume_dialog_button_size"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+        android:textColor="@androidprv:color/materialColorPrimary"
+        android:background="@drawable/volume_dialog_captions_button_transition_bg"
+        android:soundEffectsEnabled="false"
+        android:visibility="gone"/>
+
     <com.android.systemui.volume.CaptionsToggleImageButton
         android:id="@+id/odi_captions_icon"
         android:src="@drawable/ic_volume_odi_captions_disabled"
@@ -27,6 +38,19 @@
         android:soundEffectsEnabled="false"
         android:visibility="gone"/>
 
+    <ImageButton
+        android:id="@+id/app_volume_icon"
+        android:src="@drawable/ic_app_volume"
+        android:layout_width="@dimen/volume_dialog_button_size"
+        android:layout_height="@dimen/volume_dialog_button_size"
+        android:layout_gravity="center"
+        android:background="@drawable/volume_dialog_captions_button_transition_bg"
+        android:contentDescription="@string/accessibility_volume_settings"
+        android:scaleType="centerInside"
+        android:soundEffectsEnabled="false"
+        android:tint="@androidprv:color/materialColorPrimary"
+        android:visibility="gone"/>
+
     <ImageButton
         android:id="@+id/volume_dialog_settings"
         android:layout_width="@dimen/volume_dialog_button_size"
diff --git a/packages/SystemUI/res/layout/volume_dialog_legacy.xml b/packages/SystemUI/res/layout/volume_dialog_legacy.xml
index d44b6a8534f2a..277e433b38e62 100644
--- a/packages/SystemUI/res/layout/volume_dialog_legacy.xml
+++ b/packages/SystemUI/res/layout/volume_dialog_legacy.xml
@@ -21,18 +21,17 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="right"
-    android:layout_gravity="right"
     android:clipToPadding="false"
     android:theme="@style/volume_dialog_theme">
 
     <!-- right-aligned to be physically near volume button -->
-    <LinearLayout
+    <com.android.systemui.animation.view.LaunchableLinearLayout
         android:id="@+id/volume_dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="right"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_right"
+        android:layout_marginLeft="@dimen/volume_dialog_panel_transparent_padding_horizontal"
+        android:layout_marginRight="@dimen/volume_dialog_panel_transparent_padding_horizontal"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
@@ -54,7 +53,6 @@
                 android:layout_height="@dimen/volume_dialog_ringer_size"
                 android:layout_marginBottom="@dimen/volume_dialog_spacer"
                 android:gravity="right"
-                android:layout_gravity="right"
                 android:translationZ="@dimen/volume_dialog_elevation"
                 android:clipToPadding="false"
                 android:background="@drawable/rounded_bg_full">
@@ -76,7 +74,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:layout_gravity="right"
                 android:orientation="vertical"
                 android:clipChildren="false"
                 android:clipToPadding="false" >
@@ -88,15 +85,32 @@
                     android:orientation="horizontal">
                         <!-- volume rows added and removed here! :-) -->
                 </LinearLayout>
+                <FrameLayout
+                    android:id="@+id/app_volume_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <com.android.keyguard.AlphaOptimizedImageButton
+                        android:id="@+id/app_volume"
+                        android:src="@drawable/ic_app_volume"
+                        android:layout_width="@dimen/volume_dialog_tap_target_size"
+                        android:layout_height="@dimen/volume_dialog_tap_target_size"
+                        android:layout_gravity="center"
+                        android:contentDescription="@string/accessibility_volume_settings"
+                        android:background="@drawable/ripple_drawable_20dp"
+                        android:tint="?androidprv:attr/colorAccent"
+                        android:soundEffectsEnabled="false" />
+                </FrameLayout>
                 <FrameLayout
                     android:id="@+id/settings_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/volume_background_bottom"
-                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding">
+                    android:background="@drawable/volume_background">
                     <com.android.keyguard.AlphaOptimizedImageButton
                         android:id="@+id/settings"
-                        android:src="@drawable/horizontal_ellipsis"
+                        android:src="@drawable/ic_speaker_group_24dp"
                         android:layout_width="@dimen/volume_dialog_tap_target_size"
                         android:layout_height="@dimen/volume_dialog_tap_target_size"
                         android:layout_gravity="center"
@@ -105,6 +119,38 @@
                         android:tint="?androidprv:attr/colorAccent"
                         android:soundEffectsEnabled="false" />
                 </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/expandable_indicator_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background_bottom"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <com.android.systemui.statusbar.phone.ExpandableIndicator
+                        android:id="@+id/expandable_indicator"
+                        android:layout_width="@dimen/volume_dialog_tap_target_size"
+                        android:layout_height="@dimen/volume_dialog_tap_target_size"
+                        android:layout_gravity="center"
+                        android:contentDescription="@string/accessibility_volume_settings"
+                        android:background="@drawable/ripple_drawable_20dp"
+                        android:tint="?androidprv:attr/colorAccent"
+                        android:soundEffectsEnabled="false"
+                        android:padding="10dp"
+                        android:rotation="90" />
+                </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/rounded_border_bottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/volume_background_bottom"
+                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
+                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="32dp"
+                        android:background="@drawable/ripple_drawable_20dp"/>
+                </FrameLayout>
             </LinearLayout>
 
         </LinearLayout>
@@ -115,7 +161,6 @@
             android:layout_height="@dimen/volume_dialog_caption_size"
             android:layout_marginTop="@dimen/volume_dialog_row_margin_bottom"
             android:gravity="right"
-            android:layout_gravity="right"
             android:clipToPadding="false"
             android:clipToOutline="true"
             android:background="@drawable/volume_row_rounded_background">
@@ -129,7 +174,7 @@
                 android:layout_gravity="center"
                 android:soundEffectsEnabled="false"/>
         </FrameLayout>
-    </LinearLayout>
+    </com.android.systemui.animation.view.LaunchableLinearLayout>
 
     <ViewStub
         android:id="@+id/odi_captions_tooltip_stub"
@@ -137,7 +182,8 @@
         android:layout="@layout/volume_tool_tip_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom | right"
-        android:layout_marginRight="@dimen/volume_tool_tip_right_margin"/>
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="@dimen/volume_tool_tip_horizontal_margin"
+        android:layout_marginRight="@dimen/volume_tool_tip_horizontal_margin"/>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/packages/SystemUI/res/layout/weather.xml b/packages/SystemUI/res/layout/weather.xml
new file mode 100644
index 0000000000000..5820d99f1f405
--- /dev/null
+++ b/packages/SystemUI/res/layout/weather.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.WeatherSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/weather_smartspace_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/weather_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+        android:focusable="true"
+        android:textColor="?android:textColorPrimary"
+        style="@style/DateWeatherText" />
+</com.google.android.systemui.smartspace.WeatherSmartspaceView>
diff --git a/packages/SystemUI/res/layout/weather_dream_overlay_complication.xml b/packages/SystemUI/res/layout/weather_dream_overlay_complication.xml
new file mode 100644
index 0000000000000..55b556f7046f6
--- /dev/null
+++ b/packages/SystemUI/res/layout/weather_dream_overlay_complication.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.WeatherSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/dream_weather_complication_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:drawableIconInsetSize="@dimen/weather_dream_complication_icon_inset"
+    app:drawableIconSize="@dimen/weather_dream_complication_icon_dimen"
+    app:removeTextDescent="true"
+    app:textDescentExtraPadding="@dimen/weather_dream_complication_text_descent_extra_padding">
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/weather_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:textColor="@android:color/white"
+        style="@style/WeatherDreamOverlayComplication" />
+</com.google.android.systemui.smartspace.WeatherSmartspaceView>
diff --git a/packages/SystemUI/res/layout/weather_large.xml b/packages/SystemUI/res/layout/weather_large.xml
new file mode 100644
index 0000000000000..187ebac845037
--- /dev/null
+++ b/packages/SystemUI/res/layout/weather_large.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.systemui.smartspace.WeatherSmartspaceView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/weather_smartspace_view_large"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <com.google.android.systemui.smartspace.DoubleShadowTextView
+        android:id="@+id/weather_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginEnd="@dimen/enhanced_smartspace_base_action_icon_margin"
+        android:focusable="true"
+        android:textColor="?android:textColorPrimary"
+        style="@style/DateWeatherText" />
+</com.google.android.systemui.smartspace.WeatherSmartspaceView>
diff --git a/packages/SystemUI/res/layout/wireless_charging_layout.xml b/packages/SystemUI/res/layout/wireless_charging_layout.xml
index f1bc883700713..57a790ef4a0a1 100644
--- a/packages/SystemUI/res/layout/wireless_charging_layout.xml
+++ b/packages/SystemUI/res/layout/wireless_charging_layout.xml
@@ -21,7 +21,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
+    
+    <!-- NT Animation View -->
+    <com.android.systemui.charging.NTRippleView
+        android:id="@+id/wireless_charging_nt_ripple"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+    
+    <!-- Ripple View -->
     <com.android.systemui.surfaceeffects.ripple.RippleView
         android:id="@+id/wireless_charging_ripple"
         android:layout_width="match_parent"
@@ -53,6 +61,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"/>
+        <ImageView
+            android:id="@+id/wireless_charging_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_bolt"/>
     </LinearLayout>
 
 </FrameLayout>
diff --git a/packages/SystemUI/res/raw/udfps_lockscreen_fp.json b/packages/SystemUI/res/raw/udfps_lockscreen_fp.json
index a30a03a7e6080..b08bec1222623 100644
--- a/packages/SystemUI/res/raw/udfps_lockscreen_fp.json
+++ b/packages/SystemUI/res/raw/udfps_lockscreen_fp.json
@@ -1 +1 @@
-{"v":"5.7.8","fr":60,"ip":0,"op":46,"w":46,"h":65,"nm":"fingerprint_build_on","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Fingerprint_20210701 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[23.091,32.5,0],"ix":2,"l":2},"a":{"a":0,"k":[19.341,24.25,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.701,0.42],[-1.757,0],[-1.577,-0.381],[-1.485,-0.816]],"o":[[1.455,-0.799],[1.608,-0.397],[1.719,0],[1.739,0.42],[0,0]],"v":[[-9.818,1.227],[-5.064,-0.618],[0,-1.227],[4.96,-0.643],[9.818,1.227]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717999985639,0.948999980852,0.62400004069,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":24,"s":[2]}],"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[19.341,7.477],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Top","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-2.446,1.161],[-1.168,0.275],[-1.439,0],[-1.301,-0.304],[-1.225,-0.66],[-1.11,-1.844]],"o":[[1.23,-2.044],[1.024,-0.486],[1.312,-0.31],[1.425,0],[1.454,0.34],[2.122,1.143],[0,0]],"v":[[-13.091,3.273],[-7.438,-1.646],[-4.14,-2.797],[0,-3.273],[4.104,-2.805],[8.141,-1.29],[13.091,3.273]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717999985639,0.948999980852,0.62400004069,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":24,"s":[2]}],"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[19.341,16.069],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Mid Top","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-6.53,0],[0,-5.793],[0,0],[2.159,0],[0.59,1.489],[0,0],[1.587,0],[0,-2.16],[-0.81,-1.363],[-0.844,-0.674],[0,0]],"o":[[-0.753,-2.095],[0,-5.793],[6.529,0],[0,0],[0,2.16],[-1.604,0],[0,0],[-0.589,-1.489],[-2.161,0],[0,1.62],[0.54,0.909],[0,0],[0,0]],"v":[[-10.702,5.728],[-11.454,1.506],[0.001,-9],[11.454,1.506],[11.454,1.817],[7.544,5.728],[3.926,3.273],[2.618,0],[-0.997,-2.454],[-4.91,1.457],[-3.657,6.014],[-1.57,8.412],[-0.818,9]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717999994755,0.949000000954,0.624000012875,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":24,"s":[2]}],"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[19.341,28.341],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Inside to dot ","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.307,-0.561],[0.894,-0.16],[0.706,0],[0.844,0.193],[0.728,0.334],[0.967,0.901]],"o":[[-1.038,0.967],[-0.817,0.351],[-0.673,0.12],[-0.9,0],[-0.794,-0.182],[-1.203,-0.551],[0,0]],"v":[[8.182,-1.636],[4.642,0.681],[2.07,1.453],[-0.001,1.636],[-2.621,1.341],[-4.909,0.563],[-8.182,-1.636]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717999985639,0.948999980852,0.62400004069,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":24,"s":[2]}],"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[19.341,40.614],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Bottom","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"bm":0}],"markers":[{"tm":210,"cm":"2","dr":0},{"tm":255,"cm":"1","dr":0}]}
\ No newline at end of file
+{"v":"5.12.2","fr":60,"ip":0,"op":2,"w":165,"h":165,"nm":"CIRCLE EXPORT 3","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Fingerprint","sr":1,"ks":{"o":{"a":0,"k":87,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82.5,82.5,0],"ix":2,"l":2},"a":{"a":0,"k":[-1,936,0],"ix":1,"l":2},"s":{"a":0,"k":[107,107,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[146,146],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.941176474094,0.949019610882,0.949019610882,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-1,936],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2,"st":-72,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-af-rZA/matrixx_strings.xml b/packages/SystemUI/res/values-af-rZA/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-af-rZA/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ar-rSA/matrixx_strings.xml b/packages/SystemUI/res/values-ar-rSA/matrixx_strings.xml
new file mode 100644
index 0000000000000..2067ce5e8ec30
--- /dev/null
+++ b/packages/SystemUI/res/values-ar-rSA/matrixx_strings.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="zero">%d devices connected</item>
+        <item quantity="one">%d device connected</item>
+        <item quantity="two">%d devices connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="many">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ca-rES/matrixx_strings.xml b/packages/SystemUI/res/values-ca-rES/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-ca-rES/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-cs-rCZ/matrixx_strings.xml b/packages/SystemUI/res/values-cs-rCZ/matrixx_strings.xml
new file mode 100644
index 0000000000000..5e1c2b2086cc1
--- /dev/null
+++ b/packages/SystemUI/res/values-cs-rCZ/matrixx_strings.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="many">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-da-rDK/matrixx_strings.xml b/packages/SystemUI/res/values-da-rDK/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-da-rDK/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-de-rDE/matrixx_strings.xml b/packages/SystemUI/res/values-de-rDE/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-de-rDE/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-el-rGR/matrixx_strings.xml b/packages/SystemUI/res/values-el-rGR/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-el-rGR/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-en-rUS/matrixx_strings.xml b/packages/SystemUI/res/values-en-rUS/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rUS/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-es-rES/matrixx_strings.xml b/packages/SystemUI/res/values-es-rES/matrixx_strings.xml
new file mode 100644
index 0000000000000..2c96e7dbae422
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rES/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Cambio tarjeta de datos</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panel de volumen</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error al cargar los datos meteorológicos</string>
+    <string name="omnijaws_service_unknown">No hay datos meteorológicos</string>
+    <string name="omnijaws_label_default">Clima</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Frecuencia de actualización</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Convirtiendo a</string>
+    <string name="ax_dynamic_bar_camera_mic">Cámara &amp; micrófono</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">hasta que esté lleno</string>
+    <string name="ax_dynamic_bar_battery_saver">Ahorro de batería</string>
+    <string name="ax_dynamic_bar_incoming_call">Llamada entrante</string>
+    <string name="ax_dynamic_bar_connected">Conectado</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Activo</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Llamada de alta definición (VoLTE)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Manda mediante Wifi (VoWifi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-fi-rFI/matrixx_strings.xml b/packages/SystemUI/res/values-fi-rFI/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-fi-rFI/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-fr-rFR/matrixx_strings.xml b/packages/SystemUI/res/values-fr-rFR/matrixx_strings.xml
new file mode 100644
index 0000000000000..e35fd850f4809
--- /dev/null
+++ b/packages/SystemUI/res/values-fr-rFR/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Économiseur de données</string>
+    <string name="status_bar_call_strength">Puissance du réseau</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Indicateur d\'itinérance</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Icône Données désactivées</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Désactiver l\'icône de données combinées</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Icône 4G</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Nuageux</string>
+    <string name="weather_condition_rain">Pluvieux</string>
+    <string name="weather_condition_clear">Ciel dégagé</string>
+    <string name="weather_condition_storm">Orageux</string>
+    <string name="weather_condition_snow">Neigeux</string>
+    <string name="weather_condition_wind">Venteux</string>
+    <string name="weather_condition_mist">Brumeux</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charge Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> restant jusqu\'à charge complète)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Charge Dash</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charge Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> restant jusqu\'à charge complète)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Charge Warp</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charge VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> restant jusqu\'à charge complète)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Charge VOOC</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Charge Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> restant jusqu\'à charge complète)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Charge Turbo</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Prochaine alarme à %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d sur %2$d</string>
+    <string name="active_mode_content_description">%1$s est activé</string>
+    <string name="music_controls_no_title">Sans titre</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">Vue</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Mode On-The-Go activé</string>
+    <string name="onthego_notif_title">Le mode On-The-Go est activé</string>
+    <string name="onthego_notif_stop">Arrêter</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Impossible de démarrer le mode On-The-Go</string>
+    <string name="onthego_notif_restart">Redémarrer le mode On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Mode de caméra modifié</string>
+    <string name="onthego_transparency">Transparence</string>
+    <string name="onthego_front_camera">Utiliser la caméra frontale</string>
+    <string name="onthego_service_toggle">Redémarrer automatiquement le service</string>
+    <string name="onthego_channel_name">Principal</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">utilisé aujourd\'hui</string>
+    <string name="usage_data_weekly">utilisé cette semaine</string>
+    <string name="usage_data_default_suffix">Données</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Forcer l\'arrêt ?</string>
+    <string name="force_stop_dlg_text">Forcer l\'arrêt d\'une application peut provoquer son dysfonctionnement.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Son</string>
+    <string name="quick_settings_sound_ring">Sonnerie</string>
+    <string name="quick_settings_sound_vibrate">Vibreur</string>
+    <string name="quick_settings_sound_silent">Silencieux</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Infos CPU</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Infos FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS : <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Boussole</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initialisation\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SO</string>
+    <string name="quick_settings_compass_W">O</string>
+    <string name="quick_settings_compass_NW">NO</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Changer de carte SIM</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Panneau de volume</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Erreur lors du chargement des données météo</string>
+    <string name="omnijaws_service_unknown">Pas de données météorologiques</string>
+    <string name="omnijaws_label_default">Météo</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Fréquence d\'actualisation</string>
+    <string name="refresh_rate_unknown">Inconnu</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Appui long - région sélectionnée</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Langue</string>
+    <string name="quick_settings_locale_more_locales_toast">Veuillez configurer plusieurs langues pour utiliser cette fonctionnalité</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Assistant IA</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Réseau préféré</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Non supporté</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Reconnaissance faciale...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Supprimer</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Enregistrement d\'écran supprimé</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Contrôle du volume</string>
+    <string name="qs_volume_dialog_mute">Muet</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Vitesse Internet</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Ré-évaluation du thème du système... Veuillez patienter quelques secondes</string>
+    <string name="default_user_name">Projet Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">Aucun transfert de données</string>
+    <string name="usb_use_file_transfers">Transfert de fichiers</string>
+    <string name="usb_use_photo_transfers">Transfert de photos (PTP)</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">Partage de connexion USB</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Utilisez l\'USB pour</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">Partage de connexion VPN</string>
+    <string name="vpn_tethering_changed_off">Partage de connexion VPN désactivé.</string>
+    <string name="vpn_tethering_changed_on">Partage de connexion VPN activé.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">nul</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Minuteur</string>
+    <string name="ax_dynamic_bar_stopwatch">Chronomètre</string>
+    <string name="ax_dynamic_bar_alarm">Alarme</string>
+    <string name="ax_dynamic_bar_flashlight">Lampe torche</string>
+    <string name="ax_dynamic_bar_hotspot">Point d\'accès</string>
+    <string name="ax_dynamic_bar_hotspot_active">Partage de connexion actif</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN actif</string>
+    <string name="ax_dynamic_bar_screen_recording">Enregistrement d\'écran</string>
+    <string name="ax_dynamic_bar_now_playing">En cours de lecture</string>
+    <string name="ax_dynamic_bar_media_output">Sortie multimédia</string>
+    <string name="ax_dynamic_bar_sound_mode">Mode sonore</string>
+    <string name="ax_dynamic_bar_silent">Silencieux</string>
+    <string name="ax_dynamic_bar_vibrate">Vibreur</string>
+    <string name="ax_dynamic_bar_ring">Sonnerie</string>
+    <string name="ax_dynamic_bar_charging">En charge</string>
+    <string name="ax_dynamic_bar_wireless">Sans fil</string>
+    <string name="ax_dynamic_bar_saver">Économiseur</string>
+    <string name="ax_dynamic_bar_music">Musique</string>
+    <string name="ax_dynamic_bar_copied">Copié</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copié !</string>
+    <string name="ax_dynamic_bar_image_copied">Image copiée</string>
+    <string name="ax_dynamic_bar_copy_image">Copier l\'image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Image du Presse-papiers</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Ignorer</string>
+    <string name="ax_dynamic_bar_open">Ouvrir</string>
+    <string name="ax_dynamic_bar_stop">Arrêter</string>
+    <string name="ax_dynamic_bar_stop_recording">Arrêter l\'enregistrement</string>
+    <string name="ax_dynamic_bar_reset">Réinitialiser</string>
+    <string name="ax_dynamic_bar_clear_all">Tout effacer</string>
+    <string name="ax_dynamic_bar_show_more">Développer</string>
+    <string name="ax_dynamic_bar_show_less">Replier</string>
+    <string name="ax_dynamic_bar_play">Lecture</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">En pause</string>
+    <string name="ax_dynamic_bar_saved">Enregistré</string>
+    <string name="ax_dynamic_bar_recording">Enregistrement</string>
+    <string name="ax_dynamic_bar_done">Terminé</string>
+    <string name="ax_dynamic_bar_ringing">Sonnerie</string>
+    <string name="ax_dynamic_bar_running">En cours</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Récents</string>
+    <string name="ax_dynamic_bar_unlocked">Déverrouillé</string>
+    <string name="ax_dynamic_bar_device_unlocked">Appareil déverrouillé</string>
+    <string name="ax_dynamic_bar_progress">Progression</string>
+    <string name="ax_dynamic_bar_casting_to">Diffusion sur</string>
+    <string name="ax_dynamic_bar_camera_mic">Caméra &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Appareil photo</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Caméra &amp; Micro</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> appareils</string>
+    <string name="ax_dynamic_bar_wireless_charging">Charge sans fil</string>
+    <string name="ax_dynamic_bar_until_full">restant</string>
+    <string name="ax_dynamic_bar_battery_saver">Économiseur de batterie</string>
+    <string name="ax_dynamic_bar_incoming_call">Appel entrant</string>
+    <string name="ax_dynamic_bar_connected">Connecté</string>
+    <string name="ax_dynamic_bar_disconnect">Déconnecter</string>
+    <string name="ax_dynamic_bar_no_devices">Aucun appareil</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 appareil connecté</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> appareils connectés</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN connecté</string>
+    <string name="ax_dynamic_bar_secured">Sécurisé</string>
+    <string name="ax_dynamic_bar_connecting">Connexion\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 appareil</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Périphérique bluetooth</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> applications</string>
+    <string name="ax_dynamic_bar_just_now">À l\'instant</string>
+    <string name="ax_dynamic_bar_mins_ago">Il y a <xliff:g id="count" example="5">%d</xliff:g>m</string>
+    <string name="ax_dynamic_bar_hours_ago">Il y a <xliff:g id="count" example="2">%d</xliff:g>h</string>
+    <string name="ax_dynamic_bar_days_ago">Il y a <xliff:g id="count" example="3">%d</xliff:g>j</string>
+    <string name="ax_dynamic_bar_weeks_ago">Il y a <xliff:g id="count" example="1">%d</xliff:g>semaines</string>
+    <string name="ax_dynamic_bar_resume">Reprendre</string>
+    <string name="ax_dynamic_bar_clipboard">Presse-papiers</string>
+    <string name="ax_dynamic_bar_previous">Précédent</string>
+    <string name="ax_dynamic_bar_next">Suivant</string>
+    <string name="ax_dynamic_bar_shuffle">Mélange</string>
+    <string name="ax_dynamic_bar_output">Sortie</string>
+    <string name="ax_dynamic_bar_rec_short">Enr</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Actif</string>
+    <string name="ax_dynamic_bar_biometric">Biométrie</string>
+    <string name="ax_dynamic_bar_trust">Confiance</string>
+    <string name="ax_dynamic_bar_alignment">Position</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Micro</string>
+    <string name="ax_dynamic_bar_recent_apps">Applications récentes</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> en cours d\'exécution</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Mi-temps</string>
+    <string name="ax_dynamic_bar_sports_upcoming">À venir</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Capture d\'écran</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Mode veille</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Pixels intelligents</string>
+    <string name="quick_settings_smart_pixels_on">Activé</string>
+    <string name="quick_settings_smart_pixels_off">Désactivé</string>
+    <string name="smart_pixels_percent_label">Pourcentage de pixels</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Appel HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Appel Wi-Fi (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-h700dp/dimens.xml b/packages/SystemUI/res/values-h700dp/dimens.xml
index 39777ab568475..055308f177767 100644
--- a/packages/SystemUI/res/values-h700dp/dimens.xml
+++ b/packages/SystemUI/res/values-h700dp/dimens.xml
@@ -17,5 +17,4 @@
 <resources>
     <!-- Margin above the ambient indication container -->
     <dimen name="ambient_indication_container_margin_top">15dp</dimen>
-    <dimen name="volume_row_slider_height">177dp</dimen>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values-hu-rHU/matrixx_strings.xml b/packages/SystemUI/res/values-hu-rHU/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-hu-rHU/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-it-rIT/matrixx_strings.xml b/packages/SystemUI/res/values-it-rIT/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-it-rIT/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-iw-rIL/matrixx_strings.xml b/packages/SystemUI/res/values-iw-rIL/matrixx_strings.xml
new file mode 100644
index 0000000000000..97b6960342427
--- /dev/null
+++ b/packages/SystemUI/res/values-iw-rIL/matrixx_strings.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="two">%d devices connected</item>
+        <item quantity="many">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ja-rJP/matrixx_strings.xml b/packages/SystemUI/res/values-ja-rJP/matrixx_strings.xml
new file mode 100644
index 0000000000000..be41eaa9db7fb
--- /dev/null
+++ b/packages/SystemUI/res/values-ja-rJP/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ko-rKR/matrixx_strings.xml b/packages/SystemUI/res/values-ko-rKR/matrixx_strings.xml
new file mode 100644
index 0000000000000..be41eaa9db7fb
--- /dev/null
+++ b/packages/SystemUI/res/values-ko-rKR/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/matrixx_strings.xml b/packages/SystemUI/res/values-ms-rMY/matrixx_strings.xml
new file mode 100644
index 0000000000000..5b104c5d7d7eb
--- /dev/null
+++ b/packages/SystemUI/res/values-ms-rMY/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Penjimat data</string>
+    <string name="status_bar_call_strength">Kekuatan panggilan</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Perantauan penunjuk</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Ikon data dilumpuhkan</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Lumpuhkan ikon data gabungan</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G ikon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Berawan</string>
+    <string name="weather_condition_rain">Hujan</string>
+    <string name="weather_condition_clear">Langit Cerah</string>
+    <string name="weather_condition_storm">Ribut</string>
+    <string name="weather_condition_snow">Bersalji</string>
+    <string name="weather_condition_wind">Berangin</string>
+    <string name="weather_condition_mist">Berkabus</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Pengecasan Dash (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> sehingga penuh)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Pengecasan Dash</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Pengecasan Warp (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> sehingga penuh)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Pengecasan Warp</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Pengecasan VOOC (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> sehingga penuh)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • Pengecasan VOOC</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Pengecasan Turbo (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> sehingga penuh)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Pengecasan Turbo</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Penggera seterusnya pada pukul %s</string>
+    <string name="accessibility_smartspace_page">Halaman %1$d daripada %2$d</string>
+    <string name="active_mode_content_description">%1$s sudah dihidupkan</string>
+    <string name="music_controls_no_title">Tiada tajuk</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">Kod QR</string>
+    <string name="smartspace_role_desc">Paparkan</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go diaktifkan</string>
+    <string name="onthego_notif_title">On-The-Go sedang aktif</string>
+    <string name="onthego_notif_stop">Berhenti</string>
+    <string name="onthego_notif_options">Tetapan</string>
+    <string name="onthego_notif_error">Tidak dapat memulakan On-The-Go</string>
+    <string name="onthego_notif_restart">Mulakan semula On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Mod kamera berubah</string>
+    <string name="onthego_transparency">Ketelusan</string>
+    <string name="onthego_front_camera">Guna kamera depan</string>
+    <string name="onthego_service_toggle">Mulakan semula servis secara automatik</string>
+    <string name="onthego_channel_name">Utama</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">Panggilan HD (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Panggilan Wi-Fi (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index dbaa2ea55c31e..1ae95e19e7d8a 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -19,7 +19,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <!-- The dark background color behind the shade -->
-    <color name="shade_scrim_background_dark">@androidprv:color/system_under_surface_dark</color>
+    <color name="shade_scrim_background_dark">@android:color/transparent</color>
 
     <!-- The main FG tint for shade header items -->
     <!-- Only applicable when com.android.systemui.shade_header_blur_font_color is enabled -->
@@ -136,8 +136,16 @@
 
     <!-- Dark theme fallback colors for notification shade/scrim -->
     <color name="shade_panel_fallback">@android:color/system_accent2_800</color>
-    <color name="notification_scrim_fallback">@android:color/system_surface_dim_dark</color>
+    <color name="notification_scrim_fallback">@android:color/system_neutral1_900</color>
+
+    <!-- for fallback only (dual tone) -->
+    <color name="nt_scrim_behind_1">@android:color/system_neutral1_900</color>
+    <color name="nt_scrim_behind_2">@android:color/system_neutral1_1000</color>
+    <color name="nt_notification_behind_1">@android:color/system_neutral1_900</color>
+    <color name="nt_notification_behind_2">@android:color/system_neutral1_1000</color>
 
     <!-- Keyboard shortcut helper dialog -->
     <color name="ksh_key_item_color">@*android:color/system_on_surface_variant_dark</color>
+
+    <color name="privacy_chip_background">@android:color/system_accent1_400</color>
 </resources>
diff --git a/packages/SystemUI/res/values-night/kg_widgets_colors.xml b/packages/SystemUI/res/values-night/kg_widgets_colors.xml
new file mode 100644
index 0000000000000..01075f56c7718
--- /dev/null
+++ b/packages/SystemUI/res/values-night/kg_widgets_colors.xml
@@ -0,0 +1,3 @@
+<resources>    
+    <color name="card_surface_color">@*android:color/system_neutral1_900</color>
+</resources>
diff --git a/packages/SystemUI/res/values-nl-rNL/matrixx_strings.xml b/packages/SystemUI/res/values-nl-rNL/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-nl-rNL/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-no-rNO/matrixx_strings.xml b/packages/SystemUI/res/values-no-rNO/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-no-rNO/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pl-rPL/matrixx_strings.xml b/packages/SystemUI/res/values-pl-rPL/matrixx_strings.xml
new file mode 100644
index 0000000000000..5e1c2b2086cc1
--- /dev/null
+++ b/packages/SystemUI/res/values-pl-rPL/matrixx_strings.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="many">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/matrixx_strings.xml b/packages/SystemUI/res/values-pt-rBR/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rBR/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/matrixx_strings.xml b/packages/SystemUI/res/values-pt-rPT/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-pt-rPT/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ro-rRO/matrixx_strings.xml b/packages/SystemUI/res/values-ro-rRO/matrixx_strings.xml
new file mode 100644
index 0000000000000..cd3a42d8c6a35
--- /dev/null
+++ b/packages/SystemUI/res/values-ro-rRO/matrixx_strings.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ru-rRU/matrixx_strings.xml b/packages/SystemUI/res/values-ru-rRU/matrixx_strings.xml
new file mode 100644
index 0000000000000..b9f0219851309
--- /dev/null
+++ b/packages/SystemUI/res/values-ru-rRU/matrixx_strings.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">Модуль NFC</string>
+    <string name="status_bar_data_saver">Экономия трафика</string>
+    <string name="status_bar_call_strength">Уровень сигнала</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Индикатор роуминга</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Значок отключенной передачи данных</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Отключить комбинированный значок данных</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">Значок 4G</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Пасмурно</string>
+    <string name="weather_condition_rain">Дождливо</string>
+    <string name="weather_condition_clear">Ясно</string>
+    <string name="weather_condition_storm">Гроза</string>
+    <string name="weather_condition_snow">Снег</string>
+    <string name="weather_condition_wind">Ветрено</string>
+    <string name="weather_condition_mist">Туман</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Турбо Зарядка (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> до полной зарядки)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Быстрая зарядка</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Турбо Зарядка (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> до полной зарядки)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Очень быстрая зарядка</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC зарядка (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> до конца)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC зарядка</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Турбо Зарядка (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> до полной зарядки)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Турбо Зарядка</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Следующий будильник сработает в %s</string>
+    <string name="accessibility_smartspace_page">Страница %1$d. Всего: %2$d</string>
+    <string name="active_mode_content_description">%1$s Включен</string>
+    <string name="music_controls_no_title">Без названия</string>
+    <string name="smartspace_content_desc">Самое главное</string>
+    <string name="smartspace_flight_qr_code">QR-код</string>
+    <string name="smartspace_role_desc">Просмотр</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Интерфейс системы</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Режим \"На ходу\" включен</string>
+    <string name="onthego_notif_title">Режим «На ходу» активен</string>
+    <string name="onthego_notif_stop">Стоп</string>
+    <string name="onthego_notif_options">Варианты</string>
+    <string name="onthego_notif_error">Не удается включить режим \"На ходу\"</string>
+    <string name="onthego_notif_restart">Перезапустить режим \"на ходу\"</string>
+    <string name="onthego_notif_camera_changed">Режим камеры изменён</string>
+    <string name="onthego_transparency">Прозрачность</string>
+    <string name="onthego_front_camera">Использовать переднюю камеру</string>
+    <string name="onthego_service_toggle">Автоматически перезапускать службу</string>
+    <string name="onthego_channel_name">Основное</string>
+    <string name="global_action_onthego">Режим \"На ходу\"</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">использовано</string>
+    <string name="usage_data_weekly">использовалось на этой неделе</string>
+    <string name="usage_data_default_suffix">Данные</string>
+    <string name="usage_wifi_default_suffix">Вай-фай</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Принудительно остановить?</string>
+    <string name="force_stop_dlg_text">Принудительное закрытие приложения может отразиться на его функциональности.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Линза</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Звук</string>
+    <string name="quick_settings_sound_ring">Кольцо</string>
+    <string name="quick_settings_sound_vibrate">Вибрация</string>
+    <string name="quick_settings_sound_silent">Бесшумный</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">Информация о процессоре</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">Отображать количество FPS</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">Частота кадров в секунду: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Компас</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Инициализация\u2026</string>
+    <string name="quick_settings_compass_N">Н</string>
+    <string name="quick_settings_compass_NE">Северо-восток</string>
+    <string name="quick_settings_compass_E">Е</string>
+    <string name="quick_settings_compass_SE">Ю-В</string>
+    <string name="quick_settings_compass_S">С</string>
+    <string name="quick_settings_compass_SW">Юго-запад</string>
+    <string name="quick_settings_compass_W">Восток</string>
+    <string name="quick_settings_compass_NW">Северо-запад</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Сменить сим-карту для передачи данных</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Панель громкости</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Ошибка при загрузке данных о погоде</string>
+    <string name="omnijaws_service_unknown">Нет данных о погоде</string>
+    <string name="omnijaws_label_default">Погода</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Частота обновления</string>
+    <string name="refresh_rate_unknown">Неизвестно</string>
+    <string name="auto_mode_label">Автоматически</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Долгое нажатие - выбранный регион</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Язык</string>
+    <string name="quick_settings_locale_more_locales_toast">Пожалуйста, настройте несколько языков, чтобы активировать функцию</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">ИИ помощник</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Предпочтительный тип сети</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Не поддерживается</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Распознавание лица...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">Подключено устройств: %d</item>
+        <item quantity="few">Подключено устройств: %d</item>
+        <item quantity="many">Подключено устройств: %d</item>
+        <item quantity="other">Подключено устройств: %d</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Включить 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Удалить</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Запись экрана удалена</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Громкость</string>
+    <string name="qs_volume_dialog_title">Управление громкостью</string>
+    <string name="qs_volume_dialog_mute">Без звука</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Скорость интернета</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Повторная оценка системной темы... Пожалуйста, подождите несколько секунд</string>
+    <string name="default_user_name">Матрица проекта</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">Без передачи данных</string>
+    <string name="usb_use_file_transfers">Передача файлов</string>
+    <string name="usb_use_photo_transfers">Режим PTP</string>
+    <string name="usb_use_uvc_webcam">Веб-камера</string>
+    <string name="usb_use_tethering">USB-модем</string>
+    <string name="usb_use_MIDI">Режим MIDI</string>
+    <string name="usb_use">Использовать USB для</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN-модем</string>
+    <string name="vpn_tethering_changed_off">VPN-модем отключен.</string>
+    <string name="vpn_tethering_changed_on">VPN-модем включен.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">пустой</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Таймер</string>
+    <string name="ax_dynamic_bar_stopwatch">Секундомер</string>
+    <string name="ax_dynamic_bar_alarm">Сигналы</string>
+    <string name="ax_dynamic_bar_flashlight">Фонарик</string>
+    <string name="ax_dynamic_bar_hotspot">Точка доступа</string>
+    <string name="ax_dynamic_bar_hotspot_active">Точка доступа активна</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN активен</string>
+    <string name="ax_dynamic_bar_screen_recording">Запись экрана</string>
+    <string name="ax_dynamic_bar_now_playing">Сейчас играет</string>
+    <string name="ax_dynamic_bar_media_output">Медиа выход</string>
+    <string name="ax_dynamic_bar_sound_mode">Звуковой режим</string>
+    <string name="ax_dynamic_bar_silent">Без звука</string>
+    <string name="ax_dynamic_bar_vibrate">Вибрация</string>
+    <string name="ax_dynamic_bar_ring">Кольцо</string>
+    <string name="ax_dynamic_bar_charging">Зарядка</string>
+    <string name="ax_dynamic_bar_wireless">Беспроводной</string>
+    <string name="ax_dynamic_bar_saver">Энергосбережение</string>
+    <string name="ax_dynamic_bar_music">Музыка</string>
+    <string name="ax_dynamic_bar_copied">Скопировано</string>
+    <string name="ax_dynamic_bar_copied_feedback">Скопировано!</string>
+    <string name="ax_dynamic_bar_image_copied">Изображение скопировано</string>
+    <string name="ax_dynamic_bar_copy_image">Скопировать изображение</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Открыть изображение из буфера обмена</string>
+    <string name="ax_dynamic_bar_image">Изображение</string>
+    <string name="ax_dynamic_bar_url">Ссылка</string>
+    <string name="ax_dynamic_bar_dismiss">Отменить</string>
+    <string name="ax_dynamic_bar_open">Открыть</string>
+    <string name="ax_dynamic_bar_stop">Остановить</string>
+    <string name="ax_dynamic_bar_stop_recording">Остановить запись</string>
+    <string name="ax_dynamic_bar_reset">Сброс</string>
+    <string name="ax_dynamic_bar_clear_all">Очистить всё</string>
+    <string name="ax_dynamic_bar_show_more">Показать больше</string>
+    <string name="ax_dynamic_bar_show_less">Показать меньше</string>
+    <string name="ax_dynamic_bar_play">Воспроизвести</string>
+    <string name="ax_dynamic_bar_pause">Приостановить</string>
+    <string name="ax_dynamic_bar_paused">Приостановлено</string>
+    <string name="ax_dynamic_bar_saved">Сохранено</string>
+    <string name="ax_dynamic_bar_recording">Идет запись</string>
+    <string name="ax_dynamic_bar_done">Готово</string>
+    <string name="ax_dynamic_bar_ringing">Звонок</string>
+    <string name="ax_dynamic_bar_running">Выполнение</string>
+    <string name="ax_dynamic_bar_on">ВКЛ</string>
+    <string name="ax_dynamic_bar_recents">Список недавних приложений</string>
+    <string name="ax_dynamic_bar_unlocked">Разблокировано</string>
+    <string name="ax_dynamic_bar_device_unlocked">Устройство разблокировано</string>
+    <string name="ax_dynamic_bar_progress">Прогресс</string>
+    <string name="ax_dynamic_bar_casting_to">Трансляция на</string>
+    <string name="ax_dynamic_bar_camera_mic">Камера &amp; Микрофон</string>
+    <string name="ax_dynamic_bar_camera">Камера</string>
+    <string name="ax_dynamic_bar_microphone">Микрофон</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Камера &amp; микрофон</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> Устройства</string>
+    <string name="ax_dynamic_bar_wireless_charging">Беспроводная зарядка</string>
+    <string name="ax_dynamic_bar_until_full">До полного заполнения</string>
+    <string name="ax_dynamic_bar_battery_saver">Режим энергосбережения</string>
+    <string name="ax_dynamic_bar_incoming_call">Входящий вызов</string>
+    <string name="ax_dynamic_bar_connected">Подключено</string>
+    <string name="ax_dynamic_bar_disconnect">Отключено</string>
+    <string name="ax_dynamic_bar_no_devices">Нет устройств</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 устройство подключено</string>
+    <string name="ax_dynamic_bar_devices_connected">Подключено устройств: <xliff:g id="count" example="3">%d</xliff:g></string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN подключен</string>
+    <string name="ax_dynamic_bar_secured">Защищено</string>
+    <string name="ax_dynamic_bar_connecting">Подключение\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 устройство</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Устройства Bluetooth</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> Приложения</string>
+    <string name="ax_dynamic_bar_just_now">Прямо сейчас</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>Мин. Назад</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>Ч. назад</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>Дней назад</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>Недель назад</string>
+    <string name="ax_dynamic_bar_resume">Возобновить</string>
+    <string name="ax_dynamic_bar_clipboard">Буфер обмена</string>
+    <string name="ax_dynamic_bar_previous">Предыдущий</string>
+    <string name="ax_dynamic_bar_next">Далее</string>
+    <string name="ax_dynamic_bar_shuffle">Перемешать</string>
+    <string name="ax_dynamic_bar_output">Вывод</string>
+    <string name="ax_dynamic_bar_rec_short">Запись</string>
+    <string name="ax_dynamic_bar_cast_short">Транслировать</string>
+    <string name="ax_dynamic_bar_active">Активно</string>
+    <string name="ax_dynamic_bar_biometric">Биометрия</string>
+    <string name="ax_dynamic_bar_trust">Доверять</string>
+    <string name="ax_dynamic_bar_alignment">Выравнивание</string>
+    <string name="ax_dynamic_bar_cam_short">Камера</string>
+    <string name="ax_dynamic_bar_mic_short">Микрофон</string>
+    <string name="ax_dynamic_bar_recent_apps">Меню недавних приложений</string>
+    <string name="ax_dynamic_bar_count_running">Запущено: <xliff:g id="count" example="3">%d</xliff:g></string>
+    <string name="ax_dynamic_bar_sports_vs">или</string>
+    <string name="ax_dynamic_bar_sports_live">В ЭФИРЕ</string>
+    <string name="ax_dynamic_bar_sports_final">Финал</string>
+    <string name="ax_dynamic_bar_sports_halftime">Перерыв</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Предстоящие</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Скриншот</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Режим сна</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Стандарт Wi-Fi</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Умные пиксели</string>
+    <string name="quick_settings_smart_pixels_on">Включить</string>
+    <string name="quick_settings_smart_pixels_off">Отключено</string>
+    <string name="smart_pixels_percent_label">Процент пикселей</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD звонки (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi звонки (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sr-rSP/matrixx_strings.xml b/packages/SystemUI/res/values-sr-rSP/matrixx_strings.xml
new file mode 100644
index 0000000000000..cd3a42d8c6a35
--- /dev/null
+++ b/packages/SystemUI/res/values-sr-rSP/matrixx_strings.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sv-rSE/matrixx_strings.xml b/packages/SystemUI/res/values-sv-rSE/matrixx_strings.xml
new file mode 100644
index 0000000000000..4484b5aacb50b
--- /dev/null
+++ b/packages/SystemUI/res/values-sv-rSE/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sw600dp-land/config.xml b/packages/SystemUI/res/values-sw600dp-land/config.xml
index 30fdd3dfc1618..e5ba0acade69c 100644
--- a/packages/SystemUI/res/values-sw600dp-land/config.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/config.xml
@@ -31,7 +31,7 @@
     <!-- Whether to force split shade. This value has effect only when flag
     lockscreen.enable_landscape is enabled. -->
     <!-- TODO(b/411449027): This config is deprecated. Remove with the launch of SceneContainer. -->
-    <bool name="force_config_use_split_notification_shade">false</bool>
+    <bool name="force_config_use_split_notification_shade">true</bool>
 
     <!-- The number of rows in the paginated grid QuickSettings -->
     <integer name="quick_settings_paginated_grid_num_rows">3</integer>
diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
index 055c3a641d1b0..13d1cf84788f5 100644
--- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -33,7 +33,6 @@
          otherwise full space between two pages is qs_horizontal_margin*2, and that makes tiles page
          not appear immediately after user swipes to the side -->
     <dimen name="qs_tiles_page_horizontal_margin">12dp</dimen>
-    <dimen name="qs_media_session_height_expanded">172dp</dimen>
 
     <dimen name="split_shade_notifications_scrim_margin_bottom">16dp</dimen>
 
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index efd5e2e70e368..6c495b0c2aae1 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -39,9 +39,6 @@
     <!-- The width of user avatar when on Keyguard -->
     <dimen name="multi_user_avatar_keyguard_size">30dp</dimen>
 
-    <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">24dp</dimen>
-
     <!-- Screen pinning request width -->
     <dimen name="screen_pinning_request_width">400dp</dimen>
     <!-- Screen pinning request bottom button circle widths -->
diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
index f4f0424ade98b..6e35f45961b9b 100644
--- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
@@ -22,7 +22,6 @@
 
     <dimen name="keyguard_split_shade_top_margin">72dp</dimen>
 
-    <dimen name="qs_media_session_height_expanded">184dp</dimen>
     <dimen name="qs_content_horizontal_padding">40dp</dimen>
     <dimen name="qs_horizontal_margin">40dp</dimen>
     <!-- in split shade qs_tiles_page_horizontal_margin should be equal of qs_horizontal_margin/2,
diff --git a/packages/SystemUI/res/values-tr-rTR/matrixx_strings.xml b/packages/SystemUI/res/values-tr-rTR/matrixx_strings.xml
new file mode 100644
index 0000000000000..a40d1e038c318
--- /dev/null
+++ b/packages/SystemUI/res/values-tr-rTR/matrixx_strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Veri Tasarrufu</string>
+    <string name="status_bar_call_strength">Sinyal Gücü</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Dolaşım Göstergesi</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Mobil Veri Kapalı Simgesi</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Birleşik veri simgesini devre dışı bırak</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G Simgesi</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Bulutlu</string>
+    <string name="weather_condition_rain">Yağmurlu</string>
+    <string name="weather_condition_clear">Açık Gökyüzü</string>
+    <string name="weather_condition_storm">Fırtınalı</string>
+    <string name="weather_condition_snow">Karlı</string>
+    <string name="weather_condition_wind">Rüzgarlı</string>
+    <string name="weather_condition_mist">Sisli</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Şarj Oluyor (Tamamen dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kaldı)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Şarj Oluyor</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Şarj Oluyor (Tamamen dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kaldı)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Şarj Oluyor</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • WOOC Şarj Oluyor (Tamamen dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kaldı)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Şarj Oluyor</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Şarj Oluyor (Tamamen dolmasına <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> kaldı)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Şarj Oluyor</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Sonraki alarm saat %s \'da</string>
+    <string name="accessibility_smartspace_page">Sayfa %2$d\'de %1$d</string>
+    <string name="active_mode_content_description">%1$s Açık</string>
+    <string name="music_controls_no_title">Başlık yok</string>
+    <string name="smartspace_content_desc">Bir bakışta</string>
+    <string name="smartspace_flight_qr_code">Karekod</string>
+    <string name="smartspace_role_desc">Görünüş</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">Sistem Arayüzü</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">Yürüyüş modu etkinleştirildi</string>
+    <string name="onthego_notif_title">Yürüyüş modu etkin</string>
+    <string name="onthego_notif_stop">Dur</string>
+    <string name="onthego_notif_options">Seçenekler</string>
+    <string name="onthego_notif_error">Yürüyüş modu başlatılamıyor</string>
+    <string name="onthego_notif_restart">Yürüyüş modunu yeniden başlat</string>
+    <string name="onthego_notif_camera_changed">Kamera modu değişti</string>
+    <string name="onthego_transparency">Saydamlık</string>
+    <string name="onthego_front_camera">Ön kamerayı kullan</string>
+    <string name="onthego_service_toggle">Hizmeti otomatik olarak yeniden başlat</string>
+    <string name="onthego_channel_name">Ana</string>
+    <string name="global_action_onthego">Yürüyüş Modu</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">Bugün kullanılan</string>
+    <string name="usage_data_weekly">Bu hafta kullanılan</string>
+    <string name="usage_data_default_suffix">Mobil Veri</string>
+    <string name="usage_wifi_default_suffix">Kablosuz</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Durmaya zorlansın mı?</string>
+    <string name="force_stop_dlg_text">Uygulamayı zorla durdurursanız hatalı davranabilir.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Ses</string>
+    <string name="quick_settings_sound_ring">Zil Sesi</string>
+    <string name="quick_settings_sound_vibrate">Titreşim</string>
+    <string name="quick_settings_sound_silent">Sessiz</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">İşlemci Bilgisi</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS bilgisi</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Pusula</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Başlatılıyor\u2026</string>
+    <string name="quick_settings_compass_N">K</string>
+    <string name="quick_settings_compass_NE">KD</string>
+    <string name="quick_settings_compass_E">D</string>
+    <string name="quick_settings_compass_SE">GD</string>
+    <string name="quick_settings_compass_S">G</string>
+    <string name="quick_settings_compass_SW">GB</string>
+    <string name="quick_settings_compass_W">B</string>
+    <string name="quick_settings_compass_NW">KB</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Mobil veri SIM\'ini değiştir</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Ses paneli</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Hava durumu verisi yüklenirken hata oluştu</string>
+    <string name="omnijaws_service_unknown">Hava durumu verisi yok</string>
+    <string name="omnijaws_label_default">Hava Durumu</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Yenileme Hızı</string>
+    <string name="refresh_rate_unknown">Bilinmiyor</string>
+    <string name="auto_mode_label">Otomatik</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Kısmi ekran görüntüsü için basılı tutun</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Dil</string>
+    <string name="quick_settings_locale_more_locales_toast">Öncelikle birden fazla dili yapılandırın</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">Yapay Zeka Asistanı</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Tercih edilen ağ</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Desteklenmiyor</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Yüz Algılanıyor...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d cihaz bağlandı</item>
+        <item quantity="other">%d cihaz bağlandı</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">5G\'yi etkinleştir</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Sil</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Ekran kaydı silindi</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Ses</string>
+    <string name="qs_volume_dialog_title">Ses Düzeyi Kontrolü</string>
+    <string name="qs_volume_dialog_mute">Sessiz</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">İnternet Hızı</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Sistem teması yeniden değerlendiriliyor.. Lütfen biraz bekleyin</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">Veri aktarımı yok</string>
+    <string name="usb_use_file_transfers">Dosya Aktarımı</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Web Kamerası</string>
+    <string name="usb_use_tethering">USB İnternet Paylaşımı</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">USB\'yi şunun için kullan</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN İle Ağ Paylaşımı</string>
+    <string name="vpn_tethering_changed_off">VPN internet paylaşımı kapatıldı.</string>
+    <string name="vpn_tethering_changed_on">VPN internet paylaşımı açıldı.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">boş</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Zamanlayıcı</string>
+    <string name="ax_dynamic_bar_stopwatch">Kronometre</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">El feneri</string>
+    <string name="ax_dynamic_bar_hotspot">Kişisel Erişim Noktası</string>
+    <string name="ax_dynamic_bar_hotspot_active">Kişisel Erişim Noktası Etkin</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Etkin</string>
+    <string name="ax_dynamic_bar_screen_recording">Ekran Kaydı</string>
+    <string name="ax_dynamic_bar_now_playing">Şu an oynatılıyor</string>
+    <string name="ax_dynamic_bar_media_output">Medya çıkışı</string>
+    <string name="ax_dynamic_bar_sound_mode">Ses Modu</string>
+    <string name="ax_dynamic_bar_silent">Sessiz</string>
+    <string name="ax_dynamic_bar_vibrate">Titreşim</string>
+    <string name="ax_dynamic_bar_ring">Zil Sesi</string>
+    <string name="ax_dynamic_bar_charging">Şarj oluyor</string>
+    <string name="ax_dynamic_bar_wireless">Kablosuz</string>
+    <string name="ax_dynamic_bar_saver">Tasarrufu</string>
+    <string name="ax_dynamic_bar_music">Müzik</string>
+    <string name="ax_dynamic_bar_copied">Kopyalandı</string>
+    <string name="ax_dynamic_bar_copied_feedback">Kopyalandı!</string>
+    <string name="ax_dynamic_bar_image_copied">Görüntü Kopyalandı</string>
+    <string name="ax_dynamic_bar_copy_image">Görüntüyü Kopyala</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Pano Görseli</string>
+    <string name="ax_dynamic_bar_image">Görüntü</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Yoksay</string>
+    <string name="ax_dynamic_bar_open">Aç</string>
+    <string name="ax_dynamic_bar_stop">Dur</string>
+    <string name="ax_dynamic_bar_stop_recording">Kaydı Durdur</string>
+    <string name="ax_dynamic_bar_reset">Sıfırla</string>
+    <string name="ax_dynamic_bar_clear_all">Tümünü Temizle</string>
+    <string name="ax_dynamic_bar_show_more">Daha Fazla Göster</string>
+    <string name="ax_dynamic_bar_show_less">Daha Az Göster</string>
+    <string name="ax_dynamic_bar_play">Oynat</string>
+    <string name="ax_dynamic_bar_pause">Duraklat</string>
+    <string name="ax_dynamic_bar_paused">Duraklatıldı</string>
+    <string name="ax_dynamic_bar_saved">Kaydedildi</string>
+    <string name="ax_dynamic_bar_recording">Kaydediliyor</string>
+    <string name="ax_dynamic_bar_done">Tamamlandı</string>
+    <string name="ax_dynamic_bar_ringing">Çalıyor</string>
+    <string name="ax_dynamic_bar_running">Çalışıyor</string>
+    <string name="ax_dynamic_bar_on">AÇIK</string>
+    <string name="ax_dynamic_bar_recents">Son Kullanılanlar</string>
+    <string name="ax_dynamic_bar_unlocked">Kilit Açıldı</string>
+    <string name="ax_dynamic_bar_device_unlocked">Cihaz Kilidi Açıldı</string>
+    <string name="ax_dynamic_bar_progress">İlerleme</string>
+    <string name="ax_dynamic_bar_casting_to">Şuna Yansıtılıyor</string>
+    <string name="ax_dynamic_bar_camera_mic">Kamera &amp; Mikrofon</string>
+    <string name="ax_dynamic_bar_camera">Kamera</string>
+    <string name="ax_dynamic_bar_microphone">Mikrofon</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Kamera &amp; Mikrofon</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> Cihaz</string>
+    <string name="ax_dynamic_bar_wireless_charging">Kablosuz Şarj Oluyor</string>
+    <string name="ax_dynamic_bar_until_full">dolana kadar</string>
+    <string name="ax_dynamic_bar_battery_saver">Pil Tasarrufu</string>
+    <string name="ax_dynamic_bar_incoming_call">Gelen Çağrı</string>
+    <string name="ax_dynamic_bar_connected">Bağlandı</string>
+    <string name="ax_dynamic_bar_disconnect">Bağlantıyı Kes</string>
+    <string name="ax_dynamic_bar_no_devices">Cihaz Yok</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 cihaz bağlandı</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> cihaz bağlandı</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Bağlandı</string>
+    <string name="ax_dynamic_bar_secured">Güvenli</string>
+    <string name="ax_dynamic_bar_connecting">Bağlanıyor\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 Cihaz</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth Aygıtı</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> Uygulama</string>
+    <string name="ax_dynamic_bar_just_now">Şu Anda</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>dk. Önce</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>sa. Önce</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>gün Önce</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>hf. Önce</string>
+    <string name="ax_dynamic_bar_resume">Devam Ettir</string>
+    <string name="ax_dynamic_bar_clipboard">Pano</string>
+    <string name="ax_dynamic_bar_previous">Önceki</string>
+    <string name="ax_dynamic_bar_next">Sonraki</string>
+    <string name="ax_dynamic_bar_shuffle">Karıştır</string>
+    <string name="ax_dynamic_bar_output">Çıkış</string>
+    <string name="ax_dynamic_bar_rec_short">Kayıt</string>
+    <string name="ax_dynamic_bar_cast_short">Yayın</string>
+    <string name="ax_dynamic_bar_active">Etkin</string>
+    <string name="ax_dynamic_bar_biometric">Biyometrik</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Hizalama</string>
+    <string name="ax_dynamic_bar_cam_short">Kamera</string>
+    <string name="ax_dynamic_bar_mic_short">Mikrofon</string>
+    <string name="ax_dynamic_bar_recent_apps">Son Uygulamalar</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> Çalışıyor</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">CANLI</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Devre Arası</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Yakında</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Ekran Görüntüsü</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Uyku Modu</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wi-Fi Standardı</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Akıllı Pikseller</string>
+    <string name="quick_settings_smart_pixels_on">Açık</string>
+    <string name="quick_settings_smart_pixels_off">Kapalı</string>
+    <string name="smart_pixels_percent_label">Piksel yüzdesi</string>
+    <string name="smart_pixels_percent_format">%%<xliff:g id="percent" example="25">%d</xliff:g></string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD Arama (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi Arama (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-uk-rUA/matrixx_strings.xml b/packages/SystemUI/res/values-uk-rUA/matrixx_strings.xml
new file mode 100644
index 0000000000000..5e1c2b2086cc1
--- /dev/null
+++ b/packages/SystemUI/res/values-uk-rUA/matrixx_strings.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="few">%d devices connected</item>
+        <item quantity="many">%d devices connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-vi-rVN/matrixx_strings.xml b/packages/SystemUI/res/values-vi-rVN/matrixx_strings.xml
new file mode 100644
index 0000000000000..be41eaa9db7fb
--- /dev/null
+++ b/packages/SystemUI/res/values-vi-rVN/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/matrixx_strings.xml b/packages/SystemUI/res/values-zh-rCN/matrixx_strings.xml
new file mode 100644
index 0000000000000..9466b93d89128
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rCN/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">流量节省</string>
+    <string name="status_bar_call_strength">信号强度</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">漫游标识</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">数据已停用图标</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">禁用合并数据图标</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G 图标</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">多云</string>
+    <string name="weather_condition_rain">雨天</string>
+    <string name="weather_condition_clear">晴天</string>
+    <string name="weather_condition_storm">暴雨</string>
+    <string name="weather_condition_snow">下雪</string>
+    <string name="weather_condition_wind">大风</string>
+    <string name="weather_condition_mist">有雾</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • 快速充电中 (预计<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> 后充满)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • 快速充电</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp 闪充中 (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> 后充满)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp 闪充</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC 闪充中 (预计 <xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> 后充满)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC 闪充中</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo 闪充中（预计<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g>后充满）</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo 闪充中</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">闹钟下一次响铃时间是：%s</string>
+    <string name="accessibility_smartspace_page">第 %1$d/%2$d 頁</string>
+    <string name="active_mode_content_description">%1$s 已开启</string>
+    <string name="music_controls_no_title">无标题</string>
+    <string name="smartspace_content_desc">概览</string>
+    <string name="smartspace_flight_qr_code">扫一扫</string>
+    <string name="smartspace_role_desc">查看</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">系统界面</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">已启用OTG模式</string>
+    <string name="onthego_notif_title">已连接OTG</string>
+    <string name="onthego_notif_stop">停止</string>
+    <string name="onthego_notif_options">设置</string>
+    <string name="onthego_notif_error">无法启动OTG模式</string>
+    <string name="onthego_notif_restart">重新启动OTG模式</string>
+    <string name="onthego_notif_camera_changed">相机模式已更改</string>
+    <string name="onthego_transparency">透明度</string>
+    <string name="onthego_front_camera">使用前置摄像头</string>
+    <string name="onthego_service_toggle">自动重启服务</string>
+    <string name="onthego_channel_name">首页</string>
+    <string name="global_action_onthego">模式OTG</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">今日已用</string>
+    <string name="usage_data_weekly">本周已用</string>
+    <string name="usage_data_default_suffix">数据</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">确定要强行停止吗？</string>
+    <string name="force_stop_dlg_text">强行停止某个应用可能会导致其出现异常。</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">长度</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">声音</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/matrixx_strings.xml b/packages/SystemUI/res/values-zh-rTW/matrixx_strings.xml
new file mode 100644
index 0000000000000..be41eaa9db7fb
--- /dev/null
+++ b/packages/SystemUI/res/values-zh-rTW/matrixx_strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2026 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+    <!-- Notification counter -->
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_role_desc">View</string>
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+    <string name="default_user_name">Project Matrixx</string>
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
+</resources>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 8bc3eed59062b..0458a28bcd147 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -46,6 +46,7 @@
             <enum name="small" value="1" />
             <enum name="gone" value="2" />
         </attr>
+        <attr name="isStatusBar" format="boolean" />
         <attr name="showDark" format="boolean" />
     </declare-styleable>
     <attr name="orientation">
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index 381dc02c91103..6e0c495dc5da3 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -135,4 +135,9 @@
 
     <!-- Notify use that they are in Lock-to-app (for devices without navbar)-->
     <string name="screen_pinning_toast_no_navbar">To unpin this screen, touch &amp; hold Back button</string>
+
+    <!-- Flashlight Strength -->
+    <string name="flashlight_strength_title">Flashlight Strength</string>
+    <string name="flashlight_strength_turn_off">Turn off</string>
+    <string name="flashlight_strength_turn_on">Turn on</string>
 </resources>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index f65b09df925d2..ba8ba3c739515 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -33,7 +33,7 @@
     <color name="status_bar_icons_hover_color_dark">#38000000</color> <!-- 22% black -->
 
     <!-- The dark background color behind the shade -->
-    <color name="shade_scrim_background_dark">@androidprv:color/system_under_surface_light</color>
+    <color name="shade_scrim_background_dark">@android:color/transparent</color>
 
     <!-- Base colors for notification shade/scrim, the alpha component is adjusted programmatically
     to match the spec -->
@@ -43,6 +43,12 @@
     <color name="shade_panel_fallback">@android:color/system_accent2_200</color>
     <color name="notification_scrim_fallback">@android:color/system_surface_dim_light</color>
 
+    <!-- for fallback only (dual tone) -->
+    <color name="nt_scrim_behind_1">@android:color/system_neutral1_100</color>
+    <color name="nt_scrim_behind_2">@android:color/system_neutral1_200</color>
+    <color name="nt_notification_behind_1">@android:color/system_surface_dim_light</color>
+    <color name="nt_notification_behind_2">@android:color/system_neutral1_50</color>
+
     <!-- The color of the background in the separated list of the Global Actions menu -->
     <color name="global_actions_separated_background">#F5F5F5</color>
 
@@ -249,7 +255,7 @@
     <color name="screenrecord_status_color">#E94235</color>
     <color name="screenrecord_icon_color">#D93025</color><!-- red 600 -->
 
-    <color name="privacy_chip_background">#3ddc84</color>
+    <color name="privacy_chip_background">@android:color/system_accent1_500</color>
     <color name="privacy_chip_location_only_background">#3dbaf4</color>
 
     <!-- Accessibility floating menu -->
@@ -288,4 +294,9 @@
     <color name="pin_bouncer_action_button_bg">@androidprv:color/surface_effect_0</color>
     <!-- Bouncer background when blur is not enabled.   -->
     <color name="bouncer_fallback_bg">@android:color/system_accent2_200</color>
+
+    <!-- Statusbar clock chip colors -->
+    <color name="rippleDark">#14000000</color>
+    <color name="neumorph_outline_start">#FFBDBDBD</color>
+    <color name="neumorph_outline_end">#FFF0F0F0</color>
 </resources>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index e0bc1ec0e01ae..dca011ab89d0a 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -102,12 +102,12 @@
 
     <!-- The default tiles to display in QuickSettings -->
     <string name="quick_settings_tiles_default" translatable="false">
-        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.v33.SafetyCenterQsTileService)
+         internet,bt,flashlight,dnd,alarm,airplane,nfc,rotation,battery,controls,wallet,cast,screenrecord,custom(com.android.permissioncontroller/.permission.service.v33.SafetyCenterQsTileService)
     </string>
 
     <!-- The default tiles to display in QuickSettings with the new UI -->
     <string name="quick_settings_tiles_new_default" translatable="false">
-        internet,bt,dnd,cast,flashlight,airplane,rotation,wallet,alarm,controls,screenrecord,battery
+        internet,bt,flashlight,dnd,alarm,airplane,nfc,rotation,battery,screenrecord,cast,wallet,controls
     </string>
 
     <!-- The class path of the Safety Quick Settings Tile -->
@@ -120,7 +120,7 @@
 
     <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
     <string name="quick_settings_tiles_stock" translatable="false">
-        internet,wifi,cell,bt,flashlight,dnd,modes_dnd,alarm,airplane,nfc,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,desktopeffects,ambient_display,aod,caffeine,heads_up,powershare,profiles,reading_mode,sync,usb_tether,vpn
+        internet,wifi,cell,bt,flashlight,dnd,modes_dnd,alarm,airplane,nfc,rotation,battery,controls,wallet,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction,dream,font_scaling,record_issue,hearing_devices,notes,desktopeffects,ambient_display,aod,caffeine,heads_up,powershare,profiles,reading_mode,sync,usb_tether,vpn,onthego,sound,cpuinfo,fpsinfo,compass,dataswitch,volume_panel,weather,refresh_rate,screenshot,locale,dns,preferred_network,volume,five_g,vpn_tethering,sleep_mode,smart_pixels
     </string>
 
     <!-- The tiles to display in QuickSettings -->
@@ -584,6 +584,7 @@
     <string-array name="config_statusBarIconsToExclude" translatable="false">
         <item>@*android:string/status_bar_rotate</item>
         <item>@*android:string/status_bar_headset</item>
+        <item>network_speed</item>
     </string-array>
 
 
@@ -665,7 +666,7 @@
     <integer name="config_dialogShowAnimationDurationMs">300</integer>
 
     <!-- The duraction of the hide animation for the volume dialog in milliseconds -->
-    <integer name="config_dialogHideAnimationDurationMs">250</integer>
+    <integer name="config_dialogHideAnimationDurationMs">300</integer>
 
     <!-- Whether or not to show a notification for an unknown battery state -->
     <bool name="config_showNotificationForUnknownBatteryState">false</bool>
@@ -1186,4 +1187,8 @@
 
     <!-- Indicates whether the tapping to open qs panel is supported -->
     <bool name="config_statusBarTapToExpandShade">false</bool>
+
+    <!-- Packages to be hidden from the FGS manager. -->
+    <string-array name="config_hideFgsManagerPackages" translatable="false">
+    </string-array>
 </resources>
diff --git a/packages/SystemUI/res/values/cr_config.xml b/packages/SystemUI/res/values/cr_config.xml
new file mode 100644
index 0000000000000..288bee62c90e5
--- /dev/null
+++ b/packages/SystemUI/res/values/cr_config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2016-2026 crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- Notification counter -->
+    <integer name="status_bar_notification_info_maxnum">999</integer>
+
+    <!-- Charging info current divider, if needed -->
+    <integer name="config_currentInfoDivider" translatable="false">1000</integer>
+
+    <!-- On-The-Go -->
+    <integer name="quick_settings_onthego_dialog_short_timeout">3000</integer>
+    <integer name="quick_settings_onthego_dialog_long_timeout">6000</integer>
+
+    <!-- The CPU temperature sensor path, defaults to empty -->
+    <string name="config_cpuTempSensor" translatable="false">/sys/class/thermal/thermal_zone0/temp</string>
+
+    <!-- The CPU temperature divider, if needed -->
+    <integer name="config_cpuTempDivider" translatable="false">1</integer>
+
+    <!-- The CPUs to display in CPUInfoService view -->
+    <string name="config_displayCpus" translatable="false"></string>
+
+    <!-- FPSInfoService FPS node file path -->
+    <string name="config_fpsInfoSysNode" translatable="false">/sys/class/drm/sde-crtc-0/measured_fps</string>
+
+    <!-- Preferred max refresh rate at AOD & Ambient Display, if supported by the display. -->
+    <integer name="config_aodMaxRefreshRate">-1</integer>
+
+    <!-- Whether to disable Smart Pixels on UDFPS -->
+    <bool name="config_disableSmartPixelsOnUDFPS">false</bool>
+</resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 28600f5a6f7c4..79023ae5d9310 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -346,6 +346,9 @@
 
     <!-- Radius for notifications corners without adjacent notifications -->
     <dimen name="notification_corner_radius">28dp</dimen>
+    
+    <!-- Radius for media notifications -->
+    <dimen name="media_notification_corner_radius">26dp</dimen>
 
     <!-- Stroke width for notifications focus state overlay, see id/notification_focus_outline -->
     <dimen name="notification_focus_stroke_width">3dp</dimen>
@@ -373,10 +376,10 @@
     <dimen name="keyguard_indication_bottom_padding">16sp</dimen>
 
     <!-- The padding at start and end of indication text shown on AOD -->
-    <dimen name="keyguard_indication_text_padding">16dp</dimen>
+    <dimen name="keyguard_indication_text_padding">12dp</dimen>
 
     <!-- The min height on the indication text shown on AOD -->
-    <dimen name="keyguard_indication_text_min_height">48dp</dimen>
+    <dimen name="keyguard_indication_text_min_height">46dp</dimen>
 
     <!-- Shadows under the clock, date and other keyguard text fields -->
     <dimen name="keyguard_shadow_radius">5</dimen>
@@ -450,9 +453,9 @@
 
     <!-- paddings for container with status icons and battery -->
     <!-- padding start is a bit smaller than end to account for status icon margin-->
-    <dimen name="status_bar_icons_padding_start">3dp</dimen>
+    <dimen name="status_bar_icons_padding_start">0dp</dimen>
 
-    <dimen name="status_bar_icons_padding_end">4dp</dimen>
+    <dimen name="status_bar_icons_padding_end">0dp</dimen>
     <dimen name="status_bar_icons_padding_bottom">0dp</dimen>
     <dimen name="status_bar_icons_padding_top">0dp</dimen>
 
@@ -647,7 +650,7 @@
 
     <dimen name="brightness_mirror_height">48dp</dimen>
 
-    <dimen name="volume_dialog_panel_transparent_padding_right">8dp</dimen>
+    <dimen name="volume_dialog_panel_transparent_padding_horizontal">8dp</dimen>
 
     <dimen name="volume_dialog_panel_transparent_padding">20dp</dimen>
 
@@ -686,7 +689,7 @@
 
     <dimen name="volume_dialog_background_blur_radius">0dp</dimen>
 
-    <dimen name="volume_tool_tip_right_margin">76dp</dimen>
+    <dimen name="volume_tool_tip_horizontal_margin">76dp</dimen>
 
     <dimen name="volume_tool_tip_arrow_corner_radius">2dp</dimen>
 
@@ -728,11 +731,11 @@
     <dimen name="qs_tile_margin_horizontal">8dp</dimen>
     <dimen name="qs_tile_margin_vertical">@dimen/qs_tile_margin_horizontal</dimen>
     <dimen name="qs_tile_margin_top_bottom">4dp</dimen>
-    <dimen name="qs_brightness_margin_top">8dp</dimen>
+    <dimen name="qs_brightness_margin_top">10dp</dimen>
     <dimen name="qs_brightness_margin_bottom">16dp</dimen>
     <dimen name="qqs_layout_margin_top">16dp</dimen>
     <dimen name="qqs_layout_padding_bottom">24dp</dimen>
-    <item name="qqs_expand_clock_scale" format="float" type="dimen">2.57</item>
+    <item name="qqs_expand_clock_scale" format="float" type="dimen">2.2</item>
 
     <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
          aligned with notifications. The exception is split shade when this value becomes
@@ -908,9 +911,9 @@
          split shade on keyguard-->
     <dimen name="keyguard_split_shade_top_margin">68dp</dimen>
     <!-- The margin between the status view and the notifications on Keyguard.-->
-    <dimen name="keyguard_status_view_bottom_margin">20dp</dimen>
+    <dimen name="keyguard_status_view_bottom_margin">16dp</dimen>
     <!-- Minimum margin between clock and status bar -->
-    <dimen name="keyguard_clock_top_margin">18dp</dimen>
+    <dimen name="keyguard_clock_top_margin">16dp</dimen>
     <!-- The amount to shift the clocks during a small/large transition -->
     <dimen name="keyguard_clock_switch_y_shift">14dp</dimen>
 
@@ -983,16 +986,16 @@
     <dimen name="kg_framed_avatar_size">32dp</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">16dp</dimen>
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
     <!-- Additional translation (downwards) for appearing notifications when going to the full shade
          from Keyguard. -->
     <dimen name="go_to_full_shade_appearing_translation">200dp</dimen>
 
     <!-- The width/height of the keyguard bottom area icon view on keyguard. -->
-    <dimen name="keyguard_affordance_fixed_height">48dp</dimen>
-    <dimen name="keyguard_affordance_fixed_width">48dp</dimen>
-    <dimen name="keyguard_affordance_fixed_radius">24dp</dimen>
+    <dimen name="keyguard_affordance_fixed_height">56dp</dimen>
+    <dimen name="keyguard_affordance_fixed_width">56dp</dimen>
+    <dimen name="keyguard_affordance_fixed_radius">30dp</dimen>
     <dimen name="keyguard_affordance_fixed_padding">12dp</dimen>
 
     <!--  The width/height/padding of the keyguard settings popup menu  -->
@@ -1004,7 +1007,7 @@
     <!-- Amount the button should shake when it's not long-pressed for long enough. -->
     <dimen name="keyguard_affordance_shake_amplitude">8dp</dimen>
 
-    <dimen name="keyguard_affordance_horizontal_offset">16dp</dimen>
+    <dimen name="keyguard_affordance_horizontal_offset">32dp</dimen>
     <dimen name="keyguard_affordance_vertical_offset">32dp</dimen>
     <!-- Value should be at least sum of 'keyguard_affordance_width' +
          'keyguard_affordance_horizontal_offset' -->
@@ -1120,7 +1123,7 @@
     <dimen name="default_gear_space">18dp</dimen>
 
     <!-- Global actions power menu -->
-    <dimen name="global_actions_translate">9dp</dimen>
+    <dimen name="global_actions_translate">0dp</dimen>
 
     <!-- Distance from the top of screen in pixels, to position the power menu near the button. -->
     <dimen name="global_actions_top_padding">330px</dimen>
@@ -1243,7 +1246,7 @@
     <dimen name="biometric_dialog_fingerprint_icon_height">100dp</dimen>
     <dimen name="biometric_dialog_button_negative_max_width">160dp</dimen>
     <dimen name="biometric_dialog_button_positive_max_width">136dp</dimen>
-    <dimen name="biometric_dialog_corner_size">28dp</dimen>
+    <dimen name="biometric_dialog_corner_size">16dp</dimen>
     <dimen name="biometric_dialog_indicator_max_width">280dp</dimen>
     <!-- Y translation when showing/dismissing the dialog-->
     <dimen name="biometric_dialog_animation_translation_offset">350dp</dimen>
@@ -1303,6 +1306,9 @@
     <item name="wireless_charging_anim_battery_level_text_size_start" format="float" type="dimen">
         0
     </item>
+    <!-- padding size in sp of batteryIcon for wireless charging animation -->
+    <item name="wireless_charging_padding" format="float" type="dimen">8
+    </item>
     <!-- Ending text size in sp of batteryLevel for wireless charging animation -->
     <item name="wireless_charging_anim_battery_level_text_size_end" format="float" type="dimen">48
     </item>
@@ -1375,33 +1381,39 @@
     <dimen name="privacy_dialog_background_radius_small">4dp</dimen>
 
     <!-- Size of media cards in the QSPanel carousel -->
-    <dimen name="qs_media_padding">16dp</dimen>
-    <dimen name="qs_media_album_radius">14dp</dimen>
-    <dimen name="qs_media_info_margin">12dp</dimen>
-    <dimen name="qs_media_info_spacing">8dp</dimen>
-    <dimen name="qs_media_icon_offset">4dp</dimen>
-    <dimen name="qs_center_guideline_padding">10dp</dimen>
-    <dimen name="qs_media_action_spacing">4dp</dimen>
+    <dimen name="qs_media_padding">12.3985dp</dimen>
+    <dimen name="qs_media_album_radius">@dimen/notification_corner_radius</dimen>
+    <dimen name="qs_media_info_margin">9.2989dp</dimen>
+    <dimen name="qs_media_info_spacing">6.1992dp</dimen>
+    <dimen name="qs_media_icon_offset">3.0996dp</dimen>
+    <dimen name="qs_center_guideline_padding">7.7491dp</dimen>
+    <dimen name="qs_media_action_spacing">3.0996dp</dimen>
     <dimen name="qs_media_action_margin">12dp</dimen>
-    <dimen name="qs_media_action_play_pause_width">72dp</dimen>
-    <dimen name="qs_seamless_height">24dp</dimen>
-    <dimen name="qs_seamless_icon_size">12dp</dimen>
+    <dimen name="qs_media_action_play_pause_width">60dp</dimen>
+    <dimen name="qs_seamless_height">18.5978dp</dimen>
+    <dimen name="qs_seamless_icon_size">9.2989dp</dimen>
     <dimen name="qs_media_button_stroke_width">1dp</dimen>
     <dimen name="qs_media_disabled_seekbar_height">1dp</dimen>
     <dimen name="qs_media_enabled_seekbar_height">2dp</dimen>
-    <dimen name="qs_media_app_icon_size">24dp</dimen>
-    <dimen name="qs_media_explicit_indicator_icon_size">13dp</dimen>
+    <dimen name="qs_media_app_icon_size">18.5978dp</dimen>
+    <dimen name="qs_media_explicit_indicator_icon_size">10.0738dp</dimen>
 
-    <dimen name="qs_media_session_enabled_seekbar_vertical_padding">15dp</dimen>
+    <dimen name="qs_media_session_enabled_seekbar_vertical_padding">11.6236dp</dimen>
     <dimen name="qs_media_session_disabled_seekbar_vertical_padding">16dp</dimen>
-    <dimen name="qs_media_session_height_expanded">184dp</dimen>
+    <dimen name="qs_media_session_height_expanded">142.583dp</dimen>
     <dimen name="qs_media_session_height_collapsed">128dp</dimen>
     <dimen name="qs_media_seekbar_progress_wavelength">20dp</dimen>
     <dimen name="qs_media_seekbar_progress_amplitude">1.5dp</dimen>
     <dimen name="qs_media_seekbar_progress_phase">8dp</dimen>
     <dimen name="qs_media_seekbar_progress_stroke_width">2dp</dimen>
-    <dimen name="qs_media_session_collapsed_guideline">168dp</dimen>
-    <dimen name="qs_media_session_collapsed_guideline_with_arrows">216dp</dimen>
+    <dimen name="qs_media_session_collapsed_legacy_guideline">144dp</dimen>
+    <dimen name="qs_media_session_collapsed_guideline">111.5867dp</dimen>
+    <dimen name="qs_media_session_collapsed_guideline_with_arrows">159.5867dp</dimen>
+
+    <!-- Size of media cards in the QSPanel carousel -->
+    <dimen name="qs_media_session_enabled_seekbar_vertical_padding_bottom">9.2989dp</dimen>
+    <dimen name="qs_media_text_size_12">9.2989dp</dimen>
+    <dimen name="qs_media_action_48">37.1956dp</dimen>
 
     <!-- Chipbar -->
     <!-- (Used for media tap-to-transfer chip for sender device and active unlock) -->
diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml
index 07a40c86d03a5..81a19130aac0a 100644
--- a/packages/SystemUI/res/values/flags.xml
+++ b/packages/SystemUI/res/values/flags.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <bool name="are_flags_overrideable">false</bool>
+    <bool name="are_flags_overrideable">true</bool>
 
     <bool name="flag_monet">true</bool>
 
diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml
index 751ee5f23bb07..728379101562c 100644
--- a/packages/SystemUI/res/values/ids.xml
+++ b/packages/SystemUI/res/values/ids.xml
@@ -229,6 +229,8 @@
     <item type="id" name="keyguard_indication_text" />
     <item type="id" name="keyguard_indication_text_bottom" />
     <item type="id" name="keyguard_root_view" />
+    <item type="id" name="ax_dynamic_bar_keyguard_chip" />
+    <item type="id" name="ax_dynamic_bar_expanded_top_barrier" />
     <item type="id" name="keyguard_settings_button" />
     <item type="id" name="nssl_guideline" />
     <item type="id" name="nssl_placeholder" />
@@ -308,4 +310,12 @@
     <item type="id" name="screen_off_animation_guard_set" />
     <item type="id" name="screen_off_animation_guard_reported_wtf" />
     <item type="id" name="screen_off_animation_guard_screen_off_updates" />
+
+    <!-- Custom overlay on lockscreen/doze -->
+    <item type="id" name="custom_overlay_container" />
+    
+    <!-- Clock face -->
+    <item type="id" name="original_text_color" />
+    <item type="id" name="original_typeface" />
+
 </resources>
diff --git a/packages/SystemUI/res/values/integers.xml b/packages/SystemUI/res/values/integers.xml
index fad4d4ff8abe7..5157601f3b328 100644
--- a/packages/SystemUI/res/values/integers.xml
+++ b/packages/SystemUI/res/values/integers.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 <resources>
-    <integer name="biometric_dialog_text_gravity">8388611</integer> <!-- gravity start -->
+    <integer name="biometric_dialog_text_gravity">1</integer> <!-- CENTER_HORIZONTAL -->
     <integer name="biometric_prompt_content_list_item_max_lines_if_two_column">3</integer>
 
     <integer name="qs_security_footer_maxLines">2</integer>
@@ -48,4 +48,4 @@
     <integer name="max_notif_icons_on_lockscreen">3</integer>
     <!-- Maximum number of notification icons shown in the status bar (excluding overflow dot) -->
     <integer name="max_notif_static_icons">4</integer>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/SystemUI/res/values/kg_widgets_colors.xml b/packages/SystemUI/res/values/kg_widgets_colors.xml
new file mode 100644
index 0000000000000..6849e789f5142
--- /dev/null
+++ b/packages/SystemUI/res/values/kg_widgets_colors.xml
@@ -0,0 +1,7 @@
+<resources>    
+    <color name="lockscreen_widget_background_color_dark">@android:color/system_neutral1_900</color>
+    <color name="lockscreen_widget_background_color_light">@android:color/system_neutral1_0</color>
+    <color name="lockscreen_widget_active_color_dark">@android:color/system_accent1_100</color>
+    <color name="lockscreen_widget_active_color_light">@android:color/system_accent1_600</color>
+    <color name="card_surface_color">@*android:color/system_neutral1_0</color>
+</resources>
diff --git a/packages/SystemUI/res/values/kg_widgets_dimens.xml b/packages/SystemUI/res/values/kg_widgets_dimens.xml
new file mode 100644
index 0000000000000..18bc92edd963d
--- /dev/null
+++ b/packages/SystemUI/res/values/kg_widgets_dimens.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 the risingOS Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+	<dimen name="kg_widget_margin_vertical">10dp</dimen>
+	<dimen name="kg_widget_margin_bottom">6dp</dimen>
+    <dimen name="kg_widgets_margin_horizontal">12dp</dimen>
+    <dimen name="kg_widgets_main_margin_start">12dp</dimen>
+    <dimen name="kg_widgets_main_margin_end">12dp</dimen>
+    <dimen name="kg_widget_circle_size">68dp</dimen>
+    <dimen name="kg_widgets_icon_padding">20dp</dimen>
+    <dimen name="kg_main_widgets_icon_padding">20dp</dimen>
+    <dimen name="kg_widget_main_height">88dp</dimen>
+    <dimen name="kg_widget_main_width">175dp</dimen>
+</resources>
diff --git a/packages/SystemUI/res/values/kg_widgets_strings.xml b/packages/SystemUI/res/values/kg_widgets_strings.xml
new file mode 100644
index 0000000000000..93a0839c90d54
--- /dev/null
+++ b/packages/SystemUI/res/values/kg_widgets_strings.xml
@@ -0,0 +1,13 @@
+<resources>    
+    <string name="camera">Camera</string>
+    <string name="clock_timer">Clock/Timer</string>
+    <string name="calculator">Calculator</string>
+    <string name="gallery">Gallery</string>
+    <string name="no_default_app_found">No default %1$s app found</string>
+    <string name="weather_data_unavailable">Data Unavailable</string>
+    <string name="omnijaws_weather">OmniJaws</string>
+    <string name="quick_settings_data_label">Mobile data</string>
+    <string name="quick_settings_ringer_label">Ringer mode</string>
+    <string name="torch_active">Torch Active</string>
+    <string name="google_wallet">Google Wallet</string>
+</resources>
diff --git a/packages/SystemUI/res/values/kg_widgets_styles.xml b/packages/SystemUI/res/values/kg_widgets_styles.xml
new file mode 100644
index 0000000000000..e688869a6b5eb
--- /dev/null
+++ b/packages/SystemUI/res/values/kg_widgets_styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 the risingOS Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <style name="Theme.LockscreenWidgets.SystemUI" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+        <item name="android:elevation">0dp</item>
+    </style>
+	<style name="LockscreenWidgetsBackgroundOverlay" parent="">
+		<item name="cornerFamily">rounded</item>
+		<item name="cornerSize">100dp</item>
+	</style>
+</resources>
diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml
index ccb178f5d7829..5844a3dd131a5 100644
--- a/packages/SystemUI/res/values/lineage_config.xml
+++ b/packages/SystemUI/res/values/lineage_config.xml
@@ -57,6 +57,12 @@
           <item>4095,0</item>
     </string-array>
 
+    <!-- Whether to enable MediaTek-specific optical dimming for UDFPS -->
+    <bool name="config_udfpsMtkGhbmDimming">false</bool>
+
+    <!-- Name of the UDFPS HBM DimLayer for the HWComposer -->
+    <string name="config_udfpsHbmDimLayer" translatable="false">OnScreenFingerprintDimLayer</string>
+
     <!-- Doze: does the double tap sensor need a proximity check? -->
     <bool name="doze_double_tap_proximity_check">false</bool>
 
diff --git a/packages/SystemUI/res/values/lineage_dimens.xml b/packages/SystemUI/res/values/lineage_dimens.xml
index 4a24b9d357147..2b695422554e7 100644
--- a/packages/SystemUI/res/values/lineage_dimens.xml
+++ b/packages/SystemUI/res/values/lineage_dimens.xml
@@ -18,4 +18,7 @@
 <resources>
     <!-- Largest size an avatar might need to be drawn in the power menu user picker -->
     <dimen name="global_actions_avatar_size">24dp</dimen>
+
+    <!-- Weather -->  
+    <dimen name="weather_image_max_size">24dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_arrays.xml b/packages/SystemUI/res/values/matrixx_arrays.xml
index a2a2f90915aac..3333c852af076 100644
--- a/packages/SystemUI/res/values/matrixx_arrays.xml
+++ b/packages/SystemUI/res/values/matrixx_arrays.xml
@@ -4,5 +4,15 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-
+     <!-- Cardinal directions for the compass tile -->
+    <string-array name="cardinal_directions">
+        <item>@string/quick_settings_compass_N</item>  <!-- North -->
+        <item>@string/quick_settings_compass_NE</item> <!-- North east -->
+        <item>@string/quick_settings_compass_E</item>  <!-- East -->
+        <item>@string/quick_settings_compass_SE</item> <!-- South east -->
+        <item>@string/quick_settings_compass_S</item>  <!-- South -->
+        <item>@string/quick_settings_compass_SW</item> <!-- South west -->
+        <item>@string/quick_settings_compass_W</item>  <!-- West -->
+        <item>@string/quick_settings_compass_NW</item> <!-- North west -->
+    </string-array>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_attrs.xml b/packages/SystemUI/res/values/matrixx_attrs.xml
index a2a2f90915aac..1a733aebe22cd 100644
--- a/packages/SystemUI/res/values/matrixx_attrs.xml
+++ b/packages/SystemUI/res/values/matrixx_attrs.xml
@@ -3,6 +3,25 @@
      Copyright (C) 2022-2026 Project Matrixx
      SPDX-License-Identifier: Apache-2.0
 -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <!-- Smartspace -->
+    <attr format="dimension" name="backgroundCornerRadius" />
+    <attr format="dimension" name="smartspaceSubtitleTextSize" />
+    <attr format="dimension" name="smartspaceTitleTextSize" />
+    <declare-styleable
+        name="WeatherSmartspaceView">
+        <attr format="dimension" name="iconInset" />
+        <attr format="dimension" name="iconSize" />
+        <attr format="boolean" name="removeTextDescent" />
+        <attr format="dimension" name="textDescentExtraPadding" />
+    </declare-styleable>
+
+    <declare-styleable name="WeatherTextView">
+        <attr name="weatherText" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="ProgressImageView">
+        <attr name="typeface" format="string" />
+    </declare-styleable>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_colors.xml b/packages/SystemUI/res/values/matrixx_colors.xml
index a2a2f90915aac..144d78ea9074d 100644
--- a/packages/SystemUI/res/values/matrixx_colors.xml
+++ b/packages/SystemUI/res/values/matrixx_colors.xml
@@ -5,4 +5,12 @@
 -->
 <resources>
 
+     <!-- Notification counter -->
+     <color name="notification_number_text_color">#ff000000</color>
+
+     <!-- Smartspace -->
+     <color name="ambient_text_shadow_color">#40000000</color>
+     <color name="key_text_shadow_color">#89000000</color>
+     <color name="smartspace_button_background">@android:color/system_accent2_200</color>
+     <color name="smartspace_button_text">@android:color/system_accent2_700</color>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_config.xml b/packages/SystemUI/res/values/matrixx_config.xml
index a2a2f90915aac..b689228a8e14c 100644
--- a/packages/SystemUI/res/values/matrixx_config.xml
+++ b/packages/SystemUI/res/values/matrixx_config.xml
@@ -5,4 +5,18 @@
 -->
 <resources>
 
+     <!-- Notification counter -->
+     <integer name="status_bar_notification_info_maxnum">999</integer>
+
+     <!-- Charging info current divider, if needed -->
+     <integer name="config_currentInfoDivider" translatable="false">1000</integer>
+
+
+    <!-- The location of the devices physical tri state switch
+         0: Left side
+         1: Right side -->
+    <integer name="config_alertSliderLocation">0</integer>
+
+    <!-- Whether key handler sends intent when changing slider position -->
+    <string name="config_alertSliderIntent"></string>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_dimens.xml b/packages/SystemUI/res/values/matrixx_dimens.xml
index a2a2f90915aac..886ea39f0875a 100644
--- a/packages/SystemUI/res/values/matrixx_dimens.xml
+++ b/packages/SystemUI/res/values/matrixx_dimens.xml
@@ -5,4 +5,126 @@
 -->
 <resources>
 
+    <!-- HD calling icon -->
+    <dimen name="signal_icon_viewport_size">24dp</dimen>
+
+    <!-- OmniStyle custom headers -->
+    <dimen name="qs_header_image_height">142dp</dimen>
+    <dimen name="qs_header_image_fade_size">80dp</dimen>
+
+    <!-- Sb Chip -->
+    <dimen name="chip_corner_radius">28dp</dimen>
+    <dimen name="status_bar_clock_chip_tb_padding">0dp</dimen>
+    <dimen name="status_bar_clock_chip_lr_padding">8dp</dimen>
+
+    <!-- Weather -->
+    <dimen name="weather_image_max_size">24dp</dimen>
+    <dimen name="weather_humidity_margin_start">16dp</dimen>
+
+    <!-- Udfps fingerprint animation -->
+    <dimen name="udfps_animation_size">280dp</dimen>
+    <dimen name="udfps_animation_offset">0dp</dimen>
+
+    <!-- Smartspace -->
+    <dimen name="air_quality_chip_corner_radius">7.0dip</dimen>
+    <dimen name="ambient_text_shadow_radius">1.5dp</dimen>
+    <dimen name="background_bottom_padding">14.0dip</dimen>
+    <dimen name="background_top_padding">10.0dip</dimen>
+    <dimen name="bg_non_remoteviews_card_padding_horizontal">16.0dip</dimen>
+    <dimen name="enhanced_smartspace_base_action_icon_margin">8.0dp</dimen>
+    <dimen name="enhanced_smartspace_base_action_icon_padding">4.0dp</dimen>
+    <dimen name="enhanced_smartspace_card_height">76.0dp</dimen>
+    <dimen name="enhanced_smartspace_combination_sub_card_corner_radius">20.0dp</dimen>
+    <dimen name="enhanced_smartspace_height">104.0dp</dimen>
+    <dimen name="enhanced_smartspace_icon_inset">2.0dp</dimen>
+    <dimen name="enhanced_smartspace_icon_margin">4.0dp</dimen>
+    <dimen name="enhanced_smartspace_icon_size">20.0dp</dimen>
+    <dimen name="enhanced_smartspace_secondary_card_corner_radius">20.0dp</dimen>
+    <dimen name="enhanced_smartspace_secondary_card_padding_end">12.0dp</dimen>
+    <dimen name="enhanced_smartspace_secondary_card_start_margin">1.0dp</dimen>
+    <dimen name="enhanced_smartspace_subtitle_margin_top">5.0dp</dimen>
+    <dimen name="enhanced_smartspace_text_size_medium">16.0sp</dimen>
+    <dimen name="enhanced_smartspace_text_size_small">14.0sp</dimen>
+    <dimen name="enhanced_smartspace_text_size_title">18.0sp</dimen>
+    <dimen name="key_text_shadow_dx">0.5dp</dimen>
+    <dimen name="key_text_shadow_dy">0.5dp</dimen>
+    <dimen name="key_text_shadow_radius">0.5dp</dimen>
+    <dimen name="launcher_remoteviews_card_corner_radius">24.0dp</dimen>
+    <dimen name="lockscreen_remoteviews_card_corner_radius">28.0dp</dimen>
+    <dimen name="non_remoteviews_card_padding_start">16.0dp</dimen>
+    <dimen name="opa_dot_diam">10.0dp</dimen>
+    <dimen name="opa_lockscreen_padding_bottom">20.0dp</dimen>
+    <dimen name="page_indicator_dot_margin">3.0dp</dimen>
+    <dimen name="page_indicator_dot_size">6.0dp</dimen>
+    <dimen name="page_indicator_padding_top">10.0dp</dimen>
+    <dimen name="smartspaceLetterSpacing">0.01</dimen>
+    <dimen name="subtitle_hit_rect_height">48.0dp</dimen>
+    <dimen name="weather_dream_complication_icon_dimen">36.0dp</dimen>
+    <dimen name="weather_dream_complication_icon_inset">1.0dp</dimen>
+    <dimen name="weather_dream_complication_text_descent_extra_padding">1.0dp</dimen>
+    <dimen name="weather_dream_overlay_complication_line_height">52.0dp</dimen>
+    <dimen name="weather_dream_overlay_complication_text_size">45.0dp</dimen>
+
+    <!-- Tri-state UI -->
+    <dimen name="tri_state_down_dialog_position">850.0px</dimen>
+    <dimen name="tri_state_down_dialog_position_l">650.0px</dimen>
+    <dimen name="tri_state_middle_dialog_position">650.0px</dimen>
+    <dimen name="tri_state_middle_dialog_position_l">650.0px</dimen>
+    <dimen name="tri_state_up_dialog_position">450.0px</dimen>
+    <dimen name="tri_state_up_dialog_position_l">650.0px</dimen>
+    <dimen name="tri_state_up_dialog_position_deep">21.0px</dimen>
+    <dimen name="tri_state_up_dialog_position_deep_land">21.0px</dimen>
+    <dimen name="tri_state_dialog_elevation">4.0dip</dimen>
+    <dimen name="tri_state_dialog_icon_size">24.0dip</dimen>
+    <dimen name="tri_state_dialog_padding">8.0dip</dimen>
+    <dimen name="tri_state_mid_bottom_left_radius">24.0dip</dimen>
+    <dimen name="tri_state_mid_bottom_right_radius">24.0dip</dimen>
+    <dimen name="tri_state_mid_top_left_radius">24.0dip</dimen>
+    <dimen name="tri_state_mid_top_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_down_bottom_left_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_down_bottom_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_down_top_left_radius">0.0dip</dimen>
+    <dimen name="left_tri_state_down_top_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_bottom_left_radius">0.0dip</dimen>
+    <dimen name="left_tri_state_up_bottom_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_top_left_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_top_right_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_bottom_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_bottom_right_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_top_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_top_right_radius">0.0dip</dimen>
+    <dimen name="right_tri_state_up_bottom_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_up_bottom_right_radius">0.0dip</dimen>
+    <dimen name="right_tri_state_up_top_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_up_top_right_radius">24.0dip</dimen>
+
+    <!-- Maximum vertical offset of statusbar for burn-in protection -->
+    <dimen name="status_bar_offset_max_y">4dp</dimen>
+
+    <!-- FPS Info tile -->
+    <dimen name="fps_info_text_padding">4dp</dimen>
+
+    <!-- Face unlock icon -->
+    <dimen name="face_unlock_icon_margin_top">6dp</dimen>
+
+    <!-- Biometric view -->
+    <dimen name="biometric_indicator_above_margin_bottom">8dp</dimen>
+
+    <!-- Now Playing spacing values -->
+    <dimen name="nowplaying_icon_padding_compact">8dp</dimen>
+    <dimen name="nowplaying_icon_padding_normal">16dp</dimen>
+    <dimen name="nowplaying_title_artist_gap">6dp</dimen>
+
+    <!-- Network Speed -->
+    <dimen name="network_speed_margin_bottom">7dp</dimen>
+    <dimen name="network_speed_text_size">8dp</dimen>
+    <dimen name="network_speed_unit_margin_top">9dp</dimen>
+    <dimen name="network_speed_unit_text_size">6dp</dimen>
+    <dimen name="network_speed_view_padding_end">2dp</dimen>
+    <dimen name="network_speed_view_width">22dp</dimen>
+
+    <!-- Lockscreen Clock/AOD -->  
+    <dimen name="custom_aod_image_size">180dp</dimen>
+    <dimen name="custom_clock_frame_margin_top">0dp</dimen>
+    <dimen name="keyguard_status_area_margin_top">0dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_strings.xml b/packages/SystemUI/res/values/matrixx_strings.xml
index 2b6e38489246e..813c3b14d41d3 100644
--- a/packages/SystemUI/res/values/matrixx_strings.xml
+++ b/packages/SystemUI/res/values/matrixx_strings.xml
@@ -5,4 +5,313 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <!-- Statusbar Icons -->
+    <string name="status_bar_nfc">NFC</string>
+    <string name="status_bar_data_saver">Data saver</string>
+    <string name="status_bar_call_strength">Call strength</string>
+
+    <!-- Notification counter -->
+    <string name="status_bar_notification_info_overflow" translatable="false">\u221E</string>
+
+    <!-- Name of the roaming status bar icon. -->
+    <string name="status_bar_roaming">Roaming indicator</string>
+
+    <!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Data disabled icon</string>
+
+    <!-- Disable stacked mobile icons -->
+    <string name="disable_stacked_mobile_icons_title">Disable combined data icon</string>
+
+    <!-- 4G icon instead LTE -->
+    <string name="fourg_icon_title">4G icon</string>
+
+    <!-- Weather -->
+    <string name="weather_condition_clouds">Cloudy</string>
+    <string name="weather_condition_rain">Rainy</string>
+    <string name="weather_condition_clear">Clear Sky</string>
+    <string name="weather_condition_storm">Stormy</string>
+    <string name="weather_condition_snow">Snowy</string>
+    <string name="weather_condition_wind">Windy</string>
+    <string name="weather_condition_mist">Misty</string>
+
+    <!-- Indication on the keyguard that is shown when the device is charging with a dash charger. Should match keyguard_plugged_in_dash_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_dash_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Dash Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_dash_charging"><xliff:g id="percentage">%s</xliff:g> • Dash Charging</string>
+
+    <!-- Indication on the keyguard that is shown when the device is charging with a warp charger. Should match keyguard_plugged_in_warp_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_warp_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Warp Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_warp_charging"><xliff:g id="percentage">%s</xliff:g> • Warp Charging</string>
+
+    <!-- Indication on the keyguard that is shown when the device is charging with a VOOC charger. Should match keyguard_plugged_in_vooc_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_vooc_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • VOOC Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_vooc_charging"><xliff:g id="percentage">%s</xliff:g> • VOOC Charging</string>
+
+    <!-- Indication on the keyguard that is shown when the device is charging with a turbo power charger. Should match keyguard_plugged_in_turbo_charging [CHAR LIMIT=40]-->
+    <string name="keyguard_indication_turbo_power_time"><xliff:g id="percentage">%2$s</xliff:g> • Turbo Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
+    <string name="keyguard_plugged_in_turbo_charging"><xliff:g id="percentage">%s</xliff:g> • Turbo Charging</string>
+
+    <!-- Smartspace -->
+    <string name="accessibility_next_alarm">Next alarm at %s</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="active_mode_content_description">%1$s is on</string>
+    <string name="generic_smartspace_concatenated_desc" translatable="false">%1$s, %2$s</string>
+    <string name="music_controls_no_title">No title</string>
+    <string name="smartspace_content_desc">At a glance</string>
+    <string name="smartspace_flight_qr_code">QR code</string>
+    <string name="smartspace_icu_date_pattern" translatable="false">EEEMMMd</string>
+    <string name="smartspace_role_desc">View</string>
+
+    <!-- Button to restart SystemUI, within the Restart Options dialog -->
+    <string name="global_action_restart_systemui">SystemUI</string>
+
+    <!-- On The Go -->
+    <string name="onthego_notif_ticker">On-The-Go activated</string>
+    <string name="onthego_notif_title">On-The-Go is active</string>
+    <string name="onthego_notif_stop">Stop</string>
+    <string name="onthego_notif_options">Options</string>
+    <string name="onthego_notif_error">Unable to start On-The-Go</string>
+    <string name="onthego_notif_restart">Restart On-The-Go</string>
+    <string name="onthego_notif_camera_changed">Camera mode changed</string>
+    <string name="onthego_transparency">Transparency</string>
+    <string name="onthego_front_camera">Use front camera</string>
+    <string name="onthego_service_toggle">Automatically restart service</string>
+    <string name="onthego_channel_name">Main</string>
+    <string name="global_action_onthego">On-The-Go</string>
+
+    <!-- Data usage info in QS footer -->
+    <string name="usage_data">used today</string>
+    <string name="usage_data_weekly">used this week</string>
+    <string name="usage_data_default_suffix">Data</string>
+    <string name="usage_wifi_default_suffix">Wi-Fi</string>
+
+    <!-- Kill button in notification guts -->
+    <string name="force_stop_dlg_title">Force stop?</string>
+    <string name="force_stop_dlg_text">If you force stop an app, it may misbehave.</string>
+
+    <!-- Label for UI element which allows to use lens on screenshot [CHAR LIMIT=30] -->
+    <string name="screenshot_lens_label">Lens</string>
+
+    <!-- Sound QS Tile -->
+    <string name="quick_settings_sound_label">Sound</string>
+    <string name="quick_settings_sound_ring">Ring</string>
+    <string name="quick_settings_sound_vibrate">Vibrate</string>
+    <string name="quick_settings_sound_silent">Silent</string>
+
+    <!-- CPUInfo tile -->
+    <string name="quick_settings_cpuinfo_label">CPU Info</string>
+
+    <!-- FPS Info tile -->
+    <string name="quick_settings_fpsinfo_label">FPS Info</string>
+
+    <!-- FPS view text placeholder -->
+    <string name="fps_text_placeholder">FPS: <xliff:g id="fps" example="90">%1$d</xliff:g></string>
+
+    <!-- Compass QS Tile -->
+    <string name="quick_settings_compass_label">Compass</string>
+    <string name="quick_settings_compass_value"><xliff:g id="degrees">%1$.0f</xliff:g>\u00b0 <xliff:g id="direction">%2$s</xliff:g></string>
+    <string name="quick_settings_compass_init">Initializing\u2026</string>
+    <string name="quick_settings_compass_N">N</string>
+    <string name="quick_settings_compass_NE">NE</string>
+    <string name="quick_settings_compass_E">E</string>
+    <string name="quick_settings_compass_SE">SE</string>
+    <string name="quick_settings_compass_S">S</string>
+    <string name="quick_settings_compass_SW">SW</string>
+    <string name="quick_settings_compass_W">W</string>
+    <string name="quick_settings_compass_NW">NW</string>
+
+    <!-- DataSwitch Tile -->
+    <string name="qs_data_switch_label">Switch data card</string>
+
+    <!-- Volume panel QS tile -->
+    <string name="quick_settings_volume_panel_label">Volume panel</string>
+
+    <!-- Weather Tile -->
+    <string name="omnijaws_service_error">Error loading weather data</string>
+    <string name="omnijaws_service_unknown">No weather data</string>
+    <string name="omnijaws_label_default">Weather</string>
+
+    <!-- Refresh Rate Tile -->
+    <string name="refresh_rate_tile_label">Refresh rate</string>
+    <string name="refresh_rate_unknown">Unknown</string>
+    <string name="auto_mode_label">Auto</string>
+
+    <!-- Screenshot Tile -->
+    <string name="screenshot_long_press">Long press - selected region</string>
+
+    <!-- Language toggle tile -->
+    <string name="quick_settings_locale_label">Language</string>
+    <string name="quick_settings_locale_more_locales_toast">Configure multiple languages first</string>
+
+    <!-- AI Assistant affordance [CHAR LIMIT=32] -->
+    <string name="accessibility_assistant_button">AI Assistant</string>
+
+    <!-- Preferred network tile -->
+    <string name="qs_preferred_network_label">Preferred network</string>
+    <string name="qs_preferred_network_lte">4G / LTE</string>
+    <string name="qs_preferred_network_nr">5G / NR</string>
+    <string name="qs_preferred_network_unsupported">Unsupported</string>
+
+    <!-- Text while recognizing face -->
+    <string name="face_unlock_recognizing">Recognizing face...</string>
+
+    <!-- QuickSettings: InternetDialog: Summary for how many devices are connected to the hotspot [CHAR LIMIT=NONE] -->
+    <plurals name="quick_settings_internet_hotspot_summary_num_devices">
+        <item quantity="one">%d device connected</item>
+        <item quantity="other">%d devices connected</item>
+    </plurals>
+
+    <!-- 5G toggle in Internet Dialog -->
+    <string name="enable_fiveg">Enable 5G</string>
+
+    <!-- Label for notification action to delete a screen recording file [CHAR LIMIT=35] -->
+    <string name="screenrecord_delete_label">Delete</string>
+    <!-- A toast message shown after successfully deleting a screen recording [CHAR LIMIT=NONE] -->
+    <string name="screenrecord_delete_description">Screen recording deleted</string>
+
+    <!-- Volume QS Tile -->
+    <string name="quick_settings_volume_label">Volume</string>
+    <string name="qs_volume_dialog_title">Volume Control</string>
+    <string name="qs_volume_dialog_mute">Mute</string>
+
+    <!-- Internet -->
+    <string name="status_bar_settings_network_speed">Internet speed</string>
+
+    <!-- System Theme Re-evaluation Toast -->
+    <string name="reevaluating_system_theme">Re-evaluating system theme.. Please wait for a few seconds</string>
+
+    <string name="default_user_name">Lunaris AOSP</string>
+
+    <!-- USB function dialog - copied from Settings -->
+    <string name="usb_use_charging_only">No data transfer</string>
+    <string name="usb_use_file_transfers">File Transfer</string>
+    <string name="usb_use_photo_transfers">PTP</string>
+    <string name="usb_use_uvc_webcam">Webcam</string>
+    <string name="usb_use_tethering">USB tethering</string>
+    <string name="usb_use_MIDI">MIDI</string>
+    <string name="usb_use">Use USB for</string>
+
+    <!-- VPN tethering QS tile -->
+    <string name="vpn_tethering_label">VPN tethering</string>
+    <string name="vpn_tethering_changed_off">VPN tethering turned off.</string>
+    <string name="vpn_tethering_changed_on">VPN tethering turned on.</string>
+
+    <!-- Clock Weather -->
+    <string name="clock_ide_weather_data_unavailable">null</string>
+    
+    <!-- AxDynamicBar strings [CHAR LIMIT=NONE] -->
+    <string name="ax_dynamic_bar_timer">Timer</string>
+    <string name="ax_dynamic_bar_stopwatch">Stopwatch</string>
+    <string name="ax_dynamic_bar_alarm">Alarm</string>
+    <string name="ax_dynamic_bar_flashlight">Flashlight</string>
+    <string name="ax_dynamic_bar_hotspot">Hotspot</string>
+    <string name="ax_dynamic_bar_hotspot_active">Hotspot Active</string>
+    <string name="ax_dynamic_bar_vpn_active">VPN Active</string>
+    <string name="ax_dynamic_bar_screen_recording">Screen Recording</string>
+    <string name="ax_dynamic_bar_now_playing">Now Playing</string>
+    <string name="ax_dynamic_bar_media_output">Media output</string>
+    <string name="ax_dynamic_bar_sound_mode">Sound Mode</string>
+    <string name="ax_dynamic_bar_silent">Silent</string>
+    <string name="ax_dynamic_bar_vibrate">Vibrate</string>
+    <string name="ax_dynamic_bar_ring">Ring</string>
+    <string name="ax_dynamic_bar_charging">Charging</string>
+    <string name="ax_dynamic_bar_wireless">Wireless</string>
+    <string name="ax_dynamic_bar_saver">Saver</string>
+    <string name="ax_dynamic_bar_music">Music</string>
+    <string name="ax_dynamic_bar_copied">Copied</string>
+    <string name="ax_dynamic_bar_copied_feedback">Copied!</string>
+    <string name="ax_dynamic_bar_image_copied">Image copied</string>
+    <string name="ax_dynamic_bar_copy_image">Copy Image</string>
+    <string name="ax_dynamic_bar_clipboard_image_desc">Clipboard image</string>
+    <string name="ax_dynamic_bar_image">Image</string>
+    <string name="ax_dynamic_bar_url">URL</string>
+    <string name="ax_dynamic_bar_dismiss">Dismiss</string>
+    <string name="ax_dynamic_bar_open">Open</string>
+    <string name="ax_dynamic_bar_stop">Stop</string>
+    <string name="ax_dynamic_bar_stop_recording">Stop Recording</string>
+    <string name="ax_dynamic_bar_reset">Reset</string>
+    <string name="ax_dynamic_bar_clear_all">Clear All</string>
+    <string name="ax_dynamic_bar_show_more">Show more</string>
+    <string name="ax_dynamic_bar_show_less">Show less</string>
+    <string name="ax_dynamic_bar_play">Play</string>
+    <string name="ax_dynamic_bar_pause">Pause</string>
+    <string name="ax_dynamic_bar_paused">Paused</string>
+    <string name="ax_dynamic_bar_saved">Saved</string>
+    <string name="ax_dynamic_bar_recording">Recording</string>
+    <string name="ax_dynamic_bar_done">Done</string>
+    <string name="ax_dynamic_bar_ringing">Ringing</string>
+    <string name="ax_dynamic_bar_running">Running</string>
+    <string name="ax_dynamic_bar_on">ON</string>
+    <string name="ax_dynamic_bar_recents">Recents</string>
+    <string name="ax_dynamic_bar_unlocked">Unlocked</string>
+    <string name="ax_dynamic_bar_device_unlocked">Device Unlocked</string>
+    <string name="ax_dynamic_bar_progress">Progress</string>
+    <string name="ax_dynamic_bar_casting_to">Casting to</string>
+    <string name="ax_dynamic_bar_camera_mic">Camera &amp; Microphone</string>
+    <string name="ax_dynamic_bar_camera">Camera</string>
+    <string name="ax_dynamic_bar_microphone">Microphone</string>
+    <string name="ax_dynamic_bar_camera_mic_short">Camera &amp; Mic</string>
+    <string name="ax_dynamic_bar_hotspot_devices"><xliff:g id="count" example="3">%d</xliff:g> devices</string>
+    <string name="ax_dynamic_bar_wireless_charging">Wireless Charging</string>
+    <string name="ax_dynamic_bar_until_full">until full</string>
+    <string name="ax_dynamic_bar_battery_saver">Battery Saver</string>
+    <string name="ax_dynamic_bar_incoming_call">Incoming Call</string>
+    <string name="ax_dynamic_bar_connected">Connected</string>
+    <string name="ax_dynamic_bar_disconnect">Disconnect</string>
+    <string name="ax_dynamic_bar_no_devices">No devices</string>
+    <string name="ax_dynamic_bar_one_device_connected">1 device connected</string>
+    <string name="ax_dynamic_bar_devices_connected"><xliff:g id="count" example="3">%d</xliff:g> devices connected</string>
+    <string name="ax_dynamic_bar_vpn_connected">VPN Connected</string>
+    <string name="ax_dynamic_bar_secured">Secured</string>
+    <string name="ax_dynamic_bar_connecting">Connecting\u2026</string>
+    <string name="ax_dynamic_bar_one_device">1 device</string>
+    <string name="ax_dynamic_bar_bluetooth_device">Bluetooth device</string>
+    <string name="ax_dynamic_bar_apps_count"><xliff:g id="count" example="2">%d</xliff:g> apps</string>
+    <string name="ax_dynamic_bar_just_now">Just now</string>
+    <string name="ax_dynamic_bar_mins_ago"><xliff:g id="count" example="5">%d</xliff:g>m ago</string>
+    <string name="ax_dynamic_bar_hours_ago"><xliff:g id="count" example="2">%d</xliff:g>h ago</string>
+    <string name="ax_dynamic_bar_days_ago"><xliff:g id="count" example="3">%d</xliff:g>d ago</string>
+    <string name="ax_dynamic_bar_weeks_ago"><xliff:g id="count" example="1">%d</xliff:g>w ago</string>
+    <string name="ax_dynamic_bar_resume">Resume</string>
+    <string name="ax_dynamic_bar_clipboard">Clipboard</string>
+    <string name="ax_dynamic_bar_previous">Previous</string>
+    <string name="ax_dynamic_bar_next">Next</string>
+    <string name="ax_dynamic_bar_shuffle">Shuffle</string>
+    <string name="ax_dynamic_bar_output">Output</string>
+    <string name="ax_dynamic_bar_rec_short">Rec</string>
+    <string name="ax_dynamic_bar_cast_short">Cast</string>
+    <string name="ax_dynamic_bar_active">Active</string>
+    <string name="ax_dynamic_bar_biometric">Biometric</string>
+    <string name="ax_dynamic_bar_trust">Trust</string>
+    <string name="ax_dynamic_bar_alignment">Alignment</string>
+    <string name="ax_dynamic_bar_cam_short">Cam</string>
+    <string name="ax_dynamic_bar_mic_short">Mic</string>
+    <string name="ax_dynamic_bar_recent_apps">Recent Apps</string>
+    <string name="ax_dynamic_bar_count_running"><xliff:g id="count" example="3">%d</xliff:g> running</string>
+    <string name="ax_dynamic_bar_sports_vs">vs</string>
+    <string name="ax_dynamic_bar_sports_live">LIVE</string>
+    <string name="ax_dynamic_bar_sports_final">Final</string>
+    <string name="ax_dynamic_bar_sports_halftime">Halftime</string>
+    <string name="ax_dynamic_bar_sports_upcoming">Upcoming</string>
+
+    <!-- Screenshot -->
+    <string name="quick_settings_screenshot_label">Screenshot</string>
+
+    <!-- Sleep Mode -->
+    <string name="quick_settings_sleep_mode_label">Sleep Mode</string>
+
+    <!-- Wifi Standard. -->
+    <string name="status_bar_wifi_standard">Wifi Standard</string>
+
+    <!-- Smart Pixels -->
+    <string name="quick_settings_smart_pixels_label">Smart Pixels</string>
+    <string name="quick_settings_smart_pixels_on">On</string>
+    <string name="quick_settings_smart_pixels_off">Off</string>
+    <string name="smart_pixels_percent_label">Pixel percentage</string>
+    <string name="smart_pixels_percent_format"><xliff:g id="percent" example="25">%d</xliff:g>%%</string>
+
+    <!-- Name of the HD calling status bar icon. -->
+    <string name="status_bar_hd_calling">HD calling (VoLTE/VoNR)</string>
+
+    <!-- Name of the VoWiFi status bar icon. -->
+    <string name="status_bar_vowifi">Wi-Fi calling (VoWiFi)</string>
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_styles.xml b/packages/SystemUI/res/values/matrixx_styles.xml
index a2a2f90915aac..0c8571c41eb61 100644
--- a/packages/SystemUI/res/values/matrixx_styles.xml
+++ b/packages/SystemUI/res/values/matrixx_styles.xml
@@ -3,6 +3,73 @@
      Copyright (C) 2022-2026 Project Matrixx
      SPDX-License-Identifier: Apache-2.0
 -->
-<resources>
+<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+
+    <!-- Smartspace -->
+    <style
+        name="DateWeatherText"
+        parent="@style/EnhancedSmartspaceTextTitle">
+        <item name="android:textSize">@dimen/enhanced_smartspace_text_size_medium</item>
+    </style>
+    <style
+        name="DefaultSmartspaceView">
+        <item name="backgroundCornerRadius">@dimen/lockscreen_remoteviews_card_corner_radius</item>
+    </style>
+    <style
+        name="DotStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:alpha">0.0</item>
+    </style>
+    <style
+        name="EnhancedSmartspaceTextSubtitle"
+        parent="@style/EnhancedSmartspaceTextTitle">
+        <item name="android:textSize">?smartspaceSubtitleTextSize</item>
+        <item name="android:fontFamily">variable-title-medium</item>
+        <item name="android:letterSpacing">@dimen/smartspaceLetterSpacing</item>
+    </style>
+    <style
+        name="EnhancedSmartspaceTextTitle"
+        parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="android:textSize">?smartspaceTitleTextSize</item>
+        <item name="android:textColor">@androidprv:color/materialColorOnSurface</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:drawablePadding">@dimen/enhanced_smartspace_icon_margin</item>
+        <item name="android:fontFamily">variable-title-medium-emphasized</item>
+        <item name="android:lineHeight">24.0sp</item>
+    </style>
+    <style
+        name="LauncherSmartspaceView">
+        <item name="backgroundCornerRadius">@dimen/launcher_remoteviews_card_corner_radius</item>
+    </style>
+    <style
+        name="LockscreenDotStyle"
+        parent="@style/DotStyle">
+        <item name="android:alpha">0.0</item>
+        <item name="android:scaleX">0.8</item>
+        <item name="android:scaleY">0.8</item>
+    </style>
+    <style
+        name="Smartspace">
+        <item name="smartspaceSubtitleTextSize">@dimen/enhanced_smartspace_text_size_small</item>
+        <item name="smartspaceTitleTextSize">@dimen/enhanced_smartspace_text_size_title</item>
+    </style>
+    <style
+        name="WeatherDreamOverlayComplication"
+        parent="@style/EnhancedSmartspaceTextTitle">
+        <item name="android:textSize">@dimen/weather_dream_overlay_complication_text_size</item>
+        <item name="android:fontFamily">google-sans-flex</item>
+        <item name="android:lineHeight">@dimen/weather_dream_overlay_complication_line_height</item>
+    </style>
+
+    <!-- Tri-state UI -->
+    <style name="qs_theme" parent="Theme.SystemUI.QuickSettings">
+        <item name="android:windowIsFloating">true</item>
+    </style>
 
 </resources>
diff --git a/packages/SystemUI/res/values/matrixx_symbols.xml b/packages/SystemUI/res/values/matrixx_symbols.xml
index a2a2f90915aac..daaa67c69bf66 100644
--- a/packages/SystemUI/res/values/matrixx_symbols.xml
+++ b/packages/SystemUI/res/values/matrixx_symbols.xml
@@ -5,4 +5,10 @@
 -->
 <resources>
 
+    <!-- The location of the devices physical tri state switch -->
+    <java-symbol type="integer" name="config_alertSliderLocation" />
+
+    <!-- Whether key handler sends intent when changing slider position -->
+    <java-symbol type="string" name="config_alertSliderIntent" />
+
 </resources>
diff --git a/packages/SystemUI/res/values/shade_dimens.xml b/packages/SystemUI/res/values/shade_dimens.xml
index deef954a1f0f0..11488875652ad 100644
--- a/packages/SystemUI/res/values/shade_dimens.xml
+++ b/packages/SystemUI/res/values/shade_dimens.xml
@@ -32,5 +32,5 @@
     <dimen name="aux_spacing_overlay_panel_shape_radius">46dp</dimen>
     <dimen name="overlay_qs_layout_brightness_thumb_height">52dp</dimen>
     <dimen name="overlay_qs_layout_brightness_thumb_width">4dp</dimen>
-    <dimen name="overlay_qs_layout_brightness_track_height">40dp</dimen>
+    <dimen name="overlay_qs_layout_brightness_track_height">52dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 20075caa7c102..6dc321d61276d 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -997,6 +997,8 @@
     <string name="quick_settings_wifi_label">Wi-Fi</string>
     <!-- QuickSettings: Internet [CHAR LIMIT=NONE] -->
     <string name="quick_settings_internet_label">Internet</string>
+    <string name="quick_settings_5g_label">5G</string>
+    <string name="quick_settings_5g_editor_label">FiveG</string>
     <!-- QuickSettings: networks available [CHAR LIMIT=NONE] -->
     <string name="quick_settings_networks_available">Networks available</string>
     <!-- QuickSettings: networks unavailable [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 72258cbaabfee..5de95ffac8f69 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -573,7 +573,7 @@
 
     <!-- Parent style overrides style in the dot inheritance -->
     <style name="Theme.SystemUI.Dialog.QuickSettings" parent="@style/Theme.SystemUI.QuickSettings">
-        <item name="android:dialogCornerRadius">@dimen/notification_corner_radius</item>
+        <item name="android:dialogCornerRadius">@dimen/media_notification_corner_radius</item>
         <item name="android:buttonBarPositiveButtonStyle">@style/Widget.Dialog.Button.QuickSettings</item>
         <item name="android:buttonBarNegativeButtonStyle">@style/Widget.Dialog.Button.QuickSettings</item>
         <item name="android:buttonBarNeutralButtonStyle">@style/Widget.Dialog.Button.QuickSettings</item>
@@ -963,7 +963,7 @@
 
     <style name="MediaPlayer.ScrubbingTime">
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">@dimen/qs_media_text_size_12</item>
         <item name="android:gravity">center</item>
     </style>
 
@@ -982,6 +982,10 @@
         <item name="android:tint">@android:color/system_on_primary_dark</item>
         <item name="android:background">@drawable/qs_media_round_button_background</item>
         <item name="android:backgroundTint">@color/media_player_solid_button_bg</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingStart">6dp</item>
+        <item name="android:paddingEnd">6dp</item>
     </style>
 
     <style name="MediaPlayer.SessionAction.Secondary" parent="MediaPlayer.SessionAction">
diff --git a/packages/SystemUI/res/xml/combined_qs_header_scene.xml b/packages/SystemUI/res/xml/combined_qs_header_scene.xml
index c16725682a82a..b7ca14c166414 100644
--- a/packages/SystemUI/res/xml/combined_qs_header_scene.xml
+++ b/packages/SystemUI/res/xml/combined_qs_header_scene.xml
@@ -52,6 +52,16 @@
                 app:framePosition="@integer/fade_in_start_frame"
                 android:alpha="0"
                 />
+            <KeyAttribute
+                app:motionTarget="@id/clock"
+                app:framePosition="@integer/fade_out_complete_frame"
+                android:alpha="0"
+                />
+            <KeyAttribute
+                app:motionTarget="@id/clock"
+                app:framePosition="@integer/fade_in_start_frame"
+                android:alpha="0"
+                />
             <KeyPosition
                 app:motionTarget="@id/shade_header_system_icons"
                 app:keyPositionType="deltaRelative"
diff --git a/packages/SystemUI/res/xml/fileprovider.xml b/packages/SystemUI/res/xml/fileprovider.xml
index 78b7e95e8bfa3..d3ed53afd081a 100644
--- a/packages/SystemUI/res/xml/fileprovider.xml
+++ b/packages/SystemUI/res/xml/fileprovider.xml
@@ -19,4 +19,5 @@
     <cache-path name="leak" path="leak/"/>
     <external-path name="screenrecord" path="."/>
     <cache-path name="multi_user" path="multi_user/" />
+    <cache-path name="clipboard_cache" path="clipboard_cache/" />
 </paths>
diff --git a/packages/SystemUI/res/xml/media_session_expanded.xml b/packages/SystemUI/res/xml/media_session_expanded.xml
index f59c96b4fb95d..20f1248f8e085 100644
--- a/packages/SystemUI/res/xml/media_session_expanded.xml
+++ b/packages/SystemUI/res/xml/media_session_expanded.xml
@@ -122,7 +122,7 @@
     <Constraint
         android:id="@+id/actionPlayPause"
         android:layout_width="@dimen/qs_media_action_play_pause_width"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/qs_media_action_48"
         android:layout_marginStart="@dimen/qs_media_padding"
         android:layout_marginEnd="0dp"
         app:layout_goneMarginEnd="@dimen/qs_media_padding"
diff --git a/packages/SystemUI/res/xml/status_bar_prefs.xml b/packages/SystemUI/res/xml/status_bar_prefs.xml
index 0c6a850b7fe99..452b7d3aaf8b4 100644
--- a/packages/SystemUI/res/xml/status_bar_prefs.xml
+++ b/packages/SystemUI/res/xml/status_bar_prefs.xml
@@ -23,6 +23,11 @@
         android:key="rotate"
         android:title="@string/status_bar_settings_auto_rotation" />
 
+    <com.android.systemui.tuner.StatusBarSwitch
+        android:icon="@drawable/nt_statusbar_icon_internet_speed"
+        android:key="network_speed"
+        android:title="@string/status_bar_settings_network_speed" />
+
     <com.android.systemui.tuner.StatusBarSwitch
         android:icon="@drawable/ic_statusbar_headset"
         android:key="headset"
@@ -57,12 +62,13 @@
         android:key="bluetooth"
         android:title="@string/quick_settings_bluetooth_label" />
 
+    <!-- nfc -->
     <com.android.systemui.tuner.StatusBarSwitch
-        android:icon="@drawable/ic_statusbar_camera"
-        android:key="cameratoggle"
-        android:title="@string/quick_settings_camera_label" />
+        android:icon="@drawable/ic_statusbar_nfc"
+        android:key="nfc"
+        android:persistent="false"
+        android:title="@string/status_bar_nfc" />
 
-    <!-- nfc -->
     <!-- tty -->
     <!-- speakerphone -->
 
@@ -96,11 +102,56 @@
         android:key="mobile"
         android:title="@string/quick_settings_cellular_detail_title" />
 
+    <com.android.systemui.tuner.TunerSwitch
+        android:icon="@drawable/ic_statusbar_data_disabled"
+        android:key="system:data_disabled_icon"
+        android:title="@string/data_disabled_icon_title"
+        sysui:defValue="true" />
+
+    <com.android.systemui.tuner.StatusBarSwitch
+        android:icon="@drawable/ic_statusbar_data_saver"
+        android:key="data_saver"
+        android:title="@string/status_bar_data_saver" />
+
+    <com.android.systemui.tuner.StatusBarSwitch
+        android:icon="@drawable/ic_statusbar_phone"
+        android:key="call_strength"
+        android:title="@string/status_bar_call_strength" />
+
     <com.android.systemui.tuner.StatusBarSwitch
         android:icon="@drawable/ic_statusbar_airplanemode"
         android:key="airplane"
         android:title="@string/status_bar_airplane" />
 
+    <com.android.systemui.tuner.StatusBarSwitch
+        android:icon="@drawable/ic_statusbar_roaming"
+        android:key="roaming"
+        android:title="@string/status_bar_roaming" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:icon="@drawable/ic_statusbar_fourg"
+        android:key="system:show_fourg_icon"
+        android:title="@string/fourg_icon_title"
+        sysui:defValue="false" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:icon="@drawable/ic_signal"
+        android:key="system:disable_stacked_mobile_icons"
+        android:title="@string/disable_stacked_mobile_icons_title"
+        sysui:defValue="false" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:icon="@drawable/ic_statusbar_hd_calling"
+        android:key="status_bar_show_hd_calling"
+        android:title="@string/status_bar_hd_calling"
+        sysui:defValue="false" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:icon="@drawable/ic_statusbar_vowifi"
+        android:key="status_bar_show_vowifi"
+        android:title="@string/status_bar_vowifi"
+        sysui:defValue="false" />
+
     <!-- other weird signal stuff -->
 
     <com.android.systemui.tuner.StatusBarSwitch
@@ -108,11 +159,10 @@
         android:key="vpn"
         android:title="@string/legacy_vpn_name" />
 
-    <com.android.systemui.tuner.BatteryPreference
+    <com.android.systemui.tuner.StatusBarSwitch
         android:icon="@*android:drawable/ic_battery"
-        android:title="@string/battery"
-        android:summary="%s"
-        android:entries="@array/battery_options" />
+        android:key="battery"
+        android:title="@string/battery" />
 
     <com.android.systemui.tuner.StatusBarSwitch
         android:icon="@drawable/ic_statusbar_alarm"
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
index 49c0827eacc70..57e4814a60354 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl
@@ -195,5 +195,10 @@ interface ISystemUiProxy {
      */
     oneway void onKeyEvent(int keycode, int displayId) = 60;
 
-    // Next id = 61
+    /**
+     * Notifies SystemUI of a double tap to sleep event.
+     */
+    oneway void onSleepEvent(in MotionEvent event) = 61;
+
+    // Next id = 62
 }
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java
index dfb62c0b2eb02..08b32160f0631 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/FloatingRotationButton.java
@@ -73,6 +73,7 @@ public class FloatingRotationButton implements RotationButton {
 
     private AnimatedVectorDrawable mAnimatedDrawable;
     private boolean mIsShowing;
+    private boolean mCanShow = true;
     private int mDisplayRotation;
 
     private boolean mIsTaskbarVisible = false;
@@ -154,7 +155,7 @@ public View getCurrentView() {
 
     @Override
     public boolean show() {
-        if (mIsShowing) {
+        if (!mCanShow || mIsShowing) {
             return false;
         }
 
@@ -251,6 +252,14 @@ public void setDarkIntensity(float darkIntensity) {
         mKeyButtonView.setDarkIntensity(darkIntensity);
     }
 
+    @Override
+    public void setCanShowRotationButton(boolean canShow) {
+        mCanShow = canShow;
+        if (!mCanShow) {
+            hide();
+        }
+    }
+
     @Override
     public void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {
         mIsTaskbarVisible = taskbarVisible;
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java
index a44472ae96c02..43d6e384f1530 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButton.java
@@ -40,6 +40,7 @@ default void onDestroy() {}
     default boolean isVisible() {
         return false;
     }
+    default void setCanShowRotationButton(boolean canShow) {}
     default void onTaskbarStateChanged(boolean taskbarVisible, boolean taskbarStashed) {}
     default void updateIcon(int lightIconColor, int darkIconColor) { }
     default void setOnClickListener(View.OnClickListener onClickListener) { }
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
index 29753ed6bdc7b..7d826fe096b5b 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
@@ -37,14 +37,17 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
 import android.hardware.devicestate.DeviceState;
 import android.hardware.devicestate.DeviceStateManager;
+import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.HapticFeedbackConstants;
@@ -129,6 +132,7 @@ public class RotationButtonController {
     private boolean mSkipOverrideUserLockPrefsOnce;
     private final int mLightIconColor;
     private final int mDarkIconColor;
+    private boolean mButtonEnabled = true;
 
     @DrawableRes
     private final int mIconCcwStart0ResId;
@@ -238,6 +242,21 @@ public RotationButtonController(RotationPolicyWrapper rotationPolicyWrapper, Con
         mRotationPolicyWrapper = rotationPolicyWrapper;
 
         mBgExecutor = context.getMainExecutor();
+
+        mButtonEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.ENABLE_ROTATION_BUTTON, 1, UserHandle.USER_CURRENT) == 1;
+        mContext.getContentResolver().registerContentObserver(
+            Settings.System.getUriFor(Settings.System.ENABLE_ROTATION_BUTTON), false,
+            new ContentObserver(mMainThreadHandler) {
+                @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    if (uri.getLastPathSegment().equals(Settings.System.ENABLE_ROTATION_BUTTON)) {
+                        mButtonEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
+                            Settings.System.ENABLE_ROTATION_BUTTON, 1, UserHandle.USER_CURRENT) == 1;
+                    }
+                }
+            }
+        );
     }
 
     public void setRotationButton(RotationButton rotationButton,
@@ -490,7 +509,7 @@ public void onRotationProposal(int rotation, boolean isValid) {
 
         int windowRotation = mWindowRotationProvider.get();
 
-        if (!mRotationButton.acceptRotationProposal()) {
+        if (!mButtonEnabled || !mRotationButton.acceptRotationProposal()) {
             return;
         }
 
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
index 51765fce68744..289485d2300bf 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
@@ -423,6 +423,10 @@ public static boolean isLegacyMode(int mode) {
      * @param context A display associated context.
      */
     public static float getWindowCornerRadius(Context context) {
+        String callingPackage = context.getPackageManager().getNameForUid(android.os.Binder.getCallingUid());
+        if ("com.google.android.apps.nexuslauncher".equals(callingPackage)) {
+            return 0f;
+        }
         return ScreenDecorationsUtils.getWindowCornerRadius(context);
     }
 
diff --git a/packages/SystemUI/src-debug/com/android/systemui/log/DebugLogger.kt b/packages/SystemUI/src-debug/com/android/systemui/log/DebugLogger.kt
index 8d1de0e65da54..a4330ba998a0f 100644
--- a/packages/SystemUI/src-debug/com/android/systemui/log/DebugLogger.kt
+++ b/packages/SystemUI/src-debug/com/android/systemui/log/DebugLogger.kt
@@ -71,12 +71,6 @@ object DebugLogger {
         error: Throwable? = null,
         message: () -> String,
     ) {
-        if (enabled) {
-            if (error == null) {
-                Log.println(priority, tag, message())
-            } else {
-                Log.printlns(LOG_ID_MAIN, priority, tag, message(), error)
-            }
-        }
+        // no-op.
     }
 }
diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java
index b0c0f19714d1c..ba86e3d81cb97 100644
--- a/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java
@@ -17,6 +17,7 @@
 package com.android.keyguard;
 
 import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_ACTIVE_DATA_SUB_CHANGED;
+import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_CARRIER_ON_LOCKSCREEN_CHANGED;
 import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_ON_TELEPHONY_CAPABLE;
 import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_REFRESH_CARRIER_INFO;
 import static com.android.keyguard.logging.CarrierTextManagerLogger.REASON_SATELLITE_CHANGED;
@@ -27,7 +28,12 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
 import android.os.Trace;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListener;
@@ -94,6 +100,8 @@ public class CarrierTextManager {
 
     @Nullable private String mSatelliteCarrierText;
 
+    private boolean mShowCarrierText = true;
+
     private final Context mContext;
     private final TelephonyManager mTelephonyManager;
     private final CharSequence mSeparator;
@@ -231,6 +239,8 @@ private CarrierTextManager(
                 });
             }
         });
+        SettingsObserver observer = new SettingsObserver();
+        observer.observe();
     }
 
     private TelephonyManager getTelephonyManager() {
@@ -426,7 +436,8 @@ protected void updateCarrierText() {
                         plmn = i.getStringExtra(TelephonyManager.EXTRA_PLMN);
                     }
                     mLogger.logUpdateFromStickyBroadcast(plmn, spn);
-                    if (Objects.equals(plmn, spn)) {
+                    if (plmn != null && spn != null
+                            && plmn.toLowerCase().contains(spn.toLowerCase())) {
                         text = plmn;
                     } else {
                         text = concatenate(plmn, spn, mSeparator);
@@ -456,6 +467,12 @@ protected void updateCarrierText() {
         }
 
         boolean isInSatelliteMode = mSatelliteCarrierText != null;
+
+        // Hide the carrier text if the user requests
+        if (!mShowCarrierText) {
+            displayText = "";
+        }
+
         final CarrierTextCallbackInfo info = new CarrierTextCallbackInfo(
                 displayText,
                 carrierNames,
@@ -670,6 +687,33 @@ private void cancelSatelliteCollectionJob(String reason) {
         }
     }
 
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver() {
+            super(new Handler());
+        }
+
+        void observe() {
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.LOCKSCREEN_SHOW_CARRIER), false, this,
+                    UserHandle.USER_ALL);
+            updateSettings();
+        }
+
+        void updateSettings() {
+            mShowCarrierText = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.LOCKSCREEN_SHOW_CARRIER, 1, UserHandle.USER_CURRENT) != 0;
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (Settings.System.getUriFor(Settings.System.LOCKSCREEN_SHOW_CARRIER).equals(uri)) {
+                mLogger.logUpdateCarrierTextForReason(REASON_CARRIER_ON_LOCKSCREEN_CHANGED);
+                updateSettings();
+                updateCarrierText();
+            }
+        }
+    }
+
     /** Injectable Buildeer for {@#link CarrierTextManager}. */
     public static class Builder {
         private final Context mContext;
diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
index f579bc4f5d71d..faef1f1c2f260 100644
--- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
+++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
@@ -482,15 +482,21 @@ constructor(
             localeBroadcastReceiver,
             IntentFilter(Intent.ACTION_LOCALE_CHANGED),
         )
+
+        // Proactively update timezone on listener registration to avoid race conditions on startup.
+        clock?.events?.onTimeZoneChanged(IcuTimeZone.getDefault())
+
         configurationController.addCallback(configListener)
         batteryController.addCallback(batteryCallback)
         keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)
         zenModeController.addCallback(zenModeCallback)
         if (SceneContainerFlag.isEnabled) {
             handleDoze(
-                when (AOD) {
-                    keyguardTransitionInteractor.getCurrentState() -> 1f
-                    keyguardTransitionInteractor.getStartedState() -> 1f
+                when {
+                    keyguardTransitionInteractor.getCurrentState() == AOD -> 1f
+                    keyguardTransitionInteractor.getStartedState() == AOD -> 1f
+                    keyguardTransitionInteractor.getCurrentState() == DOZING -> 1f
+                    keyguardTransitionInteractor.getStartedState() == DOZING -> 1f
                     else -> 0f
                 }
             )
@@ -614,6 +620,10 @@ constructor(
                         it.copy(value = 1f - it.value)
                     },
                     keyguardTransitionInteractor.transition(Edge.create(LOCKSCREEN, AOD)),
+                    keyguardTransitionInteractor.transition(Edge.create(DOZING, LOCKSCREEN)).map {
+                        it.copy(value = 1f - it.value)
+                    },
+                    keyguardTransitionInteractor.transition(Edge.create(LOCKSCREEN, DOZING)),
                 )
                 .filter { it.transitionState != TransitionState.FINISHED }
                 .collect { handleDoze(it.value) }
@@ -642,7 +652,7 @@ constructor(
             keyguardTransitionInteractor
                 .transition(Edge.create(to = LOCKSCREEN))
                 .filter { it.transitionState == TransitionState.STARTED }
-                .filter { it.from != AOD }
+                .filter { it.from != AOD && it.from != DOZING }
                 .filter {
                     !com.android.systemui.Flags.newDozingKeyguardStates() || it.from != DOZING
                 }
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
index 428631a77eaa5..6cbb20899c9bd 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
@@ -155,6 +155,7 @@ && getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE
     @Override
     protected void updateConstraints(boolean useSplitBouncer) {
         mAlreadyUsingSplitBouncer = useSplitBouncer;
+        if (mContainerMotionLayout == null) return;
         if (useSplitBouncer) {
             mContainerMotionLayout.jumpToState(R.id.split_constraints);
             mContainerMotionLayout.setMaxWidth(Integer.MAX_VALUE);
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java
index e6c1e535ad3ee..c134bfbe64374 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java
@@ -102,7 +102,9 @@ protected void onViewAttached() {
         mView.onDevicePostureChanged(mPostureController.getDevicePosture());
         mPostureController.addCallback(mPostureCallback);
         mPasswordEntry.setUsePinShapes(true);
-        updateAutoConfirmationState();
+        if (isAutoPinConfirmEnabledInSettings()) {
+            updateAutoConfirmationState();
+        }
         mView.updatePinScrambling(
                 LineageSettings.System.getIntForUser(getContext().getContentResolver(),
                         LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0,
@@ -145,7 +147,9 @@ public boolean startDisappearAnimation(Runnable finishRunnable) {
     @Override
     protected void handleAttemptLockout(long elapsedRealtimeDeadline) {
         super.handleAttemptLockout(elapsedRealtimeDeadline);
-        updateAutoConfirmationState();
+        if (isAutoPinConfirmEnabledInSettings()) {
+            updateAutoConfirmationState();
+        }
     }
 
     private void updateAutoConfirmationState() {
@@ -172,12 +176,10 @@ private void updateOKButtonVisibility() {
      * Visibility changes are only for auto confirmation configuration.
      */
     private void updateBackSpaceVisibility() {
-        boolean isAutoConfirmation = isAutoPinConfirmEnabledInSettings();
-        mBackspaceKey.setTransparentMode(/* isTransparentMode= */
-                isAutoConfirmation && !mDisabledAutoConfirmation);
-        if (isAutoConfirmation) {
-            if (mPasswordEntry.getText().length() > 0
-                    || mDisabledAutoConfirmation) {
+        boolean hasPass = mPasswordEntry.getText().length() > 0;
+        mBackspaceKey.setTransparentMode(hasPass);
+        if (isAutoPinConfirmEnabledInSettings()) {
+            if (hasPass || mDisabledAutoConfirmation) {
                 mBackspaceKey.setVisibility(View.VISIBLE);
             } else {
                 mBackspaceKey.setVisibility(View.INVISIBLE);
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
index 1b353b019673c..e702027385ad1 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
@@ -46,6 +46,7 @@
 import android.metrics.LogMaker;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -1186,7 +1187,9 @@ private boolean canUseOneHandedBouncer() {
     }
 
     private boolean canDisplayUserSwitcher() {
-        return getContext().getResources().getBoolean(R.bool.config_enableBouncerUserSwitcher);
+        return Settings.System.getIntForUser(getContext().getContentResolver(),
+                        "kg_user_switcher_enabled", 0,
+                        UserHandle.USER_CURRENT) == 1;
     }
 
     private void configureMode() {
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
index a676e5df14b86..2ff018b421af1 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java
@@ -251,7 +251,7 @@ void onSimLockChangedResponse(final PinResult result) {
                 else {
                     Log.d(TAG, "onSimCheckResponse " + " empty One result "
                             + result.toString());
-                    if (result.getAttemptsRemaining() >= 0) {
+                    if (result.getAttemptsRemaining() > 0) {
                         mRemainingAttempts = result.getAttemptsRemaining();
                         mMessageAreaController.setMessage(
                                 mView.getPukPasswordErrorMessage(
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
index 062ff3828a60c..a1ab0f6248d82 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
@@ -58,6 +58,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 /**
  * View visible under the clock on the lock screen and AoD.
@@ -132,6 +133,18 @@ void hideSlice() {
         }
     }
 
+    private LinearLayout createSubRow() {
+        LinearLayout layout = new LinearLayout(mContext);
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                (LinearLayout.LayoutParams) mRow.getLayoutParams());
+        lp.setMarginEnd(mContext.getResources().getDimensionPixelSize(
+                R.dimen.widget_horizontal_padding));
+        layout.setLayoutParams(lp);
+        layout.setOrientation(LinearLayout.HORIZONTAL);
+        layout.setVisibility(View.VISIBLE);
+        return layout;
+    }
+
     Map<View, PendingIntent> showSlice(RowContent header, List<SliceContent> subItems) {
         Trace.beginSection("KeyguardSliceView#showSlice");
         mHasHeader = header != null;
@@ -159,8 +172,15 @@ Map<View, PendingIntent> showSlice(RowContent header, List<SliceContent> subItem
         layoutParams.gravity = Gravity.START;
         mRow.setLayoutParams(layoutParams);
 
-        for (int i = startIndex; i < subItemsCount; i++) {
-            RowContent rc = (RowContent) subItems.get(i);
+        int rowIndex = 0, colIndex = 0;
+        LinearLayout subRow = null;
+        for (SliceContent sc : subItems.subList(startIndex, subItems.size())) {
+            subRow = (LinearLayout) mRow.getChildAt(rowIndex);
+            if (subRow == null) {
+                subRow = createSubRow();
+                mRow.addView(subRow, rowIndex);
+            }
+            RowContent rc = (RowContent) sc;
             SliceItem item = rc.getSliceItem();
             final Uri itemTag = item.getSlice().getUri();
             // Try to reuse the view if already exists in the layout
@@ -169,9 +189,16 @@ Map<View, PendingIntent> showSlice(RowContent header, List<SliceContent> subItem
                 button = new KeyguardSliceTextView(mContext);
                 button.setTextColor(blendedColor);
                 button.setTag(itemTag);
-                final int viewIndex = i - (mHasHeader ? 1 : 0);
-                mRow.addView(button, viewIndex);
+                subRow.addView(button, colIndex);
+            } else {
+                LinearLayout buttonParent = (LinearLayout) button.getParent();
+                if (mRow.indexOfChild(buttonParent) != rowIndex
+                        || buttonParent.indexOfChild(button) != colIndex) {
+                    buttonParent.removeView(button);
+                    subRow.addView(button, colIndex);
+                }
             }
+            colIndex++;
 
             PendingIntent pendingIntent = null;
             if (rc.getPrimaryAction() != null) {
@@ -203,13 +230,31 @@ Map<View, PendingIntent> showSlice(RowContent header, List<SliceContent> subItem
             button.setCompoundDrawablesRelative(iconDrawable, null, null, null);
             button.setOnClickListener(mOnClickListener);
             button.setClickable(pendingIntent != null);
+
+            if (rc.hasBottomDivider()) {
+                rowIndex++;
+                colIndex = 0;
+            } else {
+                LinearLayout.LayoutParams lp =
+                        (LinearLayout.LayoutParams) button.getLayoutParams();
+                lp.setMarginEnd(mContext.getResources().getDimensionPixelSize(
+                        R.dimen.widget_horizontal_padding));
+                button.setLayoutParams(lp);
+            }
         }
 
         // Removing old views
         for (int i = 0; i < mRow.getChildCount(); i++) {
-            View child = mRow.getChildAt(i);
-            if (!clickActions.containsKey(child)) {
-                mRow.removeView(child);
+            subRow = (LinearLayout) mRow.getChildAt(i);
+            for (int j = 0; j < subRow.getChildCount(); j++) {
+                View child = subRow.getChildAt(j);
+                if (!clickActions.containsKey(child)) {
+                    subRow.removeView(child);
+                    j--;
+                }
+            }
+            if (subRow.getChildCount() == 0) {
+                mRow.removeView(subRow);
                 i--;
             }
         }
@@ -231,13 +276,7 @@ public void setDarkAmount(float darkAmount) {
     private void updateTextColors() {
         final int blendedColor = getTextColor();
         mTitle.setTextColor(blendedColor);
-        int childCount = mRow.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View v = mRow.getChildAt(i);
-            if (v instanceof TextView) {
-                ((TextView) v).setTextColor(blendedColor);
-            }
-        }
+        mRow.performOnChildren(tv -> tv.setTextColor(blendedColor));
     }
 
     /**
@@ -263,22 +302,13 @@ void onDensityOrFontScaleChanged() {
         mIconSize = mContext.getResources().getDimensionPixelSize(R.dimen.widget_icon_size);
         mIconSizeWithHeader = (int) mContext.getResources().getDimension(R.dimen.header_icon_size);
 
-        for (int i = 0; i < mRow.getChildCount(); i++) {
-            View child = mRow.getChildAt(i);
-            if (child instanceof KeyguardSliceTextView) {
-                ((KeyguardSliceTextView) child).onDensityOrFontScaleChanged();
-            }
-        }
+        mRow.performOnChildren(tv -> tv.onDensityOrFontScaleChanged());
     }
 
     void onOverlayChanged() {
-        for (int i = 0; i < mRow.getChildCount(); i++) {
-            View child = mRow.getChildAt(i);
-            if (child instanceof KeyguardSliceTextView) {
-                ((KeyguardSliceTextView) child).onOverlayChanged();
-            }
-        }
+        mRow.performOnChildren(tv -> tv.onOverlayChanged());
     }
+
     public void dump(PrintWriter pw, String[] args) {
         pw.println("KeyguardSliceView:");
         pw.println("  mTitle: " + (mTitle == null ? "null" : mTitle.getVisibility() == VISIBLE));
@@ -295,8 +325,6 @@ public void setOnClickListener(View.OnClickListener onClickListener) {
     }
 
     public static class Row extends LinearLayout {
-        private Set<KeyguardSliceTextView> mKeyguardSliceTextViewSet = new HashSet();
-
         /**
          * This view is visible in AOD, which means that the device will sleep if we
          * don't hold a wake lock. We want to enter doze only after all views have reached
@@ -365,14 +393,8 @@ public void onVisibilityAggregated(boolean isVisible) {
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             int width = MeasureSpec.getSize(widthMeasureSpec);
-            int childCount = getChildCount();
 
-            for (int i = 0; i < childCount; i++) {
-                View child = getChildAt(i);
-                if (child instanceof KeyguardSliceTextView) {
-                    ((KeyguardSliceTextView) child).setMaxWidth(Integer.MAX_VALUE);
-                }
-            }
+            performOnChildren(tv -> tv.setMaxWidth(Integer.MAX_VALUE));
 
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         }
@@ -397,20 +419,15 @@ public boolean hasOverlappingRendering() {
             return false;
         }
 
-        @Override
-        public void addView(View view, int index) {
-            super.addView(view, index);
-
-            if (view instanceof KeyguardSliceTextView) {
-                mKeyguardSliceTextViewSet.add((KeyguardSliceTextView) view);
-            }
-        }
-
-        @Override
-        public void removeView(View view) {
-            super.removeView(view);
-            if (view instanceof KeyguardSliceTextView) {
-                mKeyguardSliceTextViewSet.remove((KeyguardSliceTextView) view);
+        public void performOnChildren(Consumer<KeyguardSliceTextView> action) {
+            for (int i = 0; i < getChildCount(); i++) {
+                LinearLayout subRow = (LinearLayout) getChildAt(i);
+                for (int j = 0; j < subRow.getChildCount(); j++) {
+                    View child = subRow.getChildAt(j);
+                    if (child instanceof KeyguardSliceTextView) {
+                        action.accept((KeyguardSliceTextView) child);
+                    }
+                }
             }
         }
     }
@@ -452,7 +469,7 @@ private void updatePadding() {
             int iconPadding = (int) mContext.getResources()
                     .getDimension(R.dimen.widget_icon_padding);
             // orientation is vertical, so add padding to top & bottom
-            setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0);
+            setPadding(0, padding, 0, hasText ? padding : 0);
 
             setCompoundDrawablePadding(iconPadding);
         }
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 6aba55bd82fea..07e37c46b2d0c 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -94,6 +94,8 @@
 import android.os.Trace;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.pocket.IPocketCallback;
+import android.pocket.PocketManager;
 import android.provider.Settings;
 import android.service.dreams.IDreamManager;
 import android.telephony.CarrierConfigManager;
@@ -164,6 +166,7 @@
 import com.android.systemui.shared.system.TaskStackChangeListener;
 import com.android.systemui.shared.system.TaskStackChangeListeners;
 import com.android.systemui.statusbar.StatusBarState;
+import com.android.systemui.statusbar.phone.DozeParameters;
 import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.policy.DevicePostureController;
 import com.android.systemui.statusbar.policy.DevicePostureController.DevicePostureInt;
@@ -171,6 +174,7 @@
 import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 import com.android.systemui.util.Assert;
 import com.android.systemui.util.kotlin.JavaAdapter;
+import com.android.systemui.util.ScrimUtils;
 
 import dalvik.annotation.optimization.NeverCompile;
 
@@ -240,6 +244,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt
     private static final int MSG_SERVICE_PROVIDERS_UPDATED = 347;
     private static final int MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED = 348;
 
+    // Additional messages should be 600+
+    private static final int MSG_POCKET_STATE_CHANGED = 600;
+
     /** Biometric authentication state: Not listening. */
     @VisibleForTesting
     protected static final int BIOMETRIC_STATE_STOPPED = 0;
@@ -322,6 +329,7 @@ public void onExpandedChanged(boolean isExpanded) {
         }
     };
     private final FaceWakeUpTriggersConfig mFaceWakeUpTriggersConfig;
+    private final Provider<DozeParameters> mDozeParameters;
 
     private final Object mSimDataLockObject = new Object();
     HashMap<Integer, SimData> mSimDatasBySlotId = new HashMap<>();
@@ -447,6 +455,26 @@ protected Handler getHandler() {
     }
 
     private final Handler mHandler;
+    private PocketManager mPocketManager;
+    private boolean mIsDeviceInPocket;
+    private final IPocketCallback mPocketCallback = new IPocketCallback.Stub() {
+        @Override
+        public void onStateChanged(boolean isDeviceInPocket, int reason) {
+            boolean wasInPocket = mIsDeviceInPocket;
+            if (reason == PocketManager.REASON_SENSOR) {
+                mIsDeviceInPocket = isDeviceInPocket;
+            } else {
+                mIsDeviceInPocket = false;
+            }
+            if (wasInPocket != mIsDeviceInPocket) {
+                mHandler.sendEmptyMessage(MSG_POCKET_STATE_CHANGED);
+            }
+        }
+    };
+
+    public boolean isPocketLockVisible(){
+        return mPocketManager.isPocketLockVisible();
+    }
 
     private final IBiometricEnabledOnKeyguardCallback mBiometricEnabledCallback =
             new IBiometricEnabledOnKeyguardCallback.Stub() {
@@ -2117,6 +2145,8 @@ protected void handleStartedWakingUp(@PowerManager.WakeReason int pmWakeReason)
             }
         }
         Trace.endSection();
+
+        ScrimUtils.get().onStartedWakingUp();
     }
 
     protected void handleStartedGoingToSleep(int arg1) {
@@ -2129,30 +2159,34 @@ protected void handleStartedGoingToSleep(int arg1) {
                 cb.onStartedGoingToSleep(arg1);
             }
         }
-        mGoingToSleep = true;
         // Resetting assistant visibility state as the device is going to sleep now.
         // TaskStackChangeListener gets triggered a little late when we transition to AoD,
         // which results in face auth running once on AoD.
         mAssistantVisible = false;
-        mLogger.d("Started going to sleep, mGoingToSleep=true, mAssistantVisible=false");
+        mLogger.d("Started going to sleep, mAssistantVisible=false");
         updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
     }
 
     protected void handleFinishedGoingToSleep(int arg1) {
         Assert.isMainThread();
-        mGoingToSleep = false;
         for (int i = 0; i < mCallbacks.size(); i++) {
             KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
             if (cb != null) {
                 cb.onFinishedGoingToSleep(arg1);
             }
         }
+        if (isUdfpsSupported() && mDozeParameters.get().getAlwaysOn()) {
+            mGoingToSleep = false;
+        }
         updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
     }
 
     private void handleScreenTurnedOff() {
         Assert.isMainThread();
         mHardwareFingerprintUnavailableRetryCount = 0;
+        mGoingToSleep = false;
+        ScrimUtils.get().onScreenTurnedOff();
+        updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
     }
 
     private void handleDreamingStateChanged(int dreamStart) {
@@ -2267,7 +2301,8 @@ protected KeyguardUpdateMonitor(
             Provider<SceneInteractor> sceneInteractor,
             Provider<CommunalSceneInteractor> communalSceneInteractor,
             Provider<KeyguardServiceShowLockscreenInteractor>
-                    keyguardServiceShowLockscreenInteractor) {
+                    keyguardServiceShowLockscreenInteractor,
+            Provider<DozeParameters> dozeParameters) {
         mContext = context;
         mSubscriptionManager = subscriptionManager;
         mUserTracker = userTracker;
@@ -2322,6 +2357,12 @@ protected KeyguardUpdateMonitor(
         mCommunalSceneInteractor = communalSceneInteractor;
         mKeyguardServiceShowLockscreenInteractor = keyguardServiceShowLockscreenInteractor;
 
+        mPocketManager = (PocketManager) context.getSystemService(Context.POCKET_SERVICE);
+        if (mPocketManager != null) {
+            mPocketManager.addCallback(mPocketCallback);
+        }
+        mDozeParameters = dozeParameters;
+
         mHandler = new Handler(mainLooper) {
             @Override
             public void handleMessage(Message msg) {
@@ -2426,6 +2467,9 @@ public void handleMessage(Message msg) {
                     case MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED:
                         notifyAboutEnrollmentChange(msg.arg1);
                         break;
+                    case MSG_POCKET_STATE_CHANGED:
+                        updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
+                        break;
                     default:
                         super.handleMessage(msg);
                         break;
@@ -2480,7 +2524,8 @@ public void start() {
             // Don't override if a valid battery status update has come in
             final BatteryStatus status = new BatteryStatus(BATTERY_STATUS_UNKNOWN,
                     /* level= */ level, /* plugged= */ 0, CHARGING_POLICY_DEFAULT,
-                    /* maxChargingWattage= */0, /* present= */true);
+                    /* maxChargingWattage= */0, /* present= */true,
+                    0.0f, 0.0f, 0.0f, false);
             mMainExecutor.execute(() -> {
                 if (mBatteryStatus == null) {
                     handleBatteryUpdate(status);
@@ -2754,6 +2799,7 @@ public void onUserChanging(int newUser, @NonNull Context userContext,
         public void onUserChanged(int newUser, Context userContext) {
             mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCH_COMPLETE,
                     newUser, 0));
+            ScrimUtils.get().onUserChanged();
         }
     };
 
@@ -3157,7 +3203,8 @@ protected boolean shouldListenForFingerprint(boolean isUdfps) {
 
         boolean shouldListen = shouldListenKeyguardState && shouldListenUserState
                 && shouldListenBouncerState && shouldListenUdfpsState && !mBiometricPromptShowing
-                && shouldListenSecureLockDeviceState && shouldListenFpsState;
+                && shouldListenSecureLockDeviceState && shouldListenFpsState && !mIsDeviceInPocket
+                && (!mGoingToSleep || !isUdfps);
         logListenerModelData(
                 new KeyguardFingerprintListenModel(
                     System.currentTimeMillis(),
@@ -3802,7 +3849,15 @@ private boolean isBatteryUpdateInteresting(BatteryStatus old, BatteryStatus curr
         }
 
         // change in charging current while plugged in
-        if (nowPluggedIn && current.maxChargingWattage != old.maxChargingWattage) {
+        if (nowPluggedIn &&
+              (current.maxChargingWattage != old.maxChargingWattage ||
+               current.maxChargingCurrent != old.maxChargingCurrent ||
+               current.maxChargingVoltage != old.maxChargingVoltage)) {
+            return true;
+        }
+
+        // change in OEM charging while plugged in
+        if (nowPluggedIn && current.oemChargeStatus != old.oemChargeStatus) {
             return true;
         }
 
@@ -3811,6 +3866,11 @@ private boolean isBatteryUpdateInteresting(BatteryStatus old, BatteryStatus curr
             return true;
         }
 
+        // change in battery temperature
+        if (old.temperature != current.temperature) {
+            return true;
+        }
+
         // change in the incompatible charger
         if (!old.incompatibleCharger.equals(current.incompatibleCharger)) {
             return true;
@@ -4126,11 +4186,15 @@ public static boolean isSimPinSecure(int state) {
     public void dispatchStartedWakingUp(@PowerManager.WakeReason int pmWakeReason) {
         synchronized (this) {
             mDeviceInteractive = true;
+            mGoingToSleep = false;
         }
         mHandler.sendMessage(mHandler.obtainMessage(MSG_STARTED_WAKING_UP, pmWakeReason, 0));
     }
 
     public void dispatchStartedGoingToSleep(int why) {
+        synchronized (this) {
+            mGoingToSleep = true;
+        }
         mHandler.sendMessage(mHandler.obtainMessage(MSG_STARTED_GOING_TO_SLEEP, why, 0));
     }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java
index 717519472bbb5..810c866c83aeb 100644
--- a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java
+++ b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java
@@ -134,17 +134,10 @@ public void setTransparentMode(boolean isTransparentMode) {
             if (mDrawableForTransparentMode != 0) {
                 setImageResource(mDrawableForTransparentMode);
             }
-            setBackgroundColor(getResources().getColor(android.R.color.transparent));
         } else {
             if (mDefaultDrawable != 0) {
                 setImageResource(mDefaultDrawable);
             }
-            Drawable bgDrawable = getContext().getDrawable(R.drawable.num_pad_key_background);
-            if (Flags.bouncerUiRevamp2() && bgDrawable != null) {
-                int bgColor = BouncerColors.pinActionBg(getContext());
-                bgDrawable.setTint(bgColor);
-            }
-            setBackground(bgDrawable);
         }
         setupAnimator();
         reloadColors();
diff --git a/packages/SystemUI/src/com/android/keyguard/logging/CarrierTextManagerLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/CarrierTextManagerLogger.kt
index 7d0c491442195..6a5d4b018c70b 100644
--- a/packages/SystemUI/src/com/android/keyguard/logging/CarrierTextManagerLogger.kt
+++ b/packages/SystemUI/src/com/android/keyguard/logging/CarrierTextManagerLogger.kt
@@ -178,6 +178,7 @@ class CarrierTextManagerLogger @Inject constructor(@CarrierTextManagerLog val bu
         const val REASON_SIM_ERROR_STATE_CHANGED = 3
         const val REASON_ACTIVE_DATA_SUB_CHANGED = 4
         const val REASON_SATELLITE_CHANGED = 5
+        const val REASON_CARRIER_ON_LOCKSCREEN_CHANGED = 6
 
         @Retention(AnnotationRetention.SOURCE)
         @IntDef(
@@ -188,6 +189,7 @@ class CarrierTextManagerLogger @Inject constructor(@CarrierTextManagerLog val bu
                     REASON_SIM_ERROR_STATE_CHANGED,
                     REASON_ACTIVE_DATA_SUB_CHANGED,
                     REASON_SATELLITE_CHANGED,
+                    REASON_CARRIER_ON_LOCKSCREEN_CHANGED,
                 ]
         )
         annotation class CarrierTextRefreshReason
@@ -199,6 +201,7 @@ class CarrierTextManagerLogger @Inject constructor(@CarrierTextManagerLog val bu
                 REASON_SIM_ERROR_STATE_CHANGED -> "SIM_ERROR_STATE_CHANGED"
                 REASON_ACTIVE_DATA_SUB_CHANGED -> "ACTIVE_DATA_SUB_CHANGED"
                 REASON_SATELLITE_CHANGED -> "SATELLITE_CHANGED"
+                REASON_CARRIER_ON_LOCKSCREEN_CHANGED -> "CARRIER_ON_LOCKSCREEN_CHANGED"
                 else -> "unknown"
             }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/BootReceiver.java b/packages/SystemUI/src/com/android/systemui/BootReceiver.java
new file mode 100644
index 0000000000000..ae4d97ea482e9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/BootReceiver.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * Performs a number of miscellaneous, non-system-critical actions
+ * after the system has finished booting.
+ */
+public class BootReceiver extends BroadcastReceiver {
+    private static final String TAG = "SystemUIBootReceiver";
+    private Handler mHandler = new Handler();
+    private SettingsObserver mSettingsObserver;
+    private Context mContext;
+
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SHOW_CPU_OVERLAY),
+                    false, this);
+            mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SHOW_FPS_OVERLAY),
+                    false, this);
+            update();
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            update();
+        }
+
+        public void update() {
+            Intent cpuinfo = new Intent(mContext, com.android.systemui.CPUInfoService.class);
+            Intent fpsinfo = new Intent(mContext, com.android.systemui.FPSInfoService.class);
+            if (Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.SHOW_CPU_OVERLAY, 0) != 0) {
+                mContext.startService(cpuinfo);
+            } else {
+                mContext.stopService(cpuinfo);
+            }
+            if (Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.SHOW_FPS_OVERLAY, 0) != 0) {
+                mContext.startService(fpsinfo);
+            } else {
+                mContext.stopService(fpsinfo);
+    	    }
+        }
+    }
+
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        try {
+            mContext = context;
+            if (mSettingsObserver ==  null) {
+                mSettingsObserver = new SettingsObserver(mHandler);
+                mSettingsObserver.observe();
+            }
+
+            // Start the cpu info overlay, if activated
+            if (Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.SHOW_CPU_OVERLAY, 0) != 0) {
+                Intent cpuinfo = new Intent(mContext, com.android.systemui.CPUInfoService.class);
+                mContext.startService(cpuinfo);
+            }
+
+            // Start the fps info overlay, if activated
+            if (Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.SHOW_FPS_OVERLAY, 0) != 0) {
+                Intent fpsinfo = new Intent(mContext, com.android.systemui.FPSInfoService.class);
+                mContext.startService(fpsinfo);
+      	    }
+
+        } catch (Exception e) {
+            Log.e(TAG, "Can't start load average service", e);
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/CPUInfoService.kt b/packages/SystemUI/src/com/android/systemui/CPUInfoService.kt
new file mode 100644
index 0000000000000..81ee058c6b4e3
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/CPUInfoService.kt
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2019-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui
+
+import android.app.Service
+import android.content.Intent
+import android.content.res.Configuration
+import android.graphics.Color
+import android.graphics.PixelFormat
+import android.os.Handler
+import android.os.IBinder
+import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.core.graphics.ColorUtils
+import com.android.systemui.res.R
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.keyguard.WakefulnessLifecycle
+import java.io.File
+import java.io.RandomAccessFile
+import java.io.IOException
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+
+class CPUInfoService @Inject constructor(
+    private val wakefulnessLifecycle: WakefulnessLifecycle,
+    @Main private val handler: Handler
+) : Service() {
+
+    private lateinit var windowManager: WindowManager
+    private lateinit var cpuInfoView: TextView
+    private lateinit var configuration: Configuration
+    private lateinit var coroutineScope: CoroutineScope
+
+    private var readJob: kotlinx.coroutines.Job? = null
+    private var observerRegistered = false
+    private var cpuList: List<String> = emptyList()
+    private var cpuTempDivider = 1
+    private var cpuTempSensor = ""
+    private var cpuDisplayString = ""
+
+    private val fileMap = mutableMapOf<String, RandomAccessFile>()
+
+    private val layoutParams = WindowManager.LayoutParams(
+        WindowManager.LayoutParams.WRAP_CONTENT,
+        WindowManager.LayoutParams.WRAP_CONTENT,
+        WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,
+        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+        PixelFormat.TRANSLUCENT
+    ).apply {
+        gravity = Gravity.TOP or Gravity.END
+    }
+
+    private val wakefulnessObserver = object : WakefulnessLifecycle.Observer {
+        override fun onStartedGoingToSleep() {
+            stopReading()
+        }
+
+        override fun onStartedWakingUp() {
+            startReading()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+        windowManager = getSystemService(WindowManager::class.java)!!
+        configuration = resources.configuration
+        layoutParams.y = getTopInset()
+
+        cpuTempDivider = resources.getInteger(R.integer.config_cpuTempDivider)
+        cpuTempSensor = getString(R.string.config_cpuTempSensor)
+        cpuDisplayString = getString(R.string.config_displayCpus)
+
+        cpuList = parseCpuList(cpuDisplayString)
+
+        try {
+            fileMap[cpuTempSensor] = RandomAccessFile(cpuTempSensor, "r")
+            cpuList.forEach { cpu ->
+                val freqPath = "/sys/devices/system/cpu/cpu$cpu/cpufreq/scaling_cur_freq"
+                val govPath = "/sys/devices/system/cpu/cpu$cpu/cpufreq/scaling_governor"
+                fileMap[freqPath] = RandomAccessFile(freqPath, "r")
+                fileMap[govPath] = RandomAccessFile(govPath, "r")
+            }
+        } catch (e: IOException) {
+            Log.e(TAG, "Error preloading CPU sysfs nodes: ${e.message}")
+            stopSelf()
+        }
+
+        cpuInfoView = TextView(this).apply {
+            setBackgroundColor(ColorUtils.setAlphaComponent(Color.BLACK, BACKGROUND_ALPHA))
+            setTextColor(Color.WHITE)
+            val padding = resources.getDimensionPixelSize(R.dimen.fps_info_text_padding)
+            setPadding(padding, padding, padding, padding)
+        }
+    }
+
+    override fun onStartCommand(intent: Intent?, startId: Int, flags: Int): Int {
+        if (!observerRegistered) {
+            wakefulnessLifecycle.addObserver(wakefulnessObserver)
+            observerRegistered = true
+        }
+        startReading()
+        return START_STICKY
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        if (configuration.orientation != newConfig.orientation) {
+            layoutParams.y = getTopInset()
+            if (cpuInfoView.parent != null)
+                windowManager.updateViewLayout(cpuInfoView, layoutParams)
+        }
+        configuration = newConfig
+    }
+
+    private fun getTopInset(): Int = windowManager.currentWindowMetrics
+        .windowInsets.getInsets(WindowInsets.Type.statusBars()).top
+
+    private fun parseCpuList(displayCpus: String): List<String> {
+        return if (displayCpus.isNotBlank()) {
+            displayCpus.split(",").filter { it.toIntOrNull() != null }
+        } else {
+            val path = "/sys/devices/system/cpu/present"
+            val range = try {
+                File(path).bufferedReader().use { it.readLine() }
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to read CPU range: ${e.message}")
+                null
+            } ?: return listOf("0")
+
+            return when {
+                range.contains("-") -> {
+                    val bounds = range.split("-").mapNotNull { it.toIntOrNull() }
+                    if (bounds.size == 2) (bounds[0]..bounds[1]).map { it.toString() } else listOf("0")
+                }
+                range.contains(",") -> {
+                    range.split(",").filter { it.toIntOrNull() != null }
+                }
+                else -> listOf("0")
+            }
+        }
+    }
+
+    private fun startReading() {
+        readJob?.cancel()
+        if (cpuInfoView.parent == null) windowManager.addView(cpuInfoView, layoutParams)
+        readJob = coroutineScope.launch {
+            while (isActive) {
+                val builder = StringBuilder()
+                val temp = readLineFromRandomAccessFile(cpuTempSensor)?.toIntOrNull()?.div(cpuTempDivider) ?: 0
+                builder.append("Temp: ${temp}°C\n")
+
+                cpuList.forEach { cpu ->
+                    val freqPath = "/sys/devices/system/cpu/cpu$cpu/cpufreq/scaling_cur_freq"
+                    val govPath = "/sys/devices/system/cpu/cpu$cpu/cpufreq/scaling_governor"
+                    val freq = readLineFromRandomAccessFile(freqPath)?.toIntOrNull()?.div(1000) ?: 0
+                    val gov = readLineFromRandomAccessFile(govPath) ?: "N/A"
+                    if (freq > 0) {
+                        builder.append("cpu$cpu: $gov ${freq}MHz\n")
+                    } else {
+                        builder.append("cpu$cpu: offline\n")
+                    }
+                }
+
+                val output = builder.toString().trim()
+                handler.post {
+                    cpuInfoView.text = output
+                    cpuInfoView.visibility = View.VISIBLE
+                }
+                delay(MEASURE_INTERVAL_DEFAULT)
+            }
+        }
+    }
+
+    private fun stopReading() {
+        readJob?.cancel()
+        readJob = null
+        removeViewIfNeeded()
+    }
+
+    private fun removeViewIfNeeded() {
+        if (cpuInfoView.parent != null) {
+            windowManager.removeViewImmediate(cpuInfoView)
+        }
+    }
+
+    private fun readLineFromRandomAccessFile(path: String): String? {
+        val file = fileMap[path] ?: return null
+        return try {
+            file.seek(0L)
+            file.readLine()
+        } catch (e: IOException) {
+            Log.e(TAG, "Failed to read from $path: ${e.message}")
+            null
+        }
+    }
+
+    override fun onDestroy() {
+        stopReading()
+        coroutineScope.cancel()
+        fileMap.values.forEach {
+            try { it.close() } catch (_: IOException) {}
+        }
+        fileMap.clear()
+        if (observerRegistered) {
+            wakefulnessLifecycle.removeObserver(wakefulnessObserver)
+            observerRegistered = false
+        }
+        removeViewIfNeeded()
+        super.onDestroy()
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    private companion object {
+        private const val TAG = "CPUInfoService"
+        private const val MEASURE_INTERVAL_DEFAULT = 1000L
+        private const val BACKGROUND_ALPHA = 120
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 91cf9e9a81160..42be88397bda2 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -41,6 +41,7 @@
 import com.android.systemui.plugins.PluginManager;
 import com.android.systemui.plugins.VolumeDialogController;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.rotation.RotationPolicyWrapper;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;
@@ -52,8 +53,19 @@
 import com.android.systemui.statusbar.phone.SystemUIDialogManager;
 import com.android.systemui.statusbar.policy.BluetoothController;
 import com.android.systemui.statusbar.policy.DeviceProvisionedController;
+import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;
 import com.android.systemui.tuner.TunerService;
+import com.android.systemui.statusbar.policy.HotspotController;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.bluetooth.ui.viewModel.BluetoothDetailsContentViewModel;
+import com.android.systemui.statusbar.connectivity.AccessPointController;
+import com.android.systemui.statusbar.connectivity.NetworkController;
+import com.android.systemui.qs.tiles.dialog.InternetDialogManager;
+import com.android.systemui.media.dialog.MediaOutputDialogManager;
+import com.android.systemui.statusbar.phone.ScrimController;
+import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.systemui.statusbar.policy.FlashlightController;
 
 import dagger.Lazy;
 
@@ -117,6 +129,7 @@ public class Dependency {
 
     @Inject Lazy<BroadcastDispatcher> mBroadcastDispatcher;
     @Inject Lazy<BluetoothController> mBluetoothController;
+    @Inject Lazy<KeyguardStateController> mKeyguardStateController;
     @Inject Lazy<KeyguardUpdateMonitor> mKeyguardUpdateMonitor;
     @Inject Lazy<DeviceProvisionedController> mDeviceProvisionedController;
     @Inject Lazy<PluginManager> mPluginManager;
@@ -150,6 +163,16 @@ public class Dependency {
     @Inject Lazy<UserTracker> mUserTrackerLazy;
     @Inject Lazy<StatusBarWindowControllerStore> mStatusBarWindowControllerStoreLazy;
     @Inject Lazy<SysUIStateDisplaysInteractor> mSysUIStateDisplaysInteractor;
+    @Inject Lazy<RotationPolicyWrapper> mRotationPolicyWrapperLazy;
+    @Inject Lazy<ActivityStarter> mActivityStarter;
+    @Inject Lazy<AccessPointController> mAccessPointController;
+    @Inject Lazy<NetworkController> mNetworkController;
+    @Inject Lazy<InternetDialogManager> mInternetDialogManager;
+    @Inject Lazy<MediaOutputDialogManager> mMediaOutputDialogManager;
+    @Inject Lazy<ConfigurationController> mConfigurationController;
+    @Inject Lazy<FlashlightController> mFlashlightController;
+    @Inject Lazy<BluetoothDetailsContentViewModel> mBluetoothDetailsContentViewModel;
+    @Inject Lazy<HotspotController> mHotspotController;
 
     @Inject
     public Dependency() {
@@ -165,6 +188,7 @@ protected void start() {
         mProviders.put(BG_LOOPER, mBgLooper::get);
         mProviders.put(BroadcastDispatcher.class, mBroadcastDispatcher::get);
         mProviders.put(BluetoothController.class, mBluetoothController::get);
+        mProviders.put(KeyguardStateController.class, mKeyguardStateController::get);
         mProviders.put(KeyguardUpdateMonitor.class, mKeyguardUpdateMonitor::get);
         mProviders.put(DeviceProvisionedController.class, mDeviceProvisionedController::get);
         mProviders.put(PluginManager.class, mPluginManager::get);
@@ -196,6 +220,16 @@ protected void start() {
         mProviders.put(SysUIStateDisplaysInteractor.class, mSysUIStateDisplaysInteractor::get);
         mProviders.put(
                 StatusBarWindowControllerStore.class, mStatusBarWindowControllerStoreLazy::get);
+        mProviders.put(RotationPolicyWrapper.class, mRotationPolicyWrapperLazy::get);
+        mProviders.put(MediaOutputDialogManager.class, mMediaOutputDialogManager::get);
+        mProviders.put(AccessPointController.class, mAccessPointController::get);
+        mProviders.put(NetworkController.class, mNetworkController::get);
+        mProviders.put(InternetDialogManager.class, mInternetDialogManager::get);
+        mProviders.put(ConfigurationController.class, mConfigurationController::get);
+        mProviders.put(FlashlightController.class, mFlashlightController::get);
+        mProviders.put(BluetoothDetailsContentViewModel.class, mBluetoothDetailsContentViewModel::get);
+        mProviders.put(ActivityStarter.class, mActivityStarter::get);
+        mProviders.put(HotspotController.class, mHotspotController::get);
 
         Dependency.setInstance(this);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/FPSInfoService.kt b/packages/SystemUI/src/com/android/systemui/FPSInfoService.kt
new file mode 100644
index 0000000000000..6ce924eb6be5a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/FPSInfoService.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2019-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui
+
+import android.app.Service
+import android.content.Intent
+import android.content.res.Configuration
+import android.graphics.Color
+import android.graphics.PixelFormat
+import android.os.Handler
+import android.os.IBinder
+import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.core.graphics.ColorUtils
+import com.android.systemui.res.R
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.keyguard.WakefulnessLifecycle
+import java.io.File
+import java.io.IOException
+import java.io.RandomAccessFile
+import javax.inject.Inject
+import kotlin.math.roundToInt
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+class FPSInfoService @Inject constructor(
+    private val wakefulnessLifecycle: WakefulnessLifecycle,
+    @Main private val handler: Handler
+) : Service() {
+
+    private lateinit var coroutineScope: CoroutineScope
+    private lateinit var windowManager: WindowManager
+    private lateinit var fpsInfoView: TextView
+    private lateinit var configuration: Configuration
+
+    private var fpsReadJob: Job? = null
+    private var observerRegistered = false
+    private val fileMap = mutableMapOf<String, RandomAccessFile>()
+    private var fpsNodePath: String = ""
+
+    private val layoutParams = WindowManager.LayoutParams(
+        WindowManager.LayoutParams.WRAP_CONTENT,
+        WindowManager.LayoutParams.WRAP_CONTENT,
+        WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,
+        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+        PixelFormat.TRANSLUCENT,
+    ).apply {
+        gravity = Gravity.TOP or Gravity.START
+    }
+
+    private val wakefulnessObserver = object : WakefulnessLifecycle.Observer {
+        override fun onStartedGoingToSleep() {
+            stopReading()
+        }
+
+        override fun onStartedWakingUp() {
+            startReading()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+        windowManager = getSystemService(WindowManager::class.java)!!
+        configuration = resources.configuration
+        layoutParams.y = getTopInset()
+
+        fpsInfoView = TextView(this).apply {
+            text = getString(R.string.fps_text_placeholder, 0)
+            setBackgroundColor(ColorUtils.setAlphaComponent(Color.BLACK, BACKGROUND_ALPHA))
+            setTextColor(Color.WHITE)
+            val padding = resources.getDimensionPixelSize(R.dimen.fps_info_text_padding)
+            setPadding(padding, padding, padding, padding)
+        }
+
+        fpsNodePath = getString(R.string.config_fpsInfoSysNode)
+        val file = File(fpsNodePath)
+        if (!file.exists() || !file.canRead()) {
+            Log.e(TAG, "Sysfs node $fpsNodePath does not exist or is not readable")
+            stopSelf()
+        } else {
+            try {
+                fileMap[fpsNodePath] = RandomAccessFile(fpsNodePath, "r")
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to open FPS node: ${e.message}")
+                stopSelf()
+            }
+        }
+    }
+
+    override fun onStartCommand(intent: Intent?, startId: Int, flags: Int): Int {
+        if (!observerRegistered) {
+            wakefulnessLifecycle.addObserver(wakefulnessObserver)
+            observerRegistered = true
+        }
+        startReading()
+        return START_STICKY
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        if (configuration.orientation != newConfig.orientation) {
+            layoutParams.y = getTopInset()
+            if (fpsInfoView.parent != null)
+                windowManager.updateViewLayout(fpsInfoView, layoutParams)
+        }
+        configuration = newConfig
+    }
+
+    private fun getTopInset(): Int = windowManager.currentWindowMetrics
+        .windowInsets.getInsets(WindowInsets.Type.statusBars()).top
+
+    private fun startReading() {
+        fpsReadJob?.cancel()
+        if (fpsInfoView.parent == null) windowManager.addView(fpsInfoView, layoutParams)
+        fpsReadJob = coroutineScope.launch {
+            while (isActive) {
+                val fps = measureFps()
+                handler.post {
+                    fpsInfoView.text = getString(R.string.fps_text_placeholder, fps)
+                    fpsInfoView.visibility = View.VISIBLE
+                }
+                delay(FPS_MEASURE_INTERVAL_DEFAULT)
+            }
+        }
+    }
+
+    private fun stopReading() {
+        fpsReadJob?.cancel()
+        fpsReadJob = null
+        removeFpsViewIfNeeded()
+    }
+
+    private fun removeFpsViewIfNeeded() {
+        if (fpsInfoView.parent != null) {
+            windowManager.removeViewImmediate(fpsInfoView)
+        }
+    }
+
+    private fun measureFps(): Int {
+        val file = fileMap[fpsNodePath] ?: return -1
+        val measuredFps: String
+        try {
+            file.seek(0L)
+            measuredFps = file.readLine()
+        } catch (e: IOException) {
+            Log.e(TAG, "IOException while accessing FPS node, ${e.message}")
+            return -1
+        }
+        val fpsValue = measuredFps.trim().let {
+            if (it.contains(": ")) it.split("\\s+".toRegex())[1] else it
+        }.toFloatOrNull()
+        return fpsValue?.roundToInt() ?: -1
+    }
+
+    override fun onDestroy() {
+        stopReading()
+        coroutineScope.cancel()
+        fileMap.values.forEach {
+            try { it.close() } catch (_: IOException) {}
+        }
+        fileMap.clear()
+        if (observerRegistered) {
+            wakefulnessLifecycle.removeObserver(wakefulnessObserver)
+            observerRegistered = false
+        }
+        removeFpsViewIfNeeded()
+        super.onDestroy()
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    private companion object {
+        private const val TAG = "FPSInfoService"
+        private const val FPS_MEASURE_INTERVAL_DEFAULT = 1000L
+        private const val BACKGROUND_ALPHA = 120
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt b/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt
index b47224e6b5cb6..484be7c47c541 100644
--- a/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt
@@ -40,6 +40,8 @@ import com.android.systemui.log.ScreenDecorationsLogger
 import com.android.systemui.plugins.statusbar.StatusBarStateController
 import com.android.systemui.res.R
 import com.android.systemui.shade.domain.interactor.ShadeInteractor
+import com.android.systemui.statusbar.phone.FaceUnlockImageView
+import com.android.systemui.statusbar.phone.FaceUnlockProxy
 import com.android.systemui.util.asIndenting
 import java.io.PrintWriter
 import java.util.concurrent.Executor
@@ -132,6 +134,7 @@ class FaceScanningOverlay(
         // Delay the relayout until the end of the animation when hiding,
         // otherwise we'd clip it.
         if (showScanningAnim) {
+            FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SCANNING)
             visibility = View.VISIBLE
             requestLayout()
         }
@@ -152,6 +155,9 @@ class FaceScanningOverlay(
                 },
             )
         rimAnimator?.start()
+        if (faceAuthSucceeded) {
+            FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SUCCESS)
+        }
     }
 
     private fun faceScanningRimAnimator(
diff --git a/packages/SystemUI/src/com/android/systemui/LauncherProxyService.java b/packages/SystemUI/src/com/android/systemui/LauncherProxyService.java
index b25a362fb924c..c35e8cc8ea57b 100644
--- a/packages/SystemUI/src/com/android/systemui/LauncherProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/LauncherProxyService.java
@@ -63,6 +63,7 @@
 import android.os.IRemoteCallback;
 import android.os.Looper;
 import android.os.PatternMatcher;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.Trace;
@@ -100,6 +101,7 @@
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
 import com.android.systemui.keyguard.KeyguardWmStateRefactor;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
+import com.android.systemui.power.domain.interactor.PowerInteractor;
 import com.android.systemui.keyguard.ui.view.InWindowLauncherUnlockAnimationManager;
 import com.android.systemui.model.SysUiState;
 import com.android.systemui.model.SysUiState.SysUiStateCallback;
@@ -189,6 +191,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis
     private final ScreenshotHelper mScreenshotHelper;
     private final CommandQueue mCommandQueue;
     private final UserTracker mUserTracker;
+    private final PowerInteractor mPowerInteractor;
     private final ISysuiUnlockAnimationController mSysuiUnlockAnimationController;
     private final Optional<UnfoldTransitionProgressForwarder> mUnfoldTransitionProgressForwarder;
     private final UiEventLogger mUiEventLogger;
@@ -524,6 +527,20 @@ public void toggleQuickSettingsPanel() {
                     mCommandQueue.toggleQuickSettingsPanel());
         }
 
+        @Override
+        public void onSleepEvent(MotionEvent event) {
+            verifyCallerAndClearCallingIdentity("onSleepEvent", () -> {
+                mHandler.post(() -> {
+                    mPowerInteractor.setLastTouchToSleepPosition(
+                            event.getX(), event.getY());
+                    mContext.getSystemService(PowerManager.class)
+                            .goToSleep(event.getEventTime(),
+                                    PowerManager.GO_TO_SLEEP_REASON_TOUCH, 0);
+                    event.recycle();
+                });
+            });
+        }
+
         private void onShadeExpansionGesture(MotionEvent event, String reason) {
             if (!SceneContainerFlag.isEnabled()) {
                 return;
@@ -792,6 +809,7 @@ public LauncherProxyService(Context context,
             UserTracker userTracker,
             UserManager userManager,
             WakefulnessLifecycle wakefulnessLifecycle,
+            PowerInteractor powerInteractor,
             UiEventLogger uiEventLogger,
             DisplayTracker displayTracker,
             KeyguardUnlockAnimationController sysuiUnlockAnimationController,
@@ -834,9 +852,11 @@ public LauncherProxyService(Context context,
         mShadeModeInteractor = shadeModeInteractor;
         mShadeDisplayPolicy = shadeDisplayPolicy;
         mUserTracker = userTracker;
+        mPowerInteractor = powerInteractor;
         mConnectionBackoffAttempts = 0;
-        mRecentsComponentName = ComponentName.unflattenFromString(context.getString(
-                com.android.internal.R.string.config_recentsComponentName));
+        int defaultLauncher = android.os.SystemProperties.getInt("persist.sys.default_launcher", 0);
+        String[] launcherComponents = context.getResources().getStringArray(com.android.internal.R.array.config_launcherComponents);
+        mRecentsComponentName = ComponentName.unflattenFromString(launcherComponents[defaultLauncher]);
         mQuickStepIntent = new Intent(ACTION_QUICKSTEP)
                 .setPackage(mRecentsComponentName.getPackageName());
         mPerDisplaySysUiStateRepository = perDisplaySysUiStateRepository;
diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
index e1aa0fc518756..93b2de61d8af7 100644
--- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@ -1122,6 +1122,12 @@ public void onConfigChanged(Configuration newConfig) {
                 mLogger.logRotationChanged(oldRotation, mRotation);
             }
             setupDecorations();
+            for (int id: DISPLAY_CUTOUT_IDS) {
+                final View view = getOverlayView(id);
+                if (view instanceof DisplayCutoutView) {
+                    ((DisplayCutoutView) view).updateCutout();
+                }
+            }
             if (mOverlays != null) {
                 // Updating the layout params ensures that ViewRootImpl will call relayoutWindow(),
                 // which ensures that the forced seamless rotation will end, even if we updated
diff --git a/packages/SystemUI/src/com/android/systemui/application/impl/SystemUIApplicationImpl.java b/packages/SystemUI/src/com/android/systemui/application/impl/SystemUIApplicationImpl.java
index 00887f7b42a7b..a96b8dc0bf554 100644
--- a/packages/SystemUI/src/com/android/systemui/application/impl/SystemUIApplicationImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/application/impl/SystemUIApplicationImpl.java
@@ -491,4 +491,8 @@ public void setContextAvailableCallback(
     public WMComponent getWMComponent() {
         return mInitializer.getWMComponent();
     }
+
+    public SysUIComponent getSysUIComponent() {
+        return mSysUIComponent;
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/applocker/AxAppLockerHelper.kt b/packages/SystemUI/src/com/android/systemui/applocker/AxAppLockerHelper.kt
new file mode 100644
index 0000000000000..3e536f1e45041
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/applocker/AxAppLockerHelper.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.applocker
+
+import android.app.AxSandboxManager.AppLockState
+import android.content.Context
+import android.os.IBinder
+import android.os.RemoteException
+import android.os.ServiceManager
+import android.os.SystemClock
+import android.util.Log
+import com.android.internal.app.IAppLockStateListener
+import com.android.internal.app.IAppSessionListener
+import com.android.internal.app.IAxSandboxManager
+import com.android.systemui.CoreStartable
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.shade.QuickSettingsControllerImpl
+import com.android.systemui.shade.ShadeController
+import com.android.systemui.statusbar.policy.KeyguardStateController
+import dagger.Lazy
+import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.Executor
+import java.util.concurrent.atomic.AtomicReference
+import javax.inject.Inject
+
+@SysUISingleton
+class AxAppLockerHelper @Inject constructor(
+    private val qsController: Lazy<QuickSettingsControllerImpl>,
+    private val shadeController: Lazy<ShadeController>,
+    private val keyguardStateController: KeyguardStateController,
+    @Main private val mainExecutor: Executor,
+) : CoreStartable {
+
+    companion object {
+        private const val TAG = "AxAppLockerHelper"
+        private const val PENDING_EXPIRY_MS = 15_000L
+        private fun sessionKey(userId: Int, pkg: String): String = "$userId:$pkg"
+    }
+
+    private val serviceRef = AtomicReference<IAxSandboxManager?>()
+    @Volatile private var listenersRegistered = false
+    private val hasLockCache = ConcurrentHashMap<String, Boolean>()
+    private val sessionAuthCache = ConcurrentHashMap<String, Boolean>()
+    private val refreshListeners = CopyOnWriteArrayList<Runnable>()
+    private val notifUnlocks =
+        Collections.newSetFromMap(ConcurrentHashMap<String, Boolean>())
+    private val pendingNotifOnly = ConcurrentHashMap<String, Long>()
+
+    private val keyguardCallback = object : KeyguardStateController.Callback {
+        override fun onKeyguardShowingChanged() {
+            if (keyguardStateController.isShowing) {
+                val hadEntries = notifUnlocks.isNotEmpty() || pendingNotifOnly.isNotEmpty()
+                notifUnlocks.clear()
+                pendingNotifOnly.clear()
+                if (hadEntries) {
+                    mainExecutor.execute { refreshState() }
+                }
+            }
+        }
+    }
+
+    private val lockStateListener = object : IAppLockStateListener.Stub() {
+        override fun onAppLockStateChanged(packageName: String, locked: Boolean) {
+            if (packageName.isBlank()) return
+            hasLockCache[packageName] = locked
+            if (!locked) {
+                val prefix = ":$packageName"
+                sessionAuthCache.keys.removeAll { it.endsWith(prefix) }
+                notifUnlocks.removeAll { it.endsWith(prefix) }
+                pendingNotifOnly.keys.removeAll { it.endsWith(prefix) }
+            }
+            mainExecutor.execute {
+                qsController.get().onAppLockerUpdated(packageName)
+                refreshState()
+            }
+        }
+    }
+
+    private val sessionListener = object : IAppSessionListener.Stub() {
+        override fun onAppUnlocked(packageName: String, userId: Int) {
+            if (packageName.isBlank()) return
+            val key = sessionKey(userId, packageName)
+            sessionAuthCache[key] = false
+            val pendingTs = pendingNotifOnly.remove(key)
+            val now = SystemClock.elapsedRealtime()
+            val notifOnly = pendingTs != null && (now - pendingTs) < PENDING_EXPIRY_MS
+            if (notifOnly) notifUnlocks.add(key)
+            mainExecutor.execute {
+                if (notifOnly) {
+                    shadeController.get().animateExpandShade()
+                }
+                refreshState()
+            }
+        }
+        override fun onAppLocked(packageName: String, userId: Int) {
+            if (packageName.isBlank()) return
+            val key = sessionKey(userId, packageName)
+            sessionAuthCache[key] = true
+            if (notifUnlocks.contains(key)) return
+            mainExecutor.execute { refreshState() }
+        }
+    }
+
+    private val deathRecipient = IBinder.DeathRecipient {
+        serviceRef.set(null)
+        listenersRegistered = false
+        hasLockCache.clear()
+        sessionAuthCache.clear()
+        notifUnlocks.clear()
+        pendingNotifOnly.clear()
+    }
+
+    fun addRefreshListener(l: Runnable) { refreshListeners.addIfAbsent(l) }
+    fun removeRefreshListener(l: Runnable) { refreshListeners.remove(l) }
+    private fun refreshState() { refreshListeners.forEach { it.run() } }
+
+    private fun getService(): IAxSandboxManager? {
+        var manager = serviceRef.get()
+        if (manager == null) {
+            val binder = ServiceManager.getService(Context.AX_SANDBOX_SERVICE) ?: return null
+            try {
+                binder.linkToDeath(deathRecipient, 0)
+                manager = IAxSandboxManager.Stub.asInterface(binder)
+                serviceRef.set(manager)
+                registerListeners(manager)
+            } catch (e: RemoteException) {
+                Log.w(TAG, "Failed to link/register", e)
+            }
+        }
+        return manager
+    }
+
+    private fun registerListeners(manager: IAxSandboxManager) {
+        if (listenersRegistered) return
+        try {
+            manager.registerAppLockStateListener(lockStateListener)
+            manager.registerAppSessionListener(sessionListener)
+            listenersRegistered = true
+        } catch (e: RemoteException) {
+            Log.w(TAG, "Failed to register listeners", e)
+        }
+    }
+
+    override fun start() {
+        keyguardStateController.addCallback(keyguardCallback)
+        getService()
+    }
+
+    fun getState(packageName: String): AppLockState {
+        if (packageName.isBlank()) return AppLockState.NONE
+        val manager = getService() ?: return AppLockState.NONE
+        return try {
+            AppLockState.fromOrdinal(manager.getAppLockState(packageName))
+        } catch (e: RemoteException) {
+            Log.w(TAG, "getState RemoteException: ${e.message}")
+            AppLockState.NONE
+        }
+    }
+
+    fun hasAppLock(packageName: String): Boolean {
+        if (packageName.isBlank()) return false
+        hasLockCache[packageName]?.let { return it }
+        val hasLock = getState(packageName).hasAppLock()
+        hasLockCache[packageName] = hasLock
+        return hasLock
+    }
+
+    fun needsAuth(packageName: String, userId: Int): Boolean {
+        if (packageName.isBlank()) return false
+        if (!hasAppLock(packageName)) return false
+        val key = sessionKey(userId, packageName)
+        if (notifUnlocks.contains(key)) return false
+        sessionAuthCache[key]?.let { return it }
+        val authoritative = getState(packageName).needsAuth()
+        sessionAuthCache[key] = authoritative
+        return authoritative
+    }
+
+    fun promptUnlock(packageName: String, userId: Int) {
+        pendingNotifOnly[sessionKey(userId, packageName)] = SystemClock.elapsedRealtime()
+        shadeController.get().collapseShade()
+        val manager = getService() ?: return
+        try {
+            manager.promptUnlock(packageName, userId)
+        } catch (e: RemoteException) {
+            Log.e(TAG, "Failed to prompt unlock", e)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
index 6cfcb3f475b9c..38aecc67c7837 100644
--- a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
@@ -374,7 +374,7 @@ private boolean addNoted(int code, int uid, String packageName) {
         // We should keep this so we make sure it cannot time out.
         mBGHandler.removeCallbacksAndMessages(item);
         final long delay =
-                (Flags.locationIndicatorsEnabled() && isOpLocation(code))
+                isOpLocation(code)
                         ? NOTED_OP_TIME_LOCATION_ONLY_DELAY_MS
                         : NOTED_OP_TIME_DELAY_MS;
         mBGHandler.scheduleRemoval(item, delay);
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformBinderService.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformBinderService.kt
new file mode 100644
index 0000000000000..e849a187a7fb0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformBinderService.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+class AxPlatformBinderService : Service() {
+
+    override fun onBind(intent: Intent?): IBinder? = AxPlatformServiceImpl.sBinder
+}
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureController.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureController.kt
new file mode 100644
index 0000000000000..fdced0ad0c840
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureController.kt
@@ -0,0 +1,482 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.app.UiModeManager
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.hardware.SensorPrivacyManager
+import android.hardware.display.ColorDisplayManager
+import android.os.Handler
+import android.os.Looper
+import android.view.WindowManager
+import com.android.internal.util.ScreenshotHelper
+import android.media.projection.StopReason
+import android.net.TetheringManager
+import android.nfc.NfcAdapter
+import android.os.PowerManager
+import android.os.RemoteException
+import android.os.ServiceManager
+import android.os.UserHandle
+import android.provider.Settings
+import android.service.dreams.IDreamManager
+import android.util.Log
+import com.android.axion.platform.AxPlatformClient
+import com.android.settingslib.bluetooth.CachedBluetoothDevice
+import com.android.settingslib.bluetooth.LocalBluetoothManager
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.connectivity.AccessPointController
+import com.android.systemui.statusbar.connectivity.NetworkController
+import com.android.systemui.statusbar.phone.ManagedProfileController
+import com.android.systemui.statusbar.policy.BatteryController
+import com.android.systemui.statusbar.policy.BluetoothController
+import com.android.systemui.statusbar.policy.CastController
+import com.android.systemui.statusbar.policy.DataSaverController
+import com.android.systemui.statusbar.policy.FlashlightController
+import com.android.systemui.statusbar.policy.HotspotController
+import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController
+import com.android.systemui.statusbar.policy.LocationController
+import com.android.systemui.statusbar.policy.RotationLockController
+import com.android.systemui.screenrecord.ScreenRecordUxController
+import com.android.systemui.statusbar.policy.SecurityController
+import com.android.systemui.statusbar.policy.ZenModeController
+import com.android.wifitrackerlib.WifiEntry
+import lineageos.app.ProfileManager
+import lineageos.hardware.LineageHardwareManager
+import lineageos.providers.LineageSettings
+import javax.inject.Inject
+
+@SysUISingleton
+class AxPlatformFeatureController @Inject constructor(
+    private val context: Context,
+    private val stateManager: AxPlatformStateManager,
+    private val networkController: NetworkController,
+    private val accessPointController: AccessPointController,
+    private val bluetoothController: BluetoothController,
+    private val hotspotController: HotspotController,
+    private val flashlightController: FlashlightController,
+    private val locationController: LocationController,
+    private val rotationLockController: RotationLockController,
+    private val batteryController: BatteryController,
+    private val zenModeController: ZenModeController,
+    private val dataSaverController: DataSaverController,
+    private val localBluetoothManager: LocalBluetoothManager?,
+    private val sensorPrivacyController: IndividualSensorPrivacyController,
+    private val managedProfileController: ManagedProfileController,
+    private val securityController: SecurityController,
+    private val castController: CastController,
+    private val screenRecordUxController: ScreenRecordUxController,
+    powerManager: PowerManager
+) {
+
+    internal val wakeLock: PowerManager.WakeLock =
+        powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK, "AxPlatform:Caffeine")
+    private val profileManager: ProfileManager? = try {
+        ProfileManager.getInstance(context)
+    } catch (e: Exception) { null }
+
+    private val nfcAdapter: NfcAdapter? = NfcAdapter.getDefaultAdapter(context)
+    private val uiModeManager: UiModeManager = context.getSystemService(UiModeManager::class.java)
+    private val colorDisplayManager: ColorDisplayManager =
+        context.getSystemService(ColorDisplayManager::class.java)
+    private val tetheringManager: TetheringManager? =
+        context.getSystemService(TetheringManager::class.java)
+    internal val dreamManager: IDreamManager? = try {
+        IDreamManager.Stub.asInterface(ServiceManager.getService("dreams"))
+    } catch (e: Exception) { null }
+    internal val lineageHardware: LineageHardwareManager? = try {
+        LineageHardwareManager.getInstance(context)
+    } catch (e: Exception) { null }
+
+    private val screenshotHelper = ScreenshotHelper(context)
+    private val screenshotHandler = Handler(Looper.getMainLooper())
+
+    var latestAccessPoints: List<WifiEntry> = emptyList()
+
+    val supportedFeatures: Array<String> by lazy {
+        buildList {
+            addAll(BASE_FEATURES)
+            if (nfcAdapter != null)
+                add(AxPlatformClient.FEATURE_NFC)
+            if (sensorPrivacyController.supportsSensorToggle(SensorPrivacyManager.Sensors.CAMERA))
+                add(AxPlatformClient.FEATURE_CAMERA_PRIVACY)
+            if (sensorPrivacyController.supportsSensorToggle(SensorPrivacyManager.Sensors.MICROPHONE))
+                add(AxPlatformClient.FEATURE_MIC_PRIVACY)
+            add(AxPlatformClient.FEATURE_WORK_PROFILE)
+            if (tetheringManager?.isTetheringSupported == true)
+                add(AxPlatformClient.FEATURE_USB_TETHER)
+            if (dreamManager != null)
+                add(AxPlatformClient.FEATURE_DREAM)
+            if (lineageHardware?.isSupported(LineageHardwareManager.FEATURE_READING_ENHANCEMENT) == true)
+                add(AxPlatformClient.FEATURE_READING_MODE)
+            if (batteryController.isReverseSupported)
+                add(AxPlatformClient.FEATURE_POWER_SHARE)
+            add(AxPlatformClient.FEATURE_CAFFEINE)
+            add(AxPlatformClient.FEATURE_VPN)
+            add(AxPlatformClient.FEATURE_CAST)
+            add(AxPlatformClient.FEATURE_SMART_PIXELS)
+            if (profileManager != null)
+                add(AxPlatformClient.FEATURE_PROFILES)
+            add(AxPlatformClient.FEATURE_SCREEN_RECORD)
+            add(AxPlatformClient.FEATURE_SCREENSHOT)
+        }.toTypedArray()
+    }
+
+    fun toggle(feature: String) {
+        when (feature) {
+            AxPlatformClient.FEATURE_WIFI -> {
+                val current = stateManager.getState(feature).getBoolean("enabled", false)
+                networkController.setWifiEnabled(!current)
+            }
+            AxPlatformClient.FEATURE_MOBILE_DATA -> {
+                val ctrl = networkController.mobileDataController ?: return
+                ctrl.isMobileDataEnabled = !ctrl.isMobileDataEnabled
+            }
+            AxPlatformClient.FEATURE_BLUETOOTH ->
+                bluetoothController.setBluetoothEnabled(!bluetoothController.isBluetoothEnabled)
+            AxPlatformClient.FEATURE_HOTSPOT -> {
+                val current = stateManager.getState(feature).getBoolean("enabled", false)
+                hotspotController.setHotspotEnabled(!current)
+            }
+            AxPlatformClient.FEATURE_FLASHLIGHT -> {
+                if (flashlightController.hasFlashlight())
+                    flashlightController.setFlashlight(!flashlightController.isEnabled)
+            }
+            AxPlatformClient.FEATURE_LOCATION ->
+                locationController.setLocationEnabled(!locationController.isLocationEnabled)
+            AxPlatformClient.FEATURE_ROTATION ->
+                rotationLockController.setRotationLocked(
+                    !rotationLockController.isRotationLocked, TAG
+                )
+            AxPlatformClient.FEATURE_BATTERY_SAVER ->
+                batteryController.setPowerSaveMode(!batteryController.isPowerSave)
+            AxPlatformClient.FEATURE_ZEN -> {
+                val current = zenModeController.zen
+                zenModeController.setZen(if (current == 0) 1 else 0, null, TAG)
+            }
+            AxPlatformClient.FEATURE_DATA_SAVER ->
+                dataSaverController.setDataSaverEnabled(!dataSaverController.isDataSaverEnabled)
+            AxPlatformClient.FEATURE_AOD ->
+                stateManager.toggleSecure(Settings.Secure.DOZE_ALWAYS_ON)
+            AxPlatformClient.FEATURE_AIRPLANE_MODE -> {
+                val enabled = !stateManager.getGlobalBool(Settings.Global.AIRPLANE_MODE_ON)
+                stateManager.setGlobalBool(Settings.Global.AIRPLANE_MODE_ON, enabled)
+                context.sendBroadcastAsUser(
+                    Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED).putExtra("state", enabled),
+                    UserHandle.ALL
+                )
+            }
+            AxPlatformClient.FEATURE_NFC -> nfcAdapter?.let {
+                if (it.isEnabled) it.disable() else it.enable()
+            }
+            AxPlatformClient.FEATURE_DARK_MODE ->
+                uiModeManager.setNightModeActivated(
+                    !isDarkMode(context.resources.configuration)
+                )
+            AxPlatformClient.FEATURE_NIGHT_LIGHT ->
+                colorDisplayManager.setNightDisplayActivated(
+                    !colorDisplayManager.isNightDisplayActivated
+                )
+            AxPlatformClient.FEATURE_COLOR_INVERSION ->
+                stateManager.toggleSecure(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED)
+            AxPlatformClient.FEATURE_COLOR_CORRECTION ->
+                stateManager.toggleSecure(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED)
+            AxPlatformClient.FEATURE_REDUCE_BRIGHTNESS ->
+                stateManager.toggleSecure(SETTING_REDUCE_BRIGHT)
+            AxPlatformClient.FEATURE_ONE_HANDED_MODE ->
+                stateManager.toggleSecure(SETTING_ONE_HANDED)
+            AxPlatformClient.FEATURE_HEADS_UP ->
+                stateManager.toggleGlobal(Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED)
+            AxPlatformClient.FEATURE_AUTO_SYNC ->
+                ContentResolver.setMasterSyncAutomatically(
+                    !ContentResolver.getMasterSyncAutomatically()
+                )
+            AxPlatformClient.FEATURE_CAMERA_PRIVACY ->
+                sensorPrivacyController.setSensorBlocked(
+                    SensorPrivacyManager.Sources.QS_TILE,
+                    SensorPrivacyManager.Sensors.CAMERA,
+                    !sensorPrivacyController.isSensorBlocked(SensorPrivacyManager.Sensors.CAMERA)
+                )
+            AxPlatformClient.FEATURE_MIC_PRIVACY ->
+                sensorPrivacyController.setSensorBlocked(
+                    SensorPrivacyManager.Sources.QS_TILE,
+                    SensorPrivacyManager.Sensors.MICROPHONE,
+                    !sensorPrivacyController.isSensorBlocked(
+                        SensorPrivacyManager.Sensors.MICROPHONE
+                    )
+                )
+            AxPlatformClient.FEATURE_WORK_PROFILE ->
+                managedProfileController.setWorkModeEnabled(
+                    !managedProfileController.isWorkModeEnabled
+                )
+            AxPlatformClient.FEATURE_USB_TETHER -> {
+                val current = stateManager.getState(feature).getBoolean("active", false)
+                tetheringManager?.setUsbTethering(!current)
+            }
+            AxPlatformClient.FEATURE_DREAM -> try {
+                dreamManager?.let { if (it.isDreaming) it.awaken() else it.dream() }
+            } catch (e: RemoteException) {
+                Log.w(TAG, "Dream toggle failed", e)
+            }
+            AxPlatformClient.FEATURE_READING_MODE -> lineageHardware?.let {
+                val current = it.get(LineageHardwareManager.FEATURE_READING_ENHANCEMENT)
+                it.set(LineageHardwareManager.FEATURE_READING_ENHANCEMENT, !current)
+                stateManager.broadcastBool(feature, !current)
+            }
+            AxPlatformClient.FEATURE_POWER_SHARE ->
+                batteryController.setReverseState(!batteryController.isReverseOn)
+            AxPlatformClient.FEATURE_CAFFEINE -> {
+                if (wakeLock.isHeld) {
+                    wakeLock.release()
+                } else {
+                    wakeLock.acquire(CAFFEINE_DURATION_MS)
+                }
+                stateManager.broadcastBool(feature, wakeLock.isHeld)
+            }
+            AxPlatformClient.FEATURE_VPN -> {
+                if (securityController.isVpnEnabled) {
+                    securityController.disconnectPrimaryVpn()
+                }
+            }
+            AxPlatformClient.FEATURE_CAST -> {
+                val active = castController.castDevices.firstOrNull { it.isCasting }
+                active?.let { castController.stopCasting(it, StopReason.STOP_QS_TILE) }
+            }
+            AxPlatformClient.FEATURE_PROFILES -> {
+                val current = profilesEnabled()
+                setProfilesEnabled(!current)
+                stateManager.broadcastBool(feature, !current)
+            }
+            AxPlatformClient.FEATURE_SMART_PIXELS ->
+                stateManager.toggleSecure(SETTING_SMART_PIXELS)
+            AxPlatformClient.FEATURE_SCREEN_RECORD -> {
+                if (screenRecordUxController.isStarting) {
+                    screenRecordUxController.cancelCountdown()
+                } else if (screenRecordUxController.isRecording) {
+                    screenRecordUxController.stopRecording(StopReason.STOP_QS_TILE)
+                } else {
+                    screenRecordUxController.createScreenRecordDialog(null).show()
+                }
+            }
+            AxPlatformClient.FEATURE_SCREENSHOT -> {
+                screenshotHandler.postDelayed({
+                    screenshotHelper.takeScreenshot(
+                        WindowManager.TAKE_SCREENSHOT_FULLSCREEN,
+                        WindowManager.ScreenshotSource.SCREENSHOT_OTHER,
+                        screenshotHandler,
+                        null
+                    )
+                }, SCREENSHOT_DELAY_MS)
+            }
+            else -> Log.w(TAG, "Unknown toggle: $feature")
+        }
+    }
+
+    fun setEnabled(feature: String, enabled: Boolean) {
+        when (feature) {
+            AxPlatformClient.FEATURE_WIFI -> networkController.setWifiEnabled(enabled)
+            AxPlatformClient.FEATURE_MOBILE_DATA ->
+                networkController.mobileDataController?.let { it.isMobileDataEnabled = enabled }
+            AxPlatformClient.FEATURE_BLUETOOTH -> bluetoothController.setBluetoothEnabled(enabled)
+            AxPlatformClient.FEATURE_HOTSPOT -> hotspotController.setHotspotEnabled(enabled)
+            AxPlatformClient.FEATURE_FLASHLIGHT -> {
+                if (flashlightController.hasFlashlight()) flashlightController.setFlashlight(enabled)
+            }
+            AxPlatformClient.FEATURE_LOCATION -> locationController.setLocationEnabled(enabled)
+            AxPlatformClient.FEATURE_ROTATION ->
+                rotationLockController.setRotationLocked(!enabled, TAG)
+            AxPlatformClient.FEATURE_BATTERY_SAVER -> batteryController.setPowerSaveMode(enabled)
+            AxPlatformClient.FEATURE_ZEN ->
+                zenModeController.setZen(if (enabled) 1 else 0, null, TAG)
+            AxPlatformClient.FEATURE_DATA_SAVER -> dataSaverController.setDataSaverEnabled(enabled)
+            AxPlatformClient.FEATURE_AOD ->
+                stateManager.setSecureBool(Settings.Secure.DOZE_ALWAYS_ON, enabled)
+            AxPlatformClient.FEATURE_AIRPLANE_MODE -> {
+                stateManager.setGlobalBool(Settings.Global.AIRPLANE_MODE_ON, enabled)
+                context.sendBroadcastAsUser(
+                    Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED).putExtra("state", enabled),
+                    UserHandle.ALL
+                )
+            }
+            AxPlatformClient.FEATURE_NFC -> nfcAdapter?.let {
+                if (enabled) it.enable() else it.disable()
+            }
+            AxPlatformClient.FEATURE_DARK_MODE -> uiModeManager.setNightModeActivated(enabled)
+            AxPlatformClient.FEATURE_NIGHT_LIGHT ->
+                colorDisplayManager.setNightDisplayActivated(enabled)
+            AxPlatformClient.FEATURE_COLOR_INVERSION ->
+                stateManager.setSecureBool(
+                    Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, enabled
+                )
+            AxPlatformClient.FEATURE_COLOR_CORRECTION ->
+                stateManager.setSecureBool(
+                    Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, enabled
+                )
+            AxPlatformClient.FEATURE_REDUCE_BRIGHTNESS ->
+                stateManager.setSecureBool(SETTING_REDUCE_BRIGHT, enabled)
+            AxPlatformClient.FEATURE_ONE_HANDED_MODE ->
+                stateManager.setSecureBool(SETTING_ONE_HANDED, enabled)
+            AxPlatformClient.FEATURE_HEADS_UP ->
+                stateManager.setGlobalBool(
+                    Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, enabled
+                )
+            AxPlatformClient.FEATURE_AUTO_SYNC ->
+                ContentResolver.setMasterSyncAutomatically(enabled)
+            AxPlatformClient.FEATURE_CAMERA_PRIVACY ->
+                sensorPrivacyController.setSensorBlocked(
+                    SensorPrivacyManager.Sources.QS_TILE,
+                    SensorPrivacyManager.Sensors.CAMERA,
+                    enabled
+                )
+            AxPlatformClient.FEATURE_MIC_PRIVACY ->
+                sensorPrivacyController.setSensorBlocked(
+                    SensorPrivacyManager.Sources.QS_TILE,
+                    SensorPrivacyManager.Sensors.MICROPHONE,
+                    enabled
+                )
+            AxPlatformClient.FEATURE_WORK_PROFILE ->
+                managedProfileController.setWorkModeEnabled(enabled)
+            AxPlatformClient.FEATURE_USB_TETHER -> tetheringManager?.setUsbTethering(enabled)
+            AxPlatformClient.FEATURE_DREAM -> try {
+                dreamManager?.let { if (enabled) it.dream() else it.awaken() }
+            } catch (e: RemoteException) {
+                Log.w(TAG, "Dream setEnabled failed", e)
+            }
+            AxPlatformClient.FEATURE_READING_MODE -> lineageHardware?.let {
+                it.set(LineageHardwareManager.FEATURE_READING_ENHANCEMENT, enabled)
+                stateManager.broadcastBool(feature, enabled)
+            }
+            AxPlatformClient.FEATURE_POWER_SHARE ->
+                batteryController.setReverseState(enabled)
+            AxPlatformClient.FEATURE_CAFFEINE -> {
+                if (enabled && !wakeLock.isHeld) {
+                    wakeLock.acquire(CAFFEINE_DURATION_MS)
+                } else if (!enabled && wakeLock.isHeld) {
+                    wakeLock.release()
+                }
+                stateManager.broadcastBool(feature, wakeLock.isHeld)
+            }
+            AxPlatformClient.FEATURE_VPN -> {
+                if (!enabled && securityController.isVpnEnabled) {
+                    securityController.disconnectPrimaryVpn()
+                }
+            }
+            AxPlatformClient.FEATURE_CAST -> {
+                if (!enabled) {
+                    castController.castDevices.firstOrNull { it.isCasting }
+                        ?.let { castController.stopCasting(it, StopReason.STOP_QS_TILE) }
+                }
+            }
+            AxPlatformClient.FEATURE_PROFILES -> {
+                setProfilesEnabled(enabled)
+                stateManager.broadcastBool(feature, enabled)
+            }
+            AxPlatformClient.FEATURE_SMART_PIXELS ->
+                stateManager.setSecureBool(SETTING_SMART_PIXELS, enabled)
+            AxPlatformClient.FEATURE_SCREEN_RECORD -> {
+                if (!enabled && screenRecordUxController.isRecording) {
+                    screenRecordUxController.stopRecording(StopReason.STOP_QS_TILE)
+                }
+            }
+            AxPlatformClient.FEATURE_SCREENSHOT -> {
+                if (enabled) toggle(feature)
+            }
+            else -> Log.w(TAG, "Unknown setEnabled: $feature")
+        }
+    }
+
+    fun setValue(feature: String, value: Int) {
+        when (feature) {
+            AxPlatformClient.FEATURE_ZEN -> {
+                if (zenModeController.zen != value)
+                    zenModeController.setZen(value, null, TAG)
+            }
+            else -> Log.w(TAG, "Unknown setValue: $feature")
+        }
+    }
+
+    fun performAction(feature: String, param: String) {
+        when (feature) {
+            AxPlatformClient.ACTION_WIFI_CONNECT ->
+                latestAccessPoints
+                    .find { it.getKey() == param || it.getTitle() == param }
+                    ?.let { accessPointController.connect(it) }
+            AxPlatformClient.ACTION_BT_CONNECT ->
+                getAllBluetoothDevices().find { it.getAddress() == param }?.let {
+                    if (it.isConnected()) it.disconnect() else it.connect(true)
+                }
+            else -> Log.w(TAG, "Unknown performAction: $feature")
+        }
+    }
+
+    fun getAllBluetoothDevices(): Collection<CachedBluetoothDevice> =
+        localBluetoothManager?.cachedDeviceManager?.cachedDevicesCopy
+            ?: bluetoothController.connectedDevices
+
+    private fun profilesEnabled(): Boolean =
+        LineageSettings.System.getIntForUser(
+            context.contentResolver,
+            LineageSettings.System.SYSTEM_PROFILES_ENABLED,
+            1, UserHandle.USER_CURRENT
+        ) == 1
+
+    private fun setProfilesEnabled(enabled: Boolean) {
+        LineageSettings.System.putIntForUser(
+            context.contentResolver,
+            LineageSettings.System.SYSTEM_PROFILES_ENABLED,
+            if (enabled) 1 else 0, UserHandle.USER_CURRENT
+        )
+    }
+
+    companion object {
+        private const val TAG = "AxPlatformFeatureCtrl"
+        private const val CAFFEINE_DURATION_MS = 5L * 60 * 1000
+        private const val SCREENSHOT_DELAY_MS = 500L
+        const val SETTING_NIGHT_DISPLAY = "night_display_activated"
+        const val SETTING_REDUCE_BRIGHT = "reduce_bright_colors_activated"
+        const val SETTING_ONE_HANDED = "one_handed_mode_enabled"
+        const val SETTING_SMART_PIXELS = "ax_smart_pixel_filter_enabled"
+
+        fun isDarkMode(config: Configuration): Boolean =
+            (config.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
+
+        private val BASE_FEATURES = arrayOf(
+            AxPlatformClient.FEATURE_WIFI,
+            AxPlatformClient.FEATURE_MOBILE_DATA,
+            AxPlatformClient.FEATURE_BLUETOOTH,
+            AxPlatformClient.FEATURE_HOTSPOT,
+            AxPlatformClient.FEATURE_FLASHLIGHT,
+            AxPlatformClient.FEATURE_LOCATION,
+            AxPlatformClient.FEATURE_ROTATION,
+            AxPlatformClient.FEATURE_BATTERY_SAVER,
+            AxPlatformClient.FEATURE_ZEN,
+            AxPlatformClient.FEATURE_AOD,
+            AxPlatformClient.FEATURE_DATA_SAVER,
+            AxPlatformClient.FEATURE_AIRPLANE_MODE,
+            AxPlatformClient.FEATURE_DARK_MODE,
+            AxPlatformClient.FEATURE_NIGHT_LIGHT,
+            AxPlatformClient.FEATURE_COLOR_INVERSION,
+            AxPlatformClient.FEATURE_COLOR_CORRECTION,
+            AxPlatformClient.FEATURE_REDUCE_BRIGHTNESS,
+            AxPlatformClient.FEATURE_ONE_HANDED_MODE,
+            AxPlatformClient.FEATURE_HEADS_UP,
+            AxPlatformClient.FEATURE_AUTO_SYNC
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureMapper.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureMapper.kt
new file mode 100644
index 0000000000000..bc484383d459e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformFeatureMapper.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.content.Context
+import android.os.Bundle
+import com.android.axion.platform.AxPlatformClient
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.policy.BatteryController
+import com.android.systemui.statusbar.policy.ConfigurationController
+import javax.inject.Inject
+
+@SysUISingleton
+class AxPlatformFeatureMapper @Inject constructor(
+    private val context: Context,
+    private val batteryController: BatteryController,
+    configurationController: ConfigurationController
+) : AxPlatformStateManager.LabelProvider {
+
+    private val labelCache = mutableMapOf<String, String>()
+
+    init {
+        configurationController.addCallback(object : ConfigurationController.ConfigurationListener {
+            override fun onLocaleListChanged() {
+                labelCache.clear()
+            }
+        })
+    }
+
+    override fun getLabel(feature: String): String? {
+        labelCache[feature]?.let { return it }
+        val label = when {
+            FEATURE_LABEL_RES.containsKey(feature) -> context.getString(FEATURE_LABEL_RES[feature]!!)
+            feature == AxPlatformClient.FEATURE_SMART_PIXELS -> LABEL_SMART_PIXELS
+            else -> return null
+        }
+        labelCache[feature] = label
+        return label
+    }
+
+    override fun getSecondaryLabel(feature: String, state: Bundle): String? = when (feature) {
+        AxPlatformClient.FEATURE_WIFI -> {
+            val ssid = state.getString("ssid")
+            when {
+                state.getBoolean("connected") && !ssid.isNullOrEmpty() -> ssid
+                else -> null
+            }
+        }
+        AxPlatformClient.FEATURE_BLUETOOTH -> {
+            @Suppress("DEPRECATION")
+            val devices = state.getParcelableArrayList<Bundle>("devices")
+            devices?.firstOrNull { it.getBoolean("isConnected") }?.getString("name")
+        }
+        AxPlatformClient.FEATURE_HOTSPOT -> {
+            val num = state.getInt("numDevices", 0)
+            if (num > 0) "$num ${if (num == 1) "device" else "devices"}" else null
+        }
+        AxPlatformClient.FEATURE_MOBILE_DATA -> {
+            state.getString("description")?.takeIf { it.isNotEmpty() }
+        }
+        AxPlatformClient.FEATURE_ZEN -> {
+            val mode = state.getInt("mode", 0)
+            if (mode != 0) context.getString(R.string.zen_mode_on) else null
+        }
+        AxPlatformClient.FEATURE_POWER_SHARE -> {
+            if (batteryController.isAodPowerSave)
+                context.getString(R.string.quick_settings_powershare_off_powersave_label)
+            else null
+        }
+        AxPlatformClient.FEATURE_VPN -> {
+            state.getString("name")?.takeIf { it.isNotEmpty() }
+        }
+        AxPlatformClient.FEATURE_CAST -> {
+            state.getString("deviceName")?.takeIf { it.isNotEmpty() }
+        }
+        AxPlatformClient.FEATURE_PROFILES -> {
+            state.getString("profileName")?.takeIf { it.isNotEmpty() }
+        }
+        AxPlatformClient.FEATURE_SCREEN_RECORD -> {
+            when {
+                state.getBoolean("active") -> context.getString(R.string.quick_settings_screen_record_stop)
+                state.getBoolean("starting") -> context.getString(R.string.quick_settings_screen_record_start)
+                else -> null
+            }
+        }
+        else -> null
+    }
+
+    companion object {
+        private const val LABEL_SMART_PIXELS = "Smart Pixels"
+
+        private val FEATURE_LABEL_RES = mapOf(
+            AxPlatformClient.FEATURE_WIFI to R.string.quick_settings_wifi_label,
+            AxPlatformClient.FEATURE_MOBILE_DATA to R.string.quick_settings_internet_label,
+            AxPlatformClient.FEATURE_BLUETOOTH to R.string.quick_settings_bluetooth_label,
+            AxPlatformClient.FEATURE_HOTSPOT to R.string.quick_settings_hotspot_label,
+            AxPlatformClient.FEATURE_FLASHLIGHT to R.string.quick_settings_flashlight_label,
+            AxPlatformClient.FEATURE_LOCATION to R.string.quick_settings_location_label,
+            AxPlatformClient.FEATURE_ROTATION to R.string.quick_settings_rotation_unlocked_label,
+            AxPlatformClient.FEATURE_BATTERY_SAVER to R.string.battery_detail_switch_title,
+            AxPlatformClient.FEATURE_ZEN to R.string.quick_settings_dnd_label,
+            AxPlatformClient.FEATURE_AOD to R.string.quick_settings_aod_label,
+            AxPlatformClient.FEATURE_DATA_SAVER to R.string.data_saver,
+            AxPlatformClient.FEATURE_AIRPLANE_MODE to R.string.airplane_mode,
+            AxPlatformClient.FEATURE_NFC to R.string.quick_settings_nfc_label,
+            AxPlatformClient.FEATURE_DARK_MODE to R.string.quick_settings_ui_mode_night_label,
+            AxPlatformClient.FEATURE_NIGHT_LIGHT to R.string.quick_settings_night_display_label,
+            AxPlatformClient.FEATURE_COLOR_INVERSION to R.string.quick_settings_inversion_label,
+            AxPlatformClient.FEATURE_COLOR_CORRECTION to R.string.quick_settings_color_correction_label,
+            AxPlatformClient.FEATURE_REDUCE_BRIGHTNESS to com.android.internal.R.string.reduce_bright_colors_feature_name,
+            AxPlatformClient.FEATURE_ONE_HANDED_MODE to R.string.quick_settings_onehanded_label,
+            AxPlatformClient.FEATURE_HEADS_UP to R.string.quick_settings_heads_up_label,
+            AxPlatformClient.FEATURE_AUTO_SYNC to R.string.quick_settings_sync_label,
+            AxPlatformClient.FEATURE_CAMERA_PRIVACY to R.string.quick_settings_camera_label,
+            AxPlatformClient.FEATURE_MIC_PRIVACY to R.string.quick_settings_mic_label,
+            AxPlatformClient.FEATURE_WORK_PROFILE to R.string.quick_settings_work_mode_label,
+            AxPlatformClient.FEATURE_USB_TETHER to R.string.quick_settings_usb_tether_label,
+            AxPlatformClient.FEATURE_DREAM to R.string.quick_settings_screensaver_label,
+            AxPlatformClient.FEATURE_READING_MODE to R.string.quick_settings_reading_mode,
+            AxPlatformClient.FEATURE_POWER_SHARE to R.string.quick_settings_powershare_label,
+            AxPlatformClient.FEATURE_CAFFEINE to R.string.quick_settings_caffeine_label,
+            AxPlatformClient.FEATURE_VPN to R.string.quick_settings_vpn_label,
+            AxPlatformClient.FEATURE_CAST to R.string.quick_settings_cast_title,
+            AxPlatformClient.FEATURE_PROFILES to R.string.quick_settings_profiles_label,
+            AxPlatformClient.FEATURE_SCREEN_RECORD to R.string.quick_settings_screen_record_label,
+            AxPlatformClient.FEATURE_SCREENSHOT to R.string.quick_settings_screenshot_label
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformObservers.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformObservers.kt
new file mode 100644
index 0000000000000..43640e0e99029
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformObservers.kt
@@ -0,0 +1,904 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.content.BroadcastReceiver
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.res.Configuration
+import android.database.ExecutorContentObserver
+import android.hardware.SensorPrivacyManager
+import android.hardware.usb.UsbManager
+import android.media.MediaMetadata
+import android.media.session.PlaybackState
+import android.nfc.NfcAdapter
+import android.os.Bundle
+import android.os.RemoteException
+import android.os.UserHandle
+import android.provider.Settings
+import android.util.Log
+import com.android.axion.platform.AxPlatformClient
+import com.android.settingslib.bluetooth.LocalBluetoothManager
+import com.android.systemui.broadcast.BroadcastDispatcher
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.util.settings.SecureSettings
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.media.NotificationMediaManager
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.screenrecord.ScreenRecordUxController
+import com.android.systemui.statusbar.StatusBarState
+import com.android.systemui.statusbar.connectivity.AccessPointController
+import com.android.systemui.statusbar.connectivity.MobileDataIndicators
+import com.android.systemui.statusbar.connectivity.NetworkController
+import com.android.systemui.statusbar.connectivity.SignalCallback
+import com.android.systemui.statusbar.connectivity.WifiIndicators
+import com.android.systemui.statusbar.phone.ManagedProfileController
+import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryInteractor
+import com.android.systemui.statusbar.policy.BatteryController
+import com.android.systemui.statusbar.policy.BluetoothController
+import com.android.systemui.statusbar.policy.ConfigurationController
+import com.android.systemui.statusbar.policy.DataSaverController
+import com.android.systemui.statusbar.policy.FlashlightController
+import com.android.systemui.statusbar.policy.HotspotController
+import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController
+import com.android.systemui.statusbar.policy.KeyguardStateController
+import com.android.systemui.statusbar.policy.LocationController
+import com.android.systemui.statusbar.policy.NextAlarmController
+import com.android.systemui.statusbar.policy.RotationLockController
+import com.android.systemui.statusbar.policy.CastController
+import com.android.systemui.statusbar.policy.CastDevice
+import com.android.systemui.statusbar.policy.SecurityController
+import com.android.systemui.statusbar.policy.ZenModeController
+import com.android.wifitrackerlib.WifiEntry
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import lineageos.app.ProfileManager
+import lineageos.hardware.LineageHardwareManager
+import lineageos.providers.LineageSettings
+import java.util.concurrent.Executor
+import javax.inject.Inject
+
+@SysUISingleton
+class AxPlatformObservers @Inject constructor(
+    private val context: Context,
+    @Main private val mainExecutor: Executor,
+    @Main private val mainDispatcher: CoroutineDispatcher,
+    @Background private val bgDispatcher: CoroutineDispatcher,
+    @Application private val scope: CoroutineScope,
+    private val broadcastDispatcher: BroadcastDispatcher,
+    private val secureSettings: SecureSettings,
+    private val stateManager: AxPlatformStateManager,
+    private val featureController: AxPlatformFeatureController,
+    private val networkController: NetworkController,
+    private val accessPointController: AccessPointController,
+    private val bluetoothController: BluetoothController,
+    private val hotspotController: HotspotController,
+    private val flashlightController: FlashlightController,
+    private val locationController: LocationController,
+    private val rotationLockController: RotationLockController,
+    private val batteryController: BatteryController,
+    private val zenModeController: ZenModeController,
+    private val dataSaverController: DataSaverController,
+    private val localBluetoothManager: LocalBluetoothManager?,
+    private val notificationMediaManager: NotificationMediaManager,
+    private val nextAlarmController: NextAlarmController,
+    private val configurationController: ConfigurationController,
+    private val statusBarStateController: StatusBarStateController,
+    private val keyguardStateController: KeyguardStateController,
+    private val batteryInteractor: BatteryInteractor,
+    private val sensorPrivacyController: IndividualSensorPrivacyController,
+    private val managedProfileController: ManagedProfileController,
+    private val securityController: SecurityController,
+    private val castController: CastController,
+    private val screenRecordUxController: ScreenRecordUxController
+) {
+
+    private val resolver: ContentResolver = context.contentResolver
+    private var lastMediaState = -1
+    private var lastMediaTrack: String? = null
+    private var lastMediaArtist: String? = null
+    private var lastMediaPackage: String? = null
+    private var lastMobileDataEnabled: Boolean? = null
+
+    private val wifiStateFlow = MutableSharedFlow<Bundle>(
+        replay = 0, extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    private val mobileStateFlow = MutableSharedFlow<Bundle>(
+        replay = 0, extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+
+    init {
+        scope.launch(bgDispatcher) {
+            wifiStateFlow.collect { bundle ->
+                stateManager.broadcastState(AxPlatformClient.FEATURE_WIFI, bundle)
+            }
+        }
+        scope.launch(bgDispatcher) {
+            mobileStateFlow.collect { bundle ->
+                stateManager.broadcastState(AxPlatformClient.FEATURE_MOBILE_DATA, bundle)
+            }
+        }
+    }
+
+    fun registerAll() {
+        registerControllerCallbacks()
+        registerSettingsObservers()
+        registerNfc()
+        registerBatteryFlow()
+        registerSensorPrivacy()
+        registerWorkProfile()
+        registerUsbTether()
+        registerDream()
+        registerReadingMode()
+        registerPowerShare()
+        registerCaffeine()
+        registerVpn()
+        registerCast()
+        registerProfiles()
+        registerSmartPixels()
+        registerScreenRecord()
+        registerAmbientIndication()
+    }
+
+    private fun registerControllerCallbacks() {
+        networkController.addCallback(signalCallback)
+        bluetoothController.addCallback(bluetoothCallback)
+        hotspotController.addCallback(hotspotCallback)
+        flashlightController.addCallback(flashlightCallback)
+        locationController.addCallback(locationCallback)
+        rotationLockController.addCallback(rotationCallback)
+        batteryController.addCallback(batteryCallback)
+        zenModeController.addCallback(zenCallback)
+        dataSaverController.addCallback(dataSaverCallback)
+        notificationMediaManager.addCallback(mediaListener)
+        nextAlarmController.addCallback(nextAlarmCallback)
+        configurationController.addCallback(configurationListener)
+        statusBarStateController.addCallback(dozeCallback)
+        keyguardStateController.addCallback(keyguardCallback)
+        accessPointController.addAccessPointCallback(accessPointCallback)
+        securityController.addCallback(vpnCallback)
+        castController.addCallback(castCallback)
+    }
+
+    private fun registerSettingsObservers() {
+        stateManager.observeSecure(Settings.Secure.DOZE_ALWAYS_ON, AxPlatformClient.FEATURE_AOD)
+        stateManager.observeSecure(
+            Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED,
+            AxPlatformClient.FEATURE_COLOR_INVERSION
+        )
+        stateManager.observeSecure(
+            Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+            AxPlatformClient.FEATURE_COLOR_CORRECTION
+        )
+        stateManager.observeSecure(
+            AxPlatformFeatureController.SETTING_REDUCE_BRIGHT,
+            AxPlatformClient.FEATURE_REDUCE_BRIGHTNESS
+        )
+        stateManager.observeSecure(
+            AxPlatformFeatureController.SETTING_NIGHT_DISPLAY,
+            AxPlatformClient.FEATURE_NIGHT_LIGHT
+        )
+        stateManager.observeSecure(
+            AxPlatformFeatureController.SETTING_ONE_HANDED,
+            AxPlatformClient.FEATURE_ONE_HANDED_MODE
+        )
+        stateManager.observeGlobal(
+            Settings.Global.AIRPLANE_MODE_ON,
+            AxPlatformClient.FEATURE_AIRPLANE_MODE
+        )
+        stateManager.observeGlobal(
+            Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
+            AxPlatformClient.FEATURE_HEADS_UP
+        )
+        stateManager.broadcastBool(
+            AxPlatformClient.FEATURE_AUTO_SYNC,
+            ContentResolver.getMasterSyncAutomatically()
+        )
+        ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS) {
+            mainExecutor.execute {
+                stateManager.broadcastBool(
+                    AxPlatformClient.FEATURE_AUTO_SYNC,
+                    ContentResolver.getMasterSyncAutomatically()
+                )
+            }
+        }
+    }
+
+    private fun registerNfc() {
+        val nfcAdapter = NfcAdapter.getDefaultAdapter(context) ?: return
+        stateManager.broadcastBool(AxPlatformClient.FEATURE_NFC, nfcAdapter.isEnabled)
+        broadcastDispatcher.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                stateManager.broadcastBool(AxPlatformClient.FEATURE_NFC, nfcAdapter.isEnabled)
+            }
+        }, IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED))
+    }
+
+    private fun registerBatteryFlow() {
+        scope.launch {
+            combine(
+                batteryInteractor.level,
+                batteryInteractor.isPluggedIn,
+                batteryInteractor.isCharging,
+                batteryInteractor.powerSave,
+                batteryInteractor.batteryTimeRemainingEstimate
+            ) { level, pluggedIn, charging, powerSave, estimate ->
+                Bundle().apply {
+                    putInt("level", level ?: -1)
+                    putBoolean("isPluggedIn", pluggedIn)
+                    putBoolean("isCharging", charging)
+                    putBoolean("powerSave", powerSave)
+                    putString("batteryTimeRemainingEstimate", estimate?.toString() ?: "")
+                }
+            }.flowOn(bgDispatcher).collect { bundle ->
+                withContext(mainDispatcher) {
+                    bundle.putBoolean("wireless", batteryController.isWirelessCharging)
+                    stateManager.broadcastState(AxPlatformClient.KEY_BATTERY, bundle)
+                }
+            }
+        }
+    }
+
+    private fun registerSensorPrivacy() {
+        sensorPrivacyController.addCallback(sensorPrivacyCallback)
+        if (sensorPrivacyController.supportsSensorToggle(SensorPrivacyManager.Sensors.CAMERA)) {
+            stateManager.broadcastBool(
+                AxPlatformClient.FEATURE_CAMERA_PRIVACY,
+                sensorPrivacyController.isSensorBlocked(SensorPrivacyManager.Sensors.CAMERA)
+            )
+        }
+        if (sensorPrivacyController.supportsSensorToggle(SensorPrivacyManager.Sensors.MICROPHONE)) {
+            stateManager.broadcastBool(
+                AxPlatformClient.FEATURE_MIC_PRIVACY,
+                sensorPrivacyController.isSensorBlocked(SensorPrivacyManager.Sensors.MICROPHONE)
+            )
+        }
+    }
+
+    private fun registerWorkProfile() {
+        managedProfileController.addCallback(managedProfileCallback)
+        broadcastWorkProfileState()
+    }
+
+    private fun registerUsbTether() {
+        broadcastDispatcher.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                val connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false)
+                val rndis = intent.getBooleanExtra(UsbManager.USB_FUNCTION_RNDIS, false)
+                val ncm = intent.getBooleanExtra(UsbManager.USB_FUNCTION_NCM, false)
+                val tethering = rndis || ncm
+                stateManager.broadcastState(
+                    AxPlatformClient.FEATURE_USB_TETHER,
+                    Bundle().apply {
+                        putBoolean("enabled", tethering)
+                        putBoolean("active", tethering)
+                        putBoolean("usbConnected", connected)
+                    }
+                )
+            }
+        }, IntentFilter(UsbManager.ACTION_USB_STATE))
+    }
+
+    private fun registerDream() {
+        featureController.dreamManager ?: return
+        val filter = IntentFilter().apply {
+            addAction(Intent.ACTION_DREAMING_STARTED)
+            addAction(Intent.ACTION_DREAMING_STOPPED)
+        }
+        broadcastDispatcher.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                broadcastDreamState()
+            }
+        }, filter)
+        secureSettings.registerContentObserverSync(
+            Settings.Secure.SCREENSAVER_ENABLED,
+            object : ExecutorContentObserver(mainExecutor) {
+                override fun onChange(selfChange: Boolean) {
+                    broadcastDreamState()
+                }
+            }
+        )
+        broadcastDreamState()
+    }
+
+    private fun registerReadingMode() {
+        val hw = featureController.lineageHardware ?: return
+        if (!hw.isSupported(LineageHardwareManager.FEATURE_READING_ENHANCEMENT)) return
+        stateManager.broadcastBool(
+            AxPlatformClient.FEATURE_READING_MODE,
+            hw.get(LineageHardwareManager.FEATURE_READING_ENHANCEMENT)
+        )
+    }
+
+    private fun registerPowerShare() {
+        if (!batteryController.isReverseSupported) return
+        batteryController.addCallback(powerShareCallback)
+        stateManager.broadcastBool(
+            AxPlatformClient.FEATURE_POWER_SHARE,
+            batteryController.isReverseOn
+        )
+    }
+
+    private val signalCallback = object : SignalCallback {
+        override fun setWifiIndicators(wifiIndicators: WifiIndicators) {
+            val connected = wifiIndicators.statusIcon?.visible == true
+            val enabled = wifiIndicators.enabled
+            wifiStateFlow.tryEmit(Bundle().apply {
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putBoolean("connected", connected)
+                putString("ssid", wifiIndicators.description ?: "")
+                putString("statusLabel", wifiIndicators.statusLabel ?: "")
+                putBoolean("isDefault", connected && !wifiIndicators.isTransient)
+            })
+        }
+
+        override fun setMobileDataIndicators(mobileDataIndicators: MobileDataIndicators) {
+            val isEnabled = lastMobileDataEnabled ?: (
+                networkController.mobileDataController?.isMobileDataEnabled == true
+            ).also { lastMobileDataEnabled = it }
+            mobileStateFlow.tryEmit(Bundle().apply {
+                putBoolean("enabled", isEnabled)
+                putBoolean("active", isEnabled)
+                putString(
+                    "type",
+                    mobileDataIndicators.typeContentDescription?.toString() ?: ""
+                )
+                putString("description", mobileDataIndicators.qsDescription?.toString() ?: "")
+                putBoolean("roaming", mobileDataIndicators.roaming)
+                putBoolean("isDefault", mobileDataIndicators.isDefault)
+                putInt("subId", mobileDataIndicators.subId)
+                putBoolean("activityIn", mobileDataIndicators.activityIn)
+                putBoolean("activityOut", mobileDataIndicators.activityOut)
+                putInt("level", mobileDataIndicators.level)
+            })
+        }
+
+        override fun setMobileDataEnabled(enabled: Boolean) {
+            lastMobileDataEnabled = enabled
+        }
+
+        override fun setNoSims(show: Boolean, simDetected: Boolean) {
+            if (!simDetected) {
+                stateManager.broadcastState(
+                    AxPlatformClient.FEATURE_MOBILE_DATA,
+                    Bundle().apply {
+                        putBoolean("available", false)
+                        putBoolean("enabled", false)
+                        putBoolean("active", false)
+                    }
+                )
+            }
+        }
+    }
+
+    private val accessPointCallback = object : AccessPointController.AccessPointCallback {
+        override fun onAccessPointsChanged(accessPoints: List<WifiEntry>) {
+            featureController.latestAccessPoints = accessPoints.toList()
+            val networks = ArrayList<Bundle>()
+            accessPoints.forEach { ap ->
+                if (ap.getLevel() != -1) {
+                    networks.add(Bundle().apply {
+                        putString("title", ap.getTitle())
+                        putString("key", ap.getKey())
+                        putBoolean("isConnected",
+                            ap.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED)
+                        putBoolean("isSaved", ap.isSaved())
+                        putInt("level", ap.getLevel())
+                        putInt("security", ap.getSecurity())
+                    })
+                }
+            }
+            stateManager.broadcastState(AxPlatformClient.KEY_WIFI_SCAN, Bundle().apply {
+                putParcelableArrayList("networks", networks)
+            })
+        }
+
+        override fun onSettingsActivityTriggered(intent: Intent?) {}
+        override fun onWifiScan(isScan: Boolean) {}
+    }
+
+    private fun getAllBluetoothDevices() = featureController.getAllBluetoothDevices()
+
+    private val bluetoothCallback = object : BluetoothController.Callback {
+        override fun onBluetoothStateChange(enabled: Boolean) = broadcastBluetoothState(enabled)
+        override fun onBluetoothDevicesChanged() =
+            broadcastBluetoothState(bluetoothController.isBluetoothEnabled)
+    }
+
+    private fun broadcastBluetoothState(enabled: Boolean) {
+        val devices = getAllBluetoothDevices()
+        val deviceBundles = ArrayList<Bundle>()
+        devices.forEach { device ->
+            deviceBundles.add(Bundle().apply {
+                putString("name", device.getName())
+                putString("address", device.getAddress())
+                putBoolean("isConnected", device.isConnected())
+                putInt("connectionState", device.getMaxConnectionState())
+                putInt("bondState", device.getBondState())
+                putInt("batteryLevel", device.getBatteryLevel())
+            })
+        }
+        val hasConnected = devices.any { it.isConnected() }
+        stateManager.broadcastState(AxPlatformClient.FEATURE_BLUETOOTH, Bundle().apply {
+            putBoolean("enabled", enabled)
+            putBoolean("active", enabled)
+            putBoolean("hasConnectedDevice", hasConnected)
+            putParcelableArrayList("devices", deviceBundles)
+        })
+    }
+
+    private val hotspotCallback = object : HotspotController.Callback {
+        override fun onHotspotChanged(enabled: Boolean, numDevices: Int) {
+            stateManager.broadcastState(AxPlatformClient.FEATURE_HOTSPOT, Bundle().apply {
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putInt("numDevices", numDevices)
+            })
+        }
+    }
+
+    private val flashlightCallback = object : FlashlightController.FlashlightListener {
+        override fun onFlashlightChanged(enabled: Boolean) {
+            stateManager.broadcastState(AxPlatformClient.FEATURE_FLASHLIGHT, Bundle().apply {
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putBoolean("available", true)
+            })
+        }
+
+        override fun onFlashlightError() {}
+
+        override fun onFlashlightAvailabilityChanged(available: Boolean) {
+            if (!available) {
+                stateManager.broadcastState(AxPlatformClient.FEATURE_FLASHLIGHT, Bundle().apply {
+                    putBoolean("enabled", false)
+                    putBoolean("active", false)
+                    putBoolean("available", false)
+                })
+            }
+        }
+
+        override fun onFlashlightStrengthChanged(level: Int) {}
+    }
+
+    private val rotationCallback =
+        object : RotationLockController.RotationLockControllerCallback {
+            override fun onRotationLockStateChanged(
+                rotationLocked: Boolean,
+                affordanceVisible: Boolean
+            ) {
+                stateManager.broadcastState(AxPlatformClient.FEATURE_ROTATION, Bundle().apply {
+                    putBoolean("locked", rotationLocked)
+                    putBoolean("active", !rotationLocked)
+                })
+            }
+        }
+
+    private val locationCallback = object : LocationController.LocationChangeCallback {
+        override fun onLocationSettingsChanged(locationEnabled: Boolean) {
+            stateManager.broadcastBool(AxPlatformClient.FEATURE_LOCATION, locationEnabled)
+        }
+    }
+
+    private val batteryCallback = object : BatteryController.BatteryStateChangeCallback {
+        override fun onPowerSaveChanged(isPowerSave: Boolean) {
+            stateManager.broadcastBool(AxPlatformClient.FEATURE_BATTERY_SAVER, isPowerSave)
+        }
+    }
+
+    private val zenCallback = object : ZenModeController.Callback {
+        override fun onZenChanged(zen: Int) {
+            stateManager.broadcastState(AxPlatformClient.FEATURE_ZEN, Bundle().apply {
+                putInt("mode", zen)
+                putBoolean("active", zen != 0)
+            })
+        }
+    }
+
+    private val dataSaverCallback = object : DataSaverController.Listener {
+        override fun onDataSaverChanged(isDataSaving: Boolean) {
+            stateManager.broadcastBool(AxPlatformClient.FEATURE_DATA_SAVER, isDataSaving)
+        }
+    }
+
+    private val sensorPrivacyCallback =
+        object : IndividualSensorPrivacyController.Callback {
+            override fun onSensorBlockedChanged(sensor: Int, blocked: Boolean) {
+                when (sensor) {
+                    SensorPrivacyManager.Sensors.CAMERA ->
+                        stateManager.broadcastBool(
+                            AxPlatformClient.FEATURE_CAMERA_PRIVACY, blocked
+                        )
+                    SensorPrivacyManager.Sensors.MICROPHONE ->
+                        stateManager.broadcastBool(
+                            AxPlatformClient.FEATURE_MIC_PRIVACY, blocked
+                        )
+                }
+            }
+        }
+
+    private val managedProfileCallback = object : ManagedProfileController.Callback {
+        override fun onManagedProfileChanged() = broadcastWorkProfileState()
+        override fun onManagedProfileRemoved() {
+            stateManager.broadcastState(
+                AxPlatformClient.FEATURE_WORK_PROFILE,
+                Bundle().apply {
+                    putBoolean("enabled", false)
+                    putBoolean("active", false)
+                    putBoolean("available", false)
+                }
+            )
+        }
+    }
+
+    private fun broadcastWorkProfileState() {
+        val hasProfile = managedProfileController.hasActiveProfile()
+        val enabled = hasProfile && managedProfileController.isWorkModeEnabled
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_WORK_PROFILE,
+            Bundle().apply {
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putBoolean("available", hasProfile)
+            }
+        )
+    }
+
+    private fun broadcastDreamState() {
+        val isDreaming = try {
+            featureController.dreamManager?.isDreaming == true
+        } catch (e: RemoteException) { false }
+        val isEnabled = stateManager.getSecureBool(Settings.Secure.SCREENSAVER_ENABLED)
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_DREAM,
+            Bundle().apply {
+                putBoolean("enabled", isEnabled)
+                putBoolean("active", isDreaming)
+            }
+        )
+    }
+
+    private val powerShareCallback = object : BatteryController.BatteryStateChangeCallback {
+        override fun onReverseChanged(isReverse: Boolean, level: Int, name: String?) {
+            stateManager.broadcastState(
+                AxPlatformClient.FEATURE_POWER_SHARE,
+                Bundle().apply {
+                    putBoolean("enabled", isReverse)
+                    putBoolean("active", isReverse)
+                }
+            )
+        }
+    }
+
+    private val mediaListener = object : NotificationMediaManager.MediaListener {
+        override fun onPrimaryMetadataOrStateChanged(
+            metadata: MediaMetadata?,
+            @PlaybackState.State state: Int
+        ) {
+            val isPlaying = state == PlaybackState.STATE_PLAYING
+            val packageName = notificationMediaManager.mediaNotificationKey
+                ?.split("|")?.getOrNull(1) ?: ""
+            val track = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
+                ?: metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) ?: ""
+            val artist = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) ?: ""
+
+            if (state == lastMediaState && track == lastMediaTrack
+                && artist == lastMediaArtist && packageName == lastMediaPackage) return
+
+            lastMediaState = state
+            lastMediaTrack = track
+            lastMediaArtist = artist
+            lastMediaPackage = packageName
+
+            stateManager.broadcastState(AxPlatformClient.KEY_MEDIA, Bundle().apply {
+                putString("track", track)
+                putString("artist", artist)
+                putString("album", metadata?.getString(MediaMetadata.METADATA_KEY_ALBUM) ?: "")
+                putBoolean("isPlaying", isPlaying)
+                putInt("state", state)
+                putLong("duration", metadata?.getLong(MediaMetadata.METADATA_KEY_DURATION) ?: 0L)
+                putString("packageName", packageName)
+            })
+        }
+    }
+
+    private val nextAlarmCallback = NextAlarmController.NextAlarmChangeCallback { alarm ->
+        if (alarm != null) {
+            stateManager.broadcastState(AxPlatformClient.KEY_ALARM, Bundle().apply {
+                putLong("triggerTime", alarm.triggerTime)
+                putString("packageName", alarm.showIntent?.creatorPackage ?: "")
+            })
+        } else {
+            stateManager.broadcastState(AxPlatformClient.KEY_ALARM, Bundle())
+        }
+    }
+
+    private val configurationListener = object : ConfigurationController.ConfigurationListener {
+        override fun onConfigChanged(newConfig: Configuration) = exportConfigInfo(newConfig)
+        override fun onDensityOrFontScaleChanged() = exportConfigInfo(null)
+        override fun onUiModeChanged() {
+            exportConfigInfo(null)
+            val config = context.resources.configuration
+            stateManager.broadcastBool(
+                AxPlatformClient.FEATURE_DARK_MODE,
+                AxPlatformFeatureController.isDarkMode(config)
+            )
+        }
+        override fun onThemeChanged() = exportConfigInfo(null)
+        override fun onLocaleListChanged() = exportConfigInfo(null)
+        override fun onLayoutDirectionChanged(isLayoutRtl: Boolean) = exportConfigInfo(null)
+        override fun onOrientationChanged(orientation: Int) = exportConfigInfo(null)
+    }
+
+    private fun exportConfigInfo(config: Configuration?) {
+        val currentConfig = config ?: context.resources.configuration
+        stateManager.broadcastState(AxPlatformClient.KEY_CONFIG, Bundle().apply {
+            putInt("uiMode", currentConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK)
+            putBoolean("isDarkMode", AxPlatformFeatureController.isDarkMode(currentConfig))
+            putInt("orientation", currentConfig.orientation)
+            putFloat("fontScale", currentConfig.fontScale)
+            putInt("densityDpi", currentConfig.densityDpi)
+            putInt("smallestScreenWidthDp", currentConfig.smallestScreenWidthDp)
+            putInt("screenWidthDp", currentConfig.screenWidthDp)
+            putInt("screenHeightDp", currentConfig.screenHeightDp)
+            putString("locale", currentConfig.locales.get(0)?.toLanguageTag() ?: "")
+            putInt("layoutDirection", currentConfig.layoutDirection)
+        })
+    }
+
+    private val dozeCallback = object : StatusBarStateController.StateListener {
+        override fun onStateChanged(newState: Int) = exportKeyguardInfo()
+        override fun onDozingChanged(isDozing: Boolean) = exportDozeInfo()
+        override fun onPulsingChanged(pulsing: Boolean) = exportDozeInfo()
+        override fun onDozeAmountChanged(linear: Float, eased: Float) = exportDozeInfo()
+    }
+
+    private val keyguardCallback = object : KeyguardStateController.Callback {
+        override fun onKeyguardGoingAwayChanged() = exportKeyguardInfo()
+        override fun onKeyguardShowingChanged() = exportKeyguardInfo()
+    }
+
+    private fun exportKeyguardInfo() {
+        val state = statusBarStateController.state
+        stateManager.broadcastState(AxPlatformClient.KEY_KEYGUARD, Bundle().apply {
+            putInt("state", state)
+            putBoolean("isKeyguard", state == StatusBarState.KEYGUARD)
+            putBoolean("isUnlocked", state == StatusBarState.SHADE)
+            putBoolean("isShadeLocked", state == StatusBarState.SHADE_LOCKED)
+            putBoolean("isShowing", keyguardStateController.isShowing)
+            putBoolean("isGoingAway", keyguardStateController.isKeyguardGoingAway)
+        })
+    }
+
+    private fun exportDozeInfo() {
+        val aodEnabled = stateManager.getState(AxPlatformClient.FEATURE_AOD).getBoolean("enabled", false)
+        stateManager.broadcastState(AxPlatformClient.KEY_DOZE, Bundle().apply {
+            putBoolean("isDozing", statusBarStateController.isDozing)
+            putBoolean("isPulsing", statusBarStateController.isPulsing)
+            putFloat("dozeAmount", statusBarStateController.dozeAmount)
+            putBoolean("aodEnabled", aodEnabled)
+            putBoolean("isAodPowerSave", batteryController.isAodPowerSave)
+        })
+    }
+
+    private fun registerCaffeine() {
+        stateManager.broadcastBool(
+            AxPlatformClient.FEATURE_CAFFEINE,
+            featureController.wakeLock.isHeld
+        )
+        broadcastDispatcher.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                if (featureController.wakeLock.isHeld) {
+                    featureController.wakeLock.release()
+                    stateManager.broadcastBool(AxPlatformClient.FEATURE_CAFFEINE, false)
+                }
+            }
+        }, IntentFilter(Intent.ACTION_SCREEN_OFF))
+    }
+
+    private val vpnCallback = object : SecurityController.SecurityControllerCallback {
+        override fun onStateChanged() {
+            stateManager.broadcastState(
+                AxPlatformClient.FEATURE_VPN,
+                Bundle().apply {
+                    val enabled = securityController.isVpnEnabled
+                    putBoolean("enabled", enabled)
+                    putBoolean("active", enabled)
+                    putString("name", securityController.primaryVpnName ?: "")
+                }
+            )
+        }
+    }
+
+    private fun registerVpn() {
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_VPN,
+            Bundle().apply {
+                val enabled = securityController.isVpnEnabled
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putString("name", securityController.primaryVpnName ?: "")
+            }
+        )
+    }
+
+    private val castCallback = object : CastController.Callback {
+        override fun onCastDevicesChanged() = broadcastCastState()
+    }
+
+    private fun registerCast() {
+        broadcastCastState()
+    }
+
+    private fun broadcastCastState() {
+        val devices = castController.castDevices
+        val active = devices.any { it.state == CastDevice.CastState.Connected }
+        val connecting = devices.any { it.state == CastDevice.CastState.Connecting }
+        val activeName = devices.firstOrNull { it.isCasting }?.name
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_CAST,
+            Bundle().apply {
+                putBoolean("enabled", active || connecting)
+                putBoolean("active", active)
+                putBoolean("connecting", connecting)
+                putString("deviceName", activeName ?: "")
+            }
+        )
+    }
+
+    private fun registerProfiles() {
+        val profileManager = try {
+            ProfileManager.getInstance(context)
+        } catch (e: Exception) { return }
+
+        val activeProfile = profileManager.activeProfile
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_PROFILES,
+            Bundle().apply {
+                val enabled = profilesEnabled()
+                putBoolean("enabled", enabled)
+                putBoolean("active", enabled)
+                putString("profileName", activeProfile?.name ?: "")
+            }
+        )
+
+        val filter = IntentFilter().apply {
+            addAction(ProfileManager.INTENT_ACTION_PROFILE_SELECTED)
+            addAction(ProfileManager.INTENT_ACTION_PROFILE_UPDATED)
+        }
+        broadcastDispatcher.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                val profile = profileManager.activeProfile
+                stateManager.broadcastState(
+                    AxPlatformClient.FEATURE_PROFILES,
+                    Bundle().apply {
+                        val enabled = profilesEnabled()
+                        putBoolean("enabled", enabled)
+                        putBoolean("active", enabled)
+                        putString("profileName", profile?.name ?: "")
+                    }
+                )
+            }
+        }, filter)
+
+        val uri = LineageSettings.System.getUriFor(
+            LineageSettings.System.SYSTEM_PROFILES_ENABLED
+        )
+        resolver.registerContentObserver(uri, false, object : ExecutorContentObserver(mainExecutor) {
+            override fun onChange(selfChange: Boolean) {
+                val profile = profileManager.activeProfile
+                stateManager.broadcastState(
+                    AxPlatformClient.FEATURE_PROFILES,
+                    Bundle().apply {
+                        val enabled = profilesEnabled()
+                        putBoolean("enabled", enabled)
+                        putBoolean("active", enabled)
+                        putString("profileName", profile?.name ?: "")
+                    }
+                )
+            }
+        }, UserHandle.USER_CURRENT)
+    }
+
+    private fun profilesEnabled(): Boolean =
+        LineageSettings.System.getIntForUser(
+            resolver,
+            LineageSettings.System.SYSTEM_PROFILES_ENABLED,
+            1, UserHandle.USER_CURRENT
+        ) == 1
+
+    private fun registerSmartPixels() {
+        stateManager.observeSecure(
+            AxPlatformFeatureController.SETTING_SMART_PIXELS,
+            AxPlatformClient.FEATURE_SMART_PIXELS
+        )
+    }
+
+    private val screenRecordCallback = object : ScreenRecordUxController.StateChangeCallback {
+        override fun onCountdown(millisUntilFinished: Long) = broadcastScreenRecordState()
+        override fun onCountdownEnd() = broadcastScreenRecordState()
+        override fun onRecordingStart() = broadcastScreenRecordState()
+        override fun onRecordingEnd() = broadcastScreenRecordState()
+    }
+
+    private fun registerScreenRecord() {
+        screenRecordUxController.addCallback(screenRecordCallback)
+        broadcastScreenRecordState()
+    }
+
+    private fun broadcastScreenRecordState() {
+        val recording = screenRecordUxController.isRecording
+        val starting = screenRecordUxController.isStarting
+        stateManager.broadcastState(
+            AxPlatformClient.FEATURE_SCREEN_RECORD,
+            Bundle().apply {
+                putBoolean("enabled", recording || starting)
+                putBoolean("active", recording)
+                putBoolean("starting", starting)
+            }
+        )
+    }
+
+    private fun registerAmbientIndication() {
+        val filter = IntentFilter().apply {
+            addAction(ACTION_AMBIENT_SHOW)
+            addAction(ACTION_AMBIENT_EXPAND)
+            addAction(ACTION_AMBIENT_HIDE)
+        }
+        context.registerReceiverAsUser(
+            object : BroadcastReceiver() {
+                override fun onReceive(ctx: Context, intent: Intent) {
+                    val action = intent.action ?: return
+                    val bundle = Bundle().apply {
+                        putString("action", action)
+                        intent.extras?.let { putAll(it) }
+                    }
+                    stateManager.broadcastState(AxPlatformClient.KEY_NOW_PLAYING, bundle)
+                }
+            },
+            UserHandle.ALL,
+            filter,
+            PERMISSION_AMBIENT_INDICATION,
+            null,
+            Context.RECEIVER_EXPORTED,
+        )
+    }
+
+    companion object {
+        private const val TAG = "AxPlatformObservers"
+
+        private const val ACTION_AMBIENT_SHOW =
+            "com.google.android.ambientindication.action.AMBIENT_INDICATION_SHOW"
+        private const val ACTION_AMBIENT_EXPAND =
+            "com.google.android.ambientindication.action.AMBIENT_INDICATION_EXPAND"
+        private const val ACTION_AMBIENT_HIDE =
+            "com.google.android.ambientindication.action.AMBIENT_INDICATION_HIDE"
+        private const val PERMISSION_AMBIENT_INDICATION =
+            "com.google.android.ambientindication.permission.AMBIENT_INDICATION"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformServiceImpl.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformServiceImpl.kt
new file mode 100644
index 0000000000000..2dc47a287c205
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformServiceImpl.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.content.Context
+import android.os.Binder
+import android.os.Bundle
+import android.os.IBinder
+import android.os.Process
+import android.util.Log
+import com.android.axion.platform.IAxPlatformCallback
+import com.android.axion.platform.IAxPlatformService
+import com.android.systemui.CoreStartable
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Main
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@SysUISingleton
+class AxPlatformServiceImpl @Inject constructor(
+    private val context: Context,
+    @Main private val mainDispatcher: CoroutineDispatcher,
+    @Application private val scope: CoroutineScope,
+    private val stateManager: AxPlatformStateManager,
+    private val featureController: AxPlatformFeatureController,
+    private val featureMapper: AxPlatformFeatureMapper,
+    private val observers: AxPlatformObservers
+) : CoreStartable {
+
+    private val binderStub = object : IAxPlatformService.Stub() {
+
+        override fun toggle(feature: String?) {
+            enforceSystemCaller()
+            if (feature.isNullOrEmpty()) return
+            scope.launch(mainDispatcher) { featureController.toggle(feature) }
+        }
+
+        override fun setEnabled(feature: String?, enabled: Boolean) {
+            enforceSystemCaller()
+            if (feature.isNullOrEmpty()) return
+            scope.launch(mainDispatcher) { featureController.setEnabled(feature, enabled) }
+        }
+
+        override fun setValue(feature: String?, value: Int) {
+            enforceSystemCaller()
+            if (feature.isNullOrEmpty()) return
+            scope.launch(mainDispatcher) { featureController.setValue(feature, value) }
+        }
+
+        override fun performAction(feature: String?, param: String?) {
+            enforceSystemCaller()
+            if (feature.isNullOrEmpty() || param.isNullOrEmpty()) return
+            scope.launch(mainDispatcher) { featureController.performAction(feature, param) }
+        }
+
+        override fun getState(feature: String?): Bundle =
+            if (feature != null) stateManager.getState(feature) else Bundle.EMPTY
+
+        override fun getAllStates(): Bundle = stateManager.getAllStates()
+
+        override fun getSupportedFeatures(): Array<String> = featureController.supportedFeatures
+
+        override fun registerCallback(callback: IAxPlatformCallback?) {
+            callback?.let { stateManager.registerCallback(it) }
+        }
+
+        override fun unregisterCallback(callback: IAxPlatformCallback?) {
+            callback?.let { stateManager.unregisterCallback(it) }
+        }
+    }
+
+    override fun start() {
+        stateManager.supportedFeatures = featureController.supportedFeatures
+        stateManager.labelProvider = featureMapper
+        sBinder = binderStub
+        Log.i(TAG, "AxPlatform service ready")
+        observers.registerAll()
+    }
+
+    private fun enforceSystemCaller() {
+        val uid = Binder.getCallingUid()
+        if (uid == Process.SYSTEM_UID || uid == Process.myUid()) return
+        val token = Binder.clearCallingIdentity()
+        try {
+            val packages = context.packageManager.getPackagesForUid(uid)
+            val allowed = packages?.any {
+                it.startsWith("com.android.axion.") ||
+                    it == "com.android.systemui" ||
+                    it == "io.chaldeaprjkt.gamespace"
+            } == true
+            if (!allowed) {
+                throw SecurityException("AxPlatformService: caller uid=$uid not permitted")
+            }
+        } finally {
+            Binder.restoreCallingIdentity(token)
+        }
+    }
+
+    companion object {
+        private const val TAG = "AxPlatformService"
+        @Volatile
+        internal var sBinder: IBinder? = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/ax/AxPlatformStateManager.kt b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformStateManager.kt
new file mode 100644
index 0000000000000..1ac9e9f1444b0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/ax/AxPlatformStateManager.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.ax
+
+import android.database.ExecutorContentObserver
+import android.os.Binder
+import android.os.Bundle
+import android.os.RemoteCallbackList
+import android.os.RemoteException
+import android.os.UserHandle
+import android.util.Log
+import com.android.axion.platform.AxPlatformClient
+import com.android.axion.platform.IAxPlatformCallback
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.util.settings.GlobalSettings
+import com.android.systemui.util.settings.SecureSettings
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executor
+import javax.inject.Inject
+
+@SysUISingleton
+class AxPlatformStateManager @Inject constructor(
+    private val secureSettings: SecureSettings,
+    private val globalSettings: GlobalSettings,
+    @Main private val mainExecutor: Executor
+) {
+
+    interface LabelProvider {
+        fun getLabel(feature: String): String?
+        fun getSecondaryLabel(feature: String, state: Bundle): String?
+    }
+
+    private val callbacks = RemoteCallbackList<IAxPlatformCallback>()
+    private val stateCache = ConcurrentHashMap<String, Bundle>()
+
+    var labelProvider: LabelProvider? = null
+    var supportedFeatures: Array<String> = emptyArray()
+        internal set
+
+    fun getState(feature: String): Bundle = stateCache[feature] ?: Bundle.EMPTY
+
+    fun getAllStates(): Bundle = Bundle().also { result ->
+        stateCache.forEach { (key, bundle) -> result.putBundle(key, bundle) }
+    }
+
+    fun registerCallback(callback: IAxPlatformCallback) {
+        callbacks.register(callback)
+        stateCache.forEach { (key, bundle) ->
+            try {
+                callback.onStateChanged(key, bundle)
+            } catch (e: RemoteException) {
+                Log.w(TAG, "Failed to send initial state for key=$key", e)
+            }
+        }
+    }
+
+    fun unregisterCallback(callback: IAxPlatformCallback) {
+        callbacks.unregister(callback)
+    }
+
+    fun broadcastState(key: String, state: Bundle) {
+        val normalizedState = Bundle(state)
+        enrichBundle(key, normalizedState)
+        val oldState = stateCache[key]
+        if (oldState != null && bundlesEqual(oldState, normalizedState)) {
+            return
+        }
+        stateCache[key] = normalizedState
+        synchronized(callbacks) {
+            val count = callbacks.beginBroadcast()
+            for (i in 0 until count) {
+                try {
+                    callbacks.getBroadcastItem(i).onStateChanged(key, normalizedState)
+                } catch (e: RemoteException) {
+                    Log.w(TAG, "Callback failed for key=$key", e)
+                }
+            }
+            callbacks.finishBroadcast()
+        }
+    }
+
+    fun broadcastBool(feature: String, active: Boolean) {
+        broadcastState(feature, Bundle().apply {
+            putBoolean("enabled", active)
+            putBoolean("active", active)
+        })
+    }
+
+    private fun enrichBundle(key: String, state: Bundle) {
+        if (state === Bundle.EMPTY) return
+        if (!state.containsKey("tileState")) {
+            state.putInt("tileState", when {
+                !state.getBoolean("available", true) -> AxPlatformClient.TILE_STATE_UNAVAILABLE
+                state.getBoolean("active", false) -> AxPlatformClient.TILE_STATE_ACTIVE
+                else -> AxPlatformClient.TILE_STATE_INACTIVE
+            })
+        }
+        labelProvider?.let { provider ->
+            if (!state.containsKey("label")) {
+                provider.getLabel(key)?.let { state.putString("label", it) }
+            }
+            if (!state.containsKey("secondaryLabel")) {
+                provider.getSecondaryLabel(key, state)?.let {
+                    state.putString("secondaryLabel", it)
+                }
+            }
+        }
+    }
+
+    private fun bundlesEqual(first: Bundle, second: Bundle): Boolean {
+        if (first.size() != second.size()) return false
+        for (key in first.keySet()) {
+            if (!second.containsKey(key)) return false
+            if (!bundleValueEquals(first.get(key), second.get(key))) return false
+        }
+        return true
+    }
+
+    private fun bundleValueEquals(first: Any?, second: Any?): Boolean =
+        when {
+            first is Bundle && second is Bundle -> bundlesEqual(first, second)
+            first is IntArray && second is IntArray -> first.contentEquals(second)
+            first is LongArray && second is LongArray -> first.contentEquals(second)
+            first is BooleanArray && second is BooleanArray -> first.contentEquals(second)
+            first is Array<*> && second is Array<*> -> first.contentDeepEquals(second)
+            else -> first == second
+        }
+
+    fun getSecureBool(key: String, def: Boolean = false): Boolean =
+        secureSettings.getIntForUser(key, if (def) 1 else 0, UserHandle.USER_CURRENT) == 1
+
+    fun setSecureBool(key: String, value: Boolean) {
+        val token = Binder.clearCallingIdentity()
+        try {
+            secureSettings.putIntForUser(key, if (value) 1 else 0, UserHandle.USER_CURRENT)
+        } finally {
+            Binder.restoreCallingIdentity(token)
+        }
+    }
+
+    fun toggleSecure(key: String) = setSecureBool(key, !getSecureBool(key))
+
+    fun getGlobalBool(key: String, def: Boolean = false): Boolean =
+        globalSettings.getInt(key, if (def) 1 else 0) == 1
+
+    fun setGlobalBool(key: String, value: Boolean) {
+        val token = Binder.clearCallingIdentity()
+        try {
+            globalSettings.putInt(key, if (value) 1 else 0)
+        } finally {
+            Binder.restoreCallingIdentity(token)
+        }
+    }
+
+    fun toggleGlobal(key: String) = setGlobalBool(key, !getGlobalBool(key))
+
+    fun observeSecure(key: String, feature: String) {
+        secureSettings.registerContentObserverSync(
+            key, object : ExecutorContentObserver(mainExecutor) {
+                override fun onChange(selfChange: Boolean) {
+                    broadcastBool(feature, getSecureBool(key))
+                }
+            }
+        )
+        broadcastBool(feature, getSecureBool(key))
+    }
+
+    fun observeGlobal(key: String, feature: String) {
+        globalSettings.registerContentObserverSync(
+            key, object : ExecutorContentObserver(mainExecutor) {
+                override fun onChange(selfChange: Boolean) {
+                    broadcastBool(feature, getGlobalBool(key))
+                }
+            }
+        )
+        broadcastBool(feature, getGlobalBool(key))
+    }
+
+    companion object {
+        private const val TAG = "AxPlatformState"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/IslandEventRepository.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/IslandEventRepository.kt
new file mode 100644
index 0000000000000..962425ecd6509
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/IslandEventRepository.kt
@@ -0,0 +1,229 @@
+package com.android.systemui.axdynamicbar.data
+
+import android.util.Log
+import com.android.systemui.axdynamicbar.data.source.AospChipIslandManager
+import com.android.systemui.axdynamicbar.data.source.AppTrackingIslandManager
+import com.android.systemui.axdynamicbar.data.source.BiometricIslandManager
+import com.android.systemui.axdynamicbar.data.source.ConnectivityIslandManager
+import com.android.systemui.axdynamicbar.data.source.MediaIslandManager
+import com.android.systemui.axdynamicbar.data.source.NotificationIslandManager
+import com.android.systemui.axdynamicbar.data.source.SmartspaceIslandManager
+import com.android.systemui.axdynamicbar.data.source.SystemIslandManager
+import com.android.systemui.axdynamicbar.data.source.TorchIslandManager
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarSettings
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+
+@SysUISingleton
+class IslandEventRepository
+@Inject
+constructor(
+    val media: MediaIslandManager,
+    val connectivity: ConnectivityIslandManager,
+    val system: SystemIslandManager,
+    val notification: NotificationIslandManager,
+    val appTracking: AppTrackingIslandManager,
+    val torch: TorchIslandManager,
+    val biometric: BiometricIslandManager,
+    val smartspace: SmartspaceIslandManager,
+    val aospChip: AospChipIslandManager,
+    private val settings: AxDynamicBarSettings,
+) {
+    companion object {
+        private const val TAG = "IslandEventRepository"
+    }
+
+    @Volatile private var listenersStarted = false
+
+    private val _indicationEvents =
+        MutableStateFlow<Map<String, IslandEvent.KeyguardIndication>>(emptyMap())
+
+    fun updateIndicationEvent(event: IslandEvent.KeyguardIndication) {
+        _indicationEvents.update { it + (event.indicationType.name to event) }
+    }
+
+    fun clearIndicationEvent(type: IslandEvent.KeyguardIndication.IndicationType) {
+        _indicationEvents.update { it - type.name }
+    }
+
+    fun clearAllIndicationEvents() {
+        _indicationEvents.value = emptyMap()
+    }
+
+    val events: Flow<List<IslandEvent>> = buildEventsFlow()
+
+    private val disabled get() = settings.disabledEventTypes.value
+
+    private fun isTypeEnabled(typeId: String): Boolean = typeId !in disabled
+
+    fun startListening() {
+        if (listenersStarted) return
+        listenersStarted = true
+        Log.d(TAG, "Starting event listeners")
+        syncDisabledTypes()
+        if (isTypeEnabled("media")) media.startListening()
+        if (isTypeEnabled("bluetooth")) connectivity.startBluetooth()
+        if (isTypeEnabled("hotspot")) connectivity.startHotspot()
+        if (isTypeEnabled("vpn")) connectivity.startVpn()
+        if (isTypeEnabled("charging")) system.startCharging()
+        if (isTypeEnabled("ringer")) system.startRinger()
+        if (isTypeEnabled("clipboard")) system.startClipboard()
+        notification.startListening()
+        if (isTypeEnabled("app_switch")) appTracking.startListening()
+        if (isTypeEnabled("torch")) torch.startListening()
+        if (isTypeEnabled("biometric_unlock")) biometric.startListening()
+        if (isTypeEnabled("media") || isTypeEnabled("sports")) smartspace.startListening()
+    }
+
+    fun stopListening() {
+        if (!listenersStarted) return
+        listenersStarted = false
+        Log.d(TAG, "Stopping event listeners")
+        media.stopListening()
+        connectivity.stopListening()
+        system.stopListening()
+        notification.stopListening()
+        torch.stopListening()
+        appTracking.stopListening()
+        biometric.stopListening()
+        smartspace.stopListening()
+    }
+
+    fun refreshListeners() {
+        if (!listenersStarted) return
+        syncDisabledTypes()
+
+        if (isTypeEnabled("media")) media.startListening()
+        else media.stopListening()
+
+        if (isTypeEnabled("bluetooth")) connectivity.startBluetooth()
+        else connectivity.stopBluetooth()
+        if (isTypeEnabled("hotspot")) connectivity.startHotspot()
+        else connectivity.stopHotspot()
+        if (isTypeEnabled("vpn")) connectivity.startVpn()
+        else connectivity.stopVpn()
+
+        if (isTypeEnabled("charging")) system.startCharging()
+        else system.stopCharging()
+        if (isTypeEnabled("ringer")) system.startRinger()
+        else system.stopRinger()
+        if (isTypeEnabled("clipboard")) system.startClipboard()
+        else system.stopClipboard()
+
+        if (isTypeEnabled("app_switch")) appTracking.startListening()
+        else appTracking.stopListening()
+        if (isTypeEnabled("torch")) torch.startListening()
+        else torch.stopListening()
+        if (isTypeEnabled("biometric_unlock")) biometric.startListening()
+        else biometric.stopListening()
+
+        if (isTypeEnabled("media") || isTypeEnabled("sports")) smartspace.startListening()
+        else smartspace.stopListening()
+    }
+
+    private fun syncDisabledTypes() {
+        notification.disabledTypes = disabled
+    }
+
+    private fun buildEventsFlow(): Flow<List<IslandEvent>> {
+
+        val sportsGroup = combine(
+            smartspace.sportsEvents,
+            notification.sportsEvents,
+        ) { qlSports, notifSports ->
+            if (!isTypeEnabled("sports")) emptyList()
+            else qlSports + notifSports.filter { ns ->
+                qlSports.none { qs ->
+                    qs.team1Name.equals(ns.team1Name, ignoreCase = true) &&
+                        qs.team2Name.equals(ns.team2Name, ignoreCase = true)
+                }
+            }
+        }
+        val promotedGroup = combine(
+            notification.promotedOngoingEvents,
+            sportsGroup,
+        ) { promoted, sports ->
+            (if (isTypeEnabled("promoted_ongoing")) promoted else emptyList()) + sports
+        }
+        val highGroup =
+            combine(torch.torchEvent, biometric.biometricEvent) { t, bio ->
+                listOfNotNull(
+                    t?.takeIf { isTypeEnabled("torch") },
+                    bio?.takeIf { isTypeEnabled("biometric_unlock") },
+                )
+            }
+        val midGroup =
+            combine(
+                media.mediaEvent,
+                connectivity.bluetoothEvent,
+                connectivity.hotspotEvent,
+                system.chargingEvent,
+                notification.alarmEvent,
+            ) { m, bt, hotspot, charging, alarm ->
+                listOfNotNull(
+                    m?.takeIf { isTypeEnabled("media") },
+                    bt?.takeIf { isTypeEnabled("bluetooth") },
+                    hotspot?.takeIf { isTypeEnabled("hotspot") },
+                    charging?.takeIf { isTypeEnabled("charging") },
+                    alarm?.takeIf { isTypeEnabled("alarm") },
+                )
+            }
+        val lowGroupA =
+            combine(
+                notification.timerEvent,
+                notification.stopwatchEvent,
+                system.ringerEvent,
+                connectivity.vpnEvent,
+                system.clipboardEvent,
+            ) { timer, stopwatch, ringer, vpn, clipboard ->
+                listOfNotNull(
+                    timer?.takeIf { isTypeEnabled("timer") },
+                    stopwatch?.takeIf { isTypeEnabled("stopwatch") },
+                    ringer?.takeIf { isTypeEnabled("ringer") },
+                    vpn?.takeIf { isTypeEnabled("vpn") },
+                    clipboard?.takeIf { isTypeEnabled("clipboard") },
+                )
+            }
+        val lowGroup =
+            combine(
+                lowGroupA,
+                appTracking.appSwitchEvent,
+                notification.audioRecordingEvent,
+                smartspace.nowPlayingEvent,
+            ) { a, appSwitch, audioRec, nowPlaying ->
+                a + listOfNotNull(
+                    appSwitch?.takeIf { isTypeEnabled("app_switch") },
+                    audioRec?.takeIf { isTypeEnabled("audio_recording") },
+                    nowPlaying?.takeIf { isTypeEnabled("media") },
+                )
+            }
+        val transientGroup = combine(midGroup, lowGroup) { mid, low -> mid + low }
+
+        val indicationGroup = _indicationEvents.map { it.values.toList() }
+
+        val allEvents = combine(
+            highGroup,
+            transientGroup,
+            promotedGroup,
+            indicationGroup,
+            aospChip.aospChipEvents,
+        ) { high, transient, promoted, indication, aosp ->
+            high + transient + promoted + indication + aosp
+        }
+
+        return allEvents.map { events ->
+            events.sorted()
+        }.distinctUntilChanged { old, new ->
+            old.size == new.size && old.indices.all { i ->
+                old[i].withoutDrawables() == new[i].withoutDrawables()
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AospChipIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AospChipIslandManager.kt
new file mode 100644
index 0000000000000..74730cef35960
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AospChipIslandManager.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.data.source
+
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarChipsRefiner
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+@SysUISingleton
+class AospChipIslandManager @Inject constructor(
+    private val refiner: AxDynamicBarChipsRefiner,
+) {
+    val aospChipEvents: Flow<List<IslandEvent.AospChip>> =
+        refiner.chipsFlow.map { model ->
+            model.active
+                .filter { isAbsorbed(it) }
+                .map { IslandEvent.AospChip(active = it) }
+        }
+
+    private fun isAbsorbed(chip: OngoingActivityChipModel.Active): Boolean {
+        val key = chip.key
+        return key.startsWith("callChip-") ||
+            key == "ShareToApp" ||
+            key == "ScreenRecord" ||
+            key == "CastToOtherDevice"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AppTrackingIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AppTrackingIslandManager.kt
new file mode 100644
index 0000000000000..f48b91031b1cf
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/AppTrackingIslandManager.kt
@@ -0,0 +1,215 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.app.ActivityManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.util.Log
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.shared.system.TaskStackChangeListener
+import com.android.systemui.shared.system.TaskStackChangeListeners
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class AppTrackingIslandManager @Inject constructor(@Application private val context: Context) {
+    companion object {
+        private const val TAG = "AppTrackingIslandManager"
+        private const val MAX_RECENT = 8
+    }
+
+    private val _appSwitchEvent = MutableStateFlow<IslandEvent.AppSwitch?>(null)
+    val appSwitchEvent: StateFlow<IslandEvent.AppSwitch?> = _appSwitchEvent.asStateFlow()
+
+    private val recentApps = mutableListOf<IslandEvent.RecentApp>()
+    private var listening = false
+    private var launcherPackage: String? = null
+    private val activityManager by lazy {
+        context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+    }
+    private var switchesSincePrune = 0
+
+    @Volatile private var currentForegroundPkg: String? = null
+
+    private fun emitEvent() {
+        val event =
+            if (recentApps.isNotEmpty())
+                IslandEvent.AppSwitch(
+                    recentApps = recentApps.toList(),
+                    previousApp = _appSwitchEvent.value?.previousApp,
+                )
+            else null
+        logEvent("emit", event)
+        _appSwitchEvent.value = event
+    }
+
+    private val listener =
+        object : TaskStackChangeListener {
+            override fun onTaskMovedToFront(taskInfo: ActivityManager.RunningTaskInfo) {
+                val topActivity = taskInfo.topActivity ?: return
+                val pkg = topActivity.packageName
+                if (
+                    pkg == launcherPackage ||
+                        pkg == "com.android.systemui" ||
+                        pkg == "com.android.launcher3"
+                ) {
+                    currentForegroundPkg = null
+                    return
+                }
+                if (!hasLauncherIntent(pkg)) return
+                if (pkg == currentForegroundPkg) {
+                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, "skip duplicate front pkg=$pkg task=${taskInfo.taskId}")
+                    }
+                    return
+                }
+
+                val leavingPkg = currentForegroundPkg
+                currentForegroundPkg = pkg
+
+                val appName =
+                    try {
+                        context.packageManager
+                            .getApplicationLabel(context.packageManager.getApplicationInfo(pkg, 0))
+                            .toString()
+                    } catch (_: Exception) {
+                        pkg
+                    }
+
+                val appIcon =
+                    try {
+                        context.packageManager.getApplicationIcon(pkg)
+                    } catch (_: Exception) {
+                        null
+                    }
+
+                val app =
+                    IslandEvent.RecentApp(
+                        packageName = pkg,
+                        appName = appName,
+                        appIcon = appIcon,
+                        taskId = taskInfo.taskId,
+                        lastActiveTime = System.currentTimeMillis(),
+                    )
+
+                synchronized(recentApps) {
+                    recentApps.removeAll { it.packageName == pkg }
+                    recentApps.add(0, app)
+                    while (recentApps.size > MAX_RECENT) recentApps.removeLast()
+
+                    if (++switchesSincePrune >= 3) {
+                        switchesSincePrune = 0
+                        val runningTaskIds =
+                            activityManager.getRunningTasks(MAX_RECENT).map { it.taskId }.toSet()
+                        recentApps.removeAll { it.taskId !in runningTaskIds }
+                    }
+
+                    val newPreviousApp =
+                        if (leavingPkg != null && leavingPkg != pkg) {
+                            recentApps.find { it.packageName == leavingPkg }
+                        } else {
+                            _appSwitchEvent.value?.previousApp
+                        }
+
+                    val event =
+                        if (recentApps.isNotEmpty())
+                            IslandEvent.AppSwitch(
+                                recentApps = recentApps.toList(),
+                                previousApp = newPreviousApp,
+                            )
+                        else null
+                    logEvent("front pkg=$pkg leaving=$leavingPkg", event)
+                    _appSwitchEvent.value = event
+                }
+            }
+
+            override fun onTaskRemoved(taskId: Int) {
+                synchronized(recentApps) {
+                    val removed = recentApps.removeAll { it.taskId == taskId }
+                    if (removed) emitEvent()
+                }
+            }
+        }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        launcherPackage = resolveLauncherPackage()
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(listener)
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        launcherIntentCache.clear()
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(listener)
+        synchronized(recentApps) {
+            recentApps.clear()
+            _appSwitchEvent.value = null
+        }
+    }
+
+    fun clear() {
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "clear")
+        }
+        _appSwitchEvent.value = null
+    }
+
+    fun refreshRecentApps() {
+        synchronized(recentApps) {
+            val runningTaskIds = activityManager.getRunningTasks(MAX_RECENT + 4).map { it.taskId }.toSet()
+            val removed = recentApps.removeAll { it.taskId !in runningTaskIds }
+            if (removed) emitEvent()
+        }
+    }
+
+    fun switchToApp(taskId: Int) {
+        try {
+            activityManager.moveTaskToFront(taskId, 0)
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to switch to task $taskId", e)
+            synchronized(recentApps) {
+                recentApps.removeAll { it.taskId == taskId }
+                emitEvent()
+            }
+        }
+    }
+
+    private val launcherIntentCache = HashMap<String, Boolean>()
+
+    private fun hasLauncherIntent(pkg: String): Boolean =
+        launcherIntentCache.getOrPut(pkg) {
+            val intent = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER).setPackage(pkg)
+            try {
+                context.packageManager.queryIntentActivities(intent, 0).isNotEmpty()
+            } catch (_: Exception) {
+                false
+            }
+        }
+
+    private fun resolveLauncherPackage(): String? =
+        try {
+            val intent = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME)
+            val resolveInfo =
+                context.packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
+            resolveInfo?.activityInfo?.packageName
+        } catch (_: Exception) {
+            null
+        }
+
+    private fun logEvent(reason: String, event: IslandEvent.AppSwitch?) {
+        if (!Log.isLoggable(TAG, Log.DEBUG)) return
+        Log.d(
+            TAG,
+            "$reason emit=${event != null} " +
+                "count=${event?.recentApps?.size ?: 0} " +
+                "top=${event?.recentApps?.firstOrNull()?.packageName} " +
+                "prev=${event?.previousApp?.packageName}",
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/BiometricIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/BiometricIslandManager.kt
new file mode 100644
index 0000000000000..e3226d74a729b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/BiometricIslandManager.kt
@@ -0,0 +1,64 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.hardware.biometrics.BiometricSourceType
+import com.android.keyguard.KeyguardUpdateMonitor
+import com.android.keyguard.KeyguardUpdateMonitorCallback
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class BiometricIslandManager
+@Inject
+constructor(private val keyguardUpdateMonitor: KeyguardUpdateMonitor) {
+    private var listening = false
+    private val _biometricEvent = MutableStateFlow<IslandEvent.BiometricUnlock?>(null)
+    val biometricEvent: StateFlow<IslandEvent.BiometricUnlock?> = _biometricEvent.asStateFlow()
+
+    var onBiometricUnlock: ((IslandEvent.BiometricUnlock) -> Unit)? = null
+
+    private val callback =
+        object : KeyguardUpdateMonitorCallback() {
+            override fun onBiometricAuthenticated(
+                userId: Int,
+                biometricSourceType: BiometricSourceType,
+                isStrongBiometric: Boolean,
+            ) {
+                val name =
+                    when (biometricSourceType) {
+                        BiometricSourceType.FINGERPRINT -> "Fingerprint"
+                        BiometricSourceType.FACE -> "Face"
+                        BiometricSourceType.IRIS -> "Iris"
+                        else -> "Biometric"
+                    }
+                val event =
+                    IslandEvent.BiometricUnlock(
+                        sourceType = biometricSourceType.ordinal,
+                        sourceName = name,
+                    )
+                _biometricEvent.value = event
+                onBiometricUnlock?.invoke(event)
+            }
+        }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        keyguardUpdateMonitor.registerCallback(callback)
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        keyguardUpdateMonitor.removeCallback(callback)
+        _biometricEvent.value = null
+    }
+
+    fun clear() {
+        _biometricEvent.value = null
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/ConnectivityIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/ConnectivityIslandManager.kt
new file mode 100644
index 0000000000000..5889f4d9cbc01
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/ConnectivityIslandManager.kt
@@ -0,0 +1,218 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.util.Log
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.statusbar.policy.BluetoothController
+import com.android.systemui.statusbar.policy.HotspotController
+import com.android.systemui.statusbar.policy.vpn.domain.interactor.VpnInteractor
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+@SysUISingleton
+class ConnectivityIslandManager
+@Inject
+constructor(
+    @Application private val applicationScope: CoroutineScope,
+    @Background private val backgroundDispatcher: CoroutineDispatcher,
+    private val bluetoothController: BluetoothController,
+    private val hotspotController: HotspotController,
+    private val vpnInteractor: VpnInteractor,
+) {
+    companion object {
+        private const val TAG = "ConnectivityIslandManager"
+    }
+
+    private val _bluetoothEvent = MutableStateFlow<IslandEvent.Bluetooth?>(null)
+    val bluetoothEvent: StateFlow<IslandEvent.Bluetooth?> = _bluetoothEvent.asStateFlow()
+
+    private val _hotspotEvent = MutableStateFlow<IslandEvent.Hotspot?>(null)
+    val hotspotEvent: StateFlow<IslandEvent.Hotspot?> = _hotspotEvent.asStateFlow()
+
+    private val _vpnEvent = MutableStateFlow<IslandEvent.Vpn?>(null)
+    val vpnEvent: StateFlow<IslandEvent.Vpn?> = _vpnEvent.asStateFlow()
+
+    private val previousBtAddresses = java.util.Collections.synchronizedSet(mutableSetOf<String>())
+    private var listening = false
+    private var wasVpnEnabled = false
+    private var vpnJob: Job? = null
+
+    private val bluetoothCallback =
+        object : BluetoothController.Callback {
+            override fun onBluetoothStateChange(enabled: Boolean) {
+                if (!enabled) {
+                    previousBtAddresses.clear()
+                    _bluetoothEvent.value = null
+                }
+            }
+
+            override fun onBluetoothDevicesChanged() {
+                val devices = bluetoothController.connectedDevices
+                val currentAddresses = devices.map { it.getAddress() }.toSet()
+                val newlyConnected = devices.filter { it.getAddress() !in previousBtAddresses }
+                previousBtAddresses.clear()
+                previousBtAddresses.addAll(currentAddresses)
+
+                if (newlyConnected.isNotEmpty()) {
+                    val device = newlyConnected.first()
+                    val iconPair =
+                        try {
+                            device.getDrawableWithDescription()
+                        } catch (_: Exception) {
+                            null
+                        }
+                    val event =
+                        IslandEvent.Bluetooth(
+                            deviceName = device.getName() ?: "Unknown Device",
+                            batteryLevel = device.getBatteryLevel(),
+                            address = device.getAddress(),
+                            deviceIcon = iconPair?.first,
+                            deviceTypeLabel = iconPair?.second ?: "",
+                        )
+                    _bluetoothEvent.value = event
+                } else {
+
+                    val current = _bluetoothEvent.value
+                    if (current != null && current.address !in currentAddresses) {
+                        _bluetoothEvent.value = null
+                    }
+                }
+            }
+        }
+
+    private val hotspotCallback =
+        object : HotspotController.Callback {
+            override fun onHotspotChanged(enabled: Boolean, numDevices: Int) {
+                if (enabled) {
+                    _hotspotEvent.value = IslandEvent.Hotspot(numDevices = numDevices)
+                } else {
+                    _hotspotEvent.value = null
+                }
+            }
+        }
+
+    private fun startVpnListener() {
+        vpnJob?.cancel()
+        vpnJob =
+            applicationScope.launch(backgroundDispatcher) {
+                vpnInteractor.vpnState.collect { state ->
+                    if (state.isEnabled) {
+                        val existing = _vpnEvent.value
+                        _vpnEvent.value =
+                            if (existing != null) {
+                                existing.copy(
+                                    isBranded = state.isBranded,
+                                    isValidated = state.isValidated,
+                                )
+                            } else {
+                                IslandEvent.Vpn(
+                                    isBranded = state.isBranded,
+                                    isValidated = state.isValidated,
+                                )
+                            }
+                    } else {
+                        _vpnEvent.value = null
+                    }
+                    wasVpnEnabled = state.isEnabled
+                }
+            }
+    }
+
+    private var btListening = false
+    private var hotspotListening = false
+    private var vpnListening = false
+
+    fun startBluetooth() {
+        if (btListening) return
+        btListening = true
+        previousBtAddresses.clear()
+        bluetoothController.connectedDevices.forEach { previousBtAddresses.add(it.getAddress()) }
+        bluetoothController.addCallback(bluetoothCallback)
+    }
+
+    fun stopBluetooth() {
+        if (!btListening) return
+        btListening = false
+        bluetoothController.removeCallback(bluetoothCallback)
+        previousBtAddresses.clear()
+        _bluetoothEvent.value = null
+    }
+
+    fun startHotspot() {
+        if (hotspotListening) return
+        hotspotListening = true
+        if (hotspotController.isHotspotEnabled) {
+            _hotspotEvent.value = IslandEvent.Hotspot(hotspotController.getNumConnectedDevices())
+        }
+        hotspotController.addCallback(hotspotCallback)
+    }
+
+    fun stopHotspot() {
+        if (!hotspotListening) return
+        hotspotListening = false
+        hotspotController.removeCallback(hotspotCallback)
+        _hotspotEvent.value = null
+    }
+
+    fun startVpn() {
+        if (vpnListening) return
+        vpnListening = true
+        wasVpnEnabled = false
+        startVpnListener()
+    }
+
+    fun stopVpn() {
+        if (!vpnListening) return
+        vpnListening = false
+        vpnJob?.cancel()
+        vpnJob = null
+        _vpnEvent.value = null
+    }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        startBluetooth()
+        startHotspot()
+        startVpn()
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        stopBluetooth()
+        stopHotspot()
+        stopVpn()
+    }
+
+    fun disconnectBluetooth(address: String) {
+        if (address.isEmpty()) return
+        try {
+            bluetoothController.connectedDevices.find { it.getAddress() == address }?.disconnect()
+            _bluetoothEvent.value = null
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to disconnect Bluetooth", e)
+        }
+    }
+
+    fun clearBluetooth() {
+        _bluetoothEvent.value = null
+    }
+
+    fun clearHotspot() {
+        _hotspotEvent.value = null
+    }
+
+    fun clearVpn() {
+        _vpnEvent.value = null
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/MediaIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/MediaIslandManager.kt
new file mode 100644
index 0000000000000..caceb1fb8c937
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/MediaIslandManager.kt
@@ -0,0 +1,394 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.Icon as DrawableIcon
+import android.media.AudioDeviceInfo
+import android.media.AudioManager
+import android.media.MediaMetadata
+import android.media.session.MediaController
+import android.media.session.MediaSessionManager as SystemMediaSessionManager
+import android.media.session.PlaybackState
+import android.os.Handler
+import android.os.SystemClock
+import android.util.Log
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.media.MediaSessionManager
+import com.android.systemui.media.NotificationMediaManager
+import com.android.systemui.media.dialog.MediaOutputDialogManager
+import com.android.systemui.util.concurrency.RepeatableExecutor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class MediaIslandManager
+@Inject
+constructor(
+    @Application private val context: Context,
+    @Main private val mainHandler: Handler,
+    @Main private val mainExecutor: RepeatableExecutor,
+    private val notificationMediaManager: NotificationMediaManager,
+    private val mediaOutputDialogManager: MediaOutputDialogManager,
+) {
+    companion object {
+        private const val TAG = "MediaIslandManager"
+        private const val POSITION_UPDATE_INTERVAL_MS = 1000L
+    }
+
+    private val _mediaEvent = MutableStateFlow<IslandEvent.Media?>(null)
+    val mediaEvent: StateFlow<IslandEvent.Media?> = _mediaEvent.asStateFlow()
+
+    var activeMediaPackage: String? = null
+        private set
+
+    var onMediaSessionLost: (() -> Unit)? = null
+
+    @Volatile private var listening = false
+    @Volatile private var sessionMediaColor: Int = 0
+    @Volatile private var sessionAlbumArt: Drawable? = null
+    @Volatile private var sessionAppIcon: Drawable? = null
+    private val systemMediaSessionManager: SystemMediaSessionManager by lazy {
+        context.getSystemService(SystemMediaSessionManager::class.java)
+    }
+    private var activeMediaController: MediaController? = null
+
+    private val mediaControllerCallback =
+        object : MediaController.Callback() {
+            override fun onPlaybackStateChanged(state: PlaybackState?) {
+                if (state != null) {
+                    updatePosition(state)
+                }
+            }
+
+            override fun onAudioInfoChanged(info: MediaController.PlaybackInfo) {
+
+                val current = _mediaEvent.value ?: return
+                _mediaEvent.value = current.copy(outputDeviceName = getOutputDeviceName())
+            }
+
+            override fun onSessionDestroyed() {
+                activeMediaController = null
+                onMediaSessionLost?.invoke()
+            }
+        }
+
+    private val sessionChangedListener =
+        SystemMediaSessionManager.OnActiveSessionsChangedListener { controllers ->
+            bindController(controllers)
+        }
+
+    private val mediaSessionListener = object : MediaSessionManager.MediaDataListener {
+        override fun onMediaColorsChanged(color: Int) {
+            sessionMediaColor = color
+            val current = _mediaEvent.value ?: return
+            _mediaEvent.value = current.copy(mediaColor = color)
+        }
+
+        override fun onAlbumArtChanged(drawable: Drawable) {
+            sessionAlbumArt = drawable
+            val current = _mediaEvent.value ?: return
+            _mediaEvent.value = current.copy(albumArt = drawable)
+        }
+
+        override fun onAppIconChanged(drawable: Drawable) {
+            sessionAppIcon = drawable
+            val current = _mediaEvent.value ?: return
+            _mediaEvent.value = current.copy(appIcon = drawable)
+        }
+
+        override fun onMetadataChanged(track: String, artist: String) {
+            val current = _mediaEvent.value ?: return
+            if (current.track == track && current.artist == artist) return
+            _mediaEvent.value = current.copy(track = track, artist = artist)
+        }
+    }
+
+    private fun bindController(controllers: List<MediaController>?) {
+        activeMediaController?.unregisterCallback(mediaControllerCallback)
+        activeMediaController = controllers?.firstOrNull()
+        activeMediaController?.registerCallback(mediaControllerCallback, mainHandler)
+        activeMediaController?.playbackState?.let {
+            updatePosition(it)
+        }
+
+        if (controllers.isNullOrEmpty() && _mediaEvent.value != null) {
+            onMediaSessionLost?.invoke()
+        }
+    }
+
+    private fun isInMotion(state: PlaybackState): Boolean =
+        state.state == PlaybackState.STATE_PLAYING ||
+            state.state == PlaybackState.STATE_FAST_FORWARDING ||
+            state.state == PlaybackState.STATE_REWINDING
+
+    private fun computeAccuratePosition(state: PlaybackState): Long {
+        val basePos = state.position.coerceAtLeast(0L)
+        if (!isInMotion(state)) return basePos
+        val updateTime = state.lastPositionUpdateTime
+        if (updateTime <= 0) return basePos
+        val elapsed = SystemClock.elapsedRealtime() - updateTime
+        val speed = state.playbackSpeed.takeIf { it > 0f } ?: 1f
+        val rawDuration = _mediaEvent.value?.duration ?: Long.MAX_VALUE
+        val safeDuration = if (rawDuration > 0L) rawDuration else Long.MAX_VALUE
+
+        return (basePos + (elapsed * speed).toLong())
+            .coerceIn(0L, safeDuration)
+    }
+
+    private var cancelProgressPolling: Runnable? = null
+
+    private fun tickProgress() {
+        val ev = _mediaEvent.value ?: return
+        if (!ev.isPlaying || ev.duration <= 0L) return
+        val now = SystemClock.elapsedRealtime()
+        val elapsed = now - ev.positionUpdateTime
+        val pos = (ev.position + (elapsed * ev.playbackSpeed).toLong()).coerceIn(0L, ev.duration)
+        val prog = (pos.toFloat() / ev.duration).coerceIn(0f, 1f)
+        _mediaEvent.value = ev.copy(progress = prog, position = pos, positionUpdateTime = now)
+    }
+
+    fun startProgressPolling() {
+        if (cancelProgressPolling != null) return
+        cancelProgressPolling = mainExecutor.executeRepeatedly(
+            ::tickProgress, 0L, POSITION_UPDATE_INTERVAL_MS,
+        )
+    }
+
+    fun stopProgressPolling() {
+        cancelProgressPolling?.run()
+        cancelProgressPolling = null
+    }
+
+    private fun updatePosition(state: PlaybackState) {
+        val current = _mediaEvent.value ?: return
+        val duration = current.duration.takeIf { it > 0L } ?: return
+        val posMs = computeAccuratePosition(state)
+        val progress = (posMs.toFloat() / duration.toFloat()).coerceIn(0f, 1f)
+        val speed = state.playbackSpeed.takeIf { it > 0f } ?: 1f
+        val playing = isInMotion(state)
+        _mediaEvent.value = current.copy(
+            isPlaying = playing,
+            position = posMs,
+            progress = progress,
+            playbackSpeed = speed,
+            positionUpdateTime = state.lastPositionUpdateTime,
+        )
+    }
+
+    private fun getActiveController(): MediaController? =
+        try {
+            systemMediaSessionManager.getActiveSessions(null).firstOrNull()
+        } catch (_: Exception) {
+            null
+        }
+
+    private val mediaListener =
+        object : NotificationMediaManager.MediaListener {
+            override fun onPrimaryMetadataOrStateChanged(
+                metadata: MediaMetadata?,
+                @PlaybackState.State state: Int,
+            ) {
+                val isPlaying = state == PlaybackState.STATE_PLAYING
+                val track =
+                    metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
+                        ?: metadata?.getString(MediaMetadata.METADATA_KEY_TITLE)
+                        ?: ""
+                val artist = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST) ?: ""
+                val durationRaw = metadata?.getLong(MediaMetadata.METADATA_KEY_DURATION) ?: 0L
+                val duration = if (durationRaw > 0L) durationRaw else 0L
+
+                val albumArt = sessionAlbumArt ?: run {
+                    val bmp = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)
+                        ?: metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART)
+                    bmp?.let { BitmapDrawable(context.resources, it) }
+                }
+
+                val controller = getActiveController()
+                val ps = controller?.playbackState
+                val existingPos = _mediaEvent.value?.position ?: 0L
+                val posMs = if (ps != null) computeAccuratePosition(ps) else existingPos
+                val progress =
+                    if (duration > 0L) (posMs.toFloat() / duration.toFloat()).coerceIn(0f, 1f)
+                    else 0f
+                val outputDevice = getOutputDeviceName()
+                val pkg = controller?.packageName
+                val customActions =
+                    ps?.customActions?.take(2)?.mapNotNull { ca ->
+                        val lbl =
+                            ca.name?.toString()?.takeIf { it.isNotEmpty() }
+                                ?: return@mapNotNull null
+                        val act = ca.action?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
+                        val icon = try {
+                            if (ca.icon != 0 && pkg != null) {
+                                DrawableIcon.createWithResource(pkg, ca.icon)
+                                    .loadDrawable(context)
+                            } else null
+                        } catch (_: Exception) { null }
+                        IslandEvent.MediaCustomAction(label = lbl, action = act, icon = icon)
+                    } ?: emptyList()
+                val appIcon = sessionAppIcon
+
+                val speed = ps?.playbackSpeed?.takeIf { it > 0f } ?: 1f
+                val updateTime = ps?.lastPositionUpdateTime ?: 0L
+
+                if (isPlaying) {
+                    activeMediaPackage = pkg
+                    _mediaEvent.value =
+                        IslandEvent.Media(
+                            track = track,
+                            artist = artist,
+                            isPlaying = true,
+                            albumArt = albumArt,
+                            progress = progress,
+                            duration = duration,
+                            position = posMs,
+                            playbackSpeed = speed,
+                            positionUpdateTime = updateTime,
+                            outputDeviceName = outputDevice,
+                            customActions = customActions,
+                            appIcon = appIcon,
+                            packageName = pkg ?: "",
+                            mediaColor = sessionMediaColor,
+                        )
+                } else {
+                    val current = _mediaEvent.value
+                    if (current != null) {
+                        _mediaEvent.value =
+                            current.copy(
+                                isPlaying = false,
+                                albumArt = albumArt ?: current.albumArt,
+                                progress = progress,
+                                position = posMs,
+                                playbackSpeed = speed,
+                                positionUpdateTime = updateTime,
+                            )
+                    }
+                }
+            }
+        }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        notificationMediaManager.addCallback(mediaListener)
+        MediaSessionManager.get().addListener(mediaSessionListener)
+        try {
+            bindController(systemMediaSessionManager.getActiveSessions(null))
+            systemMediaSessionManager.addOnActiveSessionsChangedListener(
+                sessionChangedListener,
+                null,
+                mainHandler,
+            )
+        } catch (_: Exception) {}
+
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        stopProgressPolling()
+        notificationMediaManager.removeCallback(mediaListener)
+        MediaSessionManager.get().removeListener(mediaSessionListener)
+        try {
+            systemMediaSessionManager.removeOnActiveSessionsChangedListener(sessionChangedListener)
+            activeMediaController?.unregisterCallback(mediaControllerCallback)
+            activeMediaController = null
+        } catch (_: Exception) {}
+        _mediaEvent.value = null
+        activeMediaPackage = null
+        sessionMediaColor = 0
+        sessionAlbumArt = null
+        sessionAppIcon = null
+    }
+
+    fun clear() {
+        stopProgressPolling()
+        _mediaEvent.value = null
+    }
+
+    fun togglePlayPause() {
+        val c = getActiveController() ?: return
+        val playing = c.playbackState?.state == PlaybackState.STATE_PLAYING
+        if (playing) {
+            c.transportControls.pause()
+        } else {
+            c.transportControls.play()
+        }
+        val current = _mediaEvent.value ?: return
+        _mediaEvent.value = current.copy(isPlaying = !playing)
+    }
+
+    fun skipNext() {
+        getActiveController()?.transportControls?.skipToNext()
+    }
+
+    fun skipPrev() {
+        getActiveController()?.transportControls?.skipToPrevious()
+    }
+
+    fun seekTo(position: Long) {
+        getActiveController()?.transportControls?.seekTo(position)
+    }
+
+    fun sendCustomAction(action: String) {
+        getActiveController()?.transportControls?.sendCustomAction(action, null)
+    }
+
+    fun openMediaApp() {
+        val pkg = getActiveController()?.packageName ?: return
+        val intent = context.packageManager.getLaunchIntentForPackage(pkg) ?: return
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        try {
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to open media app: $pkg", e)
+        }
+    }
+
+    private fun getOutputDeviceName(): String =
+        try {
+            val am = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            val outputs = am.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
+
+            val primary =
+                outputs.firstOrNull {
+                    it.type != AudioDeviceInfo.TYPE_BUILTIN_SPEAKER &&
+                        it.type != AudioDeviceInfo.TYPE_BUILTIN_EARPIECE
+                } ?: outputs.firstOrNull()
+            when (primary?.type) {
+                AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
+                AudioDeviceInfo.TYPE_BLUETOOTH_SCO ->
+                    primary.productName?.toString()?.takeIf { it.isNotEmpty() } ?: "Bluetooth"
+                AudioDeviceInfo.TYPE_USB_HEADSET -> "USB Headset"
+                AudioDeviceInfo.TYPE_USB_DEVICE -> "USB Audio"
+                AudioDeviceInfo.TYPE_WIRED_HEADPHONES -> "Headphones"
+                AudioDeviceInfo.TYPE_WIRED_HEADSET -> "Headset"
+                AudioDeviceInfo.TYPE_HDMI -> "HDMI"
+                AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> "Speaker"
+                AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> "Earpiece"
+                null -> "Speaker"
+                else -> primary.productName?.toString()?.takeIf { it.isNotEmpty() } ?: "Speaker"
+            }
+        } catch (_: Exception) {
+            "Speaker"
+        }
+
+    fun openMediaOutputSwitcher() {
+        val pkg = getActiveController()?.packageName ?: return
+        mainHandler.post {
+            try {
+                mediaOutputDialogManager.createAndShow(packageName = pkg, aboveStatusBar = true)
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to open media output switcher", e)
+            }
+        }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/NotificationIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/NotificationIslandManager.kt
new file mode 100644
index 0000000000000..bf4f9441e2e19
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/NotificationIslandManager.kt
@@ -0,0 +1,976 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.app.Notification
+import android.content.Context
+import com.android.systemui.res.R
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.os.Parcelable
+import android.os.SystemClock
+import android.service.notification.StatusBarNotification
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Chronometer
+import android.widget.FrameLayout
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.util.ScrimUtils
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+@SysUISingleton
+class NotificationIslandManager
+@Inject
+constructor(
+    @Application private val context: Context,
+    @Application private val applicationScope: CoroutineScope,
+) {
+    companion object {
+        private const val TAG = "NotificationIslandManager"
+
+        private val CLOCK_PACKAGES = setOf("com.google.android.deskclock", "com.android.deskclock")
+        private val ALARM_PACKAGES = setOf("com.google.android.deskclock", "com.android.deskclock")
+
+        private const val GOOGLE_PACKAGE = "com.google.android.googlequicksearchbox"
+        private val SPORTS_PACKAGES = setOf(
+            "com.espn.score_center",
+            "com.fivemobile.thescore",
+            "com.yahoo.mobile.client.android.sportacular",
+            "com.sofascore.app",
+            "com.fotmob",
+            "com.foxsports.android",
+            "com.cbs.sports.android",
+            "com.bleacherreport.android.teamstream",
+            "com.nbaimd.gametime.nba2011",
+            "com.nfl.fantasy.core",
+            "com.mlb.atbat",
+            "com.nhl.gc1112.free",
+            "livescore.livesportsmedia.com",
+            "com.flashscore.en",
+            "com.365scores.android",
+            "lunosoftware.sportsalerts",
+            "com.onefootball.brasil",
+        )
+
+        private val SCORE_PATTERN =
+            Regex("""(.+?)\s+(\d+)\s*[-–—:]\s*(\d+)\s+(.+)""")
+        private val VS_PATTERN =
+            Regex("""(.+?)\s+(?:vs\.?|v\.?|at)\s+(.+)""", RegexOption.IGNORE_CASE)
+
+        private const val NOW_PLAYING_PACKAGE = "com.google.android.as"
+        private const val NOW_PLAYING_CHANNEL = "ambientmusic"
+
+        private val RECORDER_PACKAGES =
+            setOf("com.google.android.apps.recorder", "com.android.soundrecorder")
+
+        private val SUPPRESSED_PACKAGES: Set<String> = buildSet {
+            addAll(CLOCK_PACKAGES)
+            addAll(ALARM_PACKAGES)
+            addAll(RECORDER_PACKAGES)
+        }
+    }
+
+    private val _timerEvent = MutableStateFlow<IslandEvent.Timer?>(null)
+    val timerEvent: StateFlow<IslandEvent.Timer?> = _timerEvent.asStateFlow()
+
+    private val _stopwatchEvent = MutableStateFlow<IslandEvent.Stopwatch?>(null)
+    val stopwatchEvent: StateFlow<IslandEvent.Stopwatch?> = _stopwatchEvent.asStateFlow()
+
+    private val _alarmEvent = MutableStateFlow<IslandEvent.Alarm?>(null)
+    val alarmEvent: StateFlow<IslandEvent.Alarm?> = _alarmEvent.asStateFlow()
+
+    private val _notificationEvents = MutableStateFlow<List<IslandEvent.Notification>>(emptyList())
+    val notificationEvents: StateFlow<List<IslandEvent.Notification>> =
+        _notificationEvents.asStateFlow()
+
+    private val _audioRecordingEvent = MutableStateFlow<IslandEvent.AudioRecording?>(null)
+    val audioRecordingEvent: StateFlow<IslandEvent.AudioRecording?> =
+        _audioRecordingEvent.asStateFlow()
+
+    private val _promotedOngoingEvents =
+        MutableStateFlow<List<IslandEvent.PromotedOngoing>>(emptyList())
+    val promotedOngoingEvents: StateFlow<List<IslandEvent.PromotedOngoing>> =
+        _promotedOngoingEvents.asStateFlow()
+
+    private val _sportsEvents = MutableStateFlow<List<IslandEvent.Sports>>(emptyList())
+    val sportsEvents: StateFlow<List<IslandEvent.Sports>> = _sportsEvents.asStateFlow()
+
+    private val _nowPlayingEvent = MutableStateFlow<IslandEvent.NowPlaying?>(null)
+    val nowPlayingEvent: StateFlow<IslandEvent.NowPlaying?> = _nowPlayingEvent.asStateFlow()
+
+    @Volatile var disabledTypes: Set<String> = emptySet()
+
+    private var recorderPackage: String? = null
+
+    private var recorderNotifKey: String? = null
+
+    private var pauseStartMs: Long = 0L
+
+    private var accumulatedPauseMs: Long = 0L
+
+    val notificationFlow = MutableSharedFlow<IslandEvent.Notification>(extraBufferCapacity = 16)
+    val notificationRemovedFlow = MutableSharedFlow<String>(extraBufferCapacity = 16)
+
+    var activeMediaPackageProvider: (() -> String?)? = null
+
+    private val seenNotificationKeys = mutableSetOf<String>()
+    private val seenMessagingTimestamps = mutableMapOf<String, Long>()
+
+    var onTimerEvent: ((IslandEvent.Timer) -> Unit)? = null
+    var onAlarmEvent: ((IslandEvent.Alarm) -> Unit)? = null
+    var onNotificationPosted: ((IslandEvent.Notification) -> Unit)? = null
+
+    @Volatile private var listening = false
+    @Volatile private var timerJob: Job? = null
+
+    private var timerNotificationKey: String? = null
+    private var timerOriginalDurationMs: Long = 0L
+    private var stopwatchNotificationKey: String? = null
+
+    private val scrimListener =
+        object : ScrimUtils.ScrimEventListener {
+            override fun onNotificationRemoved(sbn: StatusBarNotification) {
+                val pkg = sbn.packageName ?: return
+                seenNotificationKeys.remove(sbn.key)
+                seenMessagingTimestamps.remove(sbn.key)
+
+                if (sbn.key == timerNotificationKey) {
+                    timerNotificationKey = null
+                    timerJob?.cancel()
+                    timerJob = null
+                    _timerEvent.value = null
+                }
+                if (sbn.key == stopwatchNotificationKey) {
+                    stopwatchNotificationKey = null
+                    _stopwatchEvent.value = null
+                }
+
+                if (sbn.key == recorderNotifKey) {
+                    recorderNotifKey = null
+                    val currentState = _audioRecordingEvent.value?.state
+                    if (currentState == RecordingState.SAVED) {
+                        recorderPackage = null
+                        _audioRecordingEvent.value = null
+                        pauseStartMs = 0L
+                        accumulatedPauseMs = 0L
+                    }
+                }
+
+                _promotedOngoingEvents.value =
+                    _promotedOngoingEvents.value.filter { it.sbn.key != sbn.key }
+
+                _sportsEvents.value =
+                    _sportsEvents.value.filter { it.key != sbn.key }
+
+                if (_nowPlayingEvent.value?.key == sbn.key) {
+                    _nowPlayingEvent.value = null
+                }
+
+                _notificationEvents.value =
+                    _notificationEvents.value.filter { it.sbn.key != sbn.key }
+
+                notificationRemovedFlow.tryEmit(sbn.key)
+            }
+
+            override fun onNotificationPosted(sbn: StatusBarNotification) {
+                val pkg = sbn.packageName ?: return
+                val extras = sbn.notification?.extras ?: return
+
+                if (pkg in CLOCK_PACKAGES) {
+                    val channelId = sbn.notification?.channelId?.lowercase() ?: ""
+                    val actionLabels =
+                        sbn.notification?.actions?.map { it.title?.toString()?.lowercase() ?: "" }
+                            ?: emptyList()
+                    val actionIntents =
+                        sbn.notification?.actions?.map { actionIntentString(it) ?: "" }
+                            ?: emptyList()
+                    val hasStopwatchIntent = actionIntents.any {
+                        it == DeskClockActions.START_STOPWATCH ||
+                            it == DeskClockActions.PAUSE_STOPWATCH ||
+                            it == DeskClockActions.RESET_STOPWATCH ||
+                            it == DeskClockActions.LAP_STOPWATCH ||
+                            it == DeskClockActions.SHOW_STOPWATCH
+                    }
+                    val hasTimerIntent = actionIntents.any {
+                        it == DeskClockActions.START_TIMER ||
+                            it == DeskClockActions.PAUSE_TIMER ||
+                            it == DeskClockActions.RESET_TIMER ||
+                            it == DeskClockActions.ADD_MINUTE_TIMER ||
+                            it == DeskClockActions.SHOW_TIMER
+                    }
+                    val hasLap = actionLabels.any { it.contains("lap") }
+                    val isCountDown = extras.getBoolean("android.chronometerCountDown", false)
+
+                    val isStopwatch = hasStopwatchIntent || channelId.contains("stopwatch") || hasLap
+                    val isTimer = !isStopwatch && (
+                        hasTimerIntent ||
+                            channelId.contains("timer") ||
+                            channelId.contains("firing") ||
+                            isCountDown ||
+                            actionLabels.any { it.contains("+1") || it.contains("add") }
+                    )
+
+                    if (isStopwatch && "stopwatch" !in disabledTypes) {
+                        handleStopwatch(sbn, extras, actionLabels, actionIntents)
+                        return
+                    }
+                    if (isTimer && "timer" !in disabledTypes) {
+                        handleTimer(sbn, extras, actionLabels, actionIntents)
+                        return
+                    }
+                    if (isStopwatch || isTimer) return
+                }
+
+                val isAlarmCategory = sbn.notification?.category == Notification.CATEGORY_ALARM
+                if ((isAlarmCategory || pkg in ALARM_PACKAGES) && sbn.isOngoing) {
+                    if ("alarm" !in disabledTypes) handleAlarm(sbn, extras)
+                    return
+                }
+
+                if (sbn.notification?.category == Notification.CATEGORY_CALL) {
+                    return
+                }
+
+                val allActions = sbn.notification?.actions ?: emptyArray()
+                val isMedia = sbn.notification?.category == Notification.CATEGORY_TRANSPORT ||
+                    sbn.notification?.extras?.containsKey(
+                        Notification.EXTRA_MEDIA_SESSION
+                    ) == true
+                if (sbn.isOngoing && !isMedia && "audio_recording" !in disabledTypes) {
+                    val actionIntentMap = allActions.associateWith { actionIntentString(it) }
+                    val iconResMap = allActions.associateWith { actionIconResName(it, pkg)?.lowercase() }
+                    val recActions = allActions.filter { a ->
+                        val intent = actionIntentMap[a]
+                        val icon = iconResMap[a] ?: ""
+                        when {
+                            intent == "STOP" || intent == "PAUSE" || intent == "RESUME" -> true
+                            icon.matchesMaterial(MaterialIconSet.Stop) -> true
+                            icon.matchesMaterial(MaterialIconSet.Pause) -> true
+                            icon.matchesMaterial(MaterialIconSet.Play) -> true
+                            else -> {
+                                val lbl = a.title?.toString()?.lowercase() ?: ""
+                                lbl.contains("stop") || lbl.contains("pause") || lbl.contains("resume")
+                            }
+                        }
+                    }
+                    val hasStop = recActions.any { a ->
+                        actionIntentMap[a] == "STOP" ||
+                            (iconResMap[a] ?: "").matchesMaterial(MaterialIconSet.Stop) ||
+                            (a.title?.toString()?.lowercase() ?: "").contains("stop")
+                    }
+                    if (hasStop && recActions.size >= 2) {
+                        val hasResumeAction = recActions.any { actionIntentMap[it] == "RESUME" }
+                        val hasPauseAction = recActions.any { actionIntentMap[it] == "PAUSE" }
+                        val isPaused = when {
+                            hasResumeAction -> true
+                            hasPauseAction -> false
+                            else -> recActions.any { a ->
+                                (iconResMap[a] ?: "").matchesMaterial(MaterialIconSet.Play) ||
+                                    (a.title?.toString()?.lowercase() ?: "").contains("resume")
+                            }
+                        }
+                        val notifActions =
+                            recActions.mapNotNull { a ->
+                                a.title?.let {
+                                    IslandEvent.NotificationAction(label = it, action = a)
+                                }
+                            }
+                        val appName = resolveAppName(pkg)
+                        val existing = _audioRecordingEvent.value
+                        val now = System.currentTimeMillis()
+                        val parsedElapsedMs = parseRecorderElapsedMs(extras)
+
+                        val startTime = when {
+                            parsedElapsedMs != null -> now - parsedElapsedMs
+                            existing != null && existing.state != RecordingState.SAVED &&
+                                recorderNotifKey == sbn.key -> existing.startTimeMs
+                            sbn.notification?.extras?.getBoolean("android.showChronometer") == true ->
+                                sbn.notification.`when`
+                            else -> now
+                        }
+
+                        accumulatedPauseMs = 0L
+                        pauseStartMs = 0L
+
+                        recorderPackage = pkg
+                        recorderNotifKey = sbn.key
+                        _audioRecordingEvent.value =
+                            IslandEvent.AudioRecording(
+                                appName = appName,
+                                state =
+                                    if (isPaused) RecordingState.PAUSED
+                                    else RecordingState.RECORDING,
+                                startTimeMs = startTime,
+                                actions = notifActions,
+                                pausedDurationMs = 0L,
+                            )
+                        return
+                    }
+                }
+
+                if (
+                    pkg == recorderPackage && _audioRecordingEvent.value != null && !sbn.isOngoing
+                ) {
+                    val notifActions =
+                        allActions.mapNotNull { a ->
+                            a.title?.let { IslandEvent.NotificationAction(label = it, action = a) }
+                        }
+                    val title = extras.getString("android.title") ?: ""
+                    val existing = _audioRecordingEvent.value ?: return
+                    recorderNotifKey = sbn.key
+                    _audioRecordingEvent.value =
+                        existing.copy(
+                            appName = title.ifEmpty { existing.appName },
+                            state = RecordingState.SAVED,
+                            actions = notifActions,
+                        )
+                    return
+                }
+
+                if (pkg == NOW_PLAYING_PACKAGE) {
+                    val channel = sbn.notification?.channelId ?: ""
+                    if (channel.contains(NOW_PLAYING_CHANNEL)) {
+                        if ("now_playing" !in disabledTypes) handleNowPlaying(sbn, extras)
+                        return
+                    }
+                }
+
+                if (pkg in SUPPRESSED_PACKAGES) return
+
+                if ("sports" !in disabledTypes) {
+                    if (pkg == GOOGLE_PACKAGE) {
+                        val groupKey = sbn.groupKey ?: ""
+                        val isSportsGroup = groupKey.contains("::sports", ignoreCase = true)
+                        if (isSportsGroup && handleSportsScore(sbn, extras, forceCapture = true)) return
+                    }
+                    if (pkg in SPORTS_PACKAGES && handleSportsScore(sbn, extras, forceCapture = true)) return
+                }
+
+                if (sbn.isOngoing && isPromotable(sbn, extras)) {
+                    if ("promoted_ongoing" !in disabledTypes) handlePromotedOngoing(sbn, extras, pkg)
+                    return
+                }
+
+                val indeterminate = extras.getBoolean("android.progressIndeterminate", false)
+                val progressRaw = extras.getInt("android.progress", -1)
+                val progressMax = extras.getInt("android.progressMax", 0)
+                val hasProgress =
+                    indeterminate ||
+                        (extras.containsKey("android.progress") &&
+                            progressMax > 0 &&
+                            progressRaw >= 0)
+
+                if (sbn.isOngoing && hasProgress) {
+                    if ("promoted_ongoing" !in disabledTypes) handlePromotedOngoing(sbn, extras, pkg)
+                    return
+                }
+                if (!sbn.isOngoing) {
+                    _promotedOngoingEvents.value =
+                        _promotedOngoingEvents.value.filter { it.sbn.key != sbn.key }
+                }
+                if (sbn.isOngoing) return
+                if ("notification" in disabledTypes) return
+                val category = sbn.notification?.category
+                if (category == Notification.CATEGORY_TRANSPORT) return
+                if (category == Notification.CATEGORY_SERVICE && !hasProgress) return
+                if (sbn.packageName == activeMediaPackageProvider?.invoke()) return
+
+                val notifFlags = sbn.notification?.flags ?: 0
+                if (notifFlags and Notification.FLAG_GROUP_SUMMARY != 0) return
+                val groupKey = if (sbn.isGroup) sbn.groupKey else null
+
+                val title = extras.getString("android.title")
+                val text =
+                    extras.getCharSequence("android.bigText")?.toString()?.takeIf {
+                        it.isNotEmpty()
+                    } ?: extras.getString("android.text")
+
+                val notif = sbn.notification
+                val isMessagingStyle =
+                    notif != null && notif.isStyle(Notification.MessagingStyle::class.java)
+                val latestMessageTime: Long =
+                    if (isMessagingStyle) {
+                        val msgs =
+                            notif?.extras?.getParcelableArray(
+                                Notification.EXTRA_MESSAGES,
+                                Parcelable::class.java,
+                            )
+                        if (msgs != null && msgs.isNotEmpty()) {
+                            Notification.MessagingStyle.Message
+                                .getMessagesFromBundleArray(msgs)
+                                .maxOfOrNull { it.timestamp } ?: 0L
+                        } else 0L
+                    } else 0L
+
+                if (isMessagingStyle && latestMessageTime > 0L) {
+                    val previous = seenMessagingTimestamps.put(sbn.key, latestMessageTime)
+                    if (previous != null && previous == latestMessageTime) return
+                } else {
+                    if (!seenNotificationKeys.add(sbn.key)) return
+                }
+
+                val icon =
+                    try {
+                        context.packageManager.getApplicationIcon(pkg)
+                    } catch (_: Exception) {
+                        null
+                    }
+                val appName =
+                    try {
+                        context.packageManager
+                            .getApplicationLabel(context.packageManager.getApplicationInfo(pkg, 0))
+                            .toString()
+                    } catch (_: Exception) {
+                        pkg
+                    }
+
+                val allNotifActions = sbn.notification?.actions ?: emptyArray()
+
+                val actions =
+                    allNotifActions
+                        .filter { a -> a.remoteInputs.isNullOrEmpty() && a.actionIntent != null }
+                        .take(2)
+                        .mapNotNull { a ->
+                            a.title?.let { IslandEvent.NotificationAction(label = it, action = a) }
+                        }
+
+                val event =
+                    IslandEvent.Notification(
+                        sbn = sbn,
+                        title = title,
+                        text = text,
+                        appIcon = icon,
+                        appName = appName,
+                        progress = if (hasProgress && !indeterminate) progressRaw else -1,
+                        progressMax = progressMax.coerceAtLeast(1),
+                        isProgressIndeterminate = indeterminate,
+                        actions = actions,
+                        groupKey = groupKey,
+                    )
+                applicationScope.launch { notificationFlow.emit(event) }
+                onNotificationPosted?.invoke(event)
+            }
+        }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        ScrimUtils.get().addListener(scrimListener)
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        ScrimUtils.get().removeListener(scrimListener)
+        seenNotificationKeys.clear()
+        seenMessagingTimestamps.clear()
+        timerJob?.cancel()
+        timerJob = null
+        _timerEvent.value = null
+        _stopwatchEvent.value = null
+        _alarmEvent.value = null
+        _notificationEvents.value = emptyList()
+        _promotedOngoingEvents.value = emptyList()
+        _sportsEvents.value = emptyList()
+        _nowPlayingEvent.value = null
+        _audioRecordingEvent.value = null
+        recorderPackage = null
+        recorderNotifKey = null
+        pauseStartMs = 0L
+        accumulatedPauseMs = 0L
+    }
+
+    fun clearAudioRecording() {
+        _audioRecordingEvent.value = null
+        recorderPackage = null
+        recorderNotifKey = null
+        pauseStartMs = 0L
+        accumulatedPauseMs = 0L
+    }
+
+    fun dismissNotification(event: IslandEvent.Notification) {
+        _notificationEvents.value = _notificationEvents.value.filter { it.id != event.id }
+    }
+
+    fun coalesceNotification(event: IslandEvent.Notification) {
+        val current = _notificationEvents.value.toMutableList()
+        current.removeAll { it.id == event.id }
+        current.add(0, event)
+        _notificationEvents.value = current
+    }
+
+    fun clearTimer() {
+        _timerEvent.value = null
+        timerOriginalDurationMs = 0L
+    }
+
+    fun clearStopwatch() {
+        _stopwatchEvent.value = null
+    }
+
+    fun clearAlarm() {
+        _alarmEvent.value = null
+    }
+
+    private fun handleTimer(
+        sbn: StatusBarNotification,
+        extras: Bundle,
+        actionLabels: List<String> = emptyList(),
+        actionIntents: List<String> = emptyList(),
+    ) {
+        val label = extras.getString("android.title") ?: context.getString(R.string.ax_dynamic_bar_timer)
+        val icon =
+            try {
+                context.packageManager.getApplicationIcon(sbn.packageName)
+            } catch (_: Exception) {
+                null
+            }
+
+        val hasPauseIntent = actionIntents.any { it == DeskClockActions.PAUSE_TIMER }
+        val hasStartIntent = actionIntents.any { it == DeskClockActions.START_TIMER }
+        val isPaused = when {
+            hasStartIntent -> true
+            hasPauseIntent -> false
+            else -> {
+                val hasPauseLabel = actionLabels.any { it.contains("pause") }
+                val hasResumeLabel = actionLabels.any {
+                    it.contains("resume") || it.contains("play") ||
+                        (it.contains("start") && !it.contains("stop"))
+                }
+                hasResumeLabel || (actionLabels.isNotEmpty() && !hasPauseLabel)
+            }
+        }
+
+        var endTimeMs = sbn.notification.`when`
+        if (endTimeMs <= System.currentTimeMillis()) {
+            val chronoBase = extractChronometerBase(sbn)
+            if (chronoBase > 0L) {
+                val remaining = chronoBase - SystemClock.elapsedRealtime()
+                endTimeMs = if (remaining > 0L) System.currentTimeMillis() + remaining else 0L
+            } else {
+                endTimeMs = 0L
+            }
+        }
+
+        if (isPaused && endTimeMs > System.currentTimeMillis()) {
+            val existing = _timerEvent.value
+            if (existing != null && existing.endTimeMs > 0L) {
+                endTimeMs = existing.endTimeMs
+            }
+        }
+
+        val actions = extractNotificationActions(sbn)
+        val isNewTimer = timerNotificationKey != sbn.key
+        if (isNewTimer && endTimeMs > 0L) {
+            timerOriginalDurationMs = (endTimeMs - System.currentTimeMillis()).coerceAtLeast(1000L)
+        }
+        val event =
+            IslandEvent.Timer(
+                label = label,
+                endTimeMs = endTimeMs,
+                originalDurationMs = timerOriginalDurationMs,
+                appIcon = icon,
+                isPaused = isPaused,
+                actions = actions,
+            )
+        timerNotificationKey = sbn.key
+        _timerEvent.value = event
+        onTimerEvent?.invoke(event)
+
+        timerJob?.cancel()
+        if (endTimeMs > 0L && !isPaused) {
+            val remainingMs = endTimeMs - System.currentTimeMillis()
+            timerJob =
+                applicationScope.launch {
+                    delay((remainingMs + 3_000L).coerceAtLeast(3_000L))
+                    _timerEvent.value = null
+                }
+        }
+    }
+
+    private fun handleStopwatch(
+        sbn: StatusBarNotification,
+        extras: Bundle,
+        actionLabels: List<String> = emptyList(),
+        actionIntents: List<String> = emptyList(),
+    ) {
+        val label = extras.getString("android.title") ?: ""
+        val icon =
+            try {
+                context.packageManager.getApplicationIcon(sbn.packageName)
+            } catch (_: Exception) {
+                null
+            }
+
+        val hasPauseIntent = actionIntents.any { it == DeskClockActions.PAUSE_STOPWATCH }
+        val hasStartIntent = actionIntents.any { it == DeskClockActions.START_STOPWATCH }
+        val hasLapIntent = actionIntents.any { it == DeskClockActions.LAP_STOPWATCH }
+        val isRunning = when {
+            hasPauseIntent || hasLapIntent -> true
+            hasStartIntent -> false
+            else -> actionLabels.any { it.contains("pause") || it.contains("lap") }
+        }
+
+        var startTimeMs = System.currentTimeMillis()
+        val chronoBase = extractChronometerBase(sbn)
+        if (chronoBase > 0L) {
+            val elapsed = SystemClock.elapsedRealtime() - chronoBase
+            if (elapsed > 0L) startTimeMs = System.currentTimeMillis() - elapsed
+        }
+
+        val actions = extractNotificationActions(sbn)
+        val event =
+            IslandEvent.Stopwatch(
+                label = label,
+                startTimeMs = startTimeMs,
+                isRunning = isRunning,
+                appIcon = icon,
+                actions = actions,
+            )
+        stopwatchNotificationKey = sbn.key
+        _stopwatchEvent.value = event
+    }
+
+    private fun extractChronometerBase(sbn: StatusBarNotification): Long {
+        try {
+            val rv = sbn.notification.contentView ?: sbn.notification.bigContentView ?: return 0L
+            val pkgCtx = context.createPackageContext(sbn.packageName, Context.CONTEXT_RESTRICTED)
+            val container = FrameLayout(context)
+            val inflated = rv.apply(pkgCtx, container) ?: return 0L
+            return findChronometer(inflated)?.base ?: 0L
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to extract chronometer base from ${sbn.packageName}", e)
+            return 0L
+        }
+    }
+
+    private fun findChronometer(view: View): Chronometer? {
+        if (view is Chronometer) return view
+        if (view is ViewGroup) {
+            for (i in 0 until view.childCount) {
+                findChronometer(view.getChildAt(i))?.let {
+                    return it
+                }
+            }
+        }
+        return null
+    }
+
+    private fun extractNotificationActions(
+        sbn: StatusBarNotification
+    ): List<IslandEvent.NotificationAction> {
+        return sbn.notification
+            ?.actions
+            ?.filter { a -> a.remoteInputs.isNullOrEmpty() && a.actionIntent != null }
+            ?.take(3)
+            ?.mapNotNull { a ->
+                a.title?.let { IslandEvent.NotificationAction(label = it, action = a) }
+            } ?: emptyList()
+    }
+
+    private fun handleAlarm(sbn: StatusBarNotification, extras: Bundle) {
+        val label = extras.getString("android.title") ?: context.getString(R.string.ax_dynamic_bar_alarm)
+        val isRinging = sbn.notification.category == Notification.CATEGORY_ALARM
+        val icon =
+            try {
+                context.packageManager.getApplicationIcon(sbn.packageName)
+            } catch (_: Exception) {
+                null
+            }
+        val event =
+            IslandEvent.Alarm(
+                label = label,
+                triggerTimeMs = sbn.notification.`when`,
+                isRinging = isRinging,
+                appIcon = icon,
+            )
+        _alarmEvent.value = event
+        onAlarmEvent?.invoke(event)
+    }
+
+    private fun resolveAppName(packageName: String): String =
+        try {
+            val ai = context.packageManager.getApplicationInfo(packageName, 0)
+            context.packageManager.getApplicationLabel(ai).toString()
+        } catch (_: Exception) {
+            ""
+        }
+
+    private fun actionIconResName(action: Notification.Action, pkg: String): String? {
+        val icon = action.getIcon() ?: return null
+        val resId = try { icon.resId } catch (_: Exception) { 0 }
+        if (resId == 0) return null
+        return try {
+            context.packageManager.getResourcesForApplication(pkg).getResourceEntryName(resId)
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun actionIntentString(action: Notification.Action): String? {
+        val pi = action.actionIntent ?: return null
+        return try {
+            pi.intent?.action
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun parseRecorderElapsedMs(extras: Bundle): Long? {
+        val text = extras.getCharSequence(Notification.EXTRA_TEXT)?.toString() ?: return null
+        val match = Regex("""(\d+):(\d+)(?::(\d+))?""").find(text) ?: return null
+        val a = match.groupValues[1].toLongOrNull() ?: return null
+        val b = match.groupValues[2].toLongOrNull() ?: return null
+        val c = match.groupValues[3].toLongOrNull()
+        val secs = if (c != null) a * 3600 + b * 60 + c else a * 60 + b
+        return secs * 1000L
+    }
+
+    private enum class MaterialIconSet(val patterns: List<String>) {
+        Play(listOf("play_arrow", "media_play", "play_circle", "play")),
+        Pause(listOf("pause_circle", "media_pause", "pause")),
+        Stop(listOf("stop_circle", "media_stop", "stop")),
+    }
+
+    private object DeskClockActions {
+        private const val PREFIX = "com.android.deskclock.action."
+        const val START_TIMER = PREFIX + "START_TIMER"
+        const val PAUSE_TIMER = PREFIX + "PAUSE_TIMER"
+        const val RESET_TIMER = PREFIX + "RESET_TIMER"
+        const val ADD_MINUTE_TIMER = PREFIX + "ADD_MINUTE_TIMER"
+        const val SHOW_TIMER = PREFIX + "SHOW_TIMER"
+        const val START_STOPWATCH = PREFIX + "START_STOPWATCH"
+        const val PAUSE_STOPWATCH = PREFIX + "PAUSE_STOPWATCH"
+        const val RESET_STOPWATCH = PREFIX + "RESET_STOPWATCH"
+        const val LAP_STOPWATCH = PREFIX + "LAP_STOPWATCH"
+        const val SHOW_STOPWATCH = PREFIX + "SHOW_STOPWATCH"
+        const val ALARM_SNOOZE = "com.android.deskclock.ALARM_SNOOZE"
+        const val ALARM_DISMISS = "com.android.deskclock.ALARM_DISMISS"
+    }
+
+    private fun String.matchesMaterial(set: MaterialIconSet): Boolean =
+        set.patterns.any { this.contains(it) }
+
+    private fun isPromotable(sbn: StatusBarNotification, extras: Bundle): Boolean {
+        val notification = sbn.notification ?: return false
+
+        if (notification.flags and Notification.FLAG_PROMOTED_ONGOING != 0) return true
+
+        return notification.hasPromotableCharacteristics()
+    }
+
+    private fun handlePromotedOngoing(sbn: StatusBarNotification, extras: Bundle, pkg: String) {
+        val shortCritical =
+            try {
+                sbn.notification?.shortCriticalText?.toString() ?: ""
+            } catch (_: Exception) {
+                extras.getString("android.shortCriticalText") ?: ""
+            }
+        val title = extras.getString("android.title") ?: ""
+        val text = extras.getString("android.text") ?: ""
+        val appName = resolveAppName(pkg)
+        val icon = loadNotificationIcon(sbn, pkg)
+
+        val actions = extractNotificationActions(sbn)
+
+        val progressRaw = extras.getInt("android.progress", -1)
+        val progressMax = extras.getInt("android.progressMax", 0)
+        val indeterminate = extras.getBoolean("android.progressIndeterminate", false)
+        val progress =
+            if (progressRaw >= 0 && progressMax > 0)
+                (progressRaw.toFloat() / progressMax.toFloat()).coerceIn(0f, 1f)
+            else -1f
+
+        val event =
+            IslandEvent.PromotedOngoing(
+                shortText = shortCritical,
+                title = title,
+                text = text,
+                appName = appName,
+                appIcon = icon,
+                sbn = sbn,
+                actions = actions,
+                progress = progress,
+                isIndeterminate = indeterminate,
+            )
+
+        val current = _promotedOngoingEvents.value.toMutableList()
+        current.removeAll { it.sbn.key == sbn.key }
+        current.add(0, event)
+        _promotedOngoingEvents.value = current
+    }
+
+    fun clearPromotedOngoing(key: String) {
+        _promotedOngoingEvents.value = _promotedOngoingEvents.value.filter { it.sbn.key != key }
+    }
+
+    fun clearSportsEvent(key: String) {
+        _sportsEvents.value = _sportsEvents.value.filter { it.key != key }
+    }
+
+    fun clearNowPlaying() {
+        _nowPlayingEvent.value = null
+    }
+
+    private fun handleNowPlaying(sbn: StatusBarNotification, extras: Bundle) {
+        val title = extras.getCharSequence("android.title")?.toString() ?: return
+        val byMatch = Regex("""(.+?)\s+by\s+(.+)""", RegexOption.IGNORE_CASE).find(title)
+        val dashParts = if (byMatch == null) title.split(" - ", " – ", limit = 2) else null
+        val songTitle: String
+        val artist: String
+        when {
+            byMatch != null -> {
+                songTitle = byMatch.groupValues[1].trim()
+                artist = byMatch.groupValues[2].trim()
+            }
+            dashParts != null && dashParts.size == 2 -> {
+                songTitle = dashParts[0].trim()
+                artist = dashParts[1].trim()
+            }
+            else -> {
+                songTitle = title
+                artist = ""
+            }
+        }
+
+        val allActions = sbn.notification?.actions ?: emptyArray()
+        val notifActions = allActions.mapNotNull { a ->
+            a.title?.let { IslandEvent.NotificationAction(label = it, action = a) }
+        }
+        val appIcon = loadNotificationIcon(sbn, sbn.packageName)
+
+        _nowPlayingEvent.value = IslandEvent.NowPlaying(
+            songTitle = songTitle,
+            artist = artist,
+            key = sbn.key,
+            sbn = sbn,
+            appIcon = appIcon,
+            actions = notifActions,
+        )
+    }
+
+    private fun handleSportsScore(
+        sbn: StatusBarNotification,
+        extras: Bundle,
+        forceCapture: Boolean = false,
+    ): Boolean {
+        val title = extras.getCharSequence("android.title")?.toString() ?: return false
+        val text = extras.getCharSequence("android.text")?.toString() ?: ""
+
+        val allFields = listOf(title.trim(), text.trim())
+        val scoreMatch = allFields.firstNotNullOfOrNull { SCORE_PATTERN.find(it) }
+
+        var team1Name: String
+        var team2Name: String
+        var score1 = ""
+        var score2 = ""
+
+        if (scoreMatch != null) {
+            team1Name = scoreMatch.groupValues[1].trim()
+            score1 = scoreMatch.groupValues[2]
+            score2 = scoreMatch.groupValues[3]
+            team2Name = scoreMatch.groupValues[4].trim()
+                .replace(Regex("""\s*[·•|].*"""), "")
+        } else {
+            val combined = "$title $text"
+            val vsMatch = VS_PATTERN.find(combined)
+            if (vsMatch != null) {
+                team1Name = vsMatch.groupValues[1].trim()
+                    .replace(Regex("""^.*[·•|]\s*"""), "")
+                team2Name = vsMatch.groupValues[2].trim()
+                    .replace(Regex("""\s*[·•|].*$"""), "")
+            } else if (forceCapture) {
+                val parts = text.split("·", "•", "|", " - ", " – ")
+                    .map { it.trim() }.filter { it.isNotEmpty() }
+                if (parts.size >= 2) {
+                    team1Name = parts[0]
+                    team2Name = parts[1]
+                } else {
+                    team1Name = text.ifEmpty { title }
+                    team2Name = ""
+                }
+            } else {
+                return false
+            }
+        }
+
+        val isOngoing = sbn.isOngoing
+        val status = when {
+            score1.isNotEmpty() && !isOngoing -> IslandEvent.GameStatus.FINAL
+            score1.isNotEmpty() && isOngoing -> IslandEvent.GameStatus.LIVE
+            isOngoing -> IslandEvent.GameStatus.PRE_GAME
+            else -> IslandEvent.GameStatus.FINAL
+        }
+
+        var statusDetail = ""
+        if (score1.isNotEmpty()) {
+            val shortCritical = try {
+                sbn.notification?.shortCriticalText?.toString() ?: ""
+            } catch (_: Exception) {
+                extras.getString("android.shortCriticalText") ?: ""
+            }
+            statusDetail = shortCritical
+                .replace(score1, "").replace(score2, "")
+                .replace("-", "").replace("–", "").replace(":", "")
+                .trim()
+        }
+
+        val allText = "$title · $text"
+        val league = allText.split("·", "•", "|")
+            .map { it.trim() }
+            .firstOrNull { part ->
+                part.length in 2..30 &&
+                    !part.any { it.isDigit() } &&
+                    part != team1Name && part != team2Name
+            } ?: ""
+
+        val commentary = extras.getCharSequence("android.bigText")?.toString()
+            ?: extras.getString("android.subText") ?: ""
+
+        val appIcon = loadNotificationIcon(sbn, sbn.packageName)
+
+        val event = IslandEvent.Sports(
+            team1Name = team1Name,
+            team2Name = team2Name,
+            score1 = score1,
+            score2 = score2,
+            status = status,
+            statusDetail = statusDetail,
+            league = league,
+            commentary = commentary,
+            key = sbn.key,
+            sbn = sbn,
+            appIcon = appIcon,
+        )
+
+        val current = _sportsEvents.value.toMutableList()
+        current.removeAll { it.key == sbn.key }
+        current.add(0, event)
+        _sportsEvents.value = current
+        return true
+    }
+
+    private fun loadNotificationIcon(sbn: StatusBarNotification, pkg: String): Drawable? {
+        return try {
+            sbn.notification?.smallIcon?.loadDrawable(context)
+        } catch (_: Exception) {
+            null
+        }
+            ?: try {
+                context.packageManager.getApplicationIcon(pkg)
+            } catch (_: Exception) {
+                null
+            }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SmartspaceIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SmartspaceIslandManager.kt
new file mode 100644
index 0000000000000..df253d75bb09c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SmartspaceIslandManager.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.data.source
+
+import android.app.PendingIntent
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import com.android.axion.quicklook.SportsData
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.quicklook.QuickLookClient
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class SmartspaceIslandManager
+@Inject
+constructor(
+    private val quickLookClient: QuickLookClient,
+) {
+    private val _sportsEvents = MutableStateFlow<List<IslandEvent.Sports>>(emptyList())
+    val sportsEvents: StateFlow<List<IslandEvent.Sports>> = _sportsEvents.asStateFlow()
+
+    private val _nowPlayingEvent = MutableStateFlow<IslandEvent.NowPlaying?>(null)
+    val nowPlayingEvent: StateFlow<IslandEvent.NowPlaying?> = _nowPlayingEvent.asStateFlow()
+
+    private var listening = false
+
+    private val callback = object : QuickLookClient.Callback {
+        override fun onSportsUpdate(sports: List<SportsData>) {
+            _sportsEvents.value = sports.mapIndexed { index, data ->
+                val status = parseGameStatus(data.status, data.statusDetail)
+                IslandEvent.Sports(
+                    team1Name = data.team1Name,
+                    team2Name = data.team2Name,
+                    score1 = data.score1,
+                    score2 = data.score2,
+                    team1Icon = bytesToDrawable(data.team1IconBytes),
+                    team2Icon = bytesToDrawable(data.team2IconBytes),
+                    status = status,
+                    statusDetail = data.statusDetail,
+                    league = data.league,
+                    key = "ql_sports_$index",
+                )
+            }
+        }
+
+        override fun onNowPlayingUpdate(text: String, tapAction: PendingIntent?) {
+            if (text.isBlank()) {
+                _nowPlayingEvent.value = null
+                return
+            }
+            val byMatch = Regex("""(.+?)\s+by\s+(.+)""", RegexOption.IGNORE_CASE).find(text)
+            val dashParts = if (byMatch == null) text.split(" - ", " – ", limit = 2) else null
+            val songTitle: String
+            val artist: String
+            when {
+                byMatch != null -> {
+                    songTitle = byMatch.groupValues[1].trim()
+                    artist = byMatch.groupValues[2].trim()
+                }
+                dashParts != null && dashParts.size == 2 -> {
+                    songTitle = dashParts[0].trim()
+                    artist = dashParts[1].trim()
+                }
+                else -> {
+                    songTitle = text
+                    artist = ""
+                }
+            }
+            _nowPlayingEvent.value = IslandEvent.NowPlaying(
+                songTitle = songTitle,
+                artist = artist,
+                key = "ql_now_playing",
+            )
+        }
+    }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        quickLookClient.addCallback(callback)
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        quickLookClient.removeCallback(callback)
+        _sportsEvents.value = emptyList()
+        _nowPlayingEvent.value = null
+    }
+
+    fun clearSportsEvent(key: String) {
+        _sportsEvents.value = _sportsEvents.value.filter { it.key != key }
+    }
+
+    private fun parseGameStatus(status: String, detail: String): IslandEvent.GameStatus {
+        val combined = "$status $detail".lowercase()
+        return when {
+            combined.contains("final") -> IslandEvent.GameStatus.FINAL
+            combined.contains("half") -> IslandEvent.GameStatus.HALFTIME
+            combined.contains("live") || combined.contains("q") ||
+                combined.contains("inning") || combined.contains("set") ||
+                combined.contains("period") -> IslandEvent.GameStatus.LIVE
+            combined.contains("pre") || combined.contains("upcoming") ||
+                combined.contains("tip") || combined.contains("kick") -> IslandEvent.GameStatus.PRE_GAME
+            else -> IslandEvent.GameStatus.LIVE
+        }
+    }
+
+    private fun bytesToDrawable(bytes: ByteArray?): Drawable? {
+        if (bytes == null || bytes.isEmpty()) return null
+        return try {
+            val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return null
+            BitmapDrawable(null, bitmap)
+        } catch (_: Exception) {
+            null
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SystemIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SystemIslandManager.kt
new file mode 100644
index 0000000000000..290659fc0258a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/SystemIslandManager.kt
@@ -0,0 +1,513 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import android.content.BroadcastReceiver
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.Bitmap
+import android.graphics.ImageDecoder
+import android.media.AudioManager
+import android.net.Uri
+import android.os.Handler
+import android.util.Log
+import androidx.core.content.FileProvider
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.res.R
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryInteractor
+import com.android.systemui.statusbar.policy.BatteryController
+import java.io.File
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
+import org.json.JSONArray
+import org.json.JSONObject
+
+@SysUISingleton
+class SystemIslandManager
+@Inject
+constructor(
+    @Application private val context: Context,
+    @Application private val applicationScope: CoroutineScope,
+    @Background private val backgroundDispatcher: CoroutineDispatcher,
+    @Main private val mainHandler: Handler,
+    private val batteryInteractor: BatteryInteractor,
+    private val batteryController: BatteryController,
+) {
+    companion object {
+        private const val TAG = "SystemIslandManager"
+        private const val MAX_CLIPBOARD_HISTORY = 10
+        private const val PREFS_NAME = "ax_dynamic_bar_prefs"
+        private const val KEY_CLIPBOARD_STASH = "clipboard_stash"
+        private const val CLIPBOARD_CACHE_DIR = "clipboard_cache"
+        private const val FILE_PROVIDER_AUTHORITY = "com.android.systemui.fileprovider"
+    }
+
+    private val _chargingEvent = MutableStateFlow<IslandEvent.Charging?>(null)
+    val chargingEvent: StateFlow<IslandEvent.Charging?> = _chargingEvent.asStateFlow()
+
+    private val _ringerEvent = MutableStateFlow<IslandEvent.RingerMode?>(null)
+    val ringerEvent: StateFlow<IslandEvent.RingerMode?> = _ringerEvent.asStateFlow()
+
+    private val _clipboardEvent = MutableStateFlow<IslandEvent.Clipboard?>(null)
+    val clipboardEvent: StateFlow<IslandEvent.Clipboard?> = _clipboardEvent.asStateFlow()
+
+    var onChargingStarted: ((IslandEvent.Charging) -> Unit)? = null
+
+    var onRingerChanged: ((IslandEvent.RingerMode) -> Unit)? = null
+
+    var onClipboardCopied: ((IslandEvent.Clipboard) -> Unit)? = null
+
+    private val clipboardManager: ClipboardManager by lazy {
+        context.getSystemService(ClipboardManager::class.java)
+    }
+
+    private var wasCharging = false
+    @Volatile var chargingDismissed = false
+    private var lastRingerMode = -1
+    private var batteryJob: Job? = null
+
+    private var listening = false
+    @Volatile private var suppressNextClipEvent = false
+
+    private val clipboardHistory = mutableListOf<IslandEvent.ClipboardItem>()
+
+    private val prefs by lazy { context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) }
+
+    private val clipboardCacheDir: File by lazy {
+        File(context.cacheDir, CLIPBOARD_CACHE_DIR).apply { mkdirs() }
+    }
+
+    private var persistJob: Job? = null
+
+    private val ringerReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                val mode = intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1)
+                if (mode < 0) return
+                if (lastRingerMode != -1 && lastRingerMode != mode) {
+                    val label =
+                        when (mode) {
+                            AudioManager.RINGER_MODE_SILENT -> context.getString(R.string.ax_dynamic_bar_silent)
+                            AudioManager.RINGER_MODE_VIBRATE -> context.getString(R.string.ax_dynamic_bar_vibrate)
+                            AudioManager.RINGER_MODE_NORMAL -> context.getString(R.string.ax_dynamic_bar_ring)
+                            else -> return
+                        }
+                    val event = IslandEvent.RingerMode(mode = mode, label = label)
+                    _ringerEvent.value = event
+                    onRingerChanged?.invoke(event)
+                }
+                lastRingerMode = mode
+            }
+        }
+
+    private val clipboardListener =
+        ClipboardManager.OnPrimaryClipChangedListener {
+            if (suppressNextClipEvent) {
+                suppressNextClipEvent = false
+                return@OnPrimaryClipChangedListener
+            }
+            val clip =
+                try {
+                    clipboardManager.primaryClip
+                } catch (_: Exception) {
+                    null
+                } ?: return@OnPrimaryClipChangedListener
+            val item = clip.getItemAt(0) ?: return@OnPrimaryClipChangedListener
+            val desc = clip.description
+
+            val rawText =
+                try {
+                    item.coerceToText(context)?.toString() ?: ""
+                } catch (_: Exception) {
+                    ""
+                }
+            val isUrl =
+                rawText.startsWith("http://") ||
+                    rawText.startsWith("https://") ||
+                    rawText.startsWith("www.")
+            val isImage = desc.hasMimeType("image/*")
+            val preview = rawText.trim()
+            val sourceUri =
+                if (isImage)
+                    try {
+                        item.uri
+                    } catch (_: Exception) {
+                        null
+                    }
+                else null
+
+            val label = desc.label?.toString() ?: ""
+            if (preview.isNotEmpty() || isImage || label.isNotEmpty()) {
+                val itemId = System.currentTimeMillis()
+                if (isImage && sourceUri != null) {
+                    applicationScope.launch(backgroundDispatcher) {
+                        val cachedUri = cacheClipboardImage(sourceUri, itemId)
+                        val (event, items) = buildClipboardEvent(
+                            itemId, preview, label, isUrl, true, cachedUri)
+                        _clipboardEvent.value = event
+                        mainHandler.post { onClipboardCopied?.invoke(event) }
+                    }
+                } else {
+                    val (event, _) = buildClipboardEvent(
+                        itemId, preview, label, isUrl, false, null)
+                    _clipboardEvent.value = event
+                    onClipboardCopied?.invoke(event)
+                }
+            }
+        }
+
+    private fun cacheClipboardImage(sourceUri: Uri, itemId: Long): Uri? {
+        return try {
+            val source = ImageDecoder.createSource(context.contentResolver, sourceUri)
+            val bitmap = ImageDecoder.decodeBitmap(source) { decoder, _, _ ->
+                decoder.setTargetSampleSize(2)
+            }
+            val file = File(clipboardCacheDir, "clip_$itemId.webp")
+            file.outputStream().use { out ->
+                bitmap.compress(Bitmap.CompressFormat.WEBP_LOSSY, 85, out)
+            }
+            bitmap.recycle()
+            FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, file)
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to cache clipboard image", e)
+            null
+        }
+    }
+
+    private fun buildClipboardEvent(
+        itemId: Long,
+        preview: String,
+        label: String,
+        isUrl: Boolean,
+        isImage: Boolean,
+        imageUri: Uri?,
+    ): Pair<IslandEvent.Clipboard, List<IslandEvent.ClipboardItem>> {
+        val clipItem =
+            IslandEvent.ClipboardItem(
+                id = itemId,
+                preview = preview,
+                label = label,
+                isUrl = isUrl,
+                isImage = isImage,
+                imageUri = imageUri,
+                timestamp = itemId,
+            )
+        val items: List<IslandEvent.ClipboardItem>
+        synchronized(clipboardHistory) {
+            clipboardHistory.removeAll { it.preview == preview && !isImage }
+            clipboardHistory.add(0, clipItem)
+            while (clipboardHistory.size > MAX_CLIPBOARD_HISTORY) {
+                val removed = clipboardHistory.removeLast()
+                cleanupCachedImage(removed.id)
+            }
+            items = clipboardHistory.toList()
+        }
+        persistClipboardHistory()
+
+        val event =
+            IslandEvent.Clipboard(
+                label = label,
+                preview = preview,
+                isUrl = isUrl,
+                isImage = isImage,
+                imageUri = imageUri,
+                items = items,
+            )
+        return event to items
+    }
+
+    private fun cleanupCachedImage(itemId: Long) {
+        try {
+            File(clipboardCacheDir, "clip_$itemId.webp").delete()
+            File(clipboardCacheDir, "clip_$itemId.png").delete()
+        } catch (_: Exception) {}
+    }
+
+    private var chargingListening = false
+    private var ringerListening = false
+    private var clipboardListening = false
+
+    fun startCharging() {
+        if (chargingListening) return
+        chargingListening = true
+        wasCharging = batteryController.isPluggedIn
+        batteryJob?.cancel()
+        batteryJob =
+            applicationScope.launch(backgroundDispatcher) {
+                combine(
+                        batteryInteractor.isCharging,
+                        batteryInteractor.level,
+                        batteryInteractor.powerSave,
+                        batteryInteractor.batteryTimeRemainingEstimate,
+                    ) { isCharging: Boolean, level: Int?, isPowerSave: Boolean, timeEst: String? ->
+                        ChargingSnapshot(isCharging, level, isPowerSave, timeEst)
+                    }
+                    .distinctUntilChanged()
+                    .collect { snap ->
+                        val wasChargingBefore = wasCharging
+                        wasCharging = snap.isCharging
+                        if (snap.isCharging && !wasChargingBefore && snap.level != null) {
+                            chargingDismissed = false
+                            val event =
+                                IslandEvent.Charging(
+                                    level = snap.level,
+                                    isWireless = batteryController.isWirelessCharging,
+                                    isPowerSave = snap.isPowerSave,
+                                    timeRemaining = snap.timeEst,
+                                )
+                            _chargingEvent.value = event
+                            onChargingStarted?.invoke(event)
+                        } else if (snap.isCharging && wasChargingBefore && !chargingDismissed) {
+                            _chargingEvent.value =
+                                _chargingEvent.value?.copy(
+                                    level = snap.level ?: _chargingEvent.value?.level ?: 0,
+                                    isPowerSave = snap.isPowerSave,
+                                    timeRemaining = snap.timeEst,
+                                )
+                        } else if (!snap.isCharging && wasChargingBefore) {
+                            chargingDismissed = false
+                            _chargingEvent.value = null
+                        }
+                    }
+            }
+    }
+
+    fun stopCharging() {
+        if (!chargingListening) return
+        chargingListening = false
+        batteryJob?.cancel()
+        batteryJob = null
+        _chargingEvent.value = null
+    }
+
+    fun startRinger() {
+        if (ringerListening) return
+        ringerListening = true
+        lastRingerMode =
+            (context.getSystemService(Context.AUDIO_SERVICE) as AudioManager).ringerMode
+        context.registerReceiver(
+            ringerReceiver,
+            IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION),
+            null,
+            mainHandler,
+        )
+    }
+
+    fun stopRinger() {
+        if (!ringerListening) return
+        ringerListening = false
+        try { context.unregisterReceiver(ringerReceiver) } catch (_: Exception) {}
+        _ringerEvent.value = null
+    }
+
+    fun startClipboard() {
+        if (clipboardListening) return
+        clipboardListening = true
+        loadClipboardHistory()
+        clipboardManager.addPrimaryClipChangedListener(clipboardListener)
+    }
+
+    fun stopClipboard() {
+        if (!clipboardListening) return
+        clipboardListening = false
+        clipboardManager.removePrimaryClipChangedListener(clipboardListener)
+        _clipboardEvent.value = null
+    }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        startCharging()
+        startRinger()
+        startClipboard()
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        stopCharging()
+        stopRinger()
+        stopClipboard()
+    }
+
+    fun clearRinger() {
+        _ringerEvent.value = null
+    }
+
+    fun setRingerMode(mode: Int) {
+        val am = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        am.ringerMode = mode
+    }
+
+    fun getRingerMode(): Int {
+        val am = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        return am.ringerMode
+    }
+
+    fun emitRingerEvent(mode: Int) {
+        val label =
+            when (mode) {
+                AudioManager.RINGER_MODE_SILENT -> context.getString(R.string.ax_dynamic_bar_silent)
+                AudioManager.RINGER_MODE_VIBRATE -> context.getString(R.string.ax_dynamic_bar_vibrate)
+                else -> context.getString(R.string.ax_dynamic_bar_ring)
+            }
+        val event = IslandEvent.RingerMode(mode = mode, label = label)
+        _ringerEvent.value = event
+        onRingerChanged?.invoke(event)
+    }
+
+    fun clearClipboard() {
+        _clipboardEvent.value = null
+        synchronized(clipboardHistory) {
+            clipboardHistory.forEach { cleanupCachedImage(it.id) }
+            clipboardHistory.clear()
+        }
+        persistClipboardHistory()
+    }
+
+    fun clearCharging() {
+        chargingDismissed = true
+        _chargingEvent.value = null
+    }
+
+    fun removeClipboardItem(id: Long) {
+        cleanupCachedImage(id)
+        val event: IslandEvent.Clipboard?
+        synchronized(clipboardHistory) {
+            clipboardHistory.removeAll { it.id == id }
+            event =
+                if (clipboardHistory.isEmpty()) null
+                else {
+                    val latest = clipboardHistory.first()
+                    _clipboardEvent.value?.copy(
+                        label = latest.label,
+                        preview = latest.preview,
+                        isUrl = latest.isUrl,
+                        isImage = latest.isImage,
+                        imageUri = latest.imageUri,
+                        items = clipboardHistory.toList(),
+                    )
+                }
+        }
+        persistClipboardHistory()
+        _clipboardEvent.value = event
+    }
+
+    fun copyToClipboard(text: String) {
+        if (text.isEmpty()) return
+        suppressNextClipEvent = true
+        clipboardManager.setPrimaryClip(ClipData.newPlainText("Copied", text))
+    }
+
+    fun copyUriToClipboard(uri: Uri, mimeType: String = "image/*") {
+        suppressNextClipEvent = true
+        try {
+            clipboardManager.setPrimaryClip(
+                ClipData("Copied", arrayOf(mimeType), ClipData.Item(uri)))
+        } catch (e: SecurityException) {
+            Log.w(TAG, "Failed to copy URI to clipboard, trying plain text", e)
+            clipboardManager.setPrimaryClip(ClipData.newPlainText("Copied", uri.toString()))
+        }
+    }
+
+    fun openUrl(url: String) {
+        if (url.isEmpty()) return
+        try {
+            context.startActivity(
+                Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            )
+            _clipboardEvent.value = null
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to open URL: $url", e)
+        }
+    }
+
+    private fun persistClipboardHistory() {
+        persistJob?.cancel()
+        persistJob = applicationScope.launch(backgroundDispatcher) {
+            try {
+                val arr = JSONArray()
+                synchronized(clipboardHistory) {
+                    clipboardHistory.forEach { item ->
+                        arr.put(
+                            JSONObject().apply {
+                                put("id", item.id)
+                                put("preview", item.preview)
+                                put("label", item.label)
+                                put("isUrl", item.isUrl)
+                                put("isImage", item.isImage)
+                                put("imageUri", item.imageUri?.toString() ?: "")
+                                put("ts", item.timestamp)
+                            }
+                        )
+                    }
+                }
+                prefs.edit().putString(KEY_CLIPBOARD_STASH, arr.toString()).apply()
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to persist clipboard history", e)
+            }
+        }
+    }
+
+    private fun loadClipboardHistory() {
+        try {
+            val json = prefs.getString(KEY_CLIPBOARD_STASH, null) ?: return
+            val arr = JSONArray(json)
+            synchronized(clipboardHistory) {
+                clipboardHistory.clear()
+                for (i in 0 until arr.length().coerceAtMost(MAX_CLIPBOARD_HISTORY)) {
+                    val obj = arr.getJSONObject(i)
+                    val id = obj.optLong("id", 0L)
+                    val isImage = obj.optBoolean("isImage", false)
+                    val imageUri =
+                        if (isImage) {
+                            val cachedWebp = File(clipboardCacheDir, "clip_$id.webp")
+                            val cachedPng = File(clipboardCacheDir, "clip_$id.png")
+                            when {
+                                cachedWebp.exists() ->
+                                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, cachedWebp)
+                                cachedPng.exists() ->
+                                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, cachedPng)
+                                else -> null
+                            }
+                        } else null
+                    clipboardHistory.add(
+                        IslandEvent.ClipboardItem(
+                            id = id,
+                            preview = obj.optString("preview", ""),
+                            label = obj.optString("label", ""),
+                            isUrl = obj.optBoolean("isUrl", false),
+                            isImage = isImage,
+                            imageUri = imageUri,
+                            timestamp = obj.optLong("ts", 0L),
+                        )
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to load clipboard history", e)
+        }
+    }
+
+    private data class ChargingSnapshot(
+        val isCharging: Boolean,
+        val level: Int?,
+        val isPowerSave: Boolean,
+        val timeEst: String?,
+    )
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/TorchIslandManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/TorchIslandManager.kt
new file mode 100644
index 0000000000000..d5808b5342160
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/data/source/TorchIslandManager.kt
@@ -0,0 +1,124 @@
+package com.android.systemui.axdynamicbar.data.source
+
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.flashlight.domain.interactor.FlashlightInteractor
+import com.android.systemui.flashlight.flags.FlashlightStrength
+import com.android.systemui.flashlight.shared.model.FlashlightModel
+import com.android.systemui.statusbar.policy.FlashlightController
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+@SysUISingleton
+class TorchIslandManager
+@Inject
+constructor(
+    @Application private val scope: CoroutineScope,
+    private val flashlightController: FlashlightController,
+    private val flashlightInteractor: FlashlightInteractor,
+) {
+    private val _torchEvent = MutableStateFlow<IslandEvent.Torch?>(null)
+    val torchEvent: StateFlow<IslandEvent.Torch?> = _torchEvent.asStateFlow()
+
+    private var listening = false
+    private var levelJob: Job? = null
+
+    private val listener =
+        object : FlashlightController.FlashlightListener {
+            override fun onFlashlightChanged(enabled: Boolean) {
+                if (enabled) {
+                    _torchEvent.value = IslandEvent.Torch()
+                    startLevelObserver()
+                } else {
+                    stopLevelObserver()
+                    _torchEvent.value = null
+                }
+            }
+
+            override fun onFlashlightError() {
+                stopLevelObserver()
+                _torchEvent.value = null
+            }
+
+            override fun onFlashlightAvailabilityChanged(available: Boolean) {
+                if (!available) {
+                    stopLevelObserver()
+                    _torchEvent.value = null
+                }
+            }
+
+            override fun onFlashlightStrengthChanged(level: Int) {}
+        }
+
+    private fun startLevelObserver() {
+        if (!FlashlightStrength.isEnabled) return
+        levelJob?.cancel()
+        levelJob =
+            scope.launch {
+                flashlightInteractor.state.collect { model ->
+                    when (model) {
+                        is FlashlightModel.Available.Level -> {
+                            if (model.enabled) {
+                                _torchEvent.value =
+                                    IslandEvent.Torch(level = model.level, maxLevel = model.max)
+                            }
+                        }
+                        is FlashlightModel.Available.Binary -> {
+                            _torchEvent.value =
+                                if (model.enabled) IslandEvent.Torch() else null
+                        }
+                        is FlashlightModel.Unavailable -> {
+                            _torchEvent.value = null
+                        }
+                    }
+                }
+            }
+    }
+
+    private fun stopLevelObserver() {
+        levelJob?.cancel()
+        levelJob = null
+    }
+
+    fun startListening() {
+        if (listening) return
+        listening = true
+        flashlightController.addCallback(listener)
+        if (flashlightController.isEnabled) {
+            _torchEvent.value = IslandEvent.Torch()
+            startLevelObserver()
+        }
+    }
+
+    fun stopListening() {
+        if (!listening) return
+        listening = false
+        flashlightController.removeCallback(listener)
+        stopLevelObserver()
+        _torchEvent.value = null
+    }
+
+    fun clear() {
+        stopLevelObserver()
+        _torchEvent.value = null
+    }
+
+    fun toggleTorch() {
+        flashlightController.setFlashlight(!flashlightController.isEnabled)
+    }
+
+    fun setLevel(level: Int) {
+        if (FlashlightStrength.isEnabled) flashlightInteractor.setLevel(level)
+    }
+
+    fun setLevelTemporary(level: Int) {
+        if (FlashlightStrength.isEnabled) flashlightInteractor.setTemporaryLevel(level)
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarChipsRefiner.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarChipsRefiner.kt
new file mode 100644
index 0000000000000..c8d1bbd2e1522
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarChipsRefiner.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.domain
+
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.chips.ui.model.MultipleOngoingActivityChipsModel
+import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsRefiner
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class AxDynamicBarChipsRefiner @Inject constructor(
+    private val settings: AxDynamicBarSettings,
+) : OngoingActivityChipsRefiner {
+
+    private val _chipsFlow = MutableStateFlow(MultipleOngoingActivityChipsModel())
+    val chipsFlow: StateFlow<MultipleOngoingActivityChipsModel> = _chipsFlow.asStateFlow()
+
+    override fun transform(input: MultipleOngoingActivityChipsModel): MultipleOngoingActivityChipsModel {
+        _chipsFlow.value = input
+        if (!settings.isEnabled.value) return input
+
+        return input.copy(
+            active = input.active.map { chip -> chip.copy(isHidden = true) },
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarInteractor.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarInteractor.kt
new file mode 100644
index 0000000000000..1ebab0a5efc52
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarInteractor.kt
@@ -0,0 +1,494 @@
+package com.android.systemui.axdynamicbar.domain
+
+import android.net.Uri
+import com.android.systemui.axdynamicbar.data.IslandEventRepository
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.IslandState
+import com.android.systemui.axdynamicbar.model.IslandUiState
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.shade.data.repository.ShadeRepository
+import com.android.systemui.shade.domain.interactor.ShadeInteractor
+import com.android.systemui.statusbar.KeyguardIndicationController
+import com.android.systemui.statusbar.StatusBarState
+import com.android.systemui.statusbar.policy.KeyguardStateController
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+@SysUISingleton
+class AxDynamicBarInteractor
+@Inject
+constructor(
+    @Application private val applicationScope: CoroutineScope,
+    private val repository: IslandEventRepository,
+    val settings: AxDynamicBarSettings,
+    private val statusBarStateController: StatusBarStateController,
+    private val keyguardStateController: KeyguardStateController,
+    val sliderHapticsViewModelFactory: SliderHapticsViewModel.Factory,
+    private val activityStarter: ActivityStarter,
+    private val indicationController: KeyguardIndicationController,
+    private val shadeInteractor: ShadeInteractor,
+    private val shadeRepository: ShadeRepository,
+) : IslandActions {
+    private val _uiState = MutableStateFlow(IslandUiState())
+    val uiState: StateFlow<IslandUiState> = _uiState.asStateFlow()
+
+    private val autoDismissJobs = ConcurrentHashMap<String, Job>()
+
+    private val dismissedEventIds: MutableSet<String> = ConcurrentHashMap.newKeySet()
+
+    override var onFocusableRequested: ((Boolean) -> Unit)? = null
+
+    var onCollapseRequested: (() -> Unit)? = null
+
+    private var isInitialized = false
+
+    @Volatile private var panelBlocking = false
+    private val _isPanelExpanded = MutableStateFlow(false)
+    
+    val isPanelExpanded: StateFlow<Boolean> = _isPanelExpanded.asStateFlow()
+    
+    val qsExpansion: StateFlow<Float> = shadeInteractor.qsExpansion
+    
+    val legacyShadeExpansion: StateFlow<Float> = shadeRepository.legacyShadeExpansion
+    val mediaUseWaveform: StateFlow<Boolean> = settings.useWaveformSeekBar
+    private val _isOnKeyguard = MutableStateFlow(false)
+    val isOnKeyguard: StateFlow<Boolean> = _isOnKeyguard.asStateFlow()
+    private val _isKeyguardFadingAway = MutableStateFlow(false)
+    val isKeyguardFadingAway: StateFlow<Boolean> = _isKeyguardFadingAway.asStateFlow()
+    private val _isBouncerShowing = MutableStateFlow(false)
+    val isBouncerShowing: StateFlow<Boolean> = _isBouncerShowing.asStateFlow()
+    private val _isDozing = MutableStateFlow(statusBarStateController.isDozing)
+    val isDozing: StateFlow<Boolean> = _isDozing.asStateFlow()
+    private val _dozeAmount = MutableStateFlow(0f)
+    
+    val dozeAmount: StateFlow<Float> = _dozeAmount.asStateFlow()
+    @Volatile private var isDreaming = false
+
+    private val statusBlocking: Boolean
+        get() = _isDozing.value || isDreaming
+
+    companion object {
+        private const val TAG = "AxDynamicBarInteractor"
+    }
+
+    fun init() {
+        if (isInitialized) return
+        isInitialized = true
+
+        settings.init()
+
+        repository.system.onChargingStarted = { scheduleAutoDismiss(it) }
+        repository.system.onRingerChanged = { scheduleAutoDismiss(it) }
+        repository.system.onClipboardCopied = { scheduleAutoDismiss(it) }
+
+        repository.notification.activeMediaPackageProvider = { repository.media.activeMediaPackage }
+        repository.notification.onAlarmEvent = {
+            scheduleAutoDismiss(it, if (it.isRinging) 30_000L else 5_000L)
+        }
+
+        repository.media.onMediaSessionLost = { repository.media.clear() }
+
+        repository.biometric.onBiometricUnlock = { scheduleAutoDismiss(it) }
+
+        applicationScope.launch {
+            repository.notification.audioRecordingEvent.collect { event ->
+                if (event?.state == RecordingState.SAVED) {
+                    scheduleAutoDismiss(event, 5_000L)
+                }
+            }
+        }
+
+        applicationScope.launch {
+            repository.notification.notificationFlow.collect { notification ->
+                repository.notification.coalesceNotification(notification)
+            }
+        }
+
+        applicationScope.launch {
+            combine(
+                _uiState.map { state ->
+                    state.shouldShow &&
+                        state.events.any { it is IslandEvent.Media && it.isPlaying && it.duration > 0L }
+                },
+                _isPanelExpanded,
+                qsExpansion.map { it > 0f },
+            ) { mediaActive, panelExpanded, qsOpen ->
+                mediaActive && !panelExpanded && !qsOpen
+            }.distinctUntilChanged().collect { needsPolling ->
+                if (needsPolling) repository.media.startProgressPolling()
+                else repository.media.stopProgressPolling()
+            }
+        }
+
+        _isOnKeyguard.value = statusBarStateController.state == StatusBarState.KEYGUARD
+        _isKeyguardFadingAway.value = keyguardStateController.isKeyguardFadingAway
+        _isBouncerShowing.value = keyguardStateController.isPrimaryBouncerShowing
+
+        keyguardStateController.addCallback(
+            object : KeyguardStateController.Callback {
+                override fun onKeyguardFadingAwayChanged() {
+                    _isKeyguardFadingAway.value = keyguardStateController.isKeyguardFadingAway
+                }
+
+                override fun onPrimaryBouncerShowingChanged() {
+                    _isBouncerShowing.value = keyguardStateController.isPrimaryBouncerShowing
+                }
+            }
+        )
+
+        statusBarStateController.addCallback(
+            object : StatusBarStateController.StateListener {
+                override fun onExpandedChanged(isExpanded: Boolean) {
+                    onPanelExpandedChanged(isExpanded)
+                }
+
+                override fun onStateChanged(newState: Int) {
+                    _isOnKeyguard.value = newState == StatusBarState.KEYGUARD
+                    updateChipVisibility()
+                }
+
+                override fun onDozingChanged(dozing: Boolean) {
+                    _isDozing.value = dozing
+                    updateChipVisibility()
+                }
+
+                override fun onDozeAmountChanged(linear: Float, eased: Float) {
+                    _dozeAmount.value = linear
+                }
+
+                override fun onDreamingChanged(dreaming: Boolean) {
+                    isDreaming = dreaming
+                    updateChipVisibility()
+                }
+            }
+        )
+
+        indicationController.addIndicationListener { type, text ->
+            val indicationType = mapIndicationType(type) ?: return@addIndicationListener
+            if (text != null && text.isNotEmpty()) {
+                val event = IslandEvent.KeyguardIndication(
+                    text = text.toString(),
+                    indicationType = indicationType,
+                )
+                repository.updateIndicationEvent(event)
+                scheduleAutoDismiss(event)
+            } else {
+                repository.clearIndicationEvent(indicationType)
+            }
+        }
+
+        applicationScope.launch {
+            settings.isEnabled.collect { enabled ->
+                if (enabled) repository.startListening()
+                else {
+                    repository.stopListening()
+                    autoDismissJobs.values.forEach { it.cancel() }
+                    autoDismissJobs.clear()
+                    dismissedEventIds.clear()
+                    repository.clearAllIndicationEvents()
+                    _uiState.value = IslandUiState()
+                }
+            }
+        }
+
+        applicationScope.launch {
+            settings.disabledEventTypes.collect {
+                repository.refreshListeners()
+            }
+        }
+
+        applicationScope.launch {
+            combine(
+                repository.events,
+                settings.disabledEventTypes,
+                _isOnKeyguard,
+            ) { raw, _, kg ->
+                raw.filter { settings.isEventEnabled(it) } to kg
+            }.collect { (rawEvents, onKeyguard) ->
+                if (!settings.isEnabled.value) return@collect
+                dismissedEventIds.removeAll { id -> rawEvents.none { it.id == id } }
+                val events = rawEvents.filter { e ->
+                    e.id !in dismissedEventIds &&
+                        
+                        !(onKeyguard && e is IslandEvent.Notification) &&
+                        
+                        !(onKeyguard && e is IslandEvent.Charging) &&
+                        
+                        !(onKeyguard && e is IslandEvent.AppSwitch) &&
+                        
+                        !(!onKeyguard && e is IslandEvent.KeyguardIndication)
+                }
+
+                val current = _uiState.value
+
+                val hasNewEvents = events.any { e -> current.events.none { it.id == e.id } }
+
+                val userInitiatedRefresh =
+                    events.any { e ->
+                        e is IslandEvent.Torch &&
+                            current.events.firstOrNull { it.id == e.id }?.let { it != e } == true
+                    }
+
+                val hasSignificantChange =
+                    !hasNewEvents &&
+                        events.any { e ->
+                            val old =
+                                current.events.firstOrNull { it.id == e.id } ?: return@any false
+                            when {
+                                e is IslandEvent.Media && old is IslandEvent.Media ->
+                                    e.track != old.track || e.artist != old.artist
+                                else -> false
+                            }
+                        }
+
+                val newState =
+                    when {
+                        events.isEmpty() -> IslandState.HIDDEN
+                        panelBlocking || statusBlocking -> IslandState.HIDDEN
+                        else -> IslandState.CHIP
+                    }
+
+                val prevPinnedId =
+                    current.events.getOrNull(current.pinnedEventIndex)?.id
+
+                val pinnedIndex =
+                    when {
+                        hasNewEvents -> {
+                            val currentIds = current.events.map { it.id }.toSet()
+                            events.indexOfFirst { it.id !in currentIds }.coerceAtLeast(0)
+                        }
+                        hasSignificantChange -> {
+                            val idx =
+                                events.indexOfFirst { e ->
+                                    val old =
+                                        current.events.firstOrNull { it.id == e.id }
+                                            ?: return@indexOfFirst false
+                                    when {
+                                        e is IslandEvent.Media && old is IslandEvent.Media ->
+                                            e.track != old.track || e.artist != old.artist
+                                        else -> false
+                                    }
+                                }
+                            if (idx >= 0) idx
+                            else resolveByIdOrFallback(prevPinnedId, events, current)
+                        }
+                        userInitiatedRefresh -> 0
+                        else -> resolveByIdOrFallback(prevPinnedId, events, current)
+                    }
+                val shouldReset = hasNewEvents || userInitiatedRefresh || hasSignificantChange
+
+                _uiState.value =
+                    IslandUiState(
+                        events = events,
+                        islandState = newState,
+                        pinnedEventIndex = pinnedIndex,
+                        manuallyHidden = if (shouldReset) false else current.manuallyHidden,
+                        forceVisible = false,
+                    )
+            }
+        }
+    }
+
+    fun cycleNext() {
+        val current = _uiState.value
+        if (current.events.size <= 1) return
+        val next = (current.pinnedEventIndex + 1) % current.events.size
+        _uiState.value = current.copy(pinnedEventIndex = next)
+    }
+
+    fun cyclePrev() {
+        val current = _uiState.value
+        if (current.events.size <= 1) return
+        val prev = (current.pinnedEventIndex - 1 + current.events.size) % current.events.size
+        _uiState.value = current.copy(pinnedEventIndex = prev)
+    }
+
+    fun pinEventAt(index: Int) {
+        val current = _uiState.value
+        if (index < 0 || index >= current.events.size) return
+        _uiState.value = current.copy(pinnedEventIndex = index)
+    }
+
+    override fun dismissEvent(event: IslandEvent) {
+        autoDismissJobs[event.id]?.cancel()
+        autoDismissJobs.remove(event.id)
+        if (event.behavior.suppressOnDismiss) {
+            dismissedEventIds.add(event.id)
+        }
+
+        val current = _uiState.value
+        val updatedEvents = current.events.filter { it.id != event.id }
+        val newIndex =
+            current.pinnedEventIndex.coerceAtMost((updatedEvents.size - 1).coerceAtLeast(0))
+
+        _uiState.value =
+            current.copy(
+                events = updatedEvents,
+                pinnedEventIndex = newIndex,
+                islandState =
+                    if (updatedEvents.isEmpty()) IslandState.HIDDEN else current.islandState,
+            )
+
+        when (event) {
+            is IslandEvent.AudioRecording -> repository.notification.clearAudioRecording()
+            is IslandEvent.Sports -> {
+                repository.smartspace.clearSportsEvent(event.key)
+                repository.notification.clearSportsEvent(event.key)
+            }
+            is IslandEvent.NowPlaying -> {}
+            is IslandEvent.PromotedOngoing ->
+                repository.notification.clearPromotedOngoing(event.sbn.key)
+            is IslandEvent.Media -> repository.media.clear()
+            is IslandEvent.Bluetooth -> repository.connectivity.clearBluetooth()
+            is IslandEvent.Hotspot -> repository.connectivity.clearHotspot()
+            is IslandEvent.Charging -> repository.system.clearCharging()
+            is IslandEvent.Alarm -> repository.notification.clearAlarm()
+            is IslandEvent.Timer -> repository.notification.clearTimer()
+            is IslandEvent.Stopwatch -> repository.notification.clearStopwatch()
+            is IslandEvent.RingerMode -> repository.system.clearRinger()
+            is IslandEvent.Vpn -> repository.connectivity.clearVpn()
+            is IslandEvent.Clipboard -> repository.system.clearClipboard()
+            is IslandEvent.Notification -> repository.notification.dismissNotification(event)
+            is IslandEvent.AppSwitch -> repository.appTracking.clear()
+            is IslandEvent.Torch -> {
+                repository.torch.toggleTorch()
+                repository.torch.clear()
+            }
+            is IslandEvent.BiometricUnlock -> repository.biometric.clear()
+            is IslandEvent.KeyguardIndication -> repository.clearIndicationEvent(event.indicationType)
+            is IslandEvent.AospChip -> {}
+        }
+    }
+
+    fun getTopEvent(): IslandEvent? = _uiState.value.topEvent
+
+    override fun collapseIsland() {
+        onCollapseRequested?.invoke()
+    }
+
+    override fun onNotificationInteraction(eventId: String) {
+        autoDismissJobs[eventId]?.cancel()
+        autoDismissJobs.remove(eventId)
+    }
+
+    override fun onNotificationInteractionEnd(eventId: String) {
+        val event = _uiState.value.events.find { it.id == eventId } ?: return
+        scheduleAutoDismiss(event)
+    }
+
+    override fun togglePlayPause() = repository.media.togglePlayPause()
+
+    override fun skipNext() = repository.media.skipNext()
+
+    override fun skipPrev() = repository.media.skipPrev()
+
+    override fun sendCustomAction(action: String) = repository.media.sendCustomAction(action)
+
+    override fun openMediaOutputSwitcher() = repository.media.openMediaOutputSwitcher()
+
+    override fun disconnectBluetooth(address: String) = repository.connectivity.disconnectBluetooth(address)
+
+    override fun openUrl(url: String) = repository.system.openUrl(url)
+
+    override fun openMediaApp() = repository.media.openMediaApp()
+
+    override fun seekTo(position: Long) = repository.media.seekTo(position)
+
+    override fun setRingerMode(mode: Int) = repository.system.setRingerMode(mode)
+
+    override fun toggleTorch() = repository.torch.toggleTorch()
+
+    override fun launchNotificationDismissingKeyguard(event: IslandEvent.Notification) {
+        val intent = event.sbn.notification?.contentIntent ?: return
+        activityStarter.startPendingIntentDismissingKeyguard(intent)
+    }
+
+    override fun setTorchLevel(level: Int) = repository.torch.setLevel(level)
+
+    override fun setTorchLevelTemporary(level: Int) = repository.torch.setLevelTemporary(level)
+
+    override fun copyToClipboard(text: String) = repository.system.copyToClipboard(text)
+
+    override fun copyUriToClipboard(uri: Uri) = repository.system.copyUriToClipboard(uri)
+
+    override fun removeClipboardItem(id: Long) = repository.system.removeClipboardItem(id)
+
+    override fun switchToApp(taskId: Int) = repository.appTracking.switchToApp(taskId)
+
+    fun onPanelExpandedChanged(expanded: Boolean) {
+        panelBlocking = expanded
+        _isPanelExpanded.value = expanded
+        updateChipVisibility()
+    }
+
+    private fun updateChipVisibility() {
+        val current = _uiState.value
+        val shouldHide = panelBlocking || statusBlocking
+        if (shouldHide && current.islandState == IslandState.CHIP) {
+            _uiState.value = current.copy(islandState = IslandState.HIDDEN)
+        } else if (!shouldHide && current.events.isNotEmpty() && current.islandState == IslandState.HIDDEN && !current.manuallyHidden) {
+            _uiState.value = current.copy(islandState = IslandState.CHIP)
+        }
+    }
+
+    private fun scheduleAutoDismiss(event: IslandEvent, delayOverride: Long? = null) {
+        val ms = delayOverride ?: event.behavior.autoDismissMs ?: return
+        val eventId = event.id
+        autoDismissJobs[eventId]?.cancel()
+        autoDismissJobs[eventId] =
+            applicationScope.launch {
+                delay(ms)
+                val current = _uiState.value.events.find { it.id == eventId } ?: event
+                dismissEvent(current)
+            }
+    }
+
+    private fun resolveByIdOrFallback(
+        pinnedId: String?,
+        events: List<IslandEvent>,
+        current: IslandUiState,
+    ): Int {
+        if (pinnedId != null) {
+            val idx = events.indexOfFirst { it.id == pinnedId }
+            if (idx >= 0) return idx
+        }
+        return current.pinnedEventIndex.coerceAtMost(
+            (events.size - 1).coerceAtLeast(0)
+        )
+    }
+
+    private fun mapIndicationType(type: Int): IslandEvent.KeyguardIndication.IndicationType? =
+        when (type) {
+            KeyguardIndicationController.AX_TYPE_BIOMETRIC ->
+                IslandEvent.KeyguardIndication.IndicationType.BIOMETRIC
+            KeyguardIndicationController.AX_TYPE_TRANSIENT ->
+                IslandEvent.KeyguardIndication.IndicationType.TRANSIENT
+            KeyguardIndicationController.AX_TYPE_TRUST ->
+                IslandEvent.KeyguardIndication.IndicationType.TRUST
+            KeyguardIndicationController.AX_TYPE_DISCLOSURE ->
+                IslandEvent.KeyguardIndication.IndicationType.DISCLOSURE
+            KeyguardIndicationController.AX_TYPE_OWNER_INFO ->
+                IslandEvent.KeyguardIndication.IndicationType.OWNER_INFO
+            KeyguardIndicationController.AX_TYPE_ALIGNMENT ->
+                IslandEvent.KeyguardIndication.IndicationType.ALIGNMENT
+            KeyguardIndicationController.AX_TYPE_PERSISTENT_UNLOCK ->
+                IslandEvent.KeyguardIndication.IndicationType.PERSISTENT_UNLOCK
+            else -> null
+        }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarSettings.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarSettings.kt
new file mode 100644
index 0000000000000..5fd4a092f1895
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/domain/AxDynamicBarSettings.kt
@@ -0,0 +1,144 @@
+package com.android.systemui.axdynamicbar.domain
+
+import android.database.ContentObserver
+import android.os.Handler
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.EVENT_TYPE_IDS
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.util.settings.SecureSettings
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import org.json.JSONArray
+
+@SysUISingleton
+class AxDynamicBarSettings @Inject constructor(
+    @Main private val mainHandler: Handler,
+    private val secureSettings: SecureSettings,
+    private val context: android.content.Context,
+) {
+    companion object {
+        const val KEY_ENABLED = "ax_dynamic_bar_enabled"
+        const val KEY_EVENTS = "ax_dynamic_bar_events"
+        const val KEY_KEYGUARD_ENABLED = "ax_dynamic_bar_keyguard_enabled"
+        const val KEY_KEYGUARD_MUSIC_PILL_ENABLED = "ax_dynamic_bar_keyguard_music_pill"
+        const val KEY_KEYGUARD_BATTERY_CHIP_MODE = "ax_dynamic_bar_keyguard_battery_chip_mode"
+    }
+
+    private val contentResolver = context.contentResolver
+
+    private val _isEnabled = MutableStateFlow(false)
+    @get:JvmName("getIsEnabled") val isEnabled: StateFlow<Boolean> = _isEnabled.asStateFlow()
+
+    private val _isKeyguardEnabled = MutableStateFlow(true)
+    val isKeyguardEnabled: StateFlow<Boolean> = _isKeyguardEnabled.asStateFlow()
+
+    private val _isKeyguardMusicPillEnabled = MutableStateFlow(false)
+    val isKeyguardMusicPillEnabled: StateFlow<Boolean> = _isKeyguardMusicPillEnabled.asStateFlow()
+
+    private val _keyguardBatteryChipMode = MutableStateFlow(1)
+    val keyguardBatteryChipMode: StateFlow<Int> = _keyguardBatteryChipMode.asStateFlow()
+
+    private val _useWaveformSeekBar = MutableStateFlow(false)
+    val useWaveformSeekBar: StateFlow<Boolean> = _useWaveformSeekBar.asStateFlow()
+
+    private val _disabledEventTypes = MutableStateFlow<Set<String>>(emptySet())
+    val disabledEventTypes: StateFlow<Set<String>> = _disabledEventTypes.asStateFlow()
+
+    init {
+        refresh()
+    }
+
+    private val settingsObserver =
+        object : ContentObserver(mainHandler) {
+            override fun onChange(selfChange: Boolean) {
+                refresh()
+            }
+        }
+
+    private var initialized = false
+
+    fun init() {
+        if (initialized) return
+        initialized = true
+        refresh()
+        secureSettings.registerContentObserverForUserSync(
+            KEY_ENABLED,
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+        secureSettings.registerContentObserverForUserSync(
+            KEY_EVENTS,
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+        secureSettings.registerContentObserverForUserSync(
+            KEY_KEYGUARD_ENABLED,
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+        secureSettings.registerContentObserverForUserSync(
+            KEY_KEYGUARD_MUSIC_PILL_ENABLED,
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+        secureSettings.registerContentObserverForUserSync(
+            KEY_KEYGUARD_BATTERY_CHIP_MODE,
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.MEDIA_WAVEFORM_SEEKBAR),
+            false,
+            settingsObserver,
+            UserHandle.USER_ALL,
+        )
+    }
+
+    fun destroy() {
+        if (!initialized) return
+        initialized = false
+        secureSettings.getContentResolver().unregisterContentObserver(settingsObserver)
+        contentResolver.unregisterContentObserver(settingsObserver)
+    }
+
+    private fun refresh() {
+        _isEnabled.value =
+            secureSettings.getIntForUser(KEY_ENABLED, 0, UserHandle.USER_CURRENT) == 1
+        _isKeyguardEnabled.value =
+            secureSettings.getIntForUser(KEY_KEYGUARD_ENABLED, 1, UserHandle.USER_CURRENT) == 1
+        _keyguardBatteryChipMode.value =
+            secureSettings.getIntForUser(KEY_KEYGUARD_BATTERY_CHIP_MODE, 1, UserHandle.USER_CURRENT)
+        _isKeyguardMusicPillEnabled.value =
+            secureSettings.getIntForUser(KEY_KEYGUARD_MUSIC_PILL_ENABLED, 0, UserHandle.USER_CURRENT) == 1
+        _useWaveformSeekBar.value =
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.MEDIA_WAVEFORM_SEEKBAR, 0, UserHandle.USER_CURRENT,) == 1
+
+        val json = secureSettings.getStringForUser(KEY_EVENTS, UserHandle.USER_CURRENT) ?: ""
+        _disabledEventTypes.value =
+            try {
+                if (json.isBlank()) emptySet()
+                else {
+                    val arr = JSONArray(json)
+                    (0 until arr.length()).mapNotNull { arr.optString(it) }.toSet()
+                }
+            } catch (_: Exception) {
+                emptySet()
+            }
+    }
+
+    fun isEventEnabled(event: IslandEvent): Boolean {
+        val typeId = EVENT_TYPE_IDS[event::class.java] ?: return true
+        return typeId !in _disabledEventTypes.value
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandEvent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandEvent.kt
new file mode 100644
index 0000000000000..2f6ee1e9be981
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandEvent.kt
@@ -0,0 +1,317 @@
+package com.android.systemui.axdynamicbar.model
+
+import android.app.Notification
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.service.notification.StatusBarNotification
+import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel
+
+enum class RecordingState {
+    RECORDING,
+    PAUSED,
+    SAVED,
+}
+
+const val NOTIFICATION_DECAY_MS = 5000L
+const val NOTIFICATION_FRESH_PRIORITY = 75
+const val NOTIFICATION_STALE_PRIORITY = 15
+const val MEDIA_PLAYING_PRIORITY = 70
+const val MEDIA_PAUSED_PRIORITY = 20
+
+data class EventBehavior(
+    val autoDismissMs: Long? = null,
+    val suppressOnDismiss: Boolean = true,
+    val autoShowsIsland: Boolean = true,
+)
+
+sealed class IslandEvent(open val priority: Int, val id: String) : Comparable<IslandEvent> {
+
+    open val behavior: EventBehavior
+        get() = DEFAULT_BEHAVIOR
+
+    open fun withoutDrawables(): IslandEvent = this
+
+    data class AospChip(
+        val active: OngoingActivityChipModel.Active,
+    ) : IslandEvent(priority = priorityForAospChipKey(active.key), id = "aosp_${active.key}")
+
+    data class AudioRecording(
+        val appName: String = "",
+        val state: RecordingState = RecordingState.RECORDING,
+        val startTimeMs: Long = System.currentTimeMillis(),
+        val actions: List<NotificationAction> = emptyList(),
+        val appIcon: Drawable? = null,
+        val pausedDurationMs: Long = 0L,
+    ) : IslandEvent(priority = 84, id = "audio_recording") {
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class Media(
+        val track: String,
+        val artist: String,
+        val isPlaying: Boolean,
+        val albumArt: Drawable? = null,
+        val progress: Float = 0f,
+        val duration: Long = 0L,
+        val position: Long = 0L,
+        val playbackSpeed: Float = 1f,
+        val positionUpdateTime: Long = 0L,
+        val outputDeviceName: String = "",
+        val customActions: List<MediaCustomAction> = emptyList(),
+        val appIcon: Drawable? = null,
+        val packageName: String = "",
+        val mediaColor: Int = 0,
+    ) : IslandEvent(priority = MEDIA_PLAYING_PRIORITY, id = "media") {
+        override val priority: Int
+            get() = if (isPlaying) MEDIA_PLAYING_PRIORITY else MEDIA_PAUSED_PRIORITY
+        override fun withoutDrawables() = copy(albumArt = null, appIcon = null)
+    }
+
+    data class Bluetooth(
+        val deviceName: String,
+        val batteryLevel: Int = -1,
+        val isConnected: Boolean = true,
+        val address: String = "",
+        val deviceIcon: Drawable? = null,
+        val deviceTypeLabel: String = "",
+    ) : IslandEvent(priority = 60, id = "bluetooth") {
+        override fun withoutDrawables() = copy(deviceIcon = null)
+    }
+
+    data class Hotspot(val numDevices: Int) : IslandEvent(priority = 55, id = "hotspot")
+
+    data class Charging(
+        val level: Int,
+        val isWireless: Boolean,
+        val isCharging: Boolean = true,
+        val isPowerSave: Boolean = false,
+        val timeRemaining: String? = null,
+    ) : IslandEvent(priority = 50, id = "charging") {
+        override val behavior = EventBehavior(autoDismissMs = 3000L, suppressOnDismiss = false)
+    }
+
+    data class RingerMode(val mode: Int, val label: String) :
+        IslandEvent(priority = 40, id = "ringer_mode") {
+        override val behavior = EventBehavior(autoDismissMs = 2500L, suppressOnDismiss = false)
+    }
+
+    data class BiometricUnlock(val sourceType: Int = 0, val sourceName: String = "Fingerprint") :
+        IslandEvent(priority = 80, id = "biometric_unlock") {
+        override val behavior = EventBehavior(autoDismissMs = 2000L, suppressOnDismiss = false)
+    }
+
+    data class Torch(val level: Int = -1, val maxLevel: Int = -1) :
+        IslandEvent(priority = 97, id = "torch") {
+        override val behavior = EventBehavior(suppressOnDismiss = false)
+        val supportsLevel: Boolean
+            get() = level >= 1 && maxLevel > 1
+    }
+
+    data class Vpn(val isBranded: Boolean = false, val isValidated: Boolean = false) :
+        IslandEvent(priority = 35, id = "vpn")
+
+    data class ClipboardItem(
+        val id: Long,
+        val preview: String,
+        val label: String = "",
+        val isUrl: Boolean = false,
+        val isImage: Boolean = false,
+        val imageUri: Uri? = null,
+        val timestamp: Long = System.currentTimeMillis(),
+    )
+
+    data class Clipboard(
+        val label: String = "",
+        val preview: String = "",
+        val isUrl: Boolean = false,
+        val isImage: Boolean = false,
+        val imageUri: Uri? = null,
+        val items: List<ClipboardItem> = emptyList(),
+    ) : IslandEvent(priority = 25, id = "clipboard")
+
+    data class PromotedOngoing(
+        val shortText: String = "",
+        val title: String = "",
+        val text: String = "",
+        val appName: String = "",
+        val appIcon: Drawable? = null,
+        val sbn: StatusBarNotification,
+        val actions: List<NotificationAction> = emptyList(),
+        val progress: Float = -1f,
+        val isIndeterminate: Boolean = false,
+    ) : IslandEvent(priority = 72, id = "promoted_${sbn.key}") {
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class Sports(
+        val team1Name: String,
+        val team2Name: String,
+        val score1: String,
+        val score2: String,
+        val team1Icon: Drawable? = null,
+        val team2Icon: Drawable? = null,
+        val status: GameStatus = GameStatus.LIVE,
+        val statusDetail: String = "",
+        val league: String = "",
+        val commentary: String = "",
+        val key: String,
+        val sbn: StatusBarNotification? = null,
+        val appIcon: Drawable? = null,
+    ) : IslandEvent(priority = 73, id = "sports_$key") {
+        override fun withoutDrawables() = copy(team1Icon = null, team2Icon = null, appIcon = null)
+    }
+
+    enum class GameStatus { PRE_GAME, LIVE, HALFTIME, FINAL }
+
+    data class NowPlaying(
+        val songTitle: String,
+        val artist: String,
+        val key: String,
+        val sbn: StatusBarNotification? = null,
+        val appIcon: Drawable? = null,
+        val actions: List<NotificationAction> = emptyList(),
+    ) : IslandEvent(priority = 42, id = "now_playing") {
+        override val behavior = EventBehavior(autoDismissMs = null)
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class Timer(
+        val label: String = "",
+        val endTimeMs: Long = 0L,
+        val originalDurationMs: Long = 0L,
+        val appIcon: Drawable? = null,
+        val isPaused: Boolean = false,
+        val actions: List<NotificationAction> = emptyList(),
+    ) : IslandEvent(priority = 45, id = "timer") {
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class Stopwatch(
+        val label: String = "",
+        val startTimeMs: Long = System.currentTimeMillis(),
+        val isRunning: Boolean = true,
+        val appIcon: Drawable? = null,
+        val actions: List<NotificationAction> = emptyList(),
+    ) : IslandEvent(priority = 44, id = "stopwatch") {
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class Alarm(
+        val label: String = "",
+        val triggerTimeMs: Long = 0L,
+        val isRinging: Boolean = false,
+        val appIcon: Drawable? = null,
+    ) : IslandEvent(priority = 48, id = "alarm") {
+        override val behavior = EventBehavior(autoDismissMs = 5000L)
+        override fun withoutDrawables() = copy(appIcon = null)
+    }
+
+    data class AppSwitch(
+        val recentApps: List<RecentApp> = emptyList(),
+        val previousApp: RecentApp? = null,
+    ) : IslandEvent(priority = 10, id = "app_switch") {
+        override val behavior = EventBehavior(suppressOnDismiss = false, autoShowsIsland = false)
+        override fun withoutDrawables() = copy(
+            recentApps = recentApps.map { it.copy(appIcon = null) },
+            previousApp = previousApp?.copy(appIcon = null),
+        )
+    }
+
+    data class KeyguardIndication(
+        val text: String,
+        val indicationType: IndicationType,
+    ) : IslandEvent(priority = 5, id = "kg_indication_${indicationType.name}") {
+        override val behavior: EventBehavior
+            get() = when (indicationType) {
+                IndicationType.BIOMETRIC -> EventBehavior(autoDismissMs = 3500L, suppressOnDismiss = false)
+                IndicationType.TRANSIENT -> EventBehavior(autoDismissMs = 3500L, suppressOnDismiss = false)
+                IndicationType.TRUST -> EventBehavior(suppressOnDismiss = false)
+                IndicationType.DISCLOSURE -> EventBehavior(suppressOnDismiss = false)
+                IndicationType.OWNER_INFO -> EventBehavior(suppressOnDismiss = false)
+                IndicationType.ALIGNMENT -> EventBehavior(autoDismissMs = 5000L, suppressOnDismiss = false)
+                IndicationType.PERSISTENT_UNLOCK -> EventBehavior(suppressOnDismiss = false)
+            }
+
+        enum class IndicationType {
+            BIOMETRIC,
+            TRANSIENT,
+            TRUST,
+            DISCLOSURE,
+            OWNER_INFO,
+            ALIGNMENT,
+            PERSISTENT_UNLOCK,
+        }
+    }
+
+    data class RecentApp(
+        val packageName: String,
+        val appName: String,
+        val appIcon: Drawable? = null,
+        val taskId: Int = -1,
+        val lastActiveTime: Long = System.currentTimeMillis(),
+    )
+
+    data class NotificationAction(val label: CharSequence, val action: Notification.Action)
+
+    data class MediaCustomAction(
+        val label: String,
+        val action: String,
+        val icon: Drawable? = null,
+    )
+
+    data class Notification(
+        val sbn: StatusBarNotification,
+        val title: String? = null,
+        val text: String? = null,
+        val appIcon: Drawable? = null,
+        val appName: String = "",
+        val progress: Int = -1,
+        val progressMax: Int = 100,
+        val isProgressIndeterminate: Boolean = false,
+        val actions: List<NotificationAction> = emptyList(),
+        val groupKey: String? = null,
+        val isGroupSummary: Boolean = false,
+        val createdAt: Long = System.currentTimeMillis(),
+    ) : IslandEvent(priority = NOTIFICATION_STALE_PRIORITY, id = "notification_${sbn.key}") {
+        override val behavior = EventBehavior(autoDismissMs = null)
+        override val priority: Int
+            get() =
+                if (System.currentTimeMillis() - createdAt < NOTIFICATION_DECAY_MS)
+                    NOTIFICATION_FRESH_PRIORITY
+                else NOTIFICATION_STALE_PRIORITY
+    }
+
+    companion object {
+        internal val DEFAULT_BEHAVIOR = EventBehavior()
+
+        val ONGOING_TYPES: Set<Class<out IslandEvent>> =
+            setOf(
+                AudioRecording::class.java,
+                PromotedOngoing::class.java,
+                Sports::class.java,
+                Media::class.java,
+                Timer::class.java,
+                Stopwatch::class.java,
+                AospChip::class.java,
+            )
+    }
+
+    val isOngoing: Boolean
+        get() = this::class.java in ONGOING_TYPES
+
+    override fun compareTo(other: IslandEvent): Int = other.priority - this.priority
+}
+
+enum class IslandState {
+    HIDDEN,
+    CHIP,
+}
+
+internal fun priorityForAospChipKey(key: String): Int = when {
+    key.startsWith("callChip-") -> 88
+    key == "ScreenRecord" -> 90
+    key == "ShareToApp" -> 86
+    key == "CastToOtherDevice" -> 82
+    else -> 70
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandUiState.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandUiState.kt
new file mode 100644
index 0000000000000..66648ba9a4b4f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/model/IslandUiState.kt
@@ -0,0 +1,22 @@
+package com.android.systemui.axdynamicbar.model
+
+data class IslandUiState(
+    val events: List<IslandEvent> = emptyList(),
+    val islandState: IslandState = IslandState.HIDDEN,
+    val pinnedEventIndex: Int = 0,
+    val manuallyHidden: Boolean = false,
+    val forceVisible: Boolean = false,
+) {
+
+    val shouldShow: Boolean
+        get() = islandState == IslandState.CHIP
+
+    val isChip: Boolean
+        get() = islandState == IslandState.CHIP
+
+    val topEvent: IslandEvent?
+        get() = events.getOrNull(pinnedEventIndex) ?: events.firstOrNull()
+
+    val activeEvents: List<IslandEvent>
+        get() = events.filter { it !is IslandEvent.Notification }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandActions.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandActions.kt
new file mode 100644
index 0000000000000..404f2c84d44cd
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandActions.kt
@@ -0,0 +1,53 @@
+package com.android.systemui.axdynamicbar.shared
+
+import android.net.Uri
+import com.android.systemui.axdynamicbar.model.IslandEvent
+
+val EVENT_TYPE_IDS: Map<Class<out IslandEvent>, String> =
+    mapOf(
+        IslandEvent.AudioRecording::class.java to "audio_recording",
+        IslandEvent.PromotedOngoing::class.java to "promoted_ongoing",
+        IslandEvent.Sports::class.java to "sports",
+        IslandEvent.Media::class.java to "media",
+        IslandEvent.Bluetooth::class.java to "bluetooth",
+        IslandEvent.Hotspot::class.java to "hotspot",
+        IslandEvent.Charging::class.java to "charging",
+        IslandEvent.Alarm::class.java to "alarm",
+        IslandEvent.Timer::class.java to "timer",
+        IslandEvent.Stopwatch::class.java to "stopwatch",
+        IslandEvent.RingerMode::class.java to "ringer",
+        IslandEvent.Vpn::class.java to "vpn",
+        IslandEvent.Clipboard::class.java to "clipboard",
+        IslandEvent.Notification::class.java to "notification",
+        IslandEvent.AppSwitch::class.java to "app_switch",
+        IslandEvent.Torch::class.java to "torch",
+        IslandEvent.BiometricUnlock::class.java to "biometric_unlock",
+        IslandEvent.AospChip::class.java to "aosp_chip",
+    )
+
+interface IslandActions {
+    val onFocusableRequested: ((Boolean) -> Unit)?
+        get() = null
+    fun collapseIsland()
+    fun dismissEvent(event: IslandEvent)
+    fun togglePlayPause()
+    fun skipNext()
+    fun skipPrev()
+    fun seekTo(position: Long)
+    fun sendCustomAction(action: String)
+    fun openMediaOutputSwitcher()
+    fun openMediaApp()
+    fun disconnectBluetooth(address: String)
+    fun setRingerMode(mode: Int)
+    fun toggleTorch()
+    fun setTorchLevel(level: Int)
+    fun setTorchLevelTemporary(level: Int)
+    fun copyToClipboard(text: String)
+    fun copyUriToClipboard(uri: Uri)
+    fun openUrl(url: String)
+    fun removeClipboardItem(id: Long)
+    fun switchToApp(taskId: Int)
+    fun onNotificationInteraction(eventId: String)
+    fun onNotificationInteractionEnd(eventId: String)
+    fun launchNotificationDismissingKeyguard(event: IslandEvent.Notification)
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandContentTokens.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandContentTokens.kt
new file mode 100644
index 0000000000000..35b61670b44bc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandContentTokens.kt
@@ -0,0 +1,560 @@
+package com.android.systemui.axdynamicbar.shared
+
+import android.app.ActivityOptions
+import com.android.systemui.res.R
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.core.graphics.ColorUtils
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.Repeat
+import androidx.compose.material.icons.filled.Shuffle
+import androidx.compose.material.icons.filled.ThumbDown
+import androidx.compose.material.icons.filled.ThumbUp
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.PlatformTextStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.graphics.drawable.toBitmap
+import androidx.palette.graphics.Palette
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import androidx.compose.material3.Icon
+import androidx.compose.ui.graphics.vector.ImageVector
+
+internal val SpaceXxs = 2.dp
+internal val SpaceXs = 4.dp
+internal val SpaceSm = 6.dp
+internal val SpaceMd = 8.dp
+internal val SpaceLg = 12.dp
+internal val SpaceXl = 14.dp
+internal val SpaceXxl = 16.dp
+internal val SpaceSection = 20.dp
+internal val SpacePanel = 24.dp
+internal val SpacePanelLarge = 28.dp
+
+internal val ShapeXs = RoundedCornerShape(8.dp)
+internal val ShapeSm = RoundedCornerShape(12.dp)
+internal val ShapeLg = RoundedCornerShape(24.dp)
+internal val ShapeXl = RoundedCornerShape(32.dp)
+internal val ShapeCard = RoundedCornerShape(28.dp)
+
+internal val SizeBadge = 14.dp
+internal val SizeIconSm = 20.dp
+internal val SizeIconMd = 28.dp
+internal val SizeButton = 48.dp
+internal val SizeButtonLg = 48.dp
+internal val SizeButtonXl = 64.dp
+internal val SizeAlbumSm = 52.dp
+internal val SizeAlbumLg = 200.dp
+internal val SizeSeekHeight = 16.dp
+internal val SizeProgressHeight = 8.dp
+internal val SizeStrokeWidth = 2.dp
+internal val SizeStrokeThin = 1.5f
+internal val SizeCompactIcon = 40.dp
+internal val SizeActionHeight = 48.dp
+
+internal const val AlphaSecondary = 0.7f
+internal const val AlphaTertiary = 0.5f
+internal const val AlphaHint = 0.4f
+internal const val AlphaDisabled = 0.3f
+internal const val AlphaSubtle = 0.15f
+internal const val AlphaFaint = 0.1f
+internal const val AlphaBorder = 0.08f
+internal const val AlphaStatusChip = 0.14f
+internal const val AlphaIconBg = 0.16f
+internal const val AlphaTrack = 0.25f
+
+internal val TsBadge: TextStyle
+    @Composable get() = MaterialTheme.typography.labelSmall.copy(
+        fontSize = 8.sp,
+        platformStyle = PlatformTextStyle(includeFontPadding = false),
+    )
+
+
+internal val BatteryChargingColor = Color(0xFF66BB6A)
+internal val BatteryPowerSaveColor = Color(0xFFFFA726)
+internal val BatteryNeutralColor: Color
+    @Composable get() = MaterialTheme.colorScheme.surfaceVariant
+internal val ChipContentDark = Color(0xFF1B1B1B)
+
+internal val RedAccent = Color(0xFFEF5350)
+internal val PinkAccent = Color(0xFFEC407A)
+internal val OrangeAccent = Color(0xFFFFA726)
+internal val YellowAccent = Color(0xFFFFCA28)
+internal val GreenAccent = Color(0xFF66BB6A)
+internal val MintAccent = Color(0xFF26A69A)
+internal val TealAccent = Color(0xFF29B6F6)
+internal val BlueAccent = Color(0xFF42A5F5)
+internal val IndigoAccent = Color(0xFF7E57C2)
+internal val PurpleAccent = Color(0xFFAB47BC)
+internal val PausedGray = Color(0xFF8E8E93)
+
+internal val ExpandedMaxWidth = 420.dp
+
+internal val SubtleGray: Color
+    @Composable get() = MaterialTheme.colorScheme.onSurfaceVariant
+internal val CardBg: Color
+    @Composable get() = MaterialTheme.colorScheme.surfaceBright
+internal val DarkCard: Color
+    @Composable get() = MaterialTheme.colorScheme.surfaceContainerHigh
+internal val OnCardText: Color
+    @Composable get() = MaterialTheme.colorScheme.onSurface
+internal val OnCardSecondary: Color
+    @Composable get() = MaterialTheme.colorScheme.onSurfaceVariant
+internal val ActionBg: Color
+    @Composable get() = MaterialTheme.colorScheme.primary
+internal val OnActionText: Color
+    @Composable get() = MaterialTheme.colorScheme.onPrimary
+internal val DestructiveBg: Color
+    @Composable get() = MaterialTheme.colorScheme.errorContainer
+internal val OnDestructiveText: Color
+    @Composable get() = MaterialTheme.colorScheme.onErrorContainer
+
+internal val CardBorderBrush: Brush
+    @Composable
+    get() =
+        Brush.verticalGradient(
+            colors =
+                listOf(
+                    MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f),
+                    MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.08f),
+                )
+        )
+
+internal val PillPrimary: TextStyle
+    @Composable get() = MaterialTheme.typography.labelSmall.copy(
+        fontWeight = FontWeight.SemiBold,
+        platformStyle = PlatformTextStyle(includeFontPadding = false),
+    )
+
+internal val PillAccent: TextStyle
+    @Composable get() = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.Bold)
+internal val PillMono: TextStyle
+    @Composable get() = MaterialTheme.typography.labelSmall.copy(
+        fontFamily = FontFamily.Monospace,
+        platformStyle = PlatformTextStyle(includeFontPadding = false),
+    )
+internal val TsMono: TextStyle
+    @Composable get() = MaterialTheme.typography.labelMedium.copy(fontFamily = FontFamily.Monospace)
+
+internal val ShapeIconLarge = RoundedCornerShape(20.dp)
+internal val ShapeIconMedium = RoundedCornerShape(16.dp)
+internal val ShapeAlbum = RoundedCornerShape(16.dp)
+internal val ShapeChip = RoundedCornerShape(percent = 50)
+internal val ShapeCompact = RoundedCornerShape(12.dp)
+
+internal fun accentColorFor(event: IslandEvent): Color = eventStyleFor(event).accent
+
+internal fun chipContentColorOn(background: Color): Color {
+    val luminance = ColorUtils.calculateLuminance(background.toArgb())
+    return if (luminance > 0.4) ChipContentDark else Color.White
+}
+
+internal fun darkenColor(color: Color, keep: Float = 0.35f): Color =
+    Color(
+        red = color.red * keep,
+        green = color.green * keep,
+        blue = color.blue * keep,
+        alpha = 1f,
+    )
+
+private const val DARK_THEME_MIN_L = 0.15
+private const val LIGHT_THEME_MAX_L = 0.4
+
+private fun ensureContrast(color: Color, isDark: Boolean): Color {
+    val lum = ColorUtils.calculateLuminance(color.toArgb())
+    if (isDark && lum >= DARK_THEME_MIN_L) return color
+    if (!isDark && lum <= LIGHT_THEME_MAX_L) return color
+    val hsl = FloatArray(3)
+    ColorUtils.colorToHSL(color.toArgb(), hsl)
+    if (isDark) {
+        hsl[2] = (hsl[2] + 0.15f).coerceAtMost(0.65f)
+    } else {
+        hsl[2] = (hsl[2] - 0.15f).coerceAtLeast(0.25f)
+    }
+    return Color(ColorUtils.HSLToColor(hsl))
+}
+
+internal data class IslandColorScheme(
+    val accent: Color,
+    val onAccent: Color,
+    val tonal: Color,
+    val surfaceTint: Color,
+)
+
+@Composable
+internal fun rememberIslandColors(event: IslandEvent): IslandColorScheme =
+    buildColorScheme(accentColorFor(event))
+
+@Composable
+internal fun rememberMediaColors(event: IslandEvent.Media): IslandColorScheme {
+    val raw = if (event.mediaColor != 0) Color(event.mediaColor) else PurpleAccent
+    return buildColorScheme(raw)
+}
+
+@Composable
+private fun buildColorScheme(raw: Color): IslandColorScheme {
+    val isDark = ColorUtils.calculateLuminance(
+        MaterialTheme.colorScheme.surface.toArgb()
+    ) < 0.5
+    val accent = if (!isDark) ensureContrast(raw) else raw
+    return IslandColorScheme(
+        accent = accent,
+        onAccent = chipContentColorOn(accent),
+        tonal = accent.copy(alpha = AlphaFaint),
+        surfaceTint = if (isDark) darkenColor(raw, keep = 0.25f) else accent.copy(alpha = 0.12f),
+    )
+}
+
+private fun ensureContrast(color: Color): Color {
+    val lum = ColorUtils.calculateLuminance(color.toArgb()).toFloat()
+    return if (lum > 0.5f) darkenColor(color, keep = 0.55f) else color
+}
+
+@Composable
+internal fun chipAccentColorFor(event: IslandEvent): Color {
+    if (event is IslandEvent.Media && event.mediaColor != 0) {
+        return darkenColor(Color(event.mediaColor))
+    }
+    if (event is IslandEvent.AppSwitch) {
+        val app = event.previousApp ?: event.recentApps.firstOrNull()
+        if (app?.appIcon != null) {
+            val color = rememberPaletteColor(app.appIcon!!)
+            if (color != null) return color
+        }
+    }
+    if (event is IslandEvent.Notification && event.appIcon != null) {
+        val isDark = isSystemInDarkTheme()
+        val color = rememberPaletteColor(event.appIcon!!)
+        if (color != null) return ensureContrast(color, isDark)
+    }
+    if (event is IslandEvent.AospChip) {
+        val ctx = LocalContext.current
+        return Color(event.active.colors.background(ctx).defaultColor)
+    }
+    return accentColorFor(event)
+}
+
+@Composable
+private fun rememberPaletteColor(drawable: Drawable): Color? {
+    val color by produceState<Color?>(null, drawable) {
+        
+        val bitmap = try {
+            withContext(Dispatchers.Main) { drawable.toBitmap(24, 24) }
+        } catch (_: Exception) { null }
+        value = bitmap?.let {
+            withContext(Dispatchers.Default) {
+                try {
+                    val palette = Palette.from(it).generate()
+                    val swatch =
+                        palette.darkVibrantSwatch
+                            ?: palette.vibrantSwatch
+                            ?: palette.darkMutedSwatch
+                            ?: palette.dominantSwatch
+                    swatch?.let { s -> Color(s.rgb) }
+                } catch (_: Exception) {
+                    null
+                }
+            }
+        }
+    }
+    return color
+}
+
+@Composable
+internal fun StatusChip(text: String, color: Color = SubtleGray) {
+    Box(
+        modifier =
+            Modifier.background(color.copy(alpha = AlphaSubtle), ShapeChip)
+                .padding(horizontal = SpaceXl, vertical = SpaceSm)
+    ) {
+        Text(text.uppercase(), color = color, style = MaterialTheme.typography.labelSmall)
+    }
+}
+
+@Composable
+internal fun CircleButton(
+    color: Color = ActionBg,
+    size: Dp = 48.dp,
+    onClick: () -> Unit,
+    content: @Composable () -> Unit,
+) {
+    Surface(
+        onClick = onClick,
+        modifier = Modifier.size(size),
+        shape = CircleShape,
+        color = color,
+    ) {
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size)) { content() }
+    }
+}
+
+@Composable
+internal fun ExpandedCardLayout(
+    accentColor: Color,
+    icon: @Composable () -> Unit,
+    iconSize: Dp = 44.dp,
+    iconBackground: Boolean = true,
+    title: @Composable ColumnScope.() -> Unit,
+    trailing: @Composable (() -> Unit)? = null,
+    actions: @Composable (ColumnScope.() -> Unit)? = null,
+) {
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(SpaceLg)) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeLg)
+                .background(accentColor.copy(alpha = AlphaFaint))
+                .padding(SpaceLg),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            if (iconBackground) {
+                Box(
+                    modifier = Modifier
+                        .size(iconSize)
+                        .clip(CircleShape)
+                        .background(accentColor.copy(alpha = AlphaSubtle)),
+                    contentAlignment = Alignment.Center,
+                ) { icon() }
+            } else {
+                Box(
+                    modifier = Modifier.size(iconSize),
+                    contentAlignment = Alignment.Center,
+                ) { icon() }
+            }
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(SpaceXs),
+            ) { title() }
+            trailing?.invoke()
+        }
+        actions?.invoke(this)
+    }
+}
+
+@Composable
+internal fun ActionChip(
+    label: String,
+    icon: ImageVector? = null,
+    color: Color = OnActionText,
+    bg: Color = ActionBg,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Surface(
+        onClick = onClick,
+        shape = ShapeChip,
+        color = bg,
+        modifier = modifier,
+    ) {
+        Row(
+            modifier = Modifier.height(SizeActionHeight).padding(horizontal = SpacePanel),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceMd, Alignment.CenterHorizontally),
+        ) {
+            if (icon != null) {
+                Icon(icon, null, tint = color, modifier = Modifier.size(SizeIconSm))
+            }
+            Text(label, color = color, style = MaterialTheme.typography.labelLarge, maxLines = 1)
+        }
+    }
+}
+
+@Composable
+internal fun ExpressivePillButton(
+    label: String,
+    icon: ImageVector? = null,
+    contentColor: Color,
+    backgroundColor: Color,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Surface(
+        onClick = onClick,
+        shape = RoundedCornerShape(percent = 50),
+        color = backgroundColor,
+        modifier = modifier,
+    ) {
+        Row(
+            modifier = Modifier.height(SizeActionHeight).padding(horizontal = SpacePanel),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+        ) {
+            if (icon != null) {
+                Icon(
+                    icon, null, tint = contentColor, modifier = Modifier.size(SizeIconSm),
+                )
+            }
+            Text(label, color = contentColor, style = MaterialTheme.typography.labelLarge)
+        }
+    }
+}
+
+internal data class MediaProgress(val progress: Float, val positionMs: Long)
+
+@Composable
+internal fun rememberMediaProgress(event: IslandEvent.Media): MediaProgress {
+    return MediaProgress(event.progress, event.position)
+}
+
+internal fun formatElapsedTime(ms: Long): String {
+    val secs = (ms / 1000).coerceAtLeast(0)
+    return "%02d:%02d".format(secs / 60, secs % 60)
+}
+
+internal fun formatCountdownSeconds(secs: Long): String {
+    val s = secs.coerceAtLeast(0)
+    return "%02d:%02d".format(s / 60, s % 60)
+}
+
+internal fun formatCountdownLong(ms: Long): String {
+    val secs = (ms / 1000).coerceAtLeast(0)
+    val mins = secs / 60
+    val hrs = mins / 60
+    return if (hrs > 0) "%02d:%02d:%02d".format(hrs, mins % 60, secs % 60)
+    else "%02d:%02d".format(mins, secs % 60)
+}
+
+internal fun formatStopwatch(ms: Long): String {
+    val totalSecs = (ms / 1000).coerceAtLeast(0)
+    val hrs = totalSecs / 3600
+    val mins = (totalSecs % 3600) / 60
+    val secs = totalSecs % 60
+    val tenths = ((ms % 1000) / 100).coerceIn(0, 9)
+    return if (hrs > 0) "%d:%02d:%02d.%d".format(hrs, mins, secs, tenths)
+    else "%d:%02d.%d".format(mins, secs, tenths)
+}
+
+internal fun formatTimeAgo(timestampMs: Long, res: android.content.res.Resources): String {
+    val diff = System.currentTimeMillis() - timestampMs
+    if (diff < 0) return ""
+    val secs = diff / 1000
+    val mins = secs / 60
+    val hrs = mins / 60
+    val days = hrs / 24
+    return when {
+        secs < 60 -> res.getString(R.string.ax_dynamic_bar_just_now)
+        mins < 60 -> res.getString(R.string.ax_dynamic_bar_mins_ago, mins.toInt())
+        hrs < 24 -> res.getString(R.string.ax_dynamic_bar_hours_ago, hrs.toInt())
+        days < 7 -> res.getString(R.string.ax_dynamic_bar_days_ago, days.toInt())
+        else -> res.getString(R.string.ax_dynamic_bar_weeks_ago, (days / 7).toInt())
+    }
+}
+
+@Composable
+internal fun Drawable.toScaledBitmap(sizeDp: Dp): ImageBitmap {
+    val px = with(LocalDensity.current) { sizeDp.roundToPx() }
+    return remember(this, px) { toBitmap(px, px).asImageBitmap() }
+}
+
+internal fun chipProgressFor(event: IslandEvent): Float? =
+    when (event) {
+        is IslandEvent.Media ->
+            if (event.duration > 0) (event.position.toFloat() / event.duration).coerceIn(0f, 1f)
+            else null
+        is IslandEvent.PromotedOngoing ->
+            if (event.progress >= 0f) event.progress.coerceIn(0f, 1f) else null
+        is IslandEvent.Notification ->
+            if (event.progress >= 0)
+                (event.progress.toFloat() / event.progressMax).coerceIn(0f, 1f)
+            else null
+        else -> null
+    }
+
+internal fun iconKeyFor(event: IslandEvent): Any =
+    when (event) {
+        is IslandEvent.Media -> event.albumArt?.hashCode() ?: "media_default"
+        is IslandEvent.Notification -> event.appIcon?.hashCode() ?: "notif_default"
+        is IslandEvent.AppSwitch -> {
+            val app = event.previousApp ?: event.recentApps.firstOrNull()
+            app?.appIcon?.hashCode() ?: "app_default"
+        }
+        else -> event::class.simpleName ?: "default"
+    }
+
+internal fun textKeyFor(event: IslandEvent): Any =
+    when (event) {
+        is IslandEvent.Media -> "${event.track}|${event.artist}"
+        is IslandEvent.Timer,
+        is IslandEvent.Stopwatch,
+        is IslandEvent.AudioRecording -> "tick_text"
+        else -> event.id
+    }
+
+internal fun resolveLabelIcon(label: String): ImageVector {
+    val lower = label.lowercase()
+    return when {
+        lower.contains("shuffle") -> Icons.Filled.Shuffle
+        lower.contains("repeat") -> Icons.Filled.Repeat
+        lower.contains("thumb") && lower.contains("up") -> Icons.Filled.ThumbUp
+        lower.contains("thumb") && lower.contains("down") -> Icons.Filled.ThumbDown
+        lower.contains("like") || lower.contains("love") || lower.contains("favorite") -> Icons.Filled.Favorite
+        else -> Icons.Filled.Shuffle
+    }
+}
+
+@Composable
+internal fun CustomActionIcon(
+    ca: IslandEvent.MediaCustomAction,
+    tint: Color,
+    modifier: Modifier = Modifier,
+) {
+    val appBitmap = ca.icon?.let { drawable ->
+        remember(drawable) {
+            try { drawable.toBitmap(48, 48).asImageBitmap() } catch (_: Exception) { null }
+        }
+    }
+    if (appBitmap != null) {
+        Icon(appBitmap, ca.label, tint = tint, modifier = modifier)
+    } else {
+        Icon(resolveLabelIcon(ca.label), ca.label, tint = tint, modifier = modifier)
+    }
+}
+
+internal fun PendingIntent.sendWithBal(context: Context, fillIntent: Intent? = null) {
+    val options = ActivityOptions.makeBasic()
+    options.setPendingIntentBackgroundActivityStartMode(
+        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
+    )
+    send(context, 0, fillIntent, null, null, null, options.toBundle())
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandEventMapper.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandEventMapper.kt
new file mode 100644
index 0000000000000..d7a74ff281882
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/IslandEventMapper.kt
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.shared
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Alarm
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.BatteryChargingFull
+import androidx.compose.material.icons.filled.Bluetooth
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.Fingerprint
+import androidx.compose.material.icons.filled.FlashlightOn
+import androidx.compose.material.icons.filled.Mic
+import androidx.compose.material.icons.filled.MusicNote
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.Timer
+import androidx.compose.material.icons.filled.Vibration
+import androidx.compose.material.icons.filled.VolumeOff
+import androidx.compose.material.icons.filled.VolumeUp
+import androidx.compose.material.icons.filled.VpnKey
+import androidx.compose.material.icons.filled.Wifi
+import android.media.AudioManager
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.res.R
+
+internal data class EventStyle(
+    val accent: Color,
+    val icon: ImageVector?,
+    val labelRes: Int,
+)
+
+internal fun eventStyleFor(event: IslandEvent): EventStyle = when (event) {
+    is IslandEvent.AudioRecording -> EventStyle(
+        accent = when (event.state) {
+            RecordingState.RECORDING -> RedAccent
+            RecordingState.PAUSED -> PausedGray
+            RecordingState.SAVED -> GreenAccent
+        },
+        icon = when (event.state) {
+            RecordingState.RECORDING -> Icons.Filled.Mic
+            RecordingState.PAUSED -> Icons.Filled.Pause
+            RecordingState.SAVED -> Icons.Filled.CheckCircle
+        },
+        labelRes = when (event.state) {
+            RecordingState.RECORDING -> R.string.ax_dynamic_bar_recording
+            RecordingState.PAUSED -> R.string.ax_dynamic_bar_paused
+            RecordingState.SAVED -> R.string.ax_dynamic_bar_saved
+        },
+    )
+    is IslandEvent.Media -> EventStyle(
+        accent = PurpleAccent,
+        icon = Icons.Filled.MusicNote,
+        labelRes = R.string.ax_dynamic_bar_music,
+    )
+    is IslandEvent.PromotedOngoing -> EventStyle(
+        accent = BlueAccent,
+        icon = null,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+    is IslandEvent.NowPlaying -> EventStyle(
+        accent = MintAccent,
+        icon = Icons.Filled.MusicNote,
+        labelRes = R.string.ax_dynamic_bar_now_playing,
+    )
+    is IslandEvent.Sports -> EventStyle(
+        accent = when (event.status) {
+            IslandEvent.GameStatus.LIVE, IslandEvent.GameStatus.HALFTIME -> GreenAccent
+            IslandEvent.GameStatus.PRE_GAME -> BlueAccent
+            IslandEvent.GameStatus.FINAL -> MintAccent
+        },
+        icon = null,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+    is IslandEvent.Bluetooth -> EventStyle(
+        accent = BlueAccent,
+        icon = Icons.Filled.Bluetooth,
+        labelRes = R.string.ax_dynamic_bar_connected,
+    )
+    is IslandEvent.Hotspot -> EventStyle(
+        accent = TealAccent,
+        icon = Icons.Filled.Wifi,
+        labelRes = R.string.ax_dynamic_bar_hotspot,
+    )
+    is IslandEvent.Charging -> EventStyle(
+        accent = GreenAccent,
+        icon = Icons.Filled.BatteryChargingFull,
+        labelRes = if (event.isWireless) R.string.ax_dynamic_bar_wireless_charging
+        else R.string.ax_dynamic_bar_charging,
+    )
+    is IslandEvent.Alarm -> EventStyle(
+        accent = OrangeAccent,
+        icon = Icons.Filled.Alarm,
+        labelRes = R.string.ax_dynamic_bar_alarm,
+    )
+    is IslandEvent.Timer -> EventStyle(
+        accent = BlueAccent,
+        icon = Icons.Filled.Timer,
+        labelRes = R.string.ax_dynamic_bar_timer,
+    )
+    is IslandEvent.Stopwatch -> EventStyle(
+        accent = MintAccent,
+        icon = Icons.Filled.AvTimer,
+        labelRes = R.string.ax_dynamic_bar_stopwatch,
+    )
+    is IslandEvent.RingerMode -> EventStyle(
+        accent = when (event.mode) {
+            AudioManager.RINGER_MODE_SILENT -> RedAccent
+            AudioManager.RINGER_MODE_VIBRATE -> OrangeAccent
+            else -> BlueAccent
+        },
+        icon = when (event.mode) {
+            AudioManager.RINGER_MODE_SILENT -> Icons.Filled.VolumeOff
+            AudioManager.RINGER_MODE_VIBRATE -> Icons.Filled.Vibration
+            else -> Icons.Filled.VolumeUp
+        },
+        labelRes = when (event.mode) {
+            AudioManager.RINGER_MODE_SILENT -> R.string.ax_dynamic_bar_silent
+            AudioManager.RINGER_MODE_VIBRATE -> R.string.ax_dynamic_bar_vibrate
+            else -> R.string.ax_dynamic_bar_ring
+        },
+    )
+    is IslandEvent.Vpn -> EventStyle(
+        accent = IndigoAccent,
+        icon = Icons.Filled.VpnKey,
+        labelRes = if (event.isBranded) R.string.ax_dynamic_bar_vpn_active
+        else R.string.ax_dynamic_bar_vpn_connected,
+    )
+    is IslandEvent.Clipboard -> EventStyle(
+        accent = IndigoAccent,
+        icon = Icons.Filled.ContentCopy,
+        labelRes = R.string.ax_dynamic_bar_copied,
+    )
+    is IslandEvent.Torch -> EventStyle(
+        accent = YellowAccent,
+        icon = Icons.Filled.FlashlightOn,
+        labelRes = R.string.ax_dynamic_bar_flashlight,
+    )
+    is IslandEvent.Notification -> EventStyle(
+        accent = BlueAccent,
+        icon = Icons.Filled.Notifications,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+    is IslandEvent.AppSwitch -> EventStyle(
+        accent = BlueAccent,
+        icon = null,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+    is IslandEvent.BiometricUnlock -> EventStyle(
+        accent = GreenAccent,
+        icon = Icons.Filled.Fingerprint,
+        labelRes = R.string.ax_dynamic_bar_unlocked,
+    )
+    is IslandEvent.KeyguardIndication -> EventStyle(
+        accent = when (event.indicationType) {
+            IslandEvent.KeyguardIndication.IndicationType.BIOMETRIC -> GreenAccent
+            IslandEvent.KeyguardIndication.IndicationType.ALIGNMENT -> OrangeAccent
+            else -> IndigoAccent
+        },
+        icon = null,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+    is IslandEvent.AospChip -> EventStyle(
+        accent = BlueAccent,
+        icon = Icons.Filled.Notifications,
+        labelRes = R.string.ax_dynamic_bar_on,
+    )
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/NotificationActionType.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/NotificationActionType.kt
new file mode 100644
index 0000000000000..2aa73009847fe
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/shared/NotificationActionType.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.shared
+
+import android.app.Notification
+import android.content.Context
+
+enum class NotificationActionType {
+    STOP,
+    PAUSE,
+    RESUME,
+    LAP,
+    RESET,
+    DELETE,
+    ADD_MINUTE,
+    SNOOZE,
+    DISMISS,
+    OTHER,
+}
+
+fun Notification.Action.classify(context: Context, packageName: String): NotificationActionType {
+    val intentAction = try { actionIntent?.intent?.action } catch (_: Exception) { null }
+    when (intentAction) {
+        "STOP" -> return NotificationActionType.STOP
+        "PAUSE" -> return NotificationActionType.PAUSE
+        "RESUME" -> return NotificationActionType.RESUME
+        "com.android.deskclock.action.PAUSE_TIMER",
+        "com.android.deskclock.action.PAUSE_STOPWATCH" -> return NotificationActionType.PAUSE
+        "com.android.deskclock.action.START_TIMER",
+        "com.android.deskclock.action.START_STOPWATCH" -> return NotificationActionType.RESUME
+        "com.android.deskclock.action.RESET_TIMER",
+        "com.android.deskclock.action.RESET_STOPWATCH" -> return NotificationActionType.RESET
+        "com.android.deskclock.action.LAP_STOPWATCH" -> return NotificationActionType.LAP
+        "com.android.deskclock.action.ADD_MINUTE_TIMER" -> return NotificationActionType.ADD_MINUTE
+        "com.android.deskclock.ALARM_SNOOZE" -> return NotificationActionType.SNOOZE
+        "com.android.deskclock.ALARM_DISMISS" -> return NotificationActionType.DISMISS
+    }
+
+    val iconResName: String? = run {
+        val icon = getIcon() ?: return@run null
+        val resId = try { icon.resId } catch (_: Exception) { 0 }
+        if (resId == 0) return@run null
+        try {
+            context.packageManager.getResourcesForApplication(packageName)
+                .getResourceEntryName(resId).lowercase()
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    when {
+        iconResName == null -> Unit
+        iconResName.contains("stop") -> return NotificationActionType.STOP
+        iconResName.contains("pause") -> return NotificationActionType.PAUSE
+        iconResName.contains("play") -> return NotificationActionType.RESUME
+        iconResName.contains("delete") || iconResName.contains("trash") -> return NotificationActionType.DELETE
+        iconResName.contains("reset") -> return NotificationActionType.RESET
+        iconResName.contains("lap") -> return NotificationActionType.LAP
+    }
+
+    val label = title?.toString()?.lowercase() ?: ""
+    return when {
+        label.contains("stop") -> NotificationActionType.STOP
+        label.contains("delete") -> NotificationActionType.DELETE
+        label.contains("pause") -> NotificationActionType.PAUSE
+        label.contains("resume") || label.contains("play") -> NotificationActionType.RESUME
+        label.contains("lap") -> NotificationActionType.LAP
+        label.contains("reset") -> NotificationActionType.RESET
+        label.contains("snooze") -> NotificationActionType.SNOOZE
+        label.contains("dismiss") -> NotificationActionType.DISMISS
+        else -> NotificationActionType.OTHER
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarChipViewModel.kt
new file mode 100644
index 0000000000000..9e08eb9eac83c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarChipViewModel.kt
@@ -0,0 +1,193 @@
+package com.android.systemui.axdynamicbar.ui
+
+import com.android.systemui.animation.Expandable
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarInteractor
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel
+import com.android.systemui.biometrics.AuthController
+import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.statusbar.KeyguardIndicationController
+import com.android.systemui.statusbar.pipeline.battery.domain.interactor.BatteryInteractor
+import com.android.systemui.statusbar.policy.BatteryController
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+data class AxDynamicBarChipState(
+    val event: IslandEvent,
+    val eventCount: Int,
+    val pinnedIndex: Int,
+    val allEvents: List<IslandEvent>,
+)
+
+data class KeyguardBatteryInfo(
+    val level: Int,
+    val isCharging: Boolean,
+    val isPowerSave: Boolean,
+    val isWireless: Boolean,
+    val timeRemaining: String?,
+)
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@SysUISingleton
+class AxDynamicBarChipViewModel
+@Inject
+constructor(
+    @Application private val applicationScope: CoroutineScope,
+    val interactor: AxDynamicBarInteractor,
+    batteryInteractor: BatteryInteractor,
+    private val batteryController: BatteryController,
+    authController: AuthController,
+    udfpsOverlayInteractor: UdfpsOverlayInteractor,
+    keyguardIndicationController: KeyguardIndicationController,
+    val keyguardExpansion: AxDynamicBarKeyguardExpansion,
+    val statusBarExpansion: AxDynamicBarStatusBarExpansion,
+) {
+    val isLowUdfps: StateFlow<Boolean> =
+        udfpsOverlayInteractor.udfpsOverlayParams
+            .map { params ->
+                if (!authController.isUdfpsSupported) return@map false
+                val sensorBottom = params.sensorBounds.bottom
+                val displayHeight = params.naturalDisplayHeight
+                if (displayHeight <= 0) return@map false
+                sensorBottom > displayHeight * LOW_UDFPS_THRESHOLD
+            }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Eagerly, false)
+
+    val chipState: StateFlow<AxDynamicBarChipState?> =
+        interactor.uiState
+            .map { uiState ->
+                if (!uiState.shouldShow) return@map null
+                val topEvent = uiState.topEvent ?: return@map null
+                AxDynamicBarChipState(
+                    event = topEvent,
+                    eventCount = uiState.activeEvents.size,
+                    pinnedIndex = uiState.pinnedEventIndex,
+                    allEvents = uiState.events,
+                )
+            }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Lazily, null)
+
+    val isEnabled: StateFlow<Boolean> = interactor.settings.isEnabled
+    val isKeyguardEnabled: StateFlow<Boolean> = interactor.settings.isKeyguardEnabled
+    val keyguardBatteryChipMode: StateFlow<Int> = interactor.settings.keyguardBatteryChipMode
+    val isKeyguardMusicPillEnabled: StateFlow<Boolean> = interactor.settings.isKeyguardMusicPillEnabled
+    val mediaUseWaveform: StateFlow<Boolean> = interactor.mediaUseWaveform
+
+    val keyguardBatteryInfo: StateFlow<KeyguardBatteryInfo> =
+        combine(
+            batteryInteractor.level,
+            batteryInteractor.isCharging,
+            batteryInteractor.powerSave,
+            batteryInteractor.batteryTimeRemainingEstimate,
+        ) { level, charging, powerSave, timeRemaining ->
+            KeyguardBatteryInfo(
+                level = level ?: 0,
+                isCharging = charging,
+                isPowerSave = powerSave,
+                isWireless = batteryController.isPluggedInWireless,
+                timeRemaining = timeRemaining,
+            )
+        }.stateIn(
+            applicationScope,
+            SharingStarted.Lazily,
+            KeyguardBatteryInfo(0, false, false, false, null),
+        )
+
+    // Re-compute charging string only when battery state changes. Polling this while idle is costly
+    // because KeyguardIndicationController formats through Resources on the main thread.
+    val batteryString: StateFlow<String> =
+        keyguardBatteryInfo
+            .map {
+                if (it.isCharging) {
+                    formatChargingString(keyguardIndicationController.powerChargingString)
+                } else {
+                    ""
+                }
+            }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Lazily, "")
+
+    val isOnKeyguard: StateFlow<Boolean> = interactor.isOnKeyguard
+
+    val isKeyguardFadingAway: StateFlow<Boolean> = interactor.isKeyguardFadingAway
+
+    val isBouncerShowing: StateFlow<Boolean> = interactor.isBouncerShowing
+
+    private val _keyguardCarrierText = MutableStateFlow("")
+    val keyguardCarrierText: StateFlow<String> = _keyguardCarrierText.asStateFlow()
+
+    fun updateKeyguardCarrierText(text: String) {
+        _keyguardCarrierText.value = text
+    }
+
+    private val _chipCenterXFraction = MutableStateFlow(0.5f)
+    val chipCenterXFraction: StateFlow<Float> = _chipCenterXFraction.asStateFlow()
+
+    fun updateChipCenterX(fraction: Float) {
+        _chipCenterXFraction.value = fraction
+    }
+
+    val isExpanded: StateFlow<Boolean> = statusBarExpansion.isExpanded
+
+    val isKeyguardExpanded: StateFlow<Boolean> = keyguardExpansion.isExpanded
+
+    fun cycleNext() = interactor.cycleNext()
+
+    fun cyclePrev() = interactor.cyclePrev()
+
+    fun dismissEvent(event: IslandEvent) = interactor.dismissEvent(event)
+
+    fun togglePlayPause() = interactor.togglePlayPause()
+
+    fun skipNext() = interactor.skipNext()
+
+    fun skipPrev() = interactor.skipPrev()
+
+    fun toggleTorch() = interactor.toggleTorch()
+
+    fun launchNotificationFromKeyguard(event: IslandEvent.Notification) {
+        interactor.launchNotificationDismissingKeyguard(event)
+    }
+
+    fun handleAospChipTap(event: IslandEvent.AospChip, expandable: Expandable): Boolean {
+        val active = event.active
+        return when (val behavior = active.clickBehavior) {
+            is OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification -> {
+                behavior.onClick()
+                true
+            }
+            is OngoingActivityChipModel.ClickBehavior.HideHeadsUpNotification -> {
+                behavior.onClick()
+                true
+            }
+            is OngoingActivityChipModel.ClickBehavior.ExpandAction -> {
+                behavior.onClick(expandable)
+                true
+            }
+            is OngoingActivityChipModel.ClickBehavior.None -> false
+        }
+    }
+
+    companion object {
+        private const val LOW_UDFPS_THRESHOLD = 0.93f
+    }
+
+    private fun formatChargingString(text: String?): String {
+        val cleaned = text?.trim()
+        return if (cleaned.isNullOrEmpty()) "" else cleaned
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarExpandedPanel.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarExpandedPanel.kt
new file mode 100644
index 0000000000000..2d2ac26242d9a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarExpandedPanel.kt
@@ -0,0 +1,352 @@
+package com.android.systemui.axdynamicbar.ui
+
+import android.content.Context
+import android.graphics.PixelFormat
+import android.view.Gravity
+import android.view.WindowManager
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.BiasAlignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.changedToDownIgnoreConsumed
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.dp
+
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.OnBackPressedDispatcherOwner
+import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.shared.recents.utilities.Utilities
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.ui.compose.ExpandedIslandContent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Main
+import android.os.Handler
+import android.os.Looper
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import android.view.WindowInsets
+import androidx.compose.ui.input.pointer.PointerEvent
+
+private const val EXIT_ANIM_DURATION = 300L
+
+@SysUISingleton
+class AxDynamicBarExpandedPanel
+@Inject
+constructor(
+    @Application private val context: Context,
+    private val windowManager: WindowManager,
+    @Application private val applicationScope: CoroutineScope,
+    @Main private val mainHandler: Handler,
+    private val viewModel: AxDynamicBarChipViewModel,
+) {
+    private var overlayView: ComposeView? = null
+    private var panelLifecycleOwner: PanelLifecycleOwner? = null
+    private var hideOverlayJob: Job? = null
+
+    fun init() {
+        viewModel.interactor.onCollapseRequested = { viewModel.statusBarExpansion.collapse() }
+        viewModel.interactor.onFocusableRequested = { focusable -> setOverlayFocusable(focusable) }
+
+        val needsOverlay =
+            combine(
+                viewModel.isExpanded,
+                viewModel.isOnKeyguard,
+            ) { expanded, onKeyguard ->
+                !onKeyguard && expanded
+            }
+
+        needsOverlay
+            .onEach { needed ->
+                if (needed) {
+                    hideOverlayJob?.cancel()
+                    hideOverlayJob = null
+                    showOverlay()
+                } else {
+                    
+                    hideOverlayJob?.cancel()
+                    hideOverlayJob =
+                        applicationScope.launch {
+                            delay(400)
+                            hideOverlay()
+                        }
+                }
+            }
+            .launchIn(applicationScope)
+
+        viewModel.isExpanded
+            .onEach { expanded ->
+                updateOverlay(expanded)
+            }
+            .launchIn(applicationScope)
+    }
+
+    private fun ensureMainThread(action: () -> Unit) {
+        if (Looper.myLooper() == Looper.getMainLooper()) action()
+        else mainHandler.post(action)
+    }
+
+    private fun showOverlay() {
+        ensureMainThread { showOverlayInternal() }
+    }
+
+    private fun showOverlayInternal() {
+        if (overlayView != null) return
+
+        val lifecycleOwner = PanelLifecycleOwner()
+        lifecycleOwner.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+        lifecycleOwner.handleLifecycleEvent(Lifecycle.Event.ON_START)
+        lifecycleOwner.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+
+        val windowMetrics = windowManager.currentWindowMetrics
+        val statusBarTop = windowMetrics.windowInsets
+            .getInsets(WindowInsets.Type.statusBars())
+            .top
+        val hasCutout = windowMetrics.windowInsets
+            .getInsets(WindowInsets.Type.displayCutout())
+            .top > 0
+
+        val view =
+            ComposeView(context).apply {
+                setContent { PlatformTheme { OverlayContent(viewModel, statusBarTop, hasCutout) } }
+            }
+
+        view.setViewTreeLifecycleOwner(lifecycleOwner)
+        view.setViewTreeSavedStateRegistryOwner(lifecycleOwner)
+        view.setViewTreeOnBackPressedDispatcherOwner(lifecycleOwner)
+        panelLifecycleOwner = lifecycleOwner
+
+        val isCurrentlyExpanded = viewModel.isExpanded.value
+        val flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+            WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR or
+            WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+            if (isCurrentlyExpanded) 0
+            else WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+
+        val params =
+            WindowManager.LayoutParams(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                if (isCurrentlyExpanded) WindowManager.LayoutParams.MATCH_PARENT
+                else WindowManager.LayoutParams.WRAP_CONTENT,
+                WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,
+                flags,
+                PixelFormat.TRANSLUCENT,
+            )
+        params.gravity = Gravity.TOP or Gravity.FILL_HORIZONTAL
+        params.title = "AxDynamicBarExpanded"
+
+        windowManager.addView(view, params)
+        overlayView = view
+    }
+
+    private fun hideOverlay() {
+        ensureMainThread { hideOverlayInternal() }
+    }
+
+    private fun hideOverlayInternal() {
+        shrinkRunnable?.let { mainHandler.removeCallbacks(it) }
+        shrinkRunnable = null
+        overlayView?.let { view ->
+            panelLifecycleOwner?.apply {
+                handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+                handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+                handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            }
+            windowManager.removeViewImmediate(view)
+        }
+        overlayView = null
+        panelLifecycleOwner = null
+    }
+
+    private var shrinkRunnable: Runnable? = null
+
+    private fun updateOverlay(expanded: Boolean) = ensureMainThread {
+        shrinkRunnable?.let { mainHandler.removeCallbacks(it) }
+        shrinkRunnable = null
+        val view = overlayView ?: return@ensureMainThread
+        val params = view.layoutParams as? WindowManager.LayoutParams ?: return@ensureMainThread
+        if (expanded) {
+            params.flags = params.flags and WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE.inv()
+            params.height = WindowManager.LayoutParams.MATCH_PARENT
+            windowManager.updateViewLayout(view, params)
+        } else {
+            params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            windowManager.updateViewLayout(view, params)
+            val runnable = Runnable {
+                val v = overlayView ?: return@Runnable
+                val p = v.layoutParams as? WindowManager.LayoutParams ?: return@Runnable
+                p.height = WindowManager.LayoutParams.WRAP_CONTENT
+                windowManager.updateViewLayout(v, p)
+            }
+            shrinkRunnable = runnable
+            mainHandler.postDelayed(runnable, EXIT_ANIM_DURATION)
+        }
+    }
+
+    private fun setOverlayFocusable(focusable: Boolean) = ensureMainThread {
+        val view = overlayView ?: return@ensureMainThread
+        val params = view.layoutParams as? WindowManager.LayoutParams ?: return@ensureMainThread
+        if (focusable) {
+            params.flags = params.flags and WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE.inv()
+        } else {
+            params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+        }
+        windowManager.updateViewLayout(view, params)
+    }
+}
+
+@Composable
+private fun OverlayContent(viewModel: AxDynamicBarChipViewModel, statusBarHeightPx: Int, hasCutout: Boolean) {
+    val density = LocalDensity.current
+    val isLargeScreen = Utilities.isLargeScreen(LocalContext.current)
+
+    val largeScreenExtra = if (isLargeScreen) 4.dp else 0.dp
+    val baseTopPad = 4.dp
+    val topPad = baseTopPad + if (hasCutout) largeScreenExtra
+        else with(density) { statusBarHeightPx.toDp() } + largeScreenExtra
+    val chipState by viewModel.chipState.collectAsStateWithLifecycle()
+    val isExpanded by viewModel.isExpanded.collectAsStateWithLifecycle()
+    val chipX by viewModel.chipCenterXFraction.collectAsStateWithLifecycle()
+
+    val expandedVisible = remember { MutableTransitionState(false) }
+
+    LaunchedEffect(isExpanded) {
+        expandedVisible.targetState = isExpanded
+    }
+
+    LaunchedEffect(chipState) {
+        val filtered = chipState?.allEvents?.filter { it !is IslandEvent.AospChip }
+        if (filtered.isNullOrEmpty() && isExpanded) {
+            viewModel.statusBarExpansion.collapse()
+        }
+    }
+
+    val originX = chipX
+    val origin = TransformOrigin(originX, 0f)
+    
+    val chipAlignment = BiasAlignment(
+        horizontalBias = originX * 2f - 1f,  
+        verticalBias = -1f,                    
+    )
+
+    AnimatedVisibility(
+        visibleState = expandedVisible,
+        enter = fadeIn(tween(250)) + scaleIn(
+            animationSpec = tween(350),
+            initialScale = 0.4f,
+            transformOrigin = origin,
+        ),
+        exit = fadeOut(tween(200)) + scaleOut(
+            animationSpec = tween(250),
+            targetScale = 0.4f,
+            transformOrigin = origin,
+        ),
+    ) {
+        
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .pointerInput(Unit) {
+                    val slop = viewConfiguration.touchSlop
+                    awaitEachGesture {
+                        
+                        var ev: PointerEvent
+                        do {
+                            ev = awaitPointerEvent(PointerEventPass.Final)
+                        } while (!ev.changes.any { it.changedToDownIgnoreConsumed() })
+                        val downPos = ev.changes[0].position
+                        
+                        val downConsumed = ev.changes[0].isConsumed
+                        
+                        while (true) {
+                            val event = awaitPointerEvent(PointerEventPass.Final)
+                            val change = event.changes.firstOrNull() ?: break
+                            if (!change.pressed) {
+                                if (!downConsumed && !change.isConsumed) {
+                                    val dx = change.position.x - downPos.x
+                                    val dy = change.position.y - downPos.y
+                                    if (dx * dx + dy * dy <= slop * slop) {
+                                        viewModel.statusBarExpansion.collapse()
+                                    }
+                                }
+                                break
+                            }
+                        }
+                    }
+                }
+                .padding(top = topPad),
+            contentAlignment = chipAlignment,
+        ) {
+            chipState?.let { state ->
+                val filtered = state.allEvents.filter { it !is IslandEvent.AospChip }
+                if (filtered.isEmpty()) return@let
+                ExpandedIslandContent(
+                    events = filtered,
+                    interactor = viewModel.interactor,
+                    onCollapse = { viewModel.statusBarExpansion.collapse() },
+                    pinnedEventId = state.event.id,
+                    hapticsViewModelFactory = viewModel.interactor.sliderHapticsViewModelFactory,
+                )
+            }
+        }
+    }
+}
+
+private class PanelLifecycleOwner : LifecycleOwner, SavedStateRegistryOwner,
+    OnBackPressedDispatcherOwner {
+    private val lifecycleRegistry = LifecycleRegistry(this)
+    private val savedStateRegistryController = SavedStateRegistryController.create(this)
+    private val backDispatcher = OnBackPressedDispatcher()
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
+
+    override val savedStateRegistry
+        get() = savedStateRegistryController.savedStateRegistry
+
+    override val onBackPressedDispatcher: OnBackPressedDispatcher
+        get() = backDispatcher
+
+    init {
+        savedStateRegistryController.performRestore(null)
+    }
+
+    fun handleLifecycleEvent(event: Lifecycle.Event) {
+        lifecycleRegistry.handleLifecycleEvent(event)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarKeyguardExpansion.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarKeyguardExpansion.kt
new file mode 100644
index 0000000000000..97edd7efe308e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarKeyguardExpansion.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui
+
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarInteractor
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+
+@SysUISingleton
+class AxDynamicBarKeyguardExpansion
+@Inject
+constructor(
+    @Application applicationScope: CoroutineScope,
+    private val interactor: AxDynamicBarInteractor,
+) {
+    private val _intent = MutableStateFlow(false)
+
+    private val hasChip =
+        interactor.uiState
+            .map { it.shouldShow && it.topEvent != null }
+            .distinctUntilChanged()
+
+    val canShow: StateFlow<Boolean> = run {
+        val contextAndDoze =
+            combine(
+                interactor.isOnKeyguard,
+                interactor.isDozing,
+                interactor.dozeAmount.map { it > 0f }.distinctUntilChanged(),
+                interactor.qsExpansion.map { it > 0f }.distinctUntilChanged(),
+                interactor.isPanelExpanded,
+            ) { onKg, dozing, dozeAmt, qs, panelExp ->
+                onKg && !dozing && !dozeAmt && !qs && !panelExp
+            }
+        val shadeAndBouncer =
+            combine(
+                interactor.isBouncerShowing,
+                interactor.legacyShadeExpansion.map { it >= 0.95f }.distinctUntilChanged(),
+                hasChip,
+            ) { bouncer, shadeFull, chip ->
+                !bouncer && shadeFull && chip
+            }
+        combine(contextAndDoze, shadeAndBouncer) { a, b -> a && b }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Eagerly, false)
+    }
+
+    val isExpanded: StateFlow<Boolean> =
+        combine(_intent, canShow) { intent, show -> intent && show }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Lazily, false)
+
+    private val _collapseSettled = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    val collapseSettled: SharedFlow<Unit> = _collapseSettled.asSharedFlow()
+
+    fun notifyCollapseSettled() {
+        _collapseSettled.tryEmit(Unit)
+    }
+
+    init {
+        interactor.isOnKeyguard
+            .onEach { if (!it) collapse() }
+            .launchIn(applicationScope)
+    }
+
+    fun expand() {
+        if (interactor.uiState.value.topEvent == null) return
+        _intent.value = true
+    }
+
+    fun collapse() {
+        _intent.value = false
+    }
+
+    fun toggle() {
+        if (_intent.value) collapse() else expand()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarManager.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarManager.kt
new file mode 100644
index 0000000000000..810fe1b3f8cbc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarManager.kt
@@ -0,0 +1,20 @@
+package com.android.systemui.axdynamicbar.ui
+
+import com.android.systemui.CoreStartable
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+@SysUISingleton
+class AxDynamicBarManager
+@Inject
+constructor(
+    private val viewModel: AxDynamicBarChipViewModel,
+    private val expandedPanel: AxDynamicBarExpandedPanel,
+) : CoreStartable {
+
+    override fun start() {
+        viewModel.interactor.init()
+        expandedPanel.init()
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarStatusBarExpansion.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarStatusBarExpansion.kt
new file mode 100644
index 0000000000000..bdbf456be553c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/AxDynamicBarStatusBarExpansion.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui
+
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarInteractor
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+
+@SysUISingleton
+class AxDynamicBarStatusBarExpansion
+@Inject
+constructor(
+    @Application applicationScope: CoroutineScope,
+    private val interactor: AxDynamicBarInteractor,
+) {
+    private val _intent = MutableStateFlow(false)
+
+    val isExpanded: StateFlow<Boolean> =
+        combine(_intent, interactor.isOnKeyguard) { intent, onKg -> intent && !onKg }
+            .distinctUntilChanged()
+            .stateIn(applicationScope, SharingStarted.Lazily, false)
+
+    init {
+        interactor.isOnKeyguard
+            .onEach { if (it) collapse() }
+            .launchIn(applicationScope)
+
+        interactor.uiState
+            .map { state ->
+                state.events.isEmpty() || state.events.all { it is IslandEvent.AospChip }
+            }
+            .distinctUntilChanged()
+            .onEach { shouldCollapse ->
+                if (shouldCollapse) collapse()
+            }
+            .launchIn(applicationScope)
+
+        combine(
+            interactor.qsExpansion.map { it > 0f }.distinctUntilChanged(),
+            interactor.legacyShadeExpansion.map { it > 0f }.distinctUntilChanged(),
+            interactor.isPanelExpanded,
+        ) { qs, shade, panel -> qs || shade || panel }
+            .distinctUntilChanged()
+            .onEach { if (it) collapse() }
+            .launchIn(applicationScope)
+    }
+
+    fun expand() {
+        val state = interactor.uiState.value
+        if (state.events.isEmpty() || state.events.all { it is IslandEvent.AospChip }) return
+        _intent.value = true
+    }
+
+    fun collapse() {
+        _intent.value = false
+    }
+
+    fun toggle() {
+        if (_intent.value) collapse() else expand()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarChip.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarChip.kt
new file mode 100644
index 0000000000000..e878a465aa22a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarChip.kt
@@ -0,0 +1,399 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.lerp
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.res.dimensionResource
+import com.android.compose.animation.Expandable
+import com.android.compose.animation.rememberExpandableController
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import android.graphics.drawable.Drawable
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.ui.res.stringResource
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.AlphaIconBg
+import com.android.systemui.axdynamicbar.shared.AlphaSecondary
+import com.android.systemui.axdynamicbar.shared.AlphaTertiary
+import com.android.systemui.axdynamicbar.shared.PillPrimary
+import com.android.systemui.axdynamicbar.shared.ShapeXl
+import com.android.systemui.axdynamicbar.shared.ShapeXs
+import com.android.systemui.axdynamicbar.shared.SizeBadge
+import com.android.systemui.axdynamicbar.shared.SpaceMd
+import com.android.systemui.axdynamicbar.shared.SpaceSm
+import com.android.systemui.axdynamicbar.shared.SpaceXs
+import com.android.systemui.axdynamicbar.shared.TsBadge
+import com.android.systemui.axdynamicbar.shared.chipAccentColorFor
+import com.android.systemui.axdynamicbar.shared.chipContentColorOn
+import com.android.systemui.axdynamicbar.shared.chipProgressFor
+import com.android.systemui.axdynamicbar.shared.textKeyFor
+import com.android.systemui.axdynamicbar.shared.toScaledBitmap
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel
+import com.android.systemui.res.R
+import kotlin.math.abs
+
+private val ChipShape = ShapeXl
+private val ChipHeight = 24.dp
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun AxDynamicBarChip(
+    viewModel: AxDynamicBarChipViewModel,
+    modifier: Modifier = Modifier,
+    ignoreKeyguard: Boolean = false,
+) {
+    val state by viewModel.chipState.collectAsStateWithLifecycle()
+    val isOnKeyguard by viewModel.isOnKeyguard.collectAsStateWithLifecycle()
+    val keyguardCarrier by viewModel.keyguardCarrierText.collectAsStateWithLifecycle()
+    
+    val carrierName = if (isOnKeyguard && ignoreKeyguard) keyguardCarrier.takeIf { it.isNotBlank() } else null
+    val chipTextMaxWidth = dimensionResource(R.dimen.ongoing_activity_chip_max_text_width)
+    val screenWidthPx = with(LocalDensity.current) {
+        LocalConfiguration.current.screenWidthDp.dp.toPx()
+    }
+
+    val touchSlop = LocalViewConfiguration.current.touchSlop
+    val expandableController = rememberExpandableController(color = Color.Transparent, shape = ChipShape)
+
+    val motionScheme = MaterialTheme.motionScheme
+
+    AnimatedVisibility(
+        visible = state != null && (ignoreKeyguard || !isOnKeyguard),
+        enter = fadeIn(motionScheme.defaultEffectsSpec()) + scaleIn(initialScale = 0.8f, animationSpec = motionScheme.defaultSpatialSpec()),
+        exit = fadeOut(motionScheme.fastEffectsSpec()) + scaleOut(targetScale = 0.8f, animationSpec = motionScheme.fastSpatialSpec()),
+        modifier = modifier
+            .padding(start = 4.dp, end = 2.dp)
+            .widthIn(min = 25.dp, max = 90.dp)
+            .pointerInput(viewModel) {
+                awaitEachGesture {
+                    val down = awaitFirstDown(pass = PointerEventPass.Initial)
+                    
+                    val startX = down.position.x
+                    val startY = down.position.y
+                    var dragging = false
+                    var totalDx = 0f
+                    var decided = false 
+                    while (true) {
+                        val event = awaitPointerEvent(PointerEventPass.Initial)
+                        val change = event.changes.firstOrNull() ?: break
+                        if (!change.pressed) {
+                            
+                            if (dragging) {
+                                change.consume()
+                                if (totalDx > 0) viewModel.cyclePrev()
+                                else viewModel.cycleNext()
+                            } else if (!decided) {
+
+                                change.consume()
+                                val current = state?.event
+                                if (current is IslandEvent.AospChip) {
+                                    if (!viewModel.handleAospChipTap(current, expandableController.expandable)) {
+                                        viewModel.statusBarExpansion.toggle()
+                                    }
+                                } else {
+                                    viewModel.statusBarExpansion.toggle()
+                                }
+                            }
+                            
+                            break
+                        }
+                        val dx = change.position.x - startX
+                        val dy = change.position.y - startY
+                        if (!decided && (abs(dx) > touchSlop || abs(dy) > touchSlop)) {
+                            if (abs(dx) >= abs(dy)) {
+                                
+                                decided = true
+                                dragging = true
+                                totalDx = dx
+                                change.consume()
+                            } else {
+                                
+                                decided = true
+                                break
+                            }
+                        } else if (dragging) {
+                            totalDx = dx
+                            change.consume()
+                        }
+                    }
+                }
+            }
+            .onGloballyPositioned { coords ->
+                val bounds = coords.boundsInWindow()
+                val centerX = (bounds.left + bounds.right) / 2f
+                if (screenWidthPx > 0f) {
+                    viewModel.updateChipCenterX(centerX / screenWidthPx)
+                }
+            },
+    ) {
+        state?.let { chipState ->
+            val displayEvent = chipState.event
+            val isAlert = false
+
+            Expandable(
+                controller = expandableController,
+                onClick = null,
+                defaultMinSize = false,
+            ) { _ ->
+                AnimatedContent(
+                    targetState = chipDisplayKey(displayEvent, isAlert),
+                    transitionSpec = {
+                        ((
+                            fadeIn(motionScheme.defaultEffectsSpec()) +
+                                scaleIn(
+                                    initialScale = 0.92f,
+                                    animationSpec = motionScheme.defaultSpatialSpec(),
+                                )
+                            ) togetherWith (
+                            fadeOut(motionScheme.fastEffectsSpec()) +
+                                scaleOut(
+                                    targetScale = 0.92f,
+                                    animationSpec = motionScheme.fastSpatialSpec(),
+                                )
+                            ))
+                            .using(sizeTransform = null)
+                    },
+                    label = "chip_event",
+                ) {
+                    val event = displayEvent
+                    val rawAccent = chipAccentColorFor(event)
+                    val accent by animateColorAsState(rawAccent, MaterialTheme.motionScheme.fastEffectsSpec(), label = "accent")
+                    val contentColor by animateColorAsState(
+                        chipContentColorOn(rawAccent), MaterialTheme.motionScheme.fastEffectsSpec(), label = "content",
+                    )
+                    val progress = chipProgressFor(event)
+
+                Box(
+                    modifier = Modifier.fillMaxHeight(),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Row(
+                        modifier =
+                            Modifier.height(ChipHeight)
+                                .widthIn(max = 100.dp)
+                                .clip(ChipShape)
+                                .background(accent)
+                                .then(
+                                    if (progress != null) {
+                                        val trackColor = lerp(accent, contentColor, 0.2f)
+                                        val fillColor = lerp(accent, contentColor, 0.6f)
+                                        Modifier.drawWithContent {
+                                            drawContent()
+                                            val barH = 2.dp.toPx()
+                                            val y = size.height - barH
+                                            drawRect(
+                                                trackColor,
+                                                topLeft = Offset(0f, y),
+                                                size = Size(size.width, barH),
+                                            )
+                                            drawRect(
+                                                fillColor,
+                                                topLeft = Offset(0f, y),
+                                                size = Size(size.width * progress, barH),
+                                            )
+                                        }
+                                    } else Modifier
+                                )
+                                .padding(start = SpaceSm, end = SpaceMd),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        if (carrierName != null) {
+                            Text(
+                                text = carrierName,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaSecondary),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.widthIn(max = 56.dp),
+                            )
+                            Text(
+                                text = " · ",
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaTertiary),
+                            )
+                        }
+                        if (isAlert && event is IslandEvent.Notification) {
+                            val notif = event
+                            AnimatedContent(
+                                targetState = notif.sbn.key,
+                                transitionSpec = {
+                                    (fadeIn(motionScheme.defaultEffectsSpec()) togetherWith fadeOut(motionScheme.fastEffectsSpec()))
+                                        .using(sizeTransform = null)
+                                },
+                                label = "alert_content",
+                            ) {
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    notif.appIcon?.let { icon ->
+                                        Image(
+                                            bitmap = icon.toScaledBitmap(16.dp),
+                                            contentDescription = null,
+                                            modifier =
+                                                Modifier.size(16.dp)
+                                                    .clip(ShapeXs),
+                                            contentScale = ContentScale.Crop,
+                                        )
+                                        Spacer(Modifier.width(SpaceXs))
+                                    }
+                                    Text(
+                                        text = notif.appName ?: "",
+                                        style = PillPrimary,
+                                        color = contentColor,
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        modifier = Modifier.widthIn(max = chipTextMaxWidth).basicMarquee(iterations = 1),
+                                    )
+                                }
+                            }
+                        } else if (event is IslandEvent.Sports && event.team2Name.isNotEmpty()) {
+                            val sport = event
+                            StatusBarSportsTeamBadge(sport.team1Name, sport.team1Icon, contentColor)
+                            Spacer(Modifier.width(SpaceXs))
+                            Text(
+                                if (sport.score1.isNotEmpty()) "${sport.score1} - ${sport.score2}"
+                                    else stringResource(R.string.ax_dynamic_bar_sports_vs),
+                                style = PillPrimary,
+                                color = contentColor,
+                                maxLines = 1,
+                            )
+                            Spacer(Modifier.width(SpaceXs))
+                            StatusBarSportsTeamBadge(sport.team2Name, sport.team2Icon, contentColor)
+                        } else {
+                            AnimatedContent(
+                                targetState = chipIconKey(event),
+                                transitionSpec = {
+                                    (fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                                        fadeOut(motionScheme.fastEffectsSpec()))
+                                        .using(sizeTransform = null)
+                                },
+                                label = "chip_icon",
+                            ) {
+                                PillEventIcon(event, tint = contentColor, animated = false)
+                            }
+                            Spacer(Modifier.width(SpaceXs))
+                            AnimatedContent(
+                                targetState = textKeyFor(event),
+                                transitionSpec = {
+                                    (fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                                        fadeOut(motionScheme.fastEffectsSpec()))
+                                        .using(sizeTransform = null)
+                                },
+                                label = "chip_text",
+                                modifier = Modifier.weight(1f, fill = false).widthIn(max = chipTextMaxWidth),
+                            ) {
+                                PillEventText(
+                                    event,
+                                    Modifier.widthIn(max = chipTextMaxWidth),
+                                    overrideColor = contentColor,
+                                )
+                            }
+                            if (chipState.eventCount > 1) {
+                                Spacer(Modifier.width(SpaceXs))
+                                Box(
+                                    contentAlignment = Alignment.Center,
+                                    modifier = Modifier
+                                        .height(SizeBadge)
+                                        .widthIn(min = SizeBadge)
+                                        .background(
+                                            lerp(accent, contentColor, 0.3f),
+                                            RoundedCornerShape(SizeBadge / 2),
+                                        )
+                                        .padding(horizontal = 3.dp),
+                                ) {
+                                    Text(
+                                        text = "${chipState.eventCount}",
+                                        style = TsBadge,
+                                        color = contentColor,
+                                        maxLines = 1,
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            }
+        }
+    }
+}
+
+@Composable
+private fun StatusBarSportsTeamBadge(name: String, icon: Drawable?, contentColor: Color) {
+    val badgeSize = 16.dp
+    if (icon != null) {
+        Image(
+            bitmap = icon.toScaledBitmap(badgeSize),
+            contentDescription = name,
+            modifier = Modifier.size(badgeSize).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    } else {
+        Box(
+            modifier = Modifier.size(badgeSize).clip(CircleShape)
+                .background(contentColor.copy(alpha = AlphaIconBg)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                name.take(2).uppercase(),
+                style = TsBadge,
+                color = contentColor,
+            )
+        }
+    }
+}
+
+
+private fun chipDisplayKey(event: IslandEvent, isAlert: Boolean): String =
+    if (isAlert) "alert:${event.id}" else event.id
+
+private fun chipIconKey(event: IslandEvent): Any =
+    when (event) {
+        is IslandEvent.AppSwitch -> {
+            val app = event.previousApp ?: event.recentApps.firstOrNull()
+            app?.taskId ?: app?.packageName ?: event.id
+        }
+        is IslandEvent.Media -> event.albumArt ?: event.packageName
+        is IslandEvent.Notification -> event.sbn.key
+        else -> event.id
+    }
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarKeyguardChip.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarKeyguardChip.kt
new file mode 100644
index 0000000000000..38eb64409c789
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarKeyguardChip.kt
@@ -0,0 +1,1057 @@
+@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.core.MutableTransitionState
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.FastOutSlowInEasing
+import kotlin.math.abs
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.SkipNext
+import androidx.compose.material.icons.filled.SkipPrevious
+import androidx.compose.material.icons.filled.Stop
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.lerp
+import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.graphics.drawscope.withTransform
+import androidx.compose.ui.graphics.drawscope.clipPath
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel
+import com.android.systemui.axdynamicbar.ui.KeyguardBatteryInfo
+import com.android.systemui.res.R
+import kotlin.math.abs
+import kotlinx.coroutines.delay
+import android.content.Context
+import android.graphics.drawable.Drawable
+import java.util.Calendar
+
+private val ChipHeight = 36.dp
+private val ChipShape = ShapeChip
+private val ChipIconSize = ChipHeight - SpaceLg
+private val ActionSize = SpacePanel
+private val ActionIconSize = SizeBadge
+private val BatteryIconSize = ChipHeight - SpaceXxl
+private val CountBadgeHeight = ChipHeight / 2
+
+@Composable
+private fun rememberChargingParts(batteryString: String): List<String> {
+    return remember(batteryString) {
+        batteryString.split("\n", limit = 3).map { it.trim() }.filter { it.isNotEmpty() }
+    }
+}
+
+@Composable
+fun AxDynamicBarKeyguardChip(
+    viewModel: AxDynamicBarChipViewModel,
+    modifier: Modifier = Modifier,
+) {
+    val state by viewModel.chipState.collectAsStateWithLifecycle()
+    val isOnKeyguard by viewModel.isOnKeyguard.collectAsStateWithLifecycle()
+    val isEnabled by viewModel.isEnabled.collectAsStateWithLifecycle()
+    val isKeyguardEnabled by viewModel.isKeyguardEnabled.collectAsStateWithLifecycle()
+    val isKeyguardMusicPillEnabled by viewModel.isKeyguardMusicPillEnabled.collectAsStateWithLifecycle()
+    val keyguardBatteryChipMode by viewModel.keyguardBatteryChipMode.collectAsStateWithLifecycle()
+    val batteryInfo by viewModel.keyguardBatteryInfo.collectAsStateWithLifecycle()
+    val isKeyguardExpanded by viewModel.isKeyguardExpanded.collectAsStateWithLifecycle()
+    val touchSlop = LocalViewConfiguration.current.touchSlop
+    val batteryString by viewModel.batteryString.collectAsStateWithLifecycle()
+
+    val motionScheme = MaterialTheme.motionScheme
+
+    Box(modifier = modifier) {
+
+        val expandedVisibleState = remember { MutableTransitionState(false) }
+        expandedVisibleState.targetState = isKeyguardExpanded && state != null
+        LaunchedEffect(expandedVisibleState.isIdle, expandedVisibleState.currentState) {
+            if (expandedVisibleState.isIdle && !expandedVisibleState.currentState) {
+                viewModel.keyguardExpansion.notifyCollapseSettled()
+            }
+        }
+        AnimatedVisibility(
+            visibleState = expandedVisibleState,
+            enter = fadeIn(motionScheme.defaultEffectsSpec()),
+            exit = fadeOut(tween(durationMillis = 250)),
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.Center),
+        ) {
+            state?.let {
+                KeyguardExpandedContent(
+                    event = it.event,
+                    allEvents = it.allEvents,
+                    interactor = viewModel.interactor,
+                    onCollapse = { viewModel.keyguardExpansion.collapse() },
+                    hapticsViewModelFactory = viewModel.interactor.sliderHapticsViewModelFactory,
+                )
+            }
+        }
+
+        AnimatedVisibility(
+            visible = isOnKeyguard && isEnabled && isKeyguardEnabled && !isKeyguardExpanded,
+            enter = fadeIn(tween(durationMillis = 200, delayMillis = 300)) +
+                scaleIn(
+                    initialScale = 0.9f,
+                    animationSpec = tween(durationMillis = 200, delayMillis = 300),
+                ),
+            exit = fadeOut(motionScheme.fastEffectsSpec()) + scaleOut(targetScale = 0.9f, animationSpec = motionScheme.fastSpatialSpec()),
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .pointerInput(viewModel) {
+                    awaitEachGesture {
+                        val down = awaitFirstDown(pass = PointerEventPass.Initial)
+                        val startX = down.position.x
+                        var dragging = false
+                        var totalDx = 0f
+                        while (true) {
+                            val event = awaitPointerEvent(PointerEventPass.Initial)
+                            val change = event.changes.firstOrNull() ?: break
+                            if (!change.pressed) {
+                                if (dragging) {
+                                    change.consume()
+                                    if (totalDx > 0) viewModel.cyclePrev()
+                                    else viewModel.cycleNext()
+                                }
+                                break
+                            }
+                            val dx = change.position.x - startX
+                            if (!dragging && abs(dx) > touchSlop) {
+                                dragging = true
+                            }
+                            if (dragging) {
+                                totalDx = dx
+                                change.consume()
+                            }
+                        }
+                    }
+                },
+        ) {
+            val chipState = state
+            if (chipState != null) {
+                val rawEvent = chipState.event
+                val displayEvent: com.android.systemui.axdynamicbar.model.IslandEvent? =
+                    when {
+                        isKeyguardMusicPillEnabled -> rawEvent
+                        rawEvent is com.android.systemui.axdynamicbar.model.IslandEvent.Media -> {
+                            chipState.allEvents.firstOrNull { it !is com.android.systemui.axdynamicbar.model.IslandEvent.Media }
+                        }
+                        else -> rawEvent
+                    }
+
+                if (displayEvent == null) {
+                    KeyguardBatteryChip(
+                        batteryInfo,
+                        keyguardBatteryChipMode,
+                        batteryString,
+                        modifier,
+                    )
+                    return@AnimatedVisibility
+                }
+
+                AnimatedContent(
+                    targetState = displayEvent,
+                    transitionSpec = {
+                        (fadeIn(motionScheme.defaultEffectsSpec()) + scaleIn(
+                            initialScale = 0.95f,
+                            animationSpec = motionScheme.defaultSpatialSpec(),
+                        )) togetherWith (fadeOut(motionScheme.fastEffectsSpec()) + scaleOut(
+                            targetScale = 0.95f,
+                            animationSpec = motionScheme.fastSpatialSpec(),
+                        )) using SizeTransform(clip = false, sizeAnimationSpec = { _, _ -> motionScheme.defaultSpatialSpec() })
+                    },
+                    contentKey = { it::class.simpleName },
+                    label = "keyguard_chip_event",
+                ) { event ->
+                    val rawAccent = chipAccentColorFor(event)
+                    val accent by animateColorAsState(
+                        rawAccent,
+                        MaterialTheme.motionScheme.fastEffectsSpec(),
+                        label = "kg_accent",
+                    )
+                    val contentColor by animateColorAsState(
+                        chipContentColorOn(rawAccent),
+                        MaterialTheme.motionScheme.fastEffectsSpec(),
+                        label = "kg_content",
+                    )
+                    val rawProgress = chipProgressFor(event)
+                    val progressTarget = rawProgress ?: 0f
+                    val progressAnim = remember { Animatable(progressTarget) }
+                    LaunchedEffect(progressTarget) {
+                        if (abs(progressTarget - progressAnim.value) > 0.05f) {
+                            progressAnim.animateTo(progressTarget, tween(300, easing = FastOutSlowInEasing))
+                        } else {
+                            progressAnim.snapTo(progressTarget)
+                        }
+                    }
+                    val progress = if (rawProgress != null) progressAnim.value else null
+
+                    KeyguardChipBody(
+                        event = event,
+                        accent = accent,
+                        contentColor = contentColor,
+                        progress = progress,
+                        eventCount = chipState.eventCount,
+                        viewModel = viewModel,
+                        batteryString = batteryString,
+                    )
+                }
+            } else {
+                KeyguardBatteryChip(
+                    batteryInfo,
+                    keyguardBatteryChipMode,
+                    batteryString,
+                    modifier,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun KeyguardChipBody(
+    event: IslandEvent,
+    accent: Color,
+    contentColor: Color,
+    progress: Float?,
+    eventCount: Int,
+    viewModel: AxDynamicBarChipViewModel,
+    batteryString: String = "",
+) {
+    val context = LocalContext.current
+    val motionScheme = MaterialTheme.motionScheme
+
+    val parts = rememberChargingParts(batteryString)
+    val isMultiLineCharging = event is IslandEvent.Charging && parts.size >= 2
+    val dynamicHeight = if (isMultiLineCharging) 48.dp else ChipHeight
+
+    Box(contentAlignment = Alignment.Center) {
+        Row(
+            modifier = Modifier
+                .height(dynamicHeight)
+                .widthIn(min = 48.dp, max = 260.dp)
+                .clip(ChipShape)
+                .background(accent)
+                .animateContentSize(motionScheme.defaultSpatialSpec())
+                .then(
+                    if (progress != null) {
+                        val trackColor = lerp(accent, contentColor, 0.2f)
+                        val fillColor = lerp(accent, contentColor, 0.6f)
+                        Modifier.drawWithContent {
+                            drawContent()
+                            val barH = SizeStrokeWidth.toPx()
+                            val y = size.height - barH
+                            drawRect(trackColor, Offset(0f, y), Size(size.width, barH))
+                            drawRect(fillColor, Offset(0f, y), Size(size.width * progress, barH))
+                        }
+                    } else Modifier
+                )
+                .clickable {
+                    when (event) {
+                        is IslandEvent.Notification ->
+                            viewModel.launchNotificationFromKeyguard(event)
+
+                        is IslandEvent.KeyguardIndication,
+                        is IslandEvent.AppSwitch -> { }
+                        else -> viewModel.keyguardExpansion.toggle()
+                    }
+                }
+                .padding(start = SpaceSm, end = SpaceMd),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            if (event is IslandEvent.Media) {
+                AnimatedContent(
+                    targetState = event.albumArt,
+                    transitionSpec = {
+                        (fadeIn(motionScheme.defaultEffectsSpec()) +
+                            scaleIn(initialScale = 0.85f, animationSpec = motionScheme.defaultSpatialSpec())) togetherWith
+                            (fadeOut(motionScheme.fastEffectsSpec()) +
+                                scaleOut(targetScale = 0.85f, animationSpec = motionScheme.fastSpatialSpec())) using
+                            SizeTransform(clip = false)
+                    },
+                    contentKey = { it?.hashCode() ?: 0 },
+                    label = "kg_media_icon",
+                ) { art ->
+                    if (art != null) {
+                        Image(
+                            bitmap = art.toScaledBitmap(ChipIconSize),
+                            contentDescription = null,
+                            modifier = Modifier
+                                .size(ChipIconSize)
+                                .clip(ShapeXs),
+                            contentScale = ContentScale.Crop,
+                        )
+                    } else {
+                        PillEventIcon(event, tint = contentColor)
+                    }
+                }
+                Spacer(Modifier.width(SpaceXs))
+                AnimatedContent(
+                    targetState = event,
+                    transitionSpec = {
+                        (fadeIn(motionScheme.defaultEffectsSpec()) +
+                            scaleIn(initialScale = 0.85f, animationSpec = motionScheme.defaultSpatialSpec())) togetherWith
+                            (fadeOut(motionScheme.fastEffectsSpec()) +
+                                scaleOut(targetScale = 0.85f, animationSpec = motionScheme.fastSpatialSpec())) using
+                            SizeTransform(clip = false, sizeAnimationSpec = { _, _ -> motionScheme.defaultSpatialSpec() })
+                    },
+                    contentKey = { "${it.track}|${it.artist}" },
+                    label = "kg_media_text",
+                    modifier = Modifier.weight(1f, fill = false),
+                ) { ev ->
+                    if (ev.artist.isNotBlank()) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            Text(
+                                ev.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_music) },
+                                style = PillPrimary,
+                                color = contentColor,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.widthIn(max = 90.dp).basicMarquee(iterations = 1),
+                            )
+                            Text(
+                                " · ",
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaHint),
+                            )
+                            Text(
+                                ev.artist,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaSecondary),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.widthIn(max = 60.dp),
+                            )
+                        }
+                    } else {
+                        MarqueeText(ev.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_music) }, contentColor, Modifier)
+                    }
+                }
+                Spacer(Modifier.width(SpaceXs))
+                ActionButton(
+                    icon = ActionIcon.SKIP_PREV,
+                    color = contentColor,
+                    bgColor = lerp(accent, contentColor, AlphaSubtle),
+                    onClick = { viewModel.skipPrev() },
+                    size = ActionSize,
+                    iconSize = ActionIconSize,
+                )
+                Spacer(Modifier.width(SpaceXxs))
+                Surface(
+                    onClick = { viewModel.togglePlayPause() },
+                    modifier = Modifier.size(ActionSize),
+                    shape = CircleShape,
+                    color = lerp(accent, contentColor, AlphaSubtle),
+                ) {
+                    Box(contentAlignment = Alignment.Center, modifier = Modifier.size(ActionSize)) {
+                        Icon(
+                            if (event.isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                            contentDescription = stringResource(
+                                if (event.isPlaying) R.string.ax_dynamic_bar_pause
+                                else R.string.ax_dynamic_bar_play,
+                            ),
+                            tint = contentColor,
+                            modifier = Modifier.size(ActionIconSize),
+                        )
+                    }
+                }
+                Spacer(Modifier.width(SpaceXxs))
+                ActionButton(
+                    icon = ActionIcon.SKIP_NEXT,
+                    color = contentColor,
+                    bgColor = lerp(accent, contentColor, AlphaSubtle),
+                    onClick = { viewModel.skipNext() },
+                    size = ActionSize,
+                    iconSize = ActionIconSize,
+                )
+            } else if (event is IslandEvent.Sports && event.team2Name.isNotEmpty()) {
+                SportsChipTeamBadge(event.team1Name, event.team1Icon, contentColor)
+                Spacer(Modifier.width(SpaceXs))
+                Text(
+                    if (event.score1.isNotEmpty()) "${event.score1} - ${event.score2}"
+                        else stringResource(R.string.ax_dynamic_bar_sports_vs),
+                    style = PillPrimary,
+                    color = contentColor,
+                    maxLines = 1,
+                )
+                Spacer(Modifier.width(SpaceXs))
+                SportsChipTeamBadge(event.team2Name, event.team2Icon, contentColor)
+            } else {
+                AnimatedContent(
+                    targetState = event,
+                    transitionSpec = {
+                        (fadeIn(motionScheme.defaultEffectsSpec()) +
+                            scaleIn(initialScale = 0.85f, animationSpec = motionScheme.defaultSpatialSpec())) togetherWith
+                            (fadeOut(motionScheme.fastEffectsSpec()) +
+                                scaleOut(targetScale = 0.85f, animationSpec = motionScheme.fastSpatialSpec())) using
+                            SizeTransform(clip = false, sizeAnimationSpec = { _, _ -> motionScheme.defaultSpatialSpec() })
+                    },
+                    contentKey = { iconKeyFor(it) },
+                    label = "kg_chip_icon",
+                ) { ev ->
+                    PillEventIcon(ev, tint = contentColor)
+                }
+                Spacer(Modifier.width(SpaceXs))
+                AnimatedContent(
+                    targetState = event,
+                    transitionSpec = {
+                        (fadeIn(motionScheme.defaultEffectsSpec()) +
+                            scaleIn(initialScale = 0.85f, animationSpec = motionScheme.defaultSpatialSpec())) togetherWith
+                            (fadeOut(motionScheme.fastEffectsSpec()) +
+                                scaleOut(targetScale = 0.85f, animationSpec = motionScheme.fastSpatialSpec())) using
+                            SizeTransform(clip = false, sizeAnimationSpec = { _, _ -> motionScheme.defaultSpatialSpec() })
+                    },
+                    contentKey = { textKeyFor(it) },
+                    label = "kg_chip_text",
+                    modifier = Modifier.weight(1f, fill = false),
+                ) { ev ->
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        KeyguardPrimaryText(ev, contentColor, Modifier.weight(1f, fill = false), batteryString)
+                        val secondary = secondaryTextFor(ev)
+                        if (secondary != null) {
+                            Text(
+                                " · ",
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaTertiary),
+                            )
+                            Text(
+                                secondary,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = contentColor.copy(alpha = AlphaSecondary),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                modifier = Modifier.widthIn(max = 80.dp),
+                            )
+                        }
+                    }
+                }
+            }
+
+            if (event !is IslandEvent.Media) {
+                val actionsCtx = LocalContext.current
+                val actions = actionsFor(event, actionsCtx)
+                if (actions.isNotEmpty()) {
+                    Spacer(Modifier.width(SpaceXs))
+                    actions.forEach { action ->
+                        Spacer(Modifier.width(SpaceXxs))
+                        ActionButton(
+                            icon = action.icon,
+                            color = contentColor,
+                            bgColor = lerp(accent, contentColor, AlphaSubtle),
+                            onClick = { action.perform(viewModel, event, context) },
+                            size = ActionSize,
+                            iconSize = ActionIconSize,
+                        )
+                    }
+                }
+            }
+
+            if (eventCount > 1) {
+                Spacer(Modifier.width(SpaceXs))
+                Box(
+                    contentAlignment = Alignment.Center,
+                    modifier = Modifier
+                        .height(CountBadgeHeight)
+                        .widthIn(min = CountBadgeHeight)
+                        .background(lerp(accent, contentColor, AlphaDisabled), ShapeChip)
+                        .padding(horizontal = SpaceXxs),
+                ) {
+                    Text(
+                        "$eventCount",
+                        style = TsBadge,
+                        color = contentColor,
+                        maxLines = 1,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun KeyguardBatteryChip(
+    info: KeyguardBatteryInfo,
+    keyguardBatteryChipMode: Int,
+    batteryString: String,
+    modifier: Modifier,
+) {
+    if (keyguardBatteryChipMode <= 0) return
+
+    if (keyguardBatteryChipMode == 1 && !info.isCharging) return
+
+    val accent = when {
+        info.isCharging -> BatteryChargingColor
+        info.isPowerSave -> BatteryPowerSaveColor
+        else -> BatteryNeutralColor
+    }
+    val contentColor = chipContentColorOn(accent)
+
+    val parts = rememberChargingParts(batteryString)
+    val isMultiLine = info.isCharging && parts.size >= 2
+    val dynamicHeight = if (isMultiLine) 48.dp else ChipHeight
+
+    Box(contentAlignment = Alignment.Center) {
+        Row(
+            modifier = modifier
+                .height(dynamicHeight)
+                .clip(ChipShape)
+                .background(accent)
+                .widthIn(min = 48.dp, max = 260.dp)
+                .padding(horizontal = SpaceMd)
+                .animateContentSize(MaterialTheme.motionScheme.defaultSpatialSpec()),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            
+            if (info.isCharging) {
+                AnimatedChargingBoltIcon(contentColor, BatteryIconSize)
+            } else {
+                AnimatedBatteryFillIcon(info.level, contentColor, BatteryIconSize)
+            }
+            Spacer(Modifier.width(SpaceXs))
+            if (info.isCharging) {
+                if (isMultiLine) {
+                    Column(
+                        modifier = Modifier.weight(1f, fill = false),
+                        verticalArrangement = Arrangement.Center
+                    ) {
+                        Text(
+                            parts[0],
+                            style = PillPrimary,
+                            color = contentColor,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                        Text(
+                            parts[1],
+                            style = PillPrimary.copy(fontSize = 10.sp),
+                            color = contentColor.copy(alpha = AlphaSecondary),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                } else {
+                    Text(
+                        if (parts.isNotEmpty()) parts[0] else batteryString,
+                        style = PillPrimary,
+                        color = contentColor.copy(alpha = AlphaSecondary),
+                        maxLines = 1,
+                        overflow = TextOverflow.Clip,
+                        modifier = Modifier.basicMarquee(),
+                    )
+                }
+                return
+            }
+            Text(
+                "${info.level}%",
+                style = PillPrimary,
+                color = contentColor,
+                maxLines = 1,
+            )
+
+            val secondaryLabel = when {
+                info.isCharging && info.isWireless -> stringResource(R.string.ax_dynamic_bar_wireless)
+                info.isCharging -> stringResource(R.string.ax_dynamic_bar_charging)
+                info.isPowerSave -> stringResource(R.string.ax_dynamic_bar_saver)
+                else -> null
+            }
+            if (secondaryLabel != null) {
+                Text(
+                    " · ",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = contentColor.copy(alpha = AlphaTertiary),
+                )
+                Text(
+                    secondaryLabel,
+                    style = MaterialTheme.typography.labelSmall,
+                    color = contentColor.copy(alpha = AlphaSecondary),
+                    maxLines = 1,
+                )
+            }
+
+            val timeRemaining = info.timeRemaining
+            if (timeRemaining != null) {
+                Text(
+                    " · ",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = contentColor.copy(alpha = AlphaTertiary),
+                )
+                Text(
+                    timeRemaining,
+                    style = MaterialTheme.typography.labelSmall,
+                    color = contentColor.copy(alpha = AlphaSecondary),
+                    maxLines = 1,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AnimatedChargingBoltIcon(color: Color, iconSize: Dp = BatteryIconSize) {
+    val transition = rememberInfiniteTransition(label = "kg_bolt")
+    val glow by transition.animateFloat(
+        initialValue = 0.5f,
+        targetValue = 1f,
+        animationSpec = infiniteRepeatable(
+            tween(800, easing = FastOutSlowInEasing),
+            RepeatMode.Reverse,
+        ),
+        label = "kg_bolt_glow",
+    )
+    val boltPath = remember { Path() }
+    Canvas(modifier = Modifier.size(iconSize)) {
+        val w = size.width
+        val h = size.height
+        boltPath.rewind()
+        boltPath.moveTo(w * 0.55f, h * 0.05f)
+        boltPath.lineTo(w * 0.25f, h * 0.50f)
+        boltPath.lineTo(w * 0.45f, h * 0.50f)
+        boltPath.lineTo(w * 0.40f, h * 0.95f)
+        boltPath.lineTo(w * 0.75f, h * 0.42f)
+        boltPath.lineTo(w * 0.55f, h * 0.42f)
+        boltPath.close()
+        drawPath(boltPath, color.copy(alpha = glow))
+    }
+}
+
+@Composable
+private fun AnimatedBatteryFillIcon(level: Int, color: Color, iconSize: Dp = BatteryIconSize) {
+    val fillFraction by animateFloatAsState(
+        targetValue = (level / 100f).coerceIn(0f, 1f),
+        animationSpec = MaterialTheme.motionScheme.defaultSpatialSpec(),
+        label = "kg_battery_fill",
+    )
+    Canvas(modifier = Modifier.size(iconSize * 1.6f, iconSize)) {
+        val w = size.width
+        val h = size.height
+        val cornerRadius = h * 0.18f
+
+        val bodyW = w * 0.88f
+        val bodyH = h * 0.62f
+        val bodyX = 0f
+        val bodyY = (h - bodyH) / 2f
+
+        val nubW = w * 0.07f
+        val nubH = bodyH * 0.38f
+        val nubX = bodyW
+        val nubY = bodyY + (bodyH - nubH) / 2f
+        val nubRadius = nubW * 0.45f
+
+        val inset = h * 0.05f
+        val innerRadius = (cornerRadius - inset).coerceAtLeast(2f)
+
+        drawRoundRect(
+            color = color.copy(alpha = 0.75f),
+            topLeft = Offset(nubX, nubY),
+            size = Size(nubW, nubH),
+            cornerRadius = androidx.compose.ui.geometry.CornerRadius(nubRadius, nubRadius),
+        )
+
+        drawRoundRect(
+            color = color.copy(alpha = 0.35f),
+            topLeft = Offset(bodyX, bodyY),
+            size = Size(bodyW, bodyH),
+            cornerRadius = androidx.compose.ui.geometry.CornerRadius(cornerRadius, cornerRadius),
+            style = androidx.compose.ui.graphics.drawscope.Stroke(width = h * 0.09f),
+        )
+
+        drawRoundRect(
+            color = color.copy(alpha = 0.12f),
+            topLeft = Offset(bodyX + inset, bodyY + inset),
+            size = Size(bodyW - inset * 2, bodyH - inset * 2),
+            cornerRadius = androidx.compose.ui.geometry.CornerRadius(innerRadius, innerRadius),
+            style = androidx.compose.ui.graphics.drawscope.Stroke(width = h * 0.03f),
+        )
+
+        if (fillFraction > 0f) {
+            val fillPad = h * 0.10f
+            val fillAreaX = bodyX + fillPad
+            val fillAreaY = bodyY + fillPad
+            val fillAreaW = bodyW - fillPad * 2
+            val fillAreaH = bodyH - fillPad * 2
+            val fillRadius = (cornerRadius - fillPad).coerceAtLeast(2f)
+
+            val clipPath = Path().apply {
+                addRoundRect(
+                    RoundRect(
+                        left = fillAreaX,
+                        top = fillAreaY,
+                        right = fillAreaX + fillAreaW,
+                        bottom = fillAreaY + fillAreaH,
+                        radiusX = fillRadius,
+                        radiusY = fillRadius,
+                    )
+                )
+            }
+
+            withTransform({ clipPath(clipPath) }) {
+                drawRect(
+                    color = color,
+                    topLeft = Offset(fillAreaX, fillAreaY),
+                    size = Size(fillAreaW * fillFraction, fillAreaH),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun KeyguardPrimaryText(event: IslandEvent, color: Color, modifier: Modifier, batteryString: String = "") {
+    when (event) {
+        is IslandEvent.AudioRecording -> when (event.state) {
+            RecordingState.RECORDING -> ElapsedTimeText(
+                event.startTimeMs, color, modifier, event.pausedDurationMs,
+            )
+            RecordingState.PAUSED -> MarqueeText(stringResource(R.string.ax_dynamic_bar_paused), color, modifier)
+            RecordingState.SAVED -> MarqueeText(stringResource(R.string.ax_dynamic_bar_saved), color, modifier)
+        }
+        is IslandEvent.Media -> MarqueeText(event.track, color, modifier)
+        is IslandEvent.Timer -> {
+            if (event.endTimeMs > 0L) CountdownText(event, color, modifier)
+            else MarqueeText(event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_timer) }, color, modifier)
+        }
+        is IslandEvent.Stopwatch -> StopwatchTimeText(event, color, modifier)
+        is IslandEvent.Notification -> MarqueeText(event.title ?: event.appName, color, modifier)
+        is IslandEvent.Charging -> {
+            val parts = rememberChargingParts(batteryString)
+            if (parts.size >= 2) {
+                Column(modifier = modifier, verticalArrangement = Arrangement.Center) {
+                    Text(
+                        parts[0],
+                        style = PillPrimary,
+                        color = color,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    Text(
+                        parts[1],
+                        style = PillPrimary.copy(fontSize = 10.sp),
+                        color = color.copy(alpha = AlphaSecondary),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            } else {
+                MarqueeText(if (parts.isNotEmpty()) parts[0] else "${event.level}%", color, modifier)
+            }
+        }
+        is IslandEvent.Bluetooth -> MarqueeText(event.deviceName.take(12), color, modifier)
+        is IslandEvent.Hotspot -> {
+            val hotspotLabel = stringResource(R.string.ax_dynamic_bar_hotspot)
+            MarqueeText(
+                if (event.numDevices > 0) "$hotspotLabel · ${event.numDevices}" else hotspotLabel,
+                color, modifier,
+            )
+        }
+        is IslandEvent.Alarm -> MarqueeText(event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_alarm) }, color, modifier)
+        is IslandEvent.Torch -> MarqueeText(
+            if (event.supportsLevel) "${(event.level.toFloat() / event.maxLevel * 100).toInt()}%"
+            else stringResource(R.string.ax_dynamic_bar_flashlight),
+            color, modifier,
+        )
+        is IslandEvent.RingerMode -> MarqueeText(event.label, color, modifier)
+        is IslandEvent.Vpn -> MarqueeText(stringResource(R.string.ax_dynamic_bar_vpn_active), color, modifier)
+        is IslandEvent.Clipboard -> MarqueeText(
+            event.preview.ifEmpty { stringResource(R.string.ax_dynamic_bar_copied) }, color, modifier,
+        )
+        is IslandEvent.BiometricUnlock -> MarqueeText(stringResource(R.string.ax_dynamic_bar_unlocked), color, modifier)
+        is IslandEvent.AppSwitch -> MarqueeText(stringResource(R.string.ax_dynamic_bar_recents), color, modifier)
+        is IslandEvent.PromotedOngoing -> MarqueeText(
+            event.shortText.ifEmpty { event.title.ifEmpty { event.appName } }, color, modifier,
+        )
+        is IslandEvent.Sports -> MarqueeText(
+            "${event.score1}-${event.score2}", color, modifier,
+        )
+        is IslandEvent.NowPlaying -> MarqueeText(
+            "${event.songTitle} · ${event.artist}".trimEnd(' ', '·', ' '), color, modifier,
+        )
+        is IslandEvent.KeyguardIndication -> MarqueeText(event.text, color, modifier)
+        is IslandEvent.AospChip -> {
+            val text = (event.active.content as? OngoingActivityChipModel.Content.Text)?.text
+            if (!text.isNullOrEmpty()) MarqueeText(text, color, modifier)
+        }
+    }
+}
+
+@Composable
+private fun secondaryTextFor(event: IslandEvent): String? = when (event) {
+    is IslandEvent.Media -> event.artist.takeIf { it.isNotBlank() }
+    is IslandEvent.AudioRecording -> event.appName.takeIf { it.isNotBlank() }
+    is IslandEvent.Timer -> event.label.takeIf { it.isNotBlank() }
+    is IslandEvent.Stopwatch -> event.label.takeIf { it.isNotBlank() }
+    is IslandEvent.Charging -> event.timeRemaining
+    is IslandEvent.Bluetooth -> if (event.batteryLevel >= 0) "${event.batteryLevel}%" else null
+    is IslandEvent.Hotspot -> if (event.numDevices > 0) stringResource(R.string.ax_dynamic_bar_hotspot_devices, event.numDevices) else null
+    is IslandEvent.Alarm -> {
+        if (event.triggerTimeMs > 0) {
+            val cal = Calendar.getInstance().apply { timeInMillis = event.triggerTimeMs }
+            "%d:%02d".format(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE))
+        } else null
+    }
+    is IslandEvent.Vpn -> stringResource(R.string.ax_dynamic_bar_active)
+    is IslandEvent.BiometricUnlock -> event.sourceName
+    is IslandEvent.AppSwitch -> null
+    is IslandEvent.Notification -> event.text?.take(30)
+    is IslandEvent.PromotedOngoing -> event.text.takeIf { it.isNotBlank() }?.take(20)
+    is IslandEvent.Sports -> "${event.team1Name} ${stringResource(R.string.ax_dynamic_bar_sports_vs)} ${event.team2Name}"
+    is IslandEvent.KeyguardIndication -> when (event.indicationType) {
+        IslandEvent.KeyguardIndication.IndicationType.BIOMETRIC -> stringResource(R.string.ax_dynamic_bar_biometric)
+        IslandEvent.KeyguardIndication.IndicationType.TRUST -> stringResource(R.string.ax_dynamic_bar_trust)
+        IslandEvent.KeyguardIndication.IndicationType.ALIGNMENT -> stringResource(R.string.ax_dynamic_bar_alignment)
+        else -> null
+    }
+    else -> null
+}
+
+@Composable
+private fun SportsChipTeamBadge(name: String, icon: Drawable?, contentColor: Color) {
+    if (icon != null) {
+        Image(
+            bitmap = icon.toScaledBitmap(ChipIconSize),
+            contentDescription = name,
+            modifier = Modifier.size(ChipIconSize).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    } else {
+        Box(
+            modifier = Modifier.size(ChipIconSize).clip(CircleShape)
+                .background(contentColor.copy(alpha = AlphaIconBg)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                name.take(2).uppercase(),
+                style = TsBadge,
+                color = contentColor,
+            )
+        }
+    }
+}
+
+private enum class ActionIcon { PLAY, PAUSE, STOP, SKIP_PREV, SKIP_NEXT }
+
+private data class ChipAction(
+    val icon: ActionIcon,
+    val perform: (AxDynamicBarChipViewModel, IslandEvent, Context) -> Unit,
+)
+
+private fun actionsFor(event: IslandEvent, context: Context): List<ChipAction> = when (event) {
+    is IslandEvent.Media -> listOf(
+        ChipAction(ActionIcon.SKIP_PREV) { vm, _, _ -> vm.skipPrev() },
+        ChipAction(if (event.isPlaying) ActionIcon.PAUSE else ActionIcon.PLAY) { vm, _, _ ->
+            vm.togglePlayPause()
+        },
+        ChipAction(ActionIcon.SKIP_NEXT) { vm, _, _ -> vm.skipNext() },
+    )
+    is IslandEvent.AudioRecording -> {
+        val classified = event.actions.map { it to it.action.classify(context, it.action.actionIntent?.creatorPackage ?: context.packageName) }
+        val pauseResume = classified.firstOrNull { (_, k) -> k == NotificationActionType.PAUSE || k == NotificationActionType.RESUME }?.first
+        val stop = classified.firstOrNull { (_, k) -> k == NotificationActionType.STOP || k == NotificationActionType.DELETE }?.first
+        listOfNotNull(
+            pauseResume?.let { action ->
+                ChipAction(
+                    if (event.state == RecordingState.RECORDING) ActionIcon.PAUSE else ActionIcon.PLAY,
+                ) { _, _, ctx -> action.action.actionIntent?.sendWithBal(ctx) }
+            },
+            stop?.let { action ->
+                ChipAction(ActionIcon.STOP) { _, _, ctx ->
+                    action.action.actionIntent?.sendWithBal(ctx)
+                }
+            },
+        )
+    }
+    is IslandEvent.Timer -> {
+        val toggleAction = event.actions.firstOrNull()
+        listOfNotNull(
+            toggleAction?.let { action ->
+                ChipAction(
+                    if (event.isPaused) ActionIcon.PLAY else ActionIcon.PAUSE,
+                ) { _, _, ctx -> action.action.actionIntent?.sendWithBal(ctx) }
+            },
+        )
+    }
+    is IslandEvent.Stopwatch -> {
+        val toggleAction = event.actions.firstOrNull()
+        listOfNotNull(
+            toggleAction?.let { action ->
+                ChipAction(
+                    if (event.isRunning) ActionIcon.PAUSE else ActionIcon.PLAY,
+                ) { _, _, ctx -> action.action.actionIntent?.sendWithBal(ctx) }
+            },
+        )
+    }
+    is IslandEvent.Torch -> listOf(
+        ChipAction(ActionIcon.STOP) { vm, _, _ -> vm.toggleTorch() },
+    )
+    else -> emptyList()
+}
+
+@Composable
+private fun ActionButton(
+    icon: ActionIcon,
+    color: Color,
+    bgColor: Color,
+    onClick: () -> Unit,
+    size: Dp = ActionSize,
+    iconSize: Dp = ActionIconSize,
+) {
+    val imageVector = when (icon) {
+        ActionIcon.PLAY -> Icons.Filled.PlayArrow
+        ActionIcon.PAUSE -> Icons.Filled.Pause
+        ActionIcon.STOP -> Icons.Filled.Stop
+        ActionIcon.SKIP_PREV -> Icons.Filled.SkipPrevious
+        ActionIcon.SKIP_NEXT -> Icons.Filled.SkipNext
+    }
+    Surface(
+        onClick = onClick,
+        modifier = Modifier.size(size),
+        shape = CircleShape,
+        color = bgColor,
+    ) {
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size)) {
+            Icon(
+                imageVector,
+                contentDescription = icon.name,
+                tint = color,
+                modifier = Modifier.size(iconSize),
+            )
+        }
+    }
+}
+
+@Composable
+private fun MarqueeText(text: String, color: Color, modifier: Modifier) {
+    Text(
+        text,
+        color = color,
+        style = PillPrimary,
+        maxLines = 1,
+        overflow = TextOverflow.Clip,
+        modifier = modifier.widthIn(max = 120.dp).basicMarquee(iterations = 1),
+    )
+}
+
+@Composable
+private fun ElapsedTimeText(
+    startTimeMs: Long,
+    color: Color,
+    modifier: Modifier,
+    pausedDurationMs: Long = 0L,
+) {
+    var elapsedMs by remember(startTimeMs, pausedDurationMs) {
+        mutableLongStateOf(
+            (System.currentTimeMillis() - startTimeMs - pausedDurationMs).coerceAtLeast(0L)
+        )
+    }
+    LaunchedEffect(startTimeMs, pausedDurationMs) {
+        while (true) {
+            delay(1000)
+            elapsedMs = (System.currentTimeMillis() - startTimeMs - pausedDurationMs)
+                .coerceAtLeast(0L)
+        }
+    }
+    Text(formatElapsedTime(elapsedMs), color = color, style = PillMono, modifier = modifier)
+}
+
+@Composable
+private fun CountdownText(event: IslandEvent.Timer, color: Color, modifier: Modifier) {
+    if (event.isPaused) {
+        Text(stringResource(R.string.ax_dynamic_bar_paused), color = color, style = PillMono, modifier = modifier)
+    } else {
+        var remainingMs by remember(event.endTimeMs) {
+            mutableLongStateOf((event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L))
+        }
+        LaunchedEffect(event.endTimeMs) {
+            while (remainingMs > 0L) {
+                delay(500)
+                remainingMs = (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+            }
+        }
+        Text(formatCountdownLong(remainingMs), color = color, style = PillMono, modifier = modifier)
+    }
+}
+
+@Composable
+private fun StopwatchTimeText(event: IslandEvent.Stopwatch, color: Color, modifier: Modifier) {
+    if (!event.isRunning) {
+        Text(stringResource(R.string.ax_dynamic_bar_paused), color = color, style = PillMono, modifier = modifier)
+    } else {
+        var elapsedMs by remember(event.startTimeMs) {
+            mutableLongStateOf((System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L))
+        }
+        LaunchedEffect(event.startTimeMs) {
+            while (true) {
+                delay(200)
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L)
+            }
+        }
+        Text(formatStopwatch(elapsedMs), color = color, style = PillMono, modifier = modifier)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarNowBar.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarNowBar.kt
new file mode 100644
index 0000000000000..bc21b7929ac05
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/AxDynamicBarNowBar.kt
@@ -0,0 +1,310 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.runtime.LaunchedEffect
+import kotlin.math.abs
+import androidx.compose.animation.core.animateIntAsState
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.positionChange
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.AlphaHint
+import com.android.systemui.axdynamicbar.shared.AlphaTrack
+import com.android.systemui.axdynamicbar.shared.PillPrimary
+import com.android.systemui.axdynamicbar.shared.ShapeXl
+import com.android.systemui.axdynamicbar.shared.SpaceSm
+import com.android.systemui.axdynamicbar.shared.SpaceXs
+import com.android.systemui.axdynamicbar.shared.chipAccentColorFor
+import com.android.systemui.axdynamicbar.shared.chipContentColorOn
+import com.android.systemui.axdynamicbar.shared.chipProgressFor
+import com.android.systemui.axdynamicbar.shared.iconKeyFor
+import com.android.systemui.axdynamicbar.shared.textKeyFor
+import com.android.systemui.axdynamicbar.shared.toScaledBitmap
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipState
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel
+import kotlin.math.abs
+
+private val NowBarShape = ShapeXl
+private val NowBarHeight = 32.dp
+private val NowBarMaxWidth = 200.dp
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun AxDynamicBarNowBar(
+    state: AxDynamicBarChipState?,
+    viewModel: AxDynamicBarChipViewModel,
+) {
+    val touchSlop = LocalViewConfiguration.current.touchSlop
+    val motionScheme = MaterialTheme.motionScheme
+
+    AnimatedVisibility(
+        visible = state != null,
+        enter = slideInVertically(motionScheme.defaultSpatialSpec()) { -it } + fadeIn(motionScheme.defaultEffectsSpec()),
+        exit = slideOutVertically(motionScheme.fastSpatialSpec()) { -it } + fadeOut(motionScheme.fastEffectsSpec()),
+    ) {
+        state?.let { chipState ->
+            val displayEvent = chipState.event
+            val isAlert = false
+
+            AnimatedContent(
+                targetState = NowBarDisplay(displayEvent, isAlert),
+                transitionSpec = {
+                    (fadeIn(motionScheme.defaultEffectsSpec()) + scaleIn(initialScale = 0.92f, animationSpec = motionScheme.defaultSpatialSpec())) togetherWith
+                        (fadeOut(motionScheme.fastEffectsSpec()) + scaleOut(targetScale = 0.92f, animationSpec = motionScheme.fastSpatialSpec()))
+                },
+                contentKey = { if (it.isAlert) "alert" else it.event::class.simpleName },
+                label = "nowbar_event",
+            ) { display ->
+                var targetWidthPx by remember { mutableIntStateOf(0) }
+                val animatedWidthPx by animateIntAsState(
+                    targetWidthPx, MaterialTheme.motionScheme.defaultSpatialSpec(), label = "nowbar_w",
+                )
+
+                val rawAccent = chipAccentColorFor(display.event)
+                val accent by animateColorAsState(rawAccent, MaterialTheme.motionScheme.fastEffectsSpec(), label = "accent")
+                val contentColor by animateColorAsState(
+                    chipContentColorOn(rawAccent), MaterialTheme.motionScheme.fastEffectsSpec(), label = "content",
+                )
+                val rawProgress = chipProgressFor(display.event)
+                val progressTarget = rawProgress ?: 0f
+                val progressAnim = remember { Animatable(progressTarget) }
+                LaunchedEffect(progressTarget) {
+                    if (abs(progressTarget - progressAnim.value) > 0.05f) {
+                        progressAnim.animateTo(progressTarget, tween(300, easing = FastOutSlowInEasing))
+                    } else {
+                        progressAnim.snapTo(progressTarget)
+                    }
+                }
+                val progress = if (rawProgress != null) progressAnim.value else null
+
+                Box(
+                    modifier = Modifier
+                        .padding(top = SpaceXs)
+                        .pointerInput(viewModel, touchSlop) {
+                            awaitEachGesture {
+                                awaitFirstDown(requireUnconsumed = false)
+                                var totalDragX = 0f
+                                var isDragging = false
+
+                                while (true) {
+                                    val event = awaitPointerEvent()
+                                    val change = event.changes.firstOrNull() ?: break
+
+                                    if (!change.pressed) {
+                                        change.consume()
+                                        if (isDragging) {
+                                            if (totalDragX > 0f) viewModel.cyclePrev()
+                                            else viewModel.cycleNext()
+                                        } else {
+                                            viewModel.statusBarExpansion.toggle()
+                                        }
+                                        break
+                                    }
+
+                                    val delta = change.positionChange()
+                                    totalDragX += delta.x
+
+                                    if (!isDragging && abs(totalDragX) > touchSlop) {
+                                        isDragging = true
+                                    }
+
+                                    if (isDragging) {
+                                        change.consume()
+                                    }
+                                }
+                            }
+                        },
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Row(
+                        modifier = Modifier
+                            .height(NowBarHeight)
+                            .widthIn(max = NowBarMaxWidth)
+                            .layout { measurable, constraints ->
+                                val placeable = measurable.measure(constraints)
+                                if (targetWidthPx != placeable.width) targetWidthPx = placeable.width
+                                val w = if (animatedWidthPx > 0) animatedWidthPx else placeable.width
+                                layout(w, placeable.height) { placeable.placeRelative(0, 0) }
+                            }
+                            .shadow(6.dp, NowBarShape)
+                            .clip(NowBarShape)
+                            .background(accent)
+                            .then(
+                                if (progress != null) {
+                                    Modifier.drawWithContent {
+                                        drawContent()
+                                        val barH = 3.dp.toPx()
+                                        val y = size.height - barH
+                                        drawRect(
+                                            contentColor.copy(alpha = AlphaTrack),
+                                            topLeft = Offset(0f, y),
+                                            size = Size(size.width, barH),
+                                        )
+                                        drawRect(
+                                            contentColor.copy(alpha = 0.85f),
+                                            topLeft = Offset(0f, y),
+                                            size = Size(size.width * progress, barH),
+                                        )
+                                    }
+                                } else Modifier
+                            )
+                            .padding(start = 10.dp, end = 12.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        if (display.isAlert && display.event is IslandEvent.Notification) {
+                            AlertPillContent(display.event, contentColor)
+                        } else {
+                            EventPillContent(display.event, contentColor, chipState)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun AlertPillContent(event: IslandEvent, contentColor: Color) {
+    val motionScheme = MaterialTheme.motionScheme
+    val notif = event as IslandEvent.Notification
+    AnimatedContent(
+        targetState = notif,
+        transitionSpec = {
+            (fadeIn(motionScheme.defaultEffectsSpec()) togetherWith fadeOut(motionScheme.fastEffectsSpec()))
+                .using(sizeTransform = null)
+        },
+        contentKey = { it.sbn.key },
+        label = "alert_content",
+    ) { n ->
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            n.appIcon?.let { icon ->
+                Image(
+                    bitmap = icon.toScaledBitmap(18.dp),
+                    contentDescription = null,
+                    modifier = Modifier.size(18.dp).clip(RoundedCornerShape(5.dp)),
+                    contentScale = ContentScale.Crop,
+                )
+                Spacer(Modifier.width(SpaceSm))
+            }
+            Text(
+                text = n.appName ?: "",
+                style = PillPrimary,
+                color = contentColor,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.basicMarquee(iterations = 1),
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun EventPillContent(
+    event: IslandEvent,
+    contentColor: Color,
+    chipState: AxDynamicBarChipState,
+) {
+    val motionScheme = MaterialTheme.motionScheme
+
+    AnimatedContent(
+        targetState = event,
+        transitionSpec = { fadeIn(motionScheme.defaultEffectsSpec()) togetherWith fadeOut(motionScheme.fastEffectsSpec()) },
+        contentKey = { iconKeyFor(it) },
+        label = "nowbar_icon",
+    ) { e ->
+        PillEventIcon(e, tint = contentColor)
+    }
+    Spacer(Modifier.width(SpaceSm))
+    
+    AnimatedContent(
+        targetState = event,
+        transitionSpec = {
+            (fadeIn(motionScheme.defaultEffectsSpec()) togetherWith fadeOut(motionScheme.fastEffectsSpec()))
+                .using(sizeTransform = null)
+        },
+        contentKey = { textKeyFor(it) },
+        label = "nowbar_text",
+    ) { e ->
+        PillEventText(e, Modifier, overrideColor = contentColor)
+    }
+    if (chipState.eventCount > 1) {
+        Spacer(Modifier.width(SpaceSm))
+        NowBarDots(
+            count = chipState.eventCount,
+            activeIndex = chipState.pinnedIndex,
+            color = contentColor,
+        )
+    }
+}
+
+@Composable
+private fun NowBarDots(count: Int, activeIndex: Int, color: Color) {
+    val dotCount = count.coerceAtMost(5)
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(3.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        for (i in 0 until dotCount) {
+            val active = i == activeIndex.coerceIn(0, dotCount - 1) % dotCount
+            Box(
+                Modifier
+                    .size(if (active) 5.dp else 4.dp)
+                    .clip(CircleShape)
+                    .background(color.copy(alpha = if (active) 1f else AlphaHint))
+            )
+        }
+    }
+}
+
+private data class NowBarDisplay(val event: IslandEvent, val isAlert: Boolean)
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAlertContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAlertContent.kt
new file mode 100644
index 0000000000000..323df1000156c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAlertContent.kt
@@ -0,0 +1,108 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Alarm
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+import android.text.format.DateFormat
+import java.util.Date
+
+@Composable
+internal fun AlarmExpanded(event: IslandEvent.Alarm, interactor: IslandActions) {
+    ExpandedCardLayout(
+        accentColor = OrangeAccent,
+        iconSize = SizeAlbumSm,
+        icon = {
+            if (event.isRinging) PulsingDot(color = OrangeAccent, size = 30.dp)
+            else Icon(Icons.Filled.Alarm, null, tint = OrangeAccent, modifier = Modifier.size(26.dp))
+        },
+        title = {
+            if (event.isRinging) StatusChip(stringResource(R.string.ax_dynamic_bar_ringing), OrangeAccent)
+            Text(event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_alarm) }, color = OnCardText, style = MaterialTheme.typography.titleSmall, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            if (event.triggerTimeMs > 0L) {
+                Text(
+                    DateFormat.getTimeFormat(LocalContext.current)
+                        .format(Date(event.triggerTimeMs)),
+                    color = SubtleGray,
+                    style = MaterialTheme.typography.labelMedium,
+                )
+            }
+        },
+        actions = {
+            ActionChip(
+                label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                icon = Icons.Filled.Close,
+                color = OrangeAccent,
+                bg = OrangeAccent.copy(alpha = AlphaIconBg),
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        },
+    )
+}
+
+@Composable
+internal fun RowScope.CompactAlarmRow(
+    event: IslandEvent.Alarm,
+    interactor: IslandActions,
+) {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(OrangeAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        if (event.isRinging) PulsingDot(color = OrangeAccent, size = SizeIconSm)
+        else Icon(Icons.Filled.Alarm, null, tint = OrangeAccent, modifier = Modifier.size(18.dp))
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_alarm) },
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        if (event.isRinging) Text(stringResource(R.string.ax_dynamic_bar_ringing), color = OrangeAccent, style = MaterialTheme.typography.labelSmall)
+    }
+    if (event.isRinging) {
+        Spacer(Modifier.width(SpaceMd))
+        Surface(
+            onClick = { interactor.dismissEvent(event) },
+            shape = ShapeChip,
+            color = OrangeAccent.copy(alpha = AlphaIconBg),
+        ) {
+            Text(
+                stringResource(R.string.ax_dynamic_bar_dismiss),
+                color = OrangeAccent,
+                style = MaterialTheme.typography.labelSmall,
+                modifier = Modifier.padding(horizontal = SpaceLg, vertical = SpaceSm),
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAppHistoryContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAppHistoryContent.kt
new file mode 100644
index 0000000000000..37f0eaf89244a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedAppHistoryContent.kt
@@ -0,0 +1,140 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+@Composable
+internal fun AppHistoryExpanded(event: IslandEvent.AppSwitch, interactor: IslandActions) {
+    if (event.recentApps.isEmpty()) return
+
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(SpaceXxl)) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeLg)
+                .background(BlueAccent.copy(alpha = AlphaFaint))
+                .padding(SpaceXxl),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Text(stringResource(R.string.ax_dynamic_bar_recent_apps), color = OnCardText, style = MaterialTheme.typography.titleMedium)
+            Text(stringResource(R.string.ax_dynamic_bar_count_running, event.recentApps.size), color = SubtleGray, style = MaterialTheme.typography.labelMedium)
+        }
+
+        val rows = event.recentApps.chunked(4)
+        rows.forEach { row ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+            ) {
+                row.forEach { app ->
+                    AppGridItem(
+                        app = app,
+                        onClick = {
+                            interactor.switchToApp(app.taskId)
+                            interactor.collapseIsland()
+                        },
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+
+                repeat(4 - row.size) { Spacer(Modifier.weight(1f)) }
+            }
+        }
+    }
+}
+
+@Composable
+private fun AppGridItem(
+    app: IslandEvent.RecentApp,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier =
+            modifier
+                .clip(ShapeLg)
+                .clickable(onClick = onClick)
+                .background(BlueAccent.copy(alpha = AlphaFaint), ShapeLg),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(SpaceMd),
+    ) {
+        Spacer(Modifier.size(SpaceMd))
+        app.appIcon?.let { icon ->
+            Image(
+                bitmap = icon.toScaledBitmap(48.dp),
+                contentDescription = app.appName,
+                modifier = Modifier.size(48.dp).clip(ShapeIconLarge),
+                contentScale = ContentScale.Crop,
+            )
+        }
+            ?: Box(
+                modifier = Modifier.size(48.dp).clip(ShapeIconLarge).background(CardBg),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(Icons.Filled.Apps, null, tint = SubtleGray, modifier = Modifier.size(24.dp))
+            }
+
+        Text(
+            app.appName,
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Spacer(Modifier.size(SpaceSm))
+    }
+}
+
+@Composable
+internal fun RowScope.CompactAppSwitchRow(event: IslandEvent.AppSwitch) {
+    val lastApp = event.recentApps.firstOrNull() ?: return
+    lastApp.appIcon?.let { icon ->
+        Image(
+            bitmap = icon.toScaledBitmap(SizeCompactIcon),
+            null,
+            modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact),
+            contentScale = ContentScale.Crop,
+        )
+    }
+        ?: Box(
+            modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(CardBg),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(Icons.Filled.Apps, null, tint = SubtleGray, modifier = Modifier.size(20.dp))
+        }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(stringResource(R.string.ax_dynamic_bar_recent_apps), color = OnCardText, style = MaterialTheme.typography.bodySmall)
+        Text(stringResource(R.string.ax_dynamic_bar_count_running, event.recentApps.size), color = SubtleGray, style = MaterialTheme.typography.labelSmall)
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedClipboardContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedClipboardContent.kt
new file mode 100644
index 0000000000000..6ad068ce8be8a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedClipboardContent.kt
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.DeleteSweep
+import androidx.compose.material.icons.filled.Link
+import androidx.compose.material.icons.filled.Photo
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+@Composable
+internal fun ClipboardExpanded(event: IslandEvent.Clipboard, interactor: IslandActions) {
+    Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(SpaceLg)) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeLg)
+                .background(IndigoAccent.copy(alpha = AlphaFaint))
+                .padding(SpaceXxl),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(Icons.Filled.ContentCopy, null, tint = IndigoAccent, modifier = Modifier.size(22.dp))
+            Spacer(Modifier.width(SpaceLg))
+            Text(
+                stringResource(if (event.isImage) R.string.ax_dynamic_bar_image_copied else R.string.ax_dynamic_bar_copied),
+                color = OnCardText,
+                style = MaterialTheme.typography.titleSmall,
+            )
+        }
+
+        if (event.items.isNotEmpty()) {
+            Column(verticalArrangement = Arrangement.spacedBy(SpaceMd)) {
+                event.items.forEach { item ->
+                    ClipboardStashItem(item, interactor)
+                }
+            }
+        } else {
+            ClipboardSingleItem(event, interactor)
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+        ) {
+            if (event.items.isNotEmpty()) {
+                ActionChip(
+                    label = stringResource(R.string.ax_dynamic_bar_clear_all),
+                    icon = Icons.Filled.DeleteSweep,
+                    color = IndigoAccent,
+                    bg = IndigoAccent.copy(alpha = AlphaIconBg),
+                    modifier = Modifier.weight(1f),
+                    onClick = {
+                        event.items.forEach { interactor.removeClipboardItem(it.id) }
+                        interactor.dismissEvent(event)
+                    },
+                )
+            }
+            ActionChip(
+                label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                icon = Icons.Filled.Close,
+                color = IndigoAccent,
+                bg = IndigoAccent.copy(alpha = AlphaIconBg),
+                modifier = Modifier.weight(1f),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        }
+    }
+}
+
+@Composable
+private fun ClipboardStashItem(
+    item: IslandEvent.ClipboardItem,
+    interactor: IslandActions,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(ShapeSm)
+            .background(DarkCard)
+            .clickable {
+                if (item.isImage && item.imageUri != null) interactor.copyUriToClipboard(item.imageUri)
+                else interactor.copyToClipboard(item.preview)
+            }
+            .padding(SpaceLg),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+    ) {
+        if (item.isImage) {
+            Box(
+                modifier = Modifier
+                    .size(SizeCompactIcon)
+                    .clip(ShapeCompact)
+                    .background(IndigoAccent.copy(alpha = AlphaIconBg)),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(Icons.Filled.Photo, null, tint = IndigoAccent, modifier = Modifier.size(18.dp))
+            }
+        } else if (item.isUrl) {
+            Box(
+                modifier = Modifier
+                    .size(SizeCompactIcon)
+                    .clip(ShapeCompact)
+                    .background(IndigoAccent.copy(alpha = AlphaIconBg)),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(Icons.Filled.Link, null, tint = IndigoAccent, modifier = Modifier.size(18.dp))
+            }
+        }
+
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+            if (item.isImage) {
+                Text(
+                    stringResource(R.string.ax_dynamic_bar_image),
+                    color = OnCardText,
+                    style = MaterialTheme.typography.bodySmall,
+                    maxLines = 1,
+                )
+                if (item.preview.isNotEmpty()) {
+                    Text(
+                        item.preview,
+                        color = SubtleGray,
+                        style = MaterialTheme.typography.labelSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            } else {
+                Text(
+                    item.preview,
+                    color = OnCardText,
+                    style = MaterialTheme.typography.bodySmall,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+
+        Icon(
+            Icons.Filled.ContentCopy,
+            null,
+            tint = IndigoAccent,
+            modifier = Modifier
+                .size(SizeIconSm)
+                .clickable {
+                    if (item.isImage && item.imageUri != null) interactor.copyUriToClipboard(item.imageUri)
+                    else interactor.copyToClipboard(item.preview)
+                },
+        )
+    }
+}
+
+@Composable
+private fun ClipboardSingleItem(event: IslandEvent.Clipboard, interactor: IslandActions) {
+    if (event.preview.isNotEmpty()) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeSm)
+                .background(DarkCard)
+                .clickable {
+                    interactor.copyToClipboard(event.preview)
+                    interactor.collapseIsland()
+                }
+                .padding(SpaceLg),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            if (event.isUrl) {
+                Box(
+                    modifier = Modifier
+                        .size(SizeCompactIcon)
+                        .clip(ShapeCompact)
+                        .background(IndigoAccent.copy(alpha = AlphaIconBg)),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Icon(Icons.Filled.Link, null, tint = IndigoAccent, modifier = Modifier.size(18.dp))
+                }
+            }
+            Text(
+                event.preview,
+                color = OnCardText,
+                style = MaterialTheme.typography.bodySmall,
+                maxLines = 4,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                Icons.Filled.ContentCopy,
+                null,
+                tint = IndigoAccent,
+                modifier = Modifier
+                    .size(SizeIconSm)
+                    .wrapContentWidth()
+                    .clickable {
+                        interactor.copyToClipboard(event.preview)
+                        interactor.collapseIsland()
+                    },
+            )
+        }
+    }
+
+    if (event.isUrl) {
+        ActionChip(
+            label = stringResource(R.string.ax_dynamic_bar_open),
+            icon = Icons.Filled.Link,
+            color = IndigoAccent,
+            bg = IndigoAccent.copy(alpha = AlphaIconBg),
+            modifier = Modifier.fillMaxWidth(),
+            onClick = {
+                interactor.openUrl(event.preview)
+                interactor.collapseIsland()
+            },
+        )
+    }
+}
+
+@Composable
+internal fun RowScope.CompactClipboardRow(
+    event: IslandEvent.Clipboard,
+    interactor: IslandActions,
+) {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(BlueAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(Icons.Filled.ContentCopy, null, tint = BlueAccent, modifier = Modifier.size(18.dp))
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Text(
+        event.preview.ifEmpty { stringResource(if (event.isImage) R.string.ax_dynamic_bar_image_copied else R.string.ax_dynamic_bar_copied) },
+        color = OnCardText,
+        style = MaterialTheme.typography.bodySmall,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = Modifier.weight(1f),
+    )
+    Spacer(Modifier.width(SpaceMd))
+    Surface(
+        onClick = { interactor.dismissEvent(event) },
+        shape = ShapeChip,
+        color = IndigoAccent.copy(alpha = AlphaIconBg),
+    ) {
+        Text(
+            stringResource(R.string.ax_dynamic_bar_dismiss),
+            color = IndigoAccent,
+            style = MaterialTheme.typography.labelSmall,
+            modifier = Modifier.padding(horizontal = SpaceLg, vertical = SpaceSm),
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedIslandContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedIslandContent.kt
new file mode 100644
index 0000000000000..d57029687bf51
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedIslandContent.kt
@@ -0,0 +1,243 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
+import kotlinx.coroutines.delay
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+private val EXPANDED_BOTTOM_PAD = 110.dp
+
+@Composable
+fun ExpandedIslandContent(
+    events: List<IslandEvent>,
+    interactor: IslandActions,
+    onCollapse: () -> Unit,
+    expandedFilter: String? = null,
+    pinnedEventId: String? = null,
+    hapticsViewModelFactory: SliderHapticsViewModel.Factory,
+) {
+    if (events.isEmpty()) return
+
+    val filteredEvents =
+        remember(events, expandedFilter, pinnedEventId) {
+            if (expandedFilter != null) {
+                events.filter {
+                    EVENT_TYPE_IDS[it::class.java] == expandedFilter
+                }
+            } else {
+
+                val base = events.filter { it !is IslandEvent.Notification }
+                val pinned = base.find { it.id == pinnedEventId }
+                if (pinned != null) {
+                    listOf(pinned) + base.filter { it.id != pinned.id }
+                } else {
+                    base
+                }
+            }
+        }
+
+    val notifIds =
+        remember(filteredEvents) {
+            filteredEvents.filterIsInstance<IslandEvent.Notification>().map { it.id }
+        }
+    LaunchedEffect(notifIds) { notifIds.forEach { interactor.onNotificationInteraction(it) } }
+    DisposableEffect(notifIds) {
+        onDispose { notifIds.forEach { interactor.onNotificationInteractionEnd(it) } }
+    }
+
+    LaunchedEffect(filteredEvents) {
+        if (filteredEvents.isEmpty()) {
+            
+            delay(200)
+            onCollapse()
+        }
+    }
+
+    if (filteredEvents.isEmpty()) return
+
+    val isNotificationFilter = expandedFilter == "notification"
+    val notifGroups =
+        remember(filteredEvents, isNotificationFilter) {
+            if (!isNotificationFilter) return@remember emptyList()
+            filteredEvents
+                .filterIsInstance<IslandEvent.Notification>()
+                .groupBy { it.sbn.packageName }
+                .values
+                .toList()
+        }
+
+    val expandedGroups = remember(expandedFilter) { mutableStateMapOf<String, Boolean>() }
+
+    LazyColumn(
+        modifier =
+            Modifier.widthIn(max = ExpandedMaxWidth)
+                .fillMaxSize(),
+        verticalArrangement = Arrangement.spacedBy(SpaceMd),
+        contentPadding =
+            PaddingValues(start = SpaceLg, end = SpaceLg, top = SpaceXxs, bottom = EXPANDED_BOTTOM_PAD),
+    ) {
+        if (isNotificationFilter && notifGroups.isNotEmpty()) {
+            notifGroups.forEach { group ->
+                if (group.size == 1) {
+                    val event = group.first()
+                    item(key = event.id) {
+                        MagneticSwipeToDismiss(
+                            onDismiss = { interactor.dismissEvent(event) },
+                            modifier = Modifier.animateItem(),
+                        ) {
+                            PrimaryCard { NotificationExpanded(event, interactor) }
+                        }
+                    }
+                } else {
+                    val pkg = group.first().sbn.packageName
+                    val isExpanded = expandedGroups[pkg] == true
+                    item(key = "group_$pkg") {
+                        MagneticSwipeToDismiss(
+                            onDismiss = { group.forEach { interactor.dismissEvent(it) } },
+                            modifier = Modifier.animateItem(),
+                        ) {
+                            PrimaryCard {
+                                NotificationGroupCard(
+                                    notifications = group,
+                                    isExpanded = isExpanded,
+                                    onToggleExpand = { expandedGroups[pkg] = !isExpanded },
+                                    interactor = interactor,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            items(filteredEvents, key = { it.id }) { event ->
+                MagneticSwipeToDismiss(
+                    onDismiss = { interactor.dismissEvent(event) },
+                    modifier = Modifier.animateItem(),
+                ) {
+                    if (event is IslandEvent.Media) {
+                        MediaCard(event, interactor)
+                    } else {
+                        PrimaryCard {
+                            AnimatedContent(
+                                targetState = event,
+                                transitionSpec = {
+                                    ((fadeIn(tween(180)) +
+                                        scaleIn(
+                                            initialScale = 0.95f,
+                                            animationSpec = tween(250),
+                                        )) togetherWith
+                                        (fadeOut(tween(120)) +
+                                            scaleOut(
+                                                targetScale = 0.95f,
+                                                animationSpec = tween(200),
+                                            ))).using(sizeTransform = null)
+                                },
+                                contentKey = { it::class.simpleName + it.id },
+                                label = "expanded_card",
+                            ) { animatedEvent ->
+                                ExpandedEventContent(animatedEvent, interactor, hapticsViewModelFactory)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun ExpandedEventContent(
+    event: IslandEvent,
+    interactor: IslandActions,
+    hapticsViewModelFactory: SliderHapticsViewModel.Factory,
+) {
+    when (event) {
+        is IslandEvent.AudioRecording -> AudioRecordingExpanded(event, interactor)
+        is IslandEvent.PromotedOngoing -> PromotedOngoingExpanded(event, interactor)
+        is IslandEvent.Sports -> SportsExpanded(event, interactor)
+        is IslandEvent.NowPlaying -> NowPlayingExpanded(event, interactor)
+        is IslandEvent.Media -> MediaExpanded(event, interactor)
+        is IslandEvent.Bluetooth -> BluetoothExpanded(event, interactor)
+        is IslandEvent.Hotspot -> HotspotExpanded(event)
+        is IslandEvent.Charging -> ChargingExpanded(event)
+        is IslandEvent.Alarm -> AlarmExpanded(event, interactor)
+        is IslandEvent.Timer -> TimerExpanded(event, interactor)
+        is IslandEvent.Stopwatch -> StopwatchExpanded(event, interactor)
+        is IslandEvent.RingerMode -> RingerModeExpanded(event, interactor)
+        is IslandEvent.Vpn -> VpnExpanded(event)
+        is IslandEvent.Clipboard -> ClipboardExpanded(event, interactor)
+        is IslandEvent.Notification -> NotificationExpanded(event, interactor)
+        is IslandEvent.AppSwitch -> AppHistoryExpanded(event, interactor)
+        is IslandEvent.Torch -> TorchExpanded(event, interactor, hapticsViewModelFactory)
+        is IslandEvent.BiometricUnlock -> BiometricUnlockExpanded(event)
+        is IslandEvent.KeyguardIndication -> {}
+        is IslandEvent.AospChip -> {}
+    }
+}
+
+@Composable
+internal fun BiometricUnlockExpanded(event: IslandEvent.BiometricUnlock) {
+    ExpandedCardLayout(
+        accentColor = GreenAccent,
+        icon = { Icon(Icons.Filled.Check, null, tint = GreenAccent, modifier = Modifier.size(26.dp)) },
+        title = {
+            Text(stringResource(R.string.ax_dynamic_bar_device_unlocked), color = OnCardText, style = MaterialTheme.typography.titleMedium)
+            Text(event.sourceName, color = SubtleGray, style = MaterialTheme.typography.labelMedium)
+        },
+    )
+}
+
+@Composable
+internal fun PrimaryCard(content: @Composable () -> Unit) {
+    Box(
+        modifier =
+            Modifier.fillMaxWidth()
+                .clip(ShapeCard)
+                .background(CardBg)
+                .border(1.dp, CardBorderBrush, ShapeCard)
+                .padding(SpaceXxl)
+    ) {
+        content()
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedMediaContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedMediaContent.kt
new file mode 100644
index 0000000000000..7728a4e77d1b5
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedMediaContent.kt
@@ -0,0 +1,703 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.graphics.drawable.GradientDrawable
+import android.media.AudioManager
+import android.graphics.drawable.LayerDrawable
+import android.util.TypedValue
+import android.widget.SeekBar
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MusicNote
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Shuffle
+import androidx.compose.material.icons.filled.SkipNext
+import androidx.compose.material.icons.filled.SkipPrevious
+import androidx.compose.material.icons.filled.VolumeUp
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.media.controls.ui.drawable.SquigglyProgress
+import com.android.systemui.res.R
+import kotlinx.coroutines.delay
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.android.systemui.media.controls.ui.view.WaveformSeekBar
+
+private val AlbumArtSize = 80.dp
+private val PlayPauseSize = 56.dp
+private val ControlButtonSize = 44.dp
+private val ControlIconSize = 22.dp
+private val SeekBarHeight = 28.dp
+
+@Composable
+internal fun MediaCard(event: IslandEvent.Media, interactor: IslandActions) {
+    val colors = rememberMediaColors(event)
+    val accent = colors.accent
+    val useWaveform = if (interactor is com.android.systemui.axdynamicbar.domain.AxDynamicBarInteractor) {
+        interactor.mediaUseWaveform.collectAsStateWithLifecycle().value
+    } else {
+        false
+    }
+
+    Surface(
+        modifier = Modifier.fillMaxWidth().border(1.dp, CardBorderBrush, ShapeCard),
+        shape = ShapeCard,
+        color = CardBg,
+    ) {
+        Box(modifier = Modifier.fillMaxWidth()) {
+
+            event.albumArt?.let { art ->
+                Image(
+                    bitmap = art.toScaledBitmap(380.dp),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .matchParentSize()
+                        .blur(32.dp),
+                    contentScale = ContentScale.Crop,
+                )
+            } ?: Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(CardBg),
+            )
+
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.verticalGradient(
+                            0.0f to Color(0xFF000000).copy(alpha = 0.4f),
+                            0.45f to Color(0xFF000000).copy(alpha = 0.65f),
+                            1.0f to Color(0xFF000000).copy(alpha = 1.0f),
+                        )
+                    )
+            )
+
+            Column(modifier = Modifier.fillMaxWidth()) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable {
+                            interactor.openMediaApp()
+                            interactor.collapseIsland()
+                        }
+                        .padding(SpaceXxl),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(SpaceXxl),
+                ) {
+                    event.albumArt?.let { art ->
+                        Image(
+                            bitmap = art.toScaledBitmap(AlbumArtSize),
+                            contentDescription = null,
+                            modifier = Modifier.size(AlbumArtSize).clip(ShapeLg),
+                            contentScale = ContentScale.Crop,
+                        )
+                    } ?: Box(
+                        modifier = Modifier
+                            .size(AlbumArtSize)
+                            .clip(ShapeLg)
+                            .background(accent.copy(alpha = AlphaFaint)),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(Icons.Filled.MusicNote, null, tint = accent, modifier = Modifier.size(36.dp))
+                    }
+
+                    Column(
+                        modifier = Modifier.weight(1f),
+                        verticalArrangement = Arrangement.spacedBy(SpaceXs),
+                    ) {
+                        Text(
+                            event.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_now_playing) },
+                            color = OnCardText,
+                            style = MaterialTheme.typography.titleMedium,
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                        if (event.artist.isNotEmpty()) {
+                            Text(
+                                event.artist,
+                                color = accent,
+                                style = MaterialTheme.typography.bodyMedium,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
+                    event.appIcon?.let { icon ->
+                        Image(
+                            bitmap = icon.toScaledBitmap(SizeIconSm),
+                            contentDescription = null,
+                            modifier = Modifier.size(SizeIconSm).clip(ShapeXs),
+                            colorFilter = ColorFilter.tint(OnCardText),
+                        )
+                    }
+                }
+
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = SpaceXxl, vertical = SpaceLg),
+                    verticalArrangement = Arrangement.spacedBy(SpaceLg),
+                ) {
+                    if (event.duration > 0L) {
+                        MediaSeekBar(event, interactor, accent, useWaveform)
+                    }
+                    MediaControls(event, interactor, accent)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+internal fun MediaExpanded(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+    modifier: Modifier = Modifier,
+) {
+    val useWaveform = if (interactor is com.android.systemui.axdynamicbar.domain.AxDynamicBarInteractor) {
+        interactor.mediaUseWaveform.collectAsStateWithLifecycle().value
+    } else {
+        false
+    }
+    val colors = rememberMediaColors(event)
+    val accent = colors.accent
+
+    Column(modifier = modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(SpaceXxl)) {
+        Row(
+            modifier = Modifier.fillMaxWidth().clickable {
+                interactor.openMediaApp()
+                interactor.collapseIsland()
+            },
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceXxl),
+        ) {
+            event.albumArt?.let { art ->
+                Image(
+                    bitmap = art.toScaledBitmap(SizeAlbumSm),
+                    contentDescription = null,
+                    modifier = Modifier.size(SizeAlbumSm).clip(ShapeLg),
+                    contentScale = ContentScale.Crop,
+                )
+            } ?: Surface(
+                modifier = Modifier.size(SizeAlbumSm),
+                shape = ShapeLg,
+                color = accent.copy(alpha = AlphaSubtle),
+            ) {
+                Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                    Icon(
+                        Icons.Filled.MusicNote, null,
+                        tint = accent,
+                        modifier = Modifier.size(SpacePanel),
+                    )
+                }
+            }
+
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(SpaceXs),
+            ) {
+                Text(
+                    event.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_now_playing) },
+                    color = OnCardText,
+                    style = MaterialTheme.typography.titleSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (event.artist.isNotEmpty()) {
+                    Text(
+                        event.artist,
+                        color = accent,
+                        style = MaterialTheme.typography.bodySmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+
+            event.appIcon?.let { icon ->
+                Image(
+                    bitmap = icon.toScaledBitmap(SizeIconSm),
+                    contentDescription = null,
+                    modifier = Modifier.size(SizeIconSm).clip(ShapeXs),
+                    colorFilter = ColorFilter.tint(OnCardText),
+                )
+            }
+        }
+
+        MediaControls(event, interactor, accent)
+        if (event.duration > 0L) {
+            MediaSeekBar(event, interactor, accent, useWaveform)
+        }
+    }
+}
+
+@Composable
+private fun MediaControls(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+    accent: Color,
+) {
+    val onAccent = chipContentColorOn(accent)
+    val tonalBg = accent.copy(alpha = AlphaSubtle)
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceEvenly,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        MediaCustomActionButton(event, interactor, accent, tonalBg)
+
+        Surface(
+            onClick = { interactor.skipPrev() },
+            shape = CircleShape,
+            color = tonalBg,
+            modifier = Modifier.size(ControlButtonSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                Icon(
+                    Icons.Filled.SkipPrevious, null,
+                    tint = accent,
+                    modifier = Modifier.size(ControlIconSize),
+                )
+            }
+        }
+
+        Surface(
+            onClick = { interactor.togglePlayPause() },
+            shape = CircleShape,
+            color = accent,
+            modifier = Modifier.size(PlayPauseSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                Icon(
+                    if (event.isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                    if (event.isPlaying)
+                        stringResource(R.string.ax_dynamic_bar_pause)
+                    else
+                        stringResource(R.string.ax_dynamic_bar_play),
+                    tint = onAccent,
+                    modifier = Modifier.size(26.dp),
+                )
+            }
+        }
+
+        Surface(
+            onClick = { interactor.skipNext() },
+            shape = CircleShape,
+            color = tonalBg,
+            modifier = Modifier.size(ControlButtonSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                Icon(
+                    Icons.Filled.SkipNext, null,
+                    tint = accent,
+                    modifier = Modifier.size(ControlIconSize),
+                )
+            }
+        }
+
+        MediaEndActionButton(event, interactor, accent, tonalBg)
+    }
+}
+
+@Composable
+private fun MediaSeekBar(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+    accent: Color,
+    useWaveform: Boolean = false,
+) {
+    val mediaProgress = rememberMediaProgress(event)
+    val isPlaying = event.isPlaying
+    val durationMs = event.duration
+    val positionMs = mediaProgress.positionMs
+    val serverFraction = mediaProgress.progress
+
+    var isScrubbing by remember { mutableStateOf(false) }
+    var displayFraction by remember { mutableStateOf(serverFraction) }
+
+    val interactorRef = rememberUpdatedState(interactor)
+    val swipeLock = LocalDismissSwipeLock.current
+
+    LaunchedEffect(positionMs, durationMs, isPlaying) {
+        if (isScrubbing) return@LaunchedEffect
+        displayFraction = serverFraction
+        if (!isPlaying || durationMs <= 0L) return@LaunchedEffect
+        val startWallMs = System.currentTimeMillis()
+        val startProgressMs = positionMs
+        while (true) {
+            delay(16L)
+            if (isScrubbing) break
+            val elapsed = System.currentTimeMillis() - startWallMs
+            val interpolated = ((startProgressMs + elapsed).toFloat() / durationMs).coerceIn(0f, 1f)
+            displayFraction = interpolated
+            if (interpolated >= 1f) break
+        }
+    }
+
+    val displayMs = (displayFraction * durationMs).toLong()
+    val accentArgb = accent.toArgb()
+    val trackAlphaArgb = accent.copy(alpha = AlphaSubtle).toArgb()
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(SpaceXs),
+    ) {
+        Text(
+            formatElapsedTime(displayMs),
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+        )
+
+        Box(
+            modifier = Modifier
+                .weight(1f)
+                .height(SeekBarHeight)
+                .pointerInput(swipeLock) {
+                    awaitEachGesture {
+                        awaitPointerEvent()
+                        swipeLock.value = true
+                        try {
+                            do {
+                                val event = awaitPointerEvent()
+                            } while (event.changes.any { it.pressed })
+                        } finally {
+                            swipeLock.value = false
+                        }
+                    }
+                }
+                .pointerInput("tap") {
+                    detectTapGestures { offset ->
+                        val fraction = (offset.x / size.width.toFloat()).coerceIn(0f, 1f)
+                        displayFraction = fraction
+                        interactorRef.value.seekTo((fraction * durationMs).toLong())
+                    }
+                }
+                .pointerInput("drag") {
+                    detectHorizontalDragGestures(
+                        onDragStart = { offset ->
+                            isScrubbing = true
+                            displayFraction = (offset.x / size.width.toFloat()).coerceIn(0f, 1f)
+                        },
+                        onDragEnd = {
+                            interactorRef.value.seekTo((displayFraction * durationMs).toLong())
+                            isScrubbing = false
+                        },
+                        onDragCancel = { isScrubbing = false },
+                        onHorizontalDrag = { change, _ ->
+                            displayFraction =
+                                (change.position.x / size.width.toFloat()).coerceIn(0f, 1f)
+                            change.consume()
+                        },
+                    )
+                },
+            contentAlignment = Alignment.Center,
+        ) {
+            if (useWaveform) {
+                AndroidView(
+                    factory = { context ->
+                        WaveformSeekBar(context).apply {
+                            max = 10_000
+                            setWaveformColor(accentArgb)
+                            setThumbColor(accentArgb)
+                            isEnabled = false
+                        }
+                    },
+                    update = { bar ->
+                        val target = (displayFraction * 10_000f).toInt().coerceIn(0, 10_000)
+                        if (bar.progress != target) bar.progress = target
+                        when {
+                            isPlaying && !bar.isPlaying -> bar.startWaveAnimation()
+                            !isPlaying && bar.isPlaying -> bar.stopWaveAnimation()
+                        }
+                    },
+                    modifier = Modifier.fillMaxWidth().height(SeekBarHeight),
+                )
+            } else {
+                AndroidView(
+                    factory = { context ->
+                        SeekBar(context).apply {
+                            max = 10_000
+                            splitTrack = false
+                            setPadding(0, 0, 0, 0)
+                            isEnabled = false
+
+                            thumb = createSeekBarThumb(context, accentArgb)
+                            thumbOffset = thumb.intrinsicWidth / 2
+
+                            val layer = (progressDrawable?.mutate() as? LayerDrawable)
+                            if (layer != null) {
+                                layer.findDrawableByLayerId(android.R.id.background)
+                                    ?.mutate()?.setTint(trackAlphaArgb)
+                                layer.findDrawableByLayerId(android.R.id.secondaryProgress)
+                                    ?.mutate()?.setTint(
+                                        com.android.internal.graphics.ColorUtils
+                                            .setAlphaComponent(accentArgb, 60)
+                                    )
+                                val squiggle = SquigglyProgress().apply {
+                                    waveLength = context.resources.getDimensionPixelSize(
+                                        R.dimen.qs_media_seekbar_progress_wavelength
+                                    ).toFloat()
+                                    lineAmplitude = context.resources.getDimensionPixelSize(
+                                        R.dimen.qs_media_seekbar_progress_amplitude
+                                    ).toFloat()
+                                    phaseSpeed = context.resources.getDimensionPixelSize(
+                                        R.dimen.qs_media_seekbar_progress_phase
+                                    ).toFloat()
+                                    strokeWidth = context.resources.getDimensionPixelSize(
+                                        R.dimen.qs_media_seekbar_progress_stroke_width
+                                    ).toFloat()
+                                    setTint(accentArgb)
+                                    drawRemainingLine = false
+                                    transitionEnabled = false
+                                    animate = false
+                                }
+                                layer.setDrawableByLayerId(android.R.id.progress, squiggle)
+                                progressDrawable = layer
+                            }
+                        }
+                    },
+                    update = { bar ->
+                        val target = (displayFraction * 10_000f).toInt().coerceIn(0, 10_000)
+                        bar.progress = target
+
+                        (bar.thumb as? GradientDrawable)?.setColor(accentArgb)
+
+                        val alpha = if (isPlaying) 255 else (255 * 0.55f).toInt()
+                        bar.thumb?.alpha = alpha
+
+                        val layer = bar.progressDrawable as? LayerDrawable
+
+                        layer?.findDrawableByLayerId(android.R.id.background)
+                            ?.setTint(trackAlphaArgb)
+                        layer?.findDrawableByLayerId(android.R.id.secondaryProgress)
+                            ?.setTint(
+                                com.android.internal.graphics.ColorUtils
+                                    .setAlphaComponent(accentArgb, 60)
+                            )
+
+                        val squiggle = layer
+                            ?.findDrawableByLayerId(android.R.id.progress) as? SquigglyProgress
+                        squiggle?.apply {
+                            setTint(accentArgb)
+                            setAlpha(alpha)
+                            animate = isPlaying && !isScrubbing
+                        }
+                        layer?.alpha = alpha
+                    },
+                    modifier = Modifier.fillMaxWidth().height(SeekBarHeight),
+                )
+            }
+        }
+
+        Text(
+            formatElapsedTime(durationMs),
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+        )
+    }
+}
+
+/**
+ * Creates a pill-shaped thumb drawable for the seekbar.
+ */
+private fun createSeekBarThumb(context: android.content.Context, tintColor: Int): GradientDrawable {
+    val wPx = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP, 4f, context.resources.displayMetrics
+    ).toInt().coerceAtLeast(1)
+    val hPx = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics
+    ).toInt().coerceAtLeast(1)
+    val radiusPx = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics
+    )
+    return GradientDrawable().apply {
+        shape = GradientDrawable.RECTANGLE
+        setSize(wPx, hPx)
+        cornerRadius = radiusPx
+        setColor(tintColor)
+    }
+}
+
+@Composable
+private fun MediaCustomActionButton(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+    accent: Color,
+    tonalBg: Color,
+) {
+    if (event.customActions.isNotEmpty()) {
+        val ca = event.customActions.first()
+        Surface(
+            onClick = { interactor.sendCustomAction(ca.action) },
+            shape = CircleShape,
+            color = tonalBg,
+            modifier = Modifier.size(ControlButtonSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                CustomActionIcon(ca, tint = accent, modifier = Modifier.size(ControlIconSize))
+            }
+        }
+    } else {
+        Surface(
+            onClick = { },
+            shape = CircleShape,
+            color = tonalBg.copy(alpha = AlphaSubtle),
+            modifier = Modifier.size(ControlButtonSize),
+            enabled = false,
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                Icon(
+                    Icons.Filled.Shuffle, null,
+                    tint = accent.copy(alpha = AlphaDisabled),
+                    modifier = Modifier.size(ControlIconSize),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun MediaEndActionButton(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+    accent: Color,
+    tonalBg: Color,
+) {
+    if (event.customActions.size > 1) {
+        val ca = event.customActions[1]
+        Surface(
+            onClick = { interactor.sendCustomAction(ca.action) },
+            shape = CircleShape,
+            color = tonalBg,
+            modifier = Modifier.size(ControlButtonSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                CustomActionIcon(ca, tint = accent, modifier = Modifier.size(ControlIconSize))
+            }
+        }
+    } else {
+        Surface(
+            onClick = {
+                interactor.openMediaOutputSwitcher()
+                interactor.collapseIsland()
+            },
+            shape = CircleShape,
+            color = tonalBg,
+            modifier = Modifier.size(ControlButtonSize),
+        ) {
+            Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                Icon(
+                    Icons.Filled.VolumeUp, null,
+                    tint = accent,
+                    modifier = Modifier.size(ControlIconSize),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun RowScope.CompactMediaRow(
+    event: IslandEvent.Media,
+    interactor: IslandActions,
+) {
+    event.albumArt?.let {
+        Image(
+            bitmap = it.toScaledBitmap(SizeCompactIcon),
+            null,
+            modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact),
+            contentScale = ContentScale.Crop,
+        )
+    } ?: run {
+        val accent = rememberMediaColors(event).accent
+        Box(
+            modifier = Modifier.size(SizeCompactIcon)
+                .clip(ShapeCompact)
+                .background(accent.copy(alpha = AlphaIconBg)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(Icons.Filled.MusicNote, null, tint = accent, modifier = Modifier.size(20.dp))
+        }
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_music) },
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        if (event.artist.isNotEmpty())
+            Text(
+                event.artist,
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+    }
+    Spacer(Modifier.width(SpaceMd))
+    Surface(
+        onClick = { interactor.togglePlayPause() },
+        shape = CircleShape,
+        color = ActionBg,
+        modifier = Modifier.size(36.dp),
+    ) {
+        Box(contentAlignment = Alignment.Center) {
+            Icon(
+                if (event.isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                null,
+                tint = OnActionText,
+                modifier = Modifier.size(18.dp),
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNotificationContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNotificationContent.kt
new file mode 100644
index 0000000000000..62de66a001042
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNotificationContent.kt
@@ -0,0 +1,571 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.app.Notification
+import android.content.Context
+import android.service.notification.StatusBarNotification
+import android.util.Log
+import android.util.Size
+import android.widget.FrameLayout
+import android.widget.RemoteViews
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+@Composable
+internal fun NotificationExpanded(
+    event: IslandEvent.Notification,
+    interactor: IslandActions,
+) {
+    val context = LocalContext.current
+    val accent = BlueAccent
+    val hasProgress = event.progress >= 0 || event.isProgressIndeterminate
+    val hasCustomContent =
+        event.sbn.isOngoing &&
+            (event.sbn.notification.bigContentView != null ||
+                event.sbn.notification.contentView != null)
+
+    Column(
+        modifier = Modifier.fillMaxWidth().clickable {
+            try { event.sbn.notification?.contentIntent?.sendWithBal(context) }
+            catch (_: Exception) {}
+            interactor.collapseIsland()
+        },
+        verticalArrangement = Arrangement.spacedBy(SpaceLg),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth()
+                .clip(ShapeLg)
+                .background(accent.copy(alpha = AlphaFaint))
+                .padding(SpaceLg),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            NotifExpandedAvatar(event, SizeCompactIcon)
+
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(SpaceXxs),
+            ) {
+                if (event.appName.isNotEmpty()) {
+                    Text(
+                        event.appName,
+                        color = SubtleGray,
+                        style = MaterialTheme.typography.labelSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                Text(
+                    event.title ?: event.appName.ifEmpty { event.sbn.packageName.substringAfterLast('.') },
+                    color = OnCardText,
+                    style = MaterialTheme.typography.titleSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+
+            event.appIcon?.let {
+                Image(
+                    bitmap = it.toScaledBitmap(SizeIconSm),
+                    contentDescription = null,
+                    modifier = Modifier.size(SizeIconSm).clip(ShapeSm),
+                )
+            }
+        }
+
+        if (hasProgress || hasCustomContent) {
+            SbnRemoteViewContent(
+                event.sbn,
+                fallback = {
+                    if (hasProgress) {
+                        NotificationProgressFallback(event)
+                    } else {
+                        event.text?.let {
+                            Text(it, color = SubtleGray, style = MaterialTheme.typography.bodySmall, maxLines = 4, overflow = TextOverflow.Ellipsis)
+                        }
+                    }
+                },
+            )
+        } else {
+            event.text?.let {
+                Text(it, color = SubtleGray, style = MaterialTheme.typography.bodySmall, maxLines = 4, overflow = TextOverflow.Ellipsis)
+            }
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+        ) {
+            ActionChip(
+                label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                icon = Icons.Filled.Close,
+                color = accent,
+                bg = accent.copy(alpha = AlphaIconBg),
+                modifier = Modifier.weight(1f),
+                onClick = {
+                    interactor.onNotificationInteraction(event.id)
+                    interactor.dismissEvent(event)
+                },
+            )
+
+            event.actions
+                .filter { a ->
+                    val l = a.label?.toString()?.lowercase() ?: ""
+                    l != "collapse" && l != "expand" && l != "minimize"
+                }
+                .take(2)
+                .forEach { notifAction ->
+                    ActionChip(
+                        label = notifAction.label.toString(),
+                        color = OnActionText,
+                        bg = ActionBg,
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            interactor.onNotificationInteraction(event.id)
+                            try { notifAction.action.actionIntent?.sendWithBal(context) }
+                            catch (_: Exception) {}
+                            interactor.dismissEvent(event)
+                            interactor.collapseIsland()
+                        },
+                    )
+                }
+        }
+
+    }
+}
+
+@Composable
+private fun NotifExpandedAvatar(event: IslandEvent.Notification, size: Dp) {
+    val icon = event.appIcon
+    if (icon != null) {
+        Image(
+            bitmap = icon.toScaledBitmap(size),
+            contentDescription = null,
+            modifier = Modifier.size(size).clip(ShapeIconMedium),
+        )
+    } else {
+        Box(
+            modifier = Modifier.size(size).clip(ShapeIconMedium).background(BlueAccent.copy(alpha = AlphaSubtle)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(Icons.Filled.Notifications, null, tint = BlueAccent, modifier = Modifier.size(SizeIconSm))
+        }
+    }
+}
+
+private fun resolveRemoteViews(ctx: Context, sbn: StatusBarNotification): RemoteViews? {
+
+    sbn.notification.bigContentView?.let {
+        return it
+    }
+    sbn.notification.contentView?.let {
+        return it
+    }
+
+    return try {
+        val builder = Notification.Builder.recoverBuilder(ctx, sbn.notification)
+        builder.createBigContentView() ?: builder.createContentView()
+    } catch (_: Exception) {
+        null
+    }
+}
+
+@Composable
+internal fun SbnRemoteViewContent(sbn: StatusBarNotification, fallback: @Composable () -> Unit) {
+    var remoteViewFailed by remember(sbn.key) { mutableStateOf(false) }
+
+    if (!remoteViewFailed) {
+        AndroidView(
+            factory = { factoryCtx ->
+                FrameLayout(factoryCtx).apply {
+                    try {
+                        val rv = resolveRemoteViews(factoryCtx, sbn)
+                        val inflated = rv?.apply(factoryCtx, this)
+                        if (inflated != null) {
+                            addView(
+                                inflated,
+                                FrameLayout.LayoutParams(
+                                    FrameLayout.LayoutParams.MATCH_PARENT,
+                                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                                ),
+                            )
+                        } else {
+                            remoteViewFailed = true
+                        }
+                    } catch (_: Exception) {
+                        remoteViewFailed = true
+                    }
+                }
+            },
+            update = { container ->
+                try {
+                    container.removeAllViews()
+                    val rv = resolveRemoteViews(container.context, sbn)
+                    val inflated = rv?.apply(container.context, container)
+                    if (inflated != null) {
+                        container.addView(
+                            inflated,
+                            FrameLayout.LayoutParams(
+                                FrameLayout.LayoutParams.MATCH_PARENT,
+                                FrameLayout.LayoutParams.WRAP_CONTENT,
+                            ),
+                        )
+                    }
+                } catch (_: Exception) {}
+            },
+            modifier = Modifier.fillMaxWidth().clip(ShapeIconMedium),
+        )
+    } else {
+        fallback()
+    }
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun NotificationProgressFallback(event: IslandEvent.Notification) {
+    val fraction =
+        when {
+            event.isProgressIndeterminate -> null
+            event.progressMax > 0 -> event.progress.toFloat() / event.progressMax
+            else -> null
+        }
+    Column(verticalArrangement = Arrangement.spacedBy(SpaceXs)) {
+        event.text?.let {
+            Text(
+                it,
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelMedium,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+        Row(Modifier.fillMaxWidth(), Arrangement.SpaceBetween, Alignment.CenterVertically) {
+            Text(stringResource(R.string.ax_dynamic_bar_progress), color = SubtleGray, style = MaterialTheme.typography.labelSmall)
+            if (fraction != null) {
+                Text("${(fraction * 100).toInt()}%", color = BlueAccent, style = MaterialTheme.typography.bodySmall)
+            }
+        }
+        if (fraction != null) {
+            LinearWavyProgressIndicator(
+                progress = { fraction.coerceIn(0f, 1f) },
+                modifier = Modifier.fillMaxWidth(),
+                color = BlueAccent,
+                trackColor = BlueAccent.copy(alpha = AlphaSubtle),
+            )
+        } else {
+            LinearWavyProgressIndicator(
+                modifier = Modifier.fillMaxWidth(),
+                color = BlueAccent,
+                trackColor = BlueAccent.copy(alpha = AlphaSubtle),
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+internal fun NotificationGroupCard(
+    notifications: List<IslandEvent.Notification>,
+    isExpanded: Boolean,
+    onToggleExpand: () -> Unit,
+    interactor: IslandActions,
+) {
+    val first = notifications.first()
+    val accent = BlueAccent
+
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeLg)
+                .background(accent.copy(alpha = AlphaFaint))
+                .clickable { onToggleExpand() }
+                .padding(SpaceLg),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            NotifExpandedAvatar(first, SizeCompactIcon)
+
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(SpaceXxs),
+            ) {
+                Text(
+                    first.appName.ifEmpty { first.sbn.packageName.substringAfterLast('.') },
+                    color = OnCardText,
+                    style = MaterialTheme.typography.titleSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+                if (!isExpanded) {
+                    val latest = notifications.first()
+                    Text(
+                        latest.text ?: latest.title ?: "",
+                        color = SubtleGray,
+                        style = MaterialTheme.typography.labelSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+
+            Box(
+                modifier = Modifier
+                    .clip(ShapeChip)
+                    .background(accent.copy(alpha = AlphaSubtle))
+                    .padding(horizontal = SpaceMd, vertical = SpaceXs),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    "${notifications.size}",
+                    color = accent,
+                    style = MaterialTheme.typography.labelSmall,
+                )
+            }
+
+            Icon(
+                if (isExpanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
+                contentDescription = stringResource(
+                    if (isExpanded) R.string.ax_dynamic_bar_show_less
+                    else R.string.ax_dynamic_bar_show_more,
+                ),
+                tint = SubtleGray,
+                modifier = Modifier.size(SizeIconSm),
+            )
+        }
+
+        AnimatedVisibility(
+            visible = isExpanded,
+            enter = expandVertically(MaterialTheme.motionScheme.defaultSpatialSpec()) + fadeIn(MaterialTheme.motionScheme.defaultEffectsSpec()),
+            exit = shrinkVertically(MaterialTheme.motionScheme.defaultSpatialSpec()) + fadeOut(MaterialTheme.motionScheme.defaultEffectsSpec()),
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = SpaceMd),
+                verticalArrangement = Arrangement.spacedBy(SpaceXs),
+            ) {
+                notifications.forEach { event ->
+                    GroupedNotificationRow(
+                        event = event,
+                        interactor = interactor,
+                        onDismiss = { interactor.dismissEvent(event) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun GroupedNotificationRow(
+    event: IslandEvent.Notification,
+    interactor: IslandActions,
+    onDismiss: () -> Unit,
+) {
+    val context = LocalContext.current
+    val accent = BlueAccent
+    var childExpanded by remember { mutableStateOf(false) }
+
+    MagneticSwipeToDismiss(onDismiss = onDismiss) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(ShapeSm)
+                .background(DarkCard)
+                .padding(SpaceLg),
+            verticalArrangement = Arrangement.spacedBy(SpaceMd),
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable { childExpanded = !childExpanded },
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+            ) {
+                NotifExpandedAvatar(event, SpacePanel)
+
+                Column(
+                    modifier = Modifier.weight(1f),
+                    verticalArrangement = Arrangement.spacedBy(SpaceXxs),
+                ) {
+                    val displayName = event.title
+                        ?: event.appName.ifEmpty {
+                            event.sbn.packageName.substringAfterLast('.')
+                        }
+                    Text(
+                        displayName,
+                        color = OnCardText,
+                        style = MaterialTheme.typography.titleSmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    event.text?.let {
+                        Text(
+                            it,
+                            color = SubtleGray,
+                            style = MaterialTheme.typography.bodySmall,
+                            maxLines = if (childExpanded) 4 else 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                }
+
+                Icon(
+                    if (childExpanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
+                    contentDescription = null,
+                    tint = SubtleGray,
+                    modifier = Modifier.size(SizeIconSm),
+                )
+            }
+
+            AnimatedVisibility(
+                visible = childExpanded,
+                enter = expandVertically(MaterialTheme.motionScheme.defaultSpatialSpec()) + fadeIn(MaterialTheme.motionScheme.defaultEffectsSpec()),
+                exit = shrinkVertically(MaterialTheme.motionScheme.defaultSpatialSpec()) + fadeOut(MaterialTheme.motionScheme.defaultEffectsSpec()),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+                ) {
+                    ActionChip(
+                        label = stringResource(R.string.ax_dynamic_bar_open),
+                        color = accent,
+                        bg = accent.copy(alpha = AlphaIconBg),
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            try {
+                                event.sbn.notification?.contentIntent?.sendWithBal(context)
+                            } catch (_: Exception) {}
+                            interactor.collapseIsland()
+                        },
+                    )
+
+                    event.actions
+                        .filter { a ->
+                            val l = a.label?.toString()?.lowercase() ?: ""
+                            l != "collapse" && l != "expand" && l != "minimize"
+                        }
+                        .take(2)
+                        .forEach { notifAction ->
+                            ActionChip(
+                                label = notifAction.label.toString(),
+                                color = OnActionText,
+                                bg = ActionBg,
+                                modifier = Modifier.weight(1f),
+                                onClick = {
+                                    try {
+                                        notifAction.action.actionIntent?.sendWithBal(context)
+                                    } catch (_: Exception) {}
+                                    interactor.collapseIsland()
+                                },
+                            )
+                        }
+                }
+            }
+
+        }
+    }
+}
+
+@Composable
+internal fun RowScope.CompactNotificationRow(event: IslandEvent.Notification) {
+    event.appIcon?.let {
+        Image(
+            bitmap = it.toScaledBitmap(SizeCompactIcon),
+            null,
+            modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact),
+        )
+    }
+        ?: Box(
+            modifier =
+                Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(BlueAccent.copy(alpha = AlphaIconBg)),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                Icons.Filled.Notifications,
+                null,
+                tint = BlueAccent,
+                modifier = Modifier.size(18.dp),
+            )
+        }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.title ?: event.appName.ifEmpty { event.sbn.packageName.substringAfterLast('.') },
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        if (event.text != null)
+            Text(
+                event.text,
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNowPlayingContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNowPlayingContent.kt
new file mode 100644
index 0000000000000..28f4ad5abc47b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedNowPlayingContent.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MusicNote
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.ActionChip
+import com.android.systemui.axdynamicbar.shared.ExpandedCardLayout
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.shared.MintAccent
+import com.android.systemui.axdynamicbar.shared.OnActionText
+import com.android.systemui.axdynamicbar.shared.OnCardSecondary
+import com.android.systemui.axdynamicbar.shared.OnCardText
+import com.android.systemui.axdynamicbar.shared.SpaceLg
+import com.android.systemui.axdynamicbar.shared.sendWithBal
+import com.android.systemui.res.R
+
+@Composable
+internal fun NowPlayingExpanded(event: IslandEvent.NowPlaying, interactor: IslandActions) {
+    val context = LocalContext.current
+    ExpandedCardLayout(
+        accentColor = MintAccent,
+        icon = {
+            Icon(Icons.Filled.MusicNote, null, tint = MintAccent, modifier = Modifier.size(30.dp))
+        },
+        title = {
+            Text(
+                event.songTitle,
+                color = OnCardText,
+                style = MaterialTheme.typography.titleMedium,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+            if (event.artist.isNotEmpty()) {
+                Text(
+                    event.artist,
+                    color = OnCardSecondary,
+                    style = MaterialTheme.typography.bodySmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        },
+        trailing = {
+            Text(
+                stringResource(R.string.ax_dynamic_bar_now_playing),
+                color = MintAccent,
+                style = MaterialTheme.typography.labelSmall,
+            )
+        },
+        actions = if (event.actions.isNotEmpty()) {
+            {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+                ) {
+                    event.actions.forEach { notifAction ->
+                        ActionChip(
+                            label = notifAction.label.toString(),
+                            color = OnActionText,
+                            modifier = Modifier.weight(1f),
+                            onClick = {
+                                try {
+                                    notifAction.action.actionIntent?.sendWithBal(context)
+                                } catch (_: Exception) {}
+                                interactor.collapseIsland()
+                            },
+                        )
+                    }
+                }
+            }
+        } else null,
+    )
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedOngoingContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedOngoingContent.kt
new file mode 100644
index 0000000000000..645a4d484d866
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedOngoingContent.kt
@@ -0,0 +1,265 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.app.Notification
+import android.content.Context
+import android.service.notification.StatusBarNotification
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.RemoteViews
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cast
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import androidx.compose.ui.platform.LocalContext
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+private fun resolveRemoteViews(ctx: Context, notification: Notification): RemoteViews? {
+    notification.bigContentView?.let {
+        return it
+    }
+    notification.contentView?.let {
+        return it
+    }
+    try {
+        val builder = Notification.Builder.recoverBuilder(ctx, notification)
+        builder.createBigContentView()?.let {
+            return it
+        }
+        builder.createContentView()?.let {
+            return it
+        }
+    } catch (_: Exception) {}
+    return null
+}
+
+private fun applyOrReapplyRemoteViews(frame: FrameLayout, notification: Notification): Boolean {
+    val rv =
+        try {
+            resolveRemoteViews(frame.context, notification)
+        } catch (_: Exception) {
+            return false
+        } ?: return false
+    val existing = if (frame.childCount > 0) frame.getChildAt(0) else null
+    if (existing != null) {
+        try {
+            rv.reapply(frame.context, existing)
+            prepareForIsland(existing)
+            return true
+        } catch (_: Exception) {
+            frame.removeAllViews()
+        }
+    }
+    return try {
+        val inflated = rv.apply(frame.context, frame)
+        prepareForIsland(inflated)
+        frame.addView(
+            inflated,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+            ),
+        )
+        true
+    } catch (_: Exception) {
+        false
+    }
+}
+
+@Composable
+private fun SbnContentView(sbn: StatusBarNotification, fallback: @Composable () -> Unit) {
+    var failed by remember(sbn.key) { mutableStateOf(false) }
+    if (failed) {
+        fallback()
+        return
+    }
+    AndroidView(
+        factory = { ctx ->
+            FrameLayout(ctx).apply {
+                setBackgroundColor(android.graphics.Color.TRANSPARENT)
+            }
+        },
+        update = { frame ->
+            val notification = sbn.notification
+            if (notification == null || !applyOrReapplyRemoteViews(frame, notification)) {
+                failed = true
+            }
+        },
+        modifier = Modifier.fillMaxWidth().clip(ShapeIconMedium),
+    )
+}
+
+private val COLLAPSE_CHIP_IDS = arrayOf("expand_button_touch_container", "expand_button")
+
+private fun prepareForIsland(root: View) {
+    val res = root.resources
+
+    for (name in COLLAPSE_CHIP_IDS) {
+        val id = res.getIdentifier(name, "id", "android")
+        if (id != 0) root.findViewById<View>(id)?.visibility = View.GONE
+    }
+    hideCollapseButtons(root)
+}
+
+private val COLLAPSE_LABELS = setOf("collapse", "expand", "minimize")
+
+private fun hideCollapseButtons(view: View) {
+    if (view is Button) {
+        val text = view.text?.toString()?.lowercase() ?: ""
+        if (COLLAPSE_LABELS.any { text.contains(it) }) {
+            view.visibility = View.GONE
+        }
+    }
+    if (view is ViewGroup) {
+        for (i in 0 until view.childCount) {
+            hideCollapseButtons(view.getChildAt(i))
+        }
+    }
+}
+
+@Composable
+internal fun PromotedOngoingExpanded(
+    event: IslandEvent.PromotedOngoing,
+    interactor: IslandActions,
+) {
+    val sbn = event.sbn
+    SbnContentView(sbn, fallback = { PromotedOngoingFallback(event, interactor) })
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun PromotedOngoingFallback(
+    event: IslandEvent.PromotedOngoing,
+    interactor: IslandActions,
+) {
+    val context = LocalContext.current
+    ExpandedCardLayout(
+        accentColor = BlueAccent,
+        iconSize = SizeButtonLg,
+        iconBackground = false,
+        icon = {
+            event.appIcon?.let { icon ->
+                Image(
+                    bitmap = icon.toScaledBitmap(SizeButtonLg),
+                    contentDescription = null,
+                    modifier = Modifier.size(SizeButtonLg).clip(ShapeIconLarge),
+                    contentScale = ContentScale.Crop,
+                )
+            } ?: PulsingDot(color = BlueAccent, size = 10.dp)
+        },
+        title = {
+            Text(event.title.ifEmpty { event.appName }, color = OnCardText, style = MaterialTheme.typography.titleMedium, maxLines = 2, overflow = TextOverflow.Ellipsis)
+            if (event.text.isNotEmpty()) {
+                Text(event.text, color = SubtleGray, style = MaterialTheme.typography.bodySmall, maxLines = 2, overflow = TextOverflow.Ellipsis)
+            }
+            if (event.shortText.isNotEmpty()) {
+                StatusChip(event.shortText, BlueAccent)
+            }
+        },
+        actions = {
+            if (event.progress >= 0f || event.isIndeterminate) {
+                LinearWavyProgressIndicator(
+                    progress = { if (event.isIndeterminate) 0f else event.progress },
+                    modifier = Modifier.fillMaxWidth(),
+                    color = BlueAccent,
+                    trackColor = BlueAccent.copy(alpha = 0.20f),
+                )
+            }
+            val usableActions =
+                event.actions.filter { action ->
+                    val label = action.label.toString().lowercase()
+                    label != "collapse" && label != "expand" && label != "minimize"
+                }
+            if (usableActions.isNotEmpty()) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+                ) {
+                    usableActions.take(2).forEach { notifAction ->
+                        ActionChip(
+                            label = notifAction.label.toString(),
+                            modifier = Modifier.weight(1f),
+                            onClick = {
+                                try {
+                                    notifAction.action.actionIntent?.sendWithBal(context)
+                                } catch (_: Exception) {}
+                                interactor.collapseIsland()
+                            },
+                        )
+                    }
+                }
+            }
+        },
+    )
+}
+
+@Composable
+internal fun RowScope.CompactPromotedOngoingRow(event: IslandEvent.PromotedOngoing) {
+    event.appIcon?.let { icon ->
+        Image(
+            bitmap = icon.toScaledBitmap(SizeCompactIcon),
+            contentDescription = null,
+            modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact),
+            contentScale = ContentScale.Crop,
+        )
+    }
+        ?: Box(
+            modifier =
+                Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(BlueAccent.copy(alpha = AlphaIconBg)),
+            contentAlignment = Alignment.Center,
+        ) {
+            PulsingDot(color = BlueAccent, size = SpaceMd)
+        }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.title.ifEmpty { event.appName },
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        val subLabel = event.shortText.ifEmpty {
+            if ((event.progress >= 0f || event.isIndeterminate) && event.text.isNotEmpty()) event.text
+            else ""
+        }
+        if (subLabel.isNotEmpty()) {
+            Text(subLabel, color = BlueAccent, style = MaterialTheme.typography.labelSmall)
+        }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedRecordingContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedRecordingContent.kt
new file mode 100644
index 0000000000000..8f43a67ba00b2
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedRecordingContent.kt
@@ -0,0 +1,198 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Mic
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Stop
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.res.R
+import androidx.compose.ui.platform.LocalContext
+import com.android.systemui.axdynamicbar.shared.*
+import kotlinx.coroutines.delay
+
+@Composable
+internal fun AudioRecordingExpanded(
+    event: IslandEvent.AudioRecording,
+    interactor: IslandActions,
+) {
+    val context = LocalContext.current
+    val style = eventStyleFor(event)
+    val isSaved = event.state == RecordingState.SAVED
+
+    var elapsedMs by remember(event.startTimeMs, event.pausedDurationMs) {
+        mutableLongStateOf(
+            (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs).coerceAtLeast(0L)
+        )
+    }
+    LaunchedEffect(event.startTimeMs, event.state, event.pausedDurationMs) {
+        if (event.state == RecordingState.RECORDING) {
+            while (true) {
+                delay(1000)
+                elapsedMs =
+                    (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                        .coerceAtLeast(0L)
+            }
+        }
+    }
+
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = {
+            when (event.state) {
+                RecordingState.RECORDING -> PulsingDot(color = style.accent, size = 14.dp, durationMs = 550, minAlpha = AlphaTrack)
+                else -> style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(22.dp)) }
+            }
+        },
+        title = {
+            Text(event.appName.ifEmpty { stringResource(style.labelRes) }, color = SubtleGray, style = MaterialTheme.typography.labelMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            if (!isSaved) {
+                Text(formatElapsedTime(elapsedMs), color = style.accent, style = MaterialTheme.typography.headlineMedium)
+            } else {
+                Text(stringResource(style.labelRes), color = style.accent, style = MaterialTheme.typography.titleSmall)
+            }
+        },
+        trailing = {
+            when (event.state) {
+                RecordingState.RECORDING -> StatusChip(stringResource(R.string.ax_dynamic_bar_recording), style.accent)
+                RecordingState.PAUSED -> StatusChip(stringResource(R.string.ax_dynamic_bar_paused), SubtleGray)
+                RecordingState.SAVED -> {}
+            }
+        },
+        actions = if (event.actions.isNotEmpty()) {
+            {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+                ) {
+                    event.actions.forEach { notifAction ->
+                        val pkg = notifAction.action.actionIntent?.creatorPackage ?: context.packageName
+                        val kind = notifAction.action.classify(context, pkg)
+                        val btnColor =
+                            when (kind) {
+                                NotificationActionType.STOP, NotificationActionType.DELETE -> DestructiveBg
+                                NotificationActionType.RESUME -> GreenAccent
+                                else -> ActionBg
+                            }
+                        val textColor =
+                            when (kind) {
+                                NotificationActionType.STOP, NotificationActionType.DELETE -> OnDestructiveText
+                                NotificationActionType.RESUME -> chipContentColorOn(GreenAccent)
+                                else -> OnActionText
+                            }
+                        val btnIcon =
+                            when (kind) {
+                                NotificationActionType.STOP, NotificationActionType.DELETE -> Icons.Filled.Stop
+                                NotificationActionType.RESUME -> Icons.Filled.PlayArrow
+                                NotificationActionType.PAUSE -> Icons.Filled.Pause
+                                else -> null
+                            }
+                        ActionChip(
+                            label = notifAction.label.toString(),
+                            icon = btnIcon,
+                            color = textColor,
+                            bg = btnColor,
+                            modifier = Modifier.weight(1f),
+                            onClick = {
+                                try {
+                                    notifAction.action.actionIntent?.sendWithBal(context)
+                                } catch (_: Exception) {}
+                                interactor.collapseIsland()
+                            },
+                        )
+                    }
+                }
+            }
+        } else null,
+    )
+}
+
+
+@Composable
+internal fun RowScope.CompactAudioRecordingRow(event: IslandEvent.AudioRecording) {
+    val style = eventStyleFor(event)
+    var elapsedMs by remember(event.startTimeMs, event.pausedDurationMs) {
+        mutableLongStateOf(
+            (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs).coerceAtLeast(0L)
+        )
+    }
+    LaunchedEffect(event.startTimeMs, event.state, event.pausedDurationMs) {
+        if (event.state == RecordingState.RECORDING) {
+            while (true) {
+                delay(1000)
+                elapsedMs =
+                    (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                        .coerceAtLeast(0L)
+            }
+        }
+    }
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(style.accent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        when (event.state) {
+            RecordingState.RECORDING -> PulsingDot(color = style.accent, size = 10.dp, durationMs = 550, minAlpha = AlphaTrack)
+            RecordingState.PAUSED ->
+                style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(16.dp)) }
+            RecordingState.SAVED ->
+                style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(16.dp)) }
+        }
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            when (event.state) {
+                RecordingState.RECORDING -> stringResource(R.string.ax_dynamic_bar_recording)
+                RecordingState.PAUSED -> stringResource(R.string.ax_dynamic_bar_paused)
+                RecordingState.SAVED -> stringResource(R.string.ax_dynamic_bar_saved)
+            },
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+        )
+        when (event.state) {
+            RecordingState.RECORDING, RecordingState.PAUSED ->
+                Text(formatElapsedTime(elapsedMs), color = SubtleGray, style = MaterialTheme.typography.labelSmall)
+            RecordingState.SAVED -> if (event.appName.isNotEmpty()) {
+                Text(
+                    event.appName,
+                    color = SubtleGray,
+                    style = MaterialTheme.typography.labelSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSportsContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSportsContent.kt
new file mode 100644
index 0000000000000..4b1743c131bcb
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSportsContent.kt
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.graphics.drawable.Drawable
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+@Composable
+internal fun SportsExpanded(event: IslandEvent.Sports, interactor: IslandActions) {
+    val accent = accentColorFor(event)
+
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(SpaceLg),
+    ) {
+        if (event.league.isNotEmpty()) {
+            Text(
+                event.league,
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        StatusBadge(event.status, accent)
+
+        if (event.team2Name.isNotEmpty()) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceEvenly,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                TeamColumn(event.team1Name, event.team1Icon?.toScaledBitmap(48.dp))
+                if (event.score1.isNotEmpty()) {
+                    ScoreDisplay(event.score1, event.score2, accent)
+                } else {
+                    Text(
+                        stringResource(R.string.ax_dynamic_bar_sports_vs),
+                        color = SubtleGray,
+                        style = MaterialTheme.typography.headlineSmall,
+                        fontWeight = FontWeight.Light,
+                    )
+                }
+                TeamColumn(event.team2Name, event.team2Icon?.toScaledBitmap(48.dp))
+            }
+        } else {
+            Text(
+                event.team1Name,
+                color = OnCardText,
+                style = MaterialTheme.typography.bodyMedium,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        if (event.statusDetail.isNotEmpty()) {
+            Text(
+                event.statusDetail,
+                color = OnCardSecondary,
+                style = MaterialTheme.typography.bodySmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        if (event.commentary.isNotEmpty()) {
+            Text(
+                event.commentary,
+                color = OnCardSecondary,
+                style = MaterialTheme.typography.bodySmall,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
+
+@Composable
+internal fun RowScope.CompactSportsRow(event: IslandEvent.Sports) {
+    val accent = accentColorFor(event)
+
+    CompactTeamBadge(event.team1Name, event.team1Icon, accent)
+
+    Spacer(Modifier.width(SpaceSm))
+
+    if (event.team2Name.isNotEmpty()) {
+        if (event.score1.isNotEmpty()) {
+            Text(
+                "${event.score1} - ${event.score2}",
+                color = accent,
+                style = MaterialTheme.typography.titleSmall,
+                maxLines = 1,
+            )
+        } else {
+            Text(
+                stringResource(R.string.ax_dynamic_bar_sports_vs),
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+            )
+        }
+
+        Spacer(Modifier.width(SpaceSm))
+
+        CompactTeamBadge(event.team2Name, event.team2Icon, accent)
+    } else {
+        Text(
+            event.team1Name,
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f),
+        )
+    }
+
+    Spacer(Modifier.width(SpaceSm))
+
+    StatusBadge(event.status, accent)
+}
+
+@Composable
+private fun CompactTeamBadge(name: String, icon: Drawable?, accent: Color) {
+    icon?.let {
+        Image(
+            bitmap = it.toScaledBitmap(SizeCompactIcon),
+            contentDescription = name,
+            modifier = Modifier.size(SizeCompactIcon).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    } ?: Box(
+        modifier = Modifier.size(SizeCompactIcon).clip(CircleShape).background(accent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            name.take(3).uppercase(),
+            color = accent,
+            style = TsBadge,
+        )
+    }
+}
+
+@Composable
+private fun TeamColumn(
+    name: String,
+    icon: ImageBitmap?,
+) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(SpaceMd),
+        modifier = Modifier.width(80.dp),
+    ) {
+        if (icon != null) {
+            Image(
+                bitmap = icon,
+                contentDescription = name,
+                modifier = Modifier.size(48.dp).clip(CircleShape),
+                contentScale = ContentScale.Crop,
+            )
+        } else {
+            Box(
+                modifier = Modifier.size(48.dp).clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceContainerHigh),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    name.take(3).uppercase(),
+                    color = OnCardText,
+                    style = MaterialTheme.typography.labelSmall,
+                    fontWeight = FontWeight.Bold,
+                )
+            }
+        }
+        Text(
+            name,
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Composable
+private fun ScoreDisplay(score1: String, score2: String, accent: Color) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+    ) {
+        Text(
+            score1,
+            color = OnCardText,
+            style = MaterialTheme.typography.headlineMedium,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+        )
+        Text(
+            "-",
+            color = SubtleGray,
+            style = MaterialTheme.typography.headlineSmall,
+            fontWeight = FontWeight.Light,
+        )
+        Text(
+            score2,
+            color = OnCardText,
+            style = MaterialTheme.typography.headlineMedium,
+            fontWeight = FontWeight.Bold,
+            maxLines = 1,
+        )
+    }
+}
+
+@Composable
+private fun StatusBadge(status: IslandEvent.GameStatus, accent: Color) {
+    val label = when (status) {
+        IslandEvent.GameStatus.LIVE -> stringResource(R.string.ax_dynamic_bar_sports_live)
+        IslandEvent.GameStatus.FINAL -> stringResource(R.string.ax_dynamic_bar_sports_final)
+        IslandEvent.GameStatus.HALFTIME -> stringResource(R.string.ax_dynamic_bar_sports_halftime)
+        IslandEvent.GameStatus.PRE_GAME -> stringResource(R.string.ax_dynamic_bar_sports_upcoming)
+    }
+    Surface(
+        shape = ShapeChip,
+        color = accent.copy(alpha = AlphaIconBg),
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = SpaceLg, vertical = SpaceXs),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(SpaceXs),
+        ) {
+            if (status == IslandEvent.GameStatus.LIVE) {
+                PulsingDot(color = accent, size = 6.dp)
+            }
+            Text(label, color = accent, style = MaterialTheme.typography.labelSmall, fontWeight = FontWeight.SemiBold)
+        }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSystemContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSystemContent.kt
new file mode 100644
index 0000000000000..4ff95f6cf93dc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedSystemContent.kt
@@ -0,0 +1,376 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.media.AudioManager
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BatteryChargingFull
+import androidx.compose.material.icons.filled.Bluetooth
+import androidx.compose.material.icons.filled.BluetoothDisabled
+import androidx.compose.material.icons.filled.VolumeOff
+import androidx.compose.material.icons.filled.VolumeUp
+import androidx.compose.material.icons.filled.Vibration
+import androidx.compose.material.icons.filled.VpnKey
+import androidx.compose.material.icons.filled.Wifi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+
+@Composable
+internal fun ChargingExpanded(event: IslandEvent.Charging) {
+    ExpandedCardLayout(
+        accentColor = GreenAccent,
+        icon = {
+            Icon(Icons.Filled.BatteryChargingFull, null, tint = GreenAccent, modifier = Modifier.size(30.dp))
+        },
+        title = {
+            Text(
+                if (event.isWireless) stringResource(R.string.ax_dynamic_bar_wireless_charging)
+                else stringResource(R.string.ax_dynamic_bar_charging),
+                color = OnCardText,
+                style = MaterialTheme.typography.titleMedium,
+            )
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+            ) {
+                StatusChip("${event.level}%", GreenAccent)
+                if (event.isPowerSave) {
+                    StatusChip(stringResource(R.string.ax_dynamic_bar_battery_saver), OrangeAccent)
+                }
+            }
+        },
+        trailing = if (!event.timeRemaining.isNullOrEmpty()) {
+            {
+                Text(
+                    "${event.timeRemaining} ${stringResource(R.string.ax_dynamic_bar_until_full)}",
+                    color = SubtleGray,
+                    style = MaterialTheme.typography.labelMedium,
+                )
+            }
+        } else null,
+    )
+}
+
+@Composable
+internal fun BluetoothExpanded(event: IslandEvent.Bluetooth, interactor: IslandActions) {
+    ExpandedCardLayout(
+        accentColor = BlueAccent,
+        icon = {
+            event.deviceIcon?.let {
+                Image(
+                    bitmap = it.toScaledBitmap(30.dp),
+                    contentDescription = event.deviceTypeLabel.ifEmpty {
+                        stringResource(R.string.ax_dynamic_bar_bluetooth_device)
+                    },
+                    modifier = Modifier.size(30.dp),
+                )
+            } ?: Icon(Icons.Filled.Bluetooth, null, tint = BlueAccent, modifier = Modifier.size(28.dp))
+        },
+        title = {
+            Text(event.deviceName, color = OnCardText, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+            ) {
+                StatusChip(
+                    event.deviceTypeLabel.ifEmpty { stringResource(R.string.ax_dynamic_bar_connected) },
+                    BlueAccent,
+                )
+                if (event.batteryLevel >= 0) {
+                    val batteryColor = if (event.batteryLevel > 20) GreenAccent else RedAccent
+                    StatusChip("${event.batteryLevel}%", batteryColor)
+                }
+            }
+        },
+        trailing = { PulsingDot(color = BlueAccent, size = SpaceMd) },
+        actions = {
+            ActionChip(
+                label = stringResource(R.string.ax_dynamic_bar_disconnect),
+                icon = Icons.Filled.BluetoothDisabled,
+                color = OnDestructiveText,
+                bg = DestructiveBg,
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { interactor.disconnectBluetooth(event.address) },
+            )
+        },
+    )
+}
+
+@Composable
+internal fun HotspotExpanded(event: IslandEvent.Hotspot) {
+    ExpandedCardLayout(
+        accentColor = OrangeAccent,
+        icon = { Icon(Icons.Filled.Wifi, null, tint = OrangeAccent, modifier = Modifier.size(SizeIconMd)) },
+        title = {
+            Text(stringResource(R.string.ax_dynamic_bar_hotspot_active), color = OnCardText, style = MaterialTheme.typography.titleMedium)
+            StatusChip(
+                when (event.numDevices) {
+                    0 -> stringResource(R.string.ax_dynamic_bar_no_devices)
+                    1 -> stringResource(R.string.ax_dynamic_bar_one_device_connected)
+                    else -> stringResource(R.string.ax_dynamic_bar_devices_connected, event.numDevices)
+                },
+                OrangeAccent,
+            )
+        },
+        trailing = { PulsingDot(color = OrangeAccent, size = SpaceMd) },
+    )
+}
+
+@Composable
+internal fun RingerModeExpanded(event: IslandEvent.RingerMode, interactor: IslandActions) {
+    val style = eventStyleFor(event)
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = { style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(22.dp)) } },
+        title = {
+            Text(stringResource(R.string.ax_dynamic_bar_sound_mode), color = OnCardText, style = MaterialTheme.typography.titleMedium)
+            StatusChip(stringResource(style.labelRes), style.accent)
+        },
+        actions = {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+            ) {
+                RingerCard(
+                    isSelected = event.mode == AudioManager.RINGER_MODE_NORMAL,
+                    icon = Icons.Filled.VolumeUp,
+                    label = stringResource(R.string.ax_dynamic_bar_ring),
+                    accent = BlueAccent,
+                    onClick = { interactor.setRingerMode(AudioManager.RINGER_MODE_NORMAL) },
+                    modifier = Modifier.weight(1f),
+                )
+                RingerCard(
+                    isSelected = event.mode == AudioManager.RINGER_MODE_VIBRATE,
+                    icon = Icons.Filled.Vibration,
+                    label = stringResource(R.string.ax_dynamic_bar_vibrate),
+                    accent = OrangeAccent,
+                    onClick = { interactor.setRingerMode(AudioManager.RINGER_MODE_VIBRATE) },
+                    modifier = Modifier.weight(1f),
+                )
+                RingerCard(
+                    isSelected = event.mode == AudioManager.RINGER_MODE_SILENT,
+                    icon = Icons.Filled.VolumeOff,
+                    label = stringResource(R.string.ax_dynamic_bar_silent),
+                    accent = RedAccent,
+                    onClick = { interactor.setRingerMode(AudioManager.RINGER_MODE_SILENT) },
+                    modifier = Modifier.weight(1f),
+                )
+            }
+        },
+    )
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun RingerCard(
+    isSelected: Boolean,
+    icon: ImageVector,
+    label: String,
+    accent: Color,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val bg by
+        animateColorAsState(
+            targetValue = if (isSelected) accent.copy(alpha = AlphaIconBg) else OnCardText.copy(alpha = AlphaFaint),
+            animationSpec = MaterialTheme.motionScheme.fastEffectsSpec(),
+            label = "ringer_bg",
+        )
+    val tint by
+        animateColorAsState(
+            targetValue = if (isSelected) accent else SubtleGray,
+            animationSpec = MaterialTheme.motionScheme.fastEffectsSpec(),
+            label = "ringer_tint",
+        )
+
+    Surface(
+        onClick = onClick,
+        modifier = modifier,
+        shape = ShapeLg,
+        color = bg,
+    ) {
+        Column(
+            modifier = Modifier.padding(vertical = SpaceSection),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(SpaceMd),
+        ) {
+            Icon(icon, null, tint = tint, modifier = Modifier.size(28.dp))
+            Text(label, color = tint, style = MaterialTheme.typography.labelMedium)
+        }
+    }
+}
+
+@Composable
+internal fun VpnExpanded(event: IslandEvent.Vpn) {
+    val style = eventStyleFor(event)
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = { style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(28.dp)) } },
+        title = {
+            Text(
+                stringResource(style.labelRes),
+                color = OnCardText,
+                style = MaterialTheme.typography.titleMedium,
+            )
+            StatusChip(
+                if (event.isValidated) stringResource(R.string.ax_dynamic_bar_secured)
+                else stringResource(R.string.ax_dynamic_bar_connecting),
+                if (event.isValidated) GreenAccent else OrangeAccent,
+            )
+        },
+        trailing = {
+            PulsingDot(color = if (event.isValidated) GreenAccent else OrangeAccent, size = SpaceMd)
+        },
+    )
+}
+
+@Composable
+internal fun RowScope.CompactBluetoothRow(event: IslandEvent.Bluetooth) {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(BlueAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        event.deviceIcon?.let {
+            Image(bitmap = it.toScaledBitmap(SizeIconSm), null, modifier = Modifier.size(SizeIconSm))
+        } ?: Icon(Icons.Filled.Bluetooth, null, tint = BlueAccent, modifier = Modifier.size(18.dp))
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.deviceName,
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Text(
+            event.deviceTypeLabel.ifEmpty { stringResource(R.string.ax_dynamic_bar_connected) },
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+        )
+    }
+    if (event.batteryLevel >= 0) {
+        Spacer(Modifier.width(SpaceMd))
+        Text(
+            "${event.batteryLevel}%",
+            color = if (event.batteryLevel > 20) GreenAccent else RedAccent,
+            style = MaterialTheme.typography.bodySmall,
+        )
+    }
+}
+
+@Composable
+internal fun RowScope.CompactHotspotRow(event: IslandEvent.Hotspot) {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(OrangeAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(Icons.Filled.Wifi, null, tint = OrangeAccent, modifier = Modifier.size(18.dp))
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(stringResource(R.string.ax_dynamic_bar_hotspot), color = OnCardText, style = MaterialTheme.typography.bodySmall)
+        Text(
+            when (event.numDevices) {
+                0 -> stringResource(R.string.ax_dynamic_bar_no_devices)
+                1 -> stringResource(R.string.ax_dynamic_bar_one_device)
+                else -> stringResource(R.string.ax_dynamic_bar_hotspot_devices, event.numDevices)
+            },
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+        )
+    }
+    PulsingDot(color = OrangeAccent, size = 7.dp)
+}
+
+@Composable
+internal fun RowScope.CompactChargingRow(event: IslandEvent.Charging) {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(GreenAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            Icons.Filled.BatteryChargingFull,
+            null,
+            tint = GreenAccent,
+            modifier = Modifier.size(18.dp),
+        )
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            if (event.isWireless) stringResource(R.string.ax_dynamic_bar_wireless_charging)
+            else stringResource(R.string.ax_dynamic_bar_charging),
+            color = OnCardText,
+            style = MaterialTheme.typography.bodySmall,
+        )
+        val saverLabel = if (event.isPowerSave) stringResource(R.string.ax_dynamic_bar_saver) else null
+        Text(
+            buildString {
+                append("${event.level}%")
+                saverLabel?.let { append(" · $it") }
+            },
+            color = if (event.isPowerSave) OrangeAccent else GreenAccent,
+            style = MaterialTheme.typography.labelSmall,
+        )
+    }
+}
+
+@Composable
+internal fun RowScope.CompactRingerRow(event: IslandEvent.RingerMode) {
+    val style = eventStyleFor(event)
+    Box(
+        modifier = Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(style.accent.copy(alpha = AlphaStatusChip)),
+        contentAlignment = Alignment.Center,
+    ) {
+        style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(18.dp)) }
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Text(event.label, color = OnCardText, style = MaterialTheme.typography.bodySmall, modifier = Modifier.weight(1f))
+}
+
+@Composable
+internal fun RowScope.CompactVpnRow() {
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(IndigoAccent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(Icons.Filled.VpnKey, null, tint = IndigoAccent, modifier = Modifier.size(18.dp))
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Text(stringResource(R.string.ax_dynamic_bar_vpn_active), color = OnCardText, style = MaterialTheme.typography.bodySmall, modifier = Modifier.weight(1f))
+    PulsingDot(color = GreenAccent, size = 7.dp)
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTimerContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTimerContent.kt
new file mode 100644
index 0000000000000..b14bbc77e46f1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTimerContent.kt
@@ -0,0 +1,312 @@
+/*
+ * Copyright 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.res.R
+import kotlinx.coroutines.delay
+
+@Composable
+internal fun TimerExpanded(event: IslandEvent.Timer, interactor: IslandActions) {
+    val context = LocalContext.current
+    val style = eventStyleFor(event)
+    val totalMs = event.originalDurationMs.takeIf { it > 0L } ?: 1L
+    var remainingMs by
+        remember(event.endTimeMs) {
+            mutableLongStateOf(
+                if (event.endTimeMs > 0L)
+                    (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                else 0L
+            )
+        }
+    if (!event.isPaused) {
+        LaunchedEffect(event.endTimeMs) {
+            if (event.endTimeMs > 0L) {
+                while (remainingMs > 0L) {
+                    delay(500)
+                    remainingMs = (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                }
+            }
+        }
+    }
+    val progress = if (event.endTimeMs > 0L) remainingMs.toFloat() / totalMs else 0f
+
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = {
+            Box(modifier = Modifier.size(44.dp), contentAlignment = Alignment.Center) {
+                Canvas(Modifier.size(44.dp)) {
+                    drawArc(
+                        color = style.accent.copy(alpha = AlphaSubtle),
+                        startAngle = -90f,
+                        sweepAngle = 360f,
+                        useCenter = false,
+                        style = Stroke(width = 3.dp.toPx(), cap = StrokeCap.Round),
+                        topLeft = Offset.Zero,
+                        size = Size(size.width, size.height),
+                    )
+                    drawArc(
+                        color = style.accent,
+                        startAngle = -90f,
+                        sweepAngle = 360f * progress.coerceIn(0f, 1f),
+                        useCenter = false,
+                        style = Stroke(width = 3.dp.toPx(), cap = StrokeCap.Round),
+                        topLeft = Offset.Zero,
+                        size = Size(size.width, size.height),
+                    )
+                }
+                style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(22.dp)) }
+            }
+        },
+        title = {
+            Text(event.label.ifEmpty { stringResource(style.labelRes) }, color = SubtleGray, style = MaterialTheme.typography.labelMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            if (event.endTimeMs > 0L) {
+                Text(
+                    if (event.isPaused) stringResource(R.string.ax_dynamic_bar_paused) else formatCountdownLong(remainingMs),
+                    color = if (event.isPaused) SubtleGray else style.accent,
+                    style = MaterialTheme.typography.headlineMedium,
+                )
+            } else {
+                Text(
+                    stringResource(if (event.isPaused) R.string.ax_dynamic_bar_paused else R.string.ax_dynamic_bar_running),
+                    color = if (event.isPaused) SubtleGray else style.accent,
+                    style = MaterialTheme.typography.titleSmall,
+                )
+            }
+        },
+        trailing = { if (event.isPaused) StatusChip(stringResource(R.string.ax_dynamic_bar_paused), SubtleGray) },
+        actions = {
+            if (event.actions.isNotEmpty()) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+                ) {
+                    event.actions.forEach { notifAction ->
+                        ActionChip(
+                            label = notifAction.label.toString(),
+                            modifier = Modifier.weight(1f),
+                            onClick = {
+                                try {
+                                    notifAction.action.actionIntent?.sendWithBal(context)
+                                } catch (_: Exception) {}
+                            },
+                        )
+                    }
+                }
+            } else {
+                ActionChip(
+                    label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                    icon = Icons.Filled.Close,
+                    color = style.accent,
+                    bg = style.accent.copy(alpha = AlphaIconBg),
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = { interactor.dismissEvent(event) },
+                )
+            }
+        },
+    )
+}
+
+@Composable
+internal fun StopwatchExpanded(event: IslandEvent.Stopwatch, interactor: IslandActions) {
+    val context = LocalContext.current
+    val style = eventStyleFor(event)
+    var elapsedMs by
+        remember(event.startTimeMs) {
+            mutableLongStateOf((System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L))
+        }
+    if (event.isRunning) {
+        LaunchedEffect(event.startTimeMs) {
+            while (true) {
+                delay(100)
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L)
+            }
+        }
+    }
+
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = {
+            if (event.isRunning) PulsingDot(color = style.accent, size = 22.dp)
+            else style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(22.dp)) }
+        },
+        title = {
+            Text(event.label.ifEmpty { stringResource(style.labelRes) }, color = SubtleGray, style = MaterialTheme.typography.labelMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            Text(
+                if (event.isRunning) formatStopwatch(elapsedMs) else stringResource(R.string.ax_dynamic_bar_paused),
+                color = if (event.isRunning) style.accent else SubtleGray,
+                style = MaterialTheme.typography.headlineMedium,
+            )
+        },
+        trailing = { if (!event.isRunning) StatusChip(stringResource(R.string.ax_dynamic_bar_paused), SubtleGray) },
+        actions = {
+            if (event.actions.isNotEmpty()) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+                ) {
+                    event.actions.forEach { notifAction ->
+                        ActionChip(
+                            label = notifAction.label.toString(),
+                            modifier = Modifier.weight(1f),
+                            onClick = {
+                                try {
+                                    notifAction.action.actionIntent?.sendWithBal(context)
+                                } catch (_: Exception) {}
+                            },
+                        )
+                    }
+                }
+            } else {
+                ActionChip(
+                    label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                    icon = Icons.Filled.Close,
+                    color = style.accent,
+                    bg = style.accent.copy(alpha = AlphaIconBg),
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = { interactor.dismissEvent(event) },
+                )
+            }
+        },
+    )
+}
+
+@Composable
+internal fun RowScope.CompactTimerRow(event: IslandEvent.Timer) {
+    var remainingMs by
+        remember(event.endTimeMs) {
+            mutableLongStateOf(
+                if (event.endTimeMs > 0L)
+                    (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                else 0L
+            )
+        }
+    if (!event.isPaused) {
+        LaunchedEffect(event.endTimeMs) {
+            if (event.endTimeMs > 0L) {
+                while (remainingMs > 0L) {
+                    delay(500)
+                    remainingMs = (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                }
+            }
+        }
+    }
+    val style = eventStyleFor(event)
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(style.accent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(18.dp)) }
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        if (event.label.isNotEmpty())
+            Text(
+                event.label,
+                color = SubtleGray,
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        if (event.endTimeMs > 0L) {
+            Text(
+                if (event.isPaused) stringResource(R.string.ax_dynamic_bar_paused) else formatCountdownLong(remainingMs),
+                color = if (event.isPaused) SubtleGray else style.accent,
+                style = TsMono.copy(fontSize = 13.sp),
+            )
+        } else {
+            Text(stringResource(if (event.isPaused) R.string.ax_dynamic_bar_paused else R.string.ax_dynamic_bar_running), color = style.accent, style = MaterialTheme.typography.labelSmall)
+        }
+    }
+}
+
+@Composable
+internal fun RowScope.CompactStopwatchRow(event: IslandEvent.Stopwatch) {
+    var elapsedMs by
+        remember(event.startTimeMs) {
+            mutableLongStateOf((System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L))
+        }
+    if (event.isRunning) {
+        LaunchedEffect(event.startTimeMs) {
+            while (true) {
+                delay(200)
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L)
+            }
+        }
+    }
+    val style = eventStyleFor(event)
+    Box(
+        modifier =
+            Modifier.size(SizeCompactIcon).clip(ShapeCompact).background(style.accent.copy(alpha = AlphaIconBg)),
+        contentAlignment = Alignment.Center,
+    ) {
+        if (event.isRunning) PulsingDot(color = style.accent, size = 18.dp)
+        else style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(18.dp)) }
+    }
+    Spacer(Modifier.width(SpaceLg))
+    Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SpaceXxs)) {
+        Text(
+            event.label.ifEmpty { stringResource(style.labelRes) },
+            color = SubtleGray,
+            style = MaterialTheme.typography.labelSmall,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Text(
+            if (event.isRunning) formatStopwatch(elapsedMs) else stringResource(R.string.ax_dynamic_bar_paused),
+            color = if (event.isRunning) style.accent else SubtleGray,
+            style = TsMono.copy(fontSize = 13.sp),
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTorchContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTorchContent.kt
new file mode 100644
index 0000000000000..347d5cd77b398
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/ExpandedTorchContent.kt
@@ -0,0 +1,138 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.FlashlightOff
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.flashlight.ui.composable.VerticalFlashlightSlider
+import com.android.systemui.res.R
+
+@Composable
+internal fun RowScope.TorchPill(event: IslandEvent.Torch) {
+    val style = eventStyleFor(event)
+    style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(15.dp)) }
+    Spacer(Modifier.width(SpaceSm))
+    Text(stringResource(style.labelRes), color = OnCardText, style = PillPrimary)
+    if (event.supportsLevel) {
+        Spacer(Modifier.width(SpaceSm))
+        val pct = (event.level.toFloat() / event.maxLevel * 100).toInt()
+        Text("$pct%", color = style.accent, style = PillAccent)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun TorchExpanded(
+    event: IslandEvent.Torch,
+    interactor: IslandActions,
+    hapticsViewModelFactory: SliderHapticsViewModel.Factory,
+) {
+    var isDragging by remember { mutableStateOf(false) }
+    var localLevel by remember { mutableIntStateOf(event.level) }
+    LaunchedEffect(event.level) { if (!isDragging) localLevel = event.level }
+    val displayLevel = if (isDragging) localLevel else event.level
+
+    val style = eventStyleFor(event)
+    ExpandedCardLayout(
+        accentColor = style.accent,
+        icon = { style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(28.dp)) } },
+        title = {
+            Text(stringResource(style.labelRes), color = OnCardText, style = MaterialTheme.typography.titleMedium)
+            if (event.supportsLevel) {
+                val pct = (displayLevel.toFloat() / event.maxLevel * 100).toInt()
+                StatusChip("$pct%", style.accent)
+            } else {
+                StatusChip(stringResource(R.string.ax_dynamic_bar_on), style.accent)
+            }
+        },
+        trailing = {
+            CircleButton(
+                color = RedAccent.copy(alpha = AlphaSubtle),
+                size = SizeButton,
+                onClick = { interactor.toggleTorch() },
+            ) {
+                Icon(Icons.Filled.FlashlightOff, null, tint = RedAccent, modifier = Modifier.size(22.dp))
+            }
+        },
+        actions = if (event.supportsLevel) {
+            {
+                Box(
+                    modifier = Modifier.fillMaxWidth().wrapContentHeight(),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    VerticalFlashlightSlider(
+                        valueRange = 1..event.maxLevel,
+                        onValueChange = {
+                            isDragging = true
+                            localLevel = it
+                            interactor.setTorchLevelTemporary(it)
+                        },
+                        onValueChangeFinished = {
+                            isDragging = false
+                            interactor.setTorchLevel(it)
+                        },
+                        isEnabled = true,
+                        levelValue = displayLevel,
+                        hapticsViewModelFactory = hapticsViewModelFactory,
+                        colors =
+                            SliderDefaults.colors(
+                                thumbColor = style.accent,
+                                activeTrackColor = style.accent,
+                            ),
+                    )
+                }
+            }
+        } else null,
+    )
+}
+
+@Composable
+internal fun RowScope.CompactTorchRow(event: IslandEvent.Torch) {
+    val style = eventStyleFor(event)
+    style.icon?.let { Icon(it, null, tint = style.accent, modifier = Modifier.size(SpaceXxl)) }
+    Spacer(Modifier.width(SpaceSm))
+    Text(
+        stringResource(style.labelRes),
+        color = SubtleGray,
+        style = MaterialTheme.typography.labelSmall,
+        maxLines = 1,
+        modifier = Modifier.weight(1f),
+    )
+    if (event.supportsLevel) {
+        val pct = (event.level.toFloat() / event.maxLevel * 100).toInt()
+        Text("$pct%", color = style.accent, style = PillAccent)
+    } else {
+        Text(stringResource(R.string.ax_dynamic_bar_on), color = style.accent, style = PillAccent)
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/KeyguardExpandedContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/KeyguardExpandedContent.kt
new file mode 100644
index 0000000000000..1a73e97738f42
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/KeyguardExpandedContent.kt
@@ -0,0 +1,924 @@
+@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
+
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectHorizontalDragGestures
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Mic
+import androidx.compose.material.icons.filled.MusicNote
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Shuffle
+import androidx.compose.material.icons.filled.SkipNext
+import androidx.compose.material.icons.filled.SkipPrevious
+import androidx.compose.material.icons.filled.Stop
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.VolumeUp
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearWavyProgressIndicator
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import kotlin.math.cos
+import kotlin.math.sin
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.android.systemui.axdynamicbar.shared.IslandActions
+import com.android.systemui.res.R
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.axdynamicbar.shared.*
+import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
+import kotlinx.coroutines.delay
+
+@Composable
+internal fun KeyguardExpandedContent(
+    event: IslandEvent,
+    allEvents: List<IslandEvent>,
+    interactor: IslandActions,
+    onCollapse: () -> Unit,
+    hapticsViewModelFactory: SliderHapticsViewModel.Factory,
+) {
+    if (event is IslandEvent.KeyguardIndication || event is IslandEvent.AppSwitch) {
+        LaunchedEffect(Unit) { onCollapse() }
+        return
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null,
+            ) { onCollapse() },
+        contentAlignment = Alignment.Center,
+    ) {
+        when (event) {
+            is IslandEvent.Media -> KeyguardMediaPanel(event, interactor)
+            is IslandEvent.Timer -> KeyguardTimerPanel(event, interactor)
+            is IslandEvent.Stopwatch -> KeyguardStopwatchPanel(event, interactor)
+            is IslandEvent.AudioRecording -> KeyguardAudioRecordingPanel(event, interactor)
+            else -> KeyguardGenericPanel(event, interactor, hapticsViewModelFactory)
+        }
+    }
+}
+
+@Composable
+private fun ProgressRing(
+    progress: Float,
+    color: Color,
+    modifier: Modifier = Modifier,
+    trackColor: Color = color.copy(alpha = AlphaFaint),
+    strokeWidth: Dp = 10.dp,
+    handleRadius: Dp = 8.dp,
+) {
+    Canvas(modifier = modifier) {
+        val stroke = strokeWidth.toPx()
+        val handle = handleRadius.toPx()
+        val pad = handle.coerceAtLeast(stroke / 2)
+        val arcSize = Size(size.width - pad * 2, size.height - pad * 2)
+        val topLeft = Offset(pad, pad)
+        drawArc(
+            color = trackColor,
+            startAngle = -90f,
+            sweepAngle = 360f,
+            useCenter = false,
+            topLeft = topLeft,
+            size = arcSize,
+            style = Stroke(width = stroke, cap = StrokeCap.Round),
+        )
+        if (progress > 0f) {
+            val sweep = 360f * progress
+            drawArc(
+                color = color,
+                startAngle = -90f,
+                sweepAngle = sweep,
+                useCenter = false,
+                topLeft = topLeft,
+                size = arcSize,
+                style = Stroke(width = stroke, cap = StrokeCap.Round),
+            )
+            val angleRad = Math.toRadians((-90.0 + sweep)).toFloat()
+            val cx = size.width / 2 + (arcSize.width / 2) * cos(angleRad)
+            val cy = size.height / 2 + (arcSize.height / 2) * sin(angleRad)
+            drawCircle(color = color, radius = handle, center = Offset(cx, cy))
+        }
+    }
+}
+
+@Composable
+private fun KeyguardPanelSurface(content: @Composable () -> Unit) {
+    Box(
+        modifier = Modifier
+            .widthIn(max = ExpandedMaxWidth)
+            .fillMaxWidth()
+            .padding(horizontal = SpaceSection)
+            .clip(ShapeXl)
+            .background(CardBg)
+            .border(1.dp, CardBorderBrush, ShapeXl)
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null,
+                onClick = {},
+            ),
+    ) {
+        content()
+    }
+}
+
+@Composable
+private fun TonalBanner(
+    colors: IslandColorScheme,
+    content: @Composable () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(ShapeLg)
+            .background(colors.tonal)
+            .padding(horizontal = SpaceXxl, vertical = SpaceLg),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+    ) {
+        content()
+    }
+}
+
+@Composable
+private fun KeyguardMediaPanel(event: IslandEvent.Media, interactor: IslandActions) {
+    val colors = rememberMediaColors(event)
+    val motionScheme = MaterialTheme.motionScheme
+
+    Box(
+        modifier = Modifier
+            .widthIn(max = ExpandedMaxWidth)
+            .fillMaxSize()
+            .padding(horizontal = SpaceSection)
+            .clip(ShapeXl)
+            .background(CardBg)
+            .border(1.dp, CardBorderBrush, ShapeXl)
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null,
+                onClick = {},
+            ),
+    ) {
+        AnimatedContent(
+            targetState = event.albumArt,
+            transitionSpec = {
+                fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                    fadeOut(motionScheme.fastEffectsSpec()) using
+                    SizeTransform(clip = false)
+            },
+            contentKey = { it?.hashCode() ?: 0 },
+            label = "kg_media_backdrop",
+        ) { art ->
+            Box(modifier = Modifier.fillMaxSize()) { 
+                if (art != null) {
+                    Image(
+                        bitmap = art.toScaledBitmap(350.dp),
+                        contentDescription = null,
+                        modifier = Modifier
+                            .matchParentSize()
+                            .graphicsLayer {
+                                scaleX = 1.15f
+                                scaleY = 1.15f
+                            }
+                            .blur(32.dp),
+                        contentScale = ContentScale.Crop,
+                    )
+                } else {
+                    Box(
+                        modifier = Modifier
+                            .matchParentSize()
+                            .background(Brush.verticalGradient(listOf(colors.tonal, CardBg)))
+                    )
+                }
+
+                Box(
+                    modifier = Modifier
+                        .matchParentSize()
+                        .background(
+                            Brush.verticalGradient(
+                                0f to Color.Black.copy(alpha = 0.30f),
+                                0.45f to Color.Black.copy(alpha = 0.55f),
+                                1f to Color.Black.copy(alpha = 0.88f),
+                            )
+                        )
+                )
+
+                Box(
+                    modifier = Modifier
+                        .matchParentSize()
+                        .background(colors.accent.copy(alpha = 0.08f))
+                )
+            }
+        }
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(SpaceSection),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Box(
+                modifier = Modifier
+                    .weight(1f, fill = true)
+                    .fillMaxWidth(),
+                contentAlignment = Alignment.Center,
+            ) {
+                AnimatedContent(
+                    targetState = event.albumArt,
+                    transitionSpec = {
+                        fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                            fadeOut(motionScheme.fastEffectsSpec()) using
+                            SizeTransform(clip = false)
+                    },
+                    contentKey = { it?.hashCode() ?: 0 },
+                    label = "kg_media_album_art",
+                ) { art ->
+                    if (art != null) {
+                        Image(
+                            bitmap = art.toScaledBitmap(SizeAlbumLg),
+                            contentDescription = null,
+                            modifier = Modifier
+                                .fillMaxHeight()
+                                .aspectRatio(1f)
+                                .clip(ShapeLg),
+                            contentScale = ContentScale.Crop,
+                        )
+                    } else {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxHeight()
+                                .aspectRatio(1f)
+                                .clip(ShapeLg)
+                                .background(colors.tonal),
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            Icon(
+                                Icons.Filled.MusicNote,
+                                null,
+                                tint = colors.accent.copy(alpha = AlphaDisabled),
+                                modifier = Modifier.size(SpacePanelLarge),
+                            )
+                        }
+                    }
+                }
+            }
+
+            Spacer(Modifier.height(SpaceLg))
+
+            val trackText = event.track.ifEmpty { stringResource(R.string.ax_dynamic_bar_now_playing) }
+            AnimatedContent(
+                targetState = trackText,
+                transitionSpec = {
+                    fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                        fadeOut(motionScheme.fastEffectsSpec()) using
+                        SizeTransform(clip = false)
+                },
+                label = "kg_media_track",
+            ) { title ->
+                Text(
+                    title,
+                    color = Color.White,
+                    style = MaterialTheme.typography.titleLarge,
+                    textAlign = TextAlign.Center,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+
+            if (event.artist.isNotEmpty()) {
+                Spacer(Modifier.height(SpaceMd))
+                AnimatedContent(
+                    targetState = event.artist,
+                    transitionSpec = {
+                        fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                            fadeOut(motionScheme.fastEffectsSpec()) using
+                            SizeTransform(clip = false)
+                    },
+                    label = "kg_media_artist",
+                ) { artist ->
+                    Text(
+                        artist,
+                        color = Color.White.copy(alpha = AlphaSecondary),
+                        style = MaterialTheme.typography.bodyMedium,
+                        textAlign = TextAlign.Center,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+
+            Spacer(Modifier.height(SpaceLg))
+
+            Surface(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .border(1.dp, CardBorderBrush, ShapeCard),
+                shape = ShapeCard,
+                color = Color.Black.copy(alpha = 0.22f),
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = SpaceXxl, vertical = SpaceLg),
+                    verticalArrangement = Arrangement.Center,
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                    ) {
+                        Row(
+                            modifier = Modifier.weight(1f),
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(SpaceMd),
+                        ) {
+                            event.appIcon?.let { icon ->
+                                Image(
+                                    bitmap = icon.toScaledBitmap(SizeIconSm),
+                                    contentDescription = null,
+                                    modifier = Modifier.size(SizeIconSm).clip(ShapeXs),
+                                    colorFilter = ColorFilter.tint(colors.accent),
+                                )
+                            } ?: Icon(
+                                Icons.Filled.MusicNote,
+                                null,
+                                tint = colors.accent,
+                                modifier = Modifier.size(SizeIconSm),
+                            )
+                            Text(
+                                event.outputDeviceName.ifBlank {
+                                    stringResource(R.string.ax_dynamic_bar_now_playing)
+                                },
+                                color = Color.White,
+                                style = MaterialTheme.typography.labelMedium,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+
+                        Surface(
+                            onClick = {
+                                interactor.openMediaOutputSwitcher()
+                                interactor.collapseIsland()
+                            },
+                            shape = ShapeChip,
+                            color = colors.accent.copy(alpha = AlphaSubtle),
+                        ) {
+                            Row(
+                                modifier = Modifier.padding(horizontal = SpaceLg, vertical = SpaceSm),
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.spacedBy(SpaceXs),
+                            ) {
+                                Icon(
+                                    Icons.Filled.VolumeUp,
+                                    stringResource(R.string.ax_dynamic_bar_output),
+                                    tint = colors.accent,
+                                    modifier = Modifier.size(SizeIconSm),
+                                )
+                            }
+                        }
+                    }
+
+                    if (event.duration > 0L) {
+                        Spacer(Modifier.height(SpaceMd))
+                        val mediaProgress = rememberMediaProgress(event)
+                        var isSeeking by remember { mutableStateOf(false) }
+                        var seekProgress by remember { mutableFloatStateOf(mediaProgress.progress) }
+                        if (!isSeeking) seekProgress = mediaProgress.progress
+                        val displayMs =
+                            if (isSeeking) (seekProgress * event.duration).toLong()
+                            else mediaProgress.positionMs
+
+                        Box(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(SpaceSection)
+                                .pointerInput("tap") {
+                                    detectTapGestures { offset ->
+                                        val f = (offset.x / size.width.toFloat()).coerceIn(0f, 1f)
+                                        seekProgress = f
+                                        interactor.seekTo((f * event.duration).toLong())
+                                    }
+                                }
+                                .pointerInput("drag") {
+                                    detectHorizontalDragGestures(
+                                        onDragStart = { offset ->
+                                            isSeeking = true
+                                            seekProgress =
+                                                (offset.x / size.width.toFloat()).coerceIn(0f, 1f)
+                                        },
+                                        onDragEnd = {
+                                            isSeeking = false
+                                            interactor.seekTo((seekProgress * event.duration).toLong())
+                                        },
+                                        onDragCancel = { isSeeking = false },
+                                        onHorizontalDrag = { change, _ ->
+                                            seekProgress =
+                                                (change.position.x / size.width.toFloat()).coerceIn(0f, 1f)
+                                            change.consume()
+                                        },
+                                    )
+                                },
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            LinearWavyProgressIndicator(
+                                progress = { seekProgress },
+                                modifier = Modifier.fillMaxWidth(),
+                                color = colors.accent,
+                                trackColor = colors.accent.copy(alpha = AlphaSubtle),
+                                amplitude = { if (event.isPlaying) 1f else 0f },
+                            )
+                        }
+
+                        Spacer(Modifier.height(SpaceXs))
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                        ) {
+                            Text(
+                                formatElapsedTime(displayMs),
+                                color = Color.White.copy(alpha = AlphaSecondary),
+                                style = MaterialTheme.typography.labelSmall,
+                            )
+                            Text(
+                                formatElapsedTime(event.duration),
+                                color = Color.White.copy(alpha = AlphaSecondary),
+                                style = MaterialTheme.typography.labelSmall,
+                            )
+                        }
+                    }
+
+                    Spacer(Modifier.height(SpaceMd))
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        IconButton(
+                            onClick = {
+                                event.customActions.firstOrNull()?.let {
+                                    interactor.sendCustomAction(it.action)
+                                }
+                            },
+                            modifier = Modifier.size(SizeButtonLg),
+                        ) {
+                            val ca = event.customActions.firstOrNull()
+                            if (ca != null) {
+                                CustomActionIcon(ca, tint = Color.White.copy(alpha = AlphaSecondary), modifier = Modifier.size(SizeIconMd))
+                            } else {
+                                Icon(
+                                    Icons.Filled.Shuffle,
+                                    stringResource(R.string.ax_dynamic_bar_shuffle),
+                                    tint = Color.White.copy(alpha = AlphaSecondary),
+                                    modifier = Modifier.size(SizeIconMd),
+                                )
+                            }
+                        }
+
+                        Spacer(Modifier.width(SpaceSm))
+
+                        IconButton(
+                            onClick = { interactor.skipPrev() },
+                            modifier = Modifier.size(SizeButtonLg),
+                        ) {
+                            Icon(
+                                Icons.Filled.SkipPrevious,
+                                stringResource(R.string.ax_dynamic_bar_previous),
+                                tint = Color.White,
+                                modifier = Modifier.size(SizeIconMd),
+                            )
+                        }
+
+                        Spacer(Modifier.width(SpaceSm))
+
+                        Surface(
+                            onClick = { interactor.togglePlayPause() },
+                            modifier = Modifier.size(SizeButtonLg),
+                            shape = CircleShape,
+                            color = colors.accent,
+                        ) {
+                            Box(
+                                contentAlignment = Alignment.Center,
+                                modifier = Modifier.fillMaxSize(),
+                            ) {
+                                AnimatedContent(
+                                    targetState = event.isPlaying,
+                                    transitionSpec = {
+                                        fadeIn(motionScheme.defaultEffectsSpec()) togetherWith
+                                            fadeOut(motionScheme.fastEffectsSpec())
+                                    },
+                                    label = "kg_media_playpause",
+                                ) { playing ->
+                                    Icon(
+                                        if (playing) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                                        if (playing) stringResource(R.string.ax_dynamic_bar_pause)
+                                        else stringResource(R.string.ax_dynamic_bar_play),
+                                        tint = colors.onAccent,
+                                        modifier = Modifier.size(SizeIconMd),
+                                    )
+                                }
+                            }
+                        }
+
+                        Spacer(Modifier.width(SpaceSm))
+
+                        IconButton(
+                            onClick = { interactor.skipNext() },
+                            modifier = Modifier.size(SizeButtonLg),
+                        ) {
+                            Icon(
+                                Icons.Filled.SkipNext,
+                                stringResource(R.string.ax_dynamic_bar_next),
+                                tint = Color.White,
+                                modifier = Modifier.size(SizeIconMd),
+                            )
+                        }
+
+                        Spacer(Modifier.width(SpaceSm))
+
+                        IconButton(
+                            onClick = {
+                                event.customActions.getOrNull(1)?.let {
+                                    interactor.sendCustomAction(it.action)
+                                }
+                            },
+                            modifier = Modifier.size(SizeButtonLg),
+                        ) {
+                            val ca = event.customActions.getOrNull(1)
+                            if (ca != null) {
+                                CustomActionIcon(ca, tint = Color.White.copy(alpha = AlphaSecondary), modifier = Modifier.size(SizeIconMd))
+                            } else {
+                                Icon(
+                                    Icons.Filled.Shuffle,
+                                    stringResource(R.string.ax_dynamic_bar_shuffle),
+                                    tint = Color.White.copy(alpha = AlphaSecondary),
+                                    modifier = Modifier.size(SizeIconMd),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun KeyguardTimerPanel(event: IslandEvent.Timer, interactor: IslandActions) {
+    val context = LocalContext.current
+    val colors = rememberIslandColors(event)
+    var remainingMs by remember(event.endTimeMs) {
+        mutableLongStateOf((event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L))
+    }
+    if (!event.isPaused) {
+        LaunchedEffect(event.endTimeMs) {
+            while (remainingMs > 0L) {
+                delay(500)
+                remainingMs = (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+            }
+        }
+    }
+
+    val elapsedFraction = if (event.originalDurationMs > 0L)
+        (remainingMs.toFloat() / event.originalDurationMs).coerceIn(0f, 1f)
+    else 0f
+
+    val pulseTransition = rememberInfiniteTransition(label = "timer_pulse")
+    val pulseScale by pulseTransition.animateFloat(
+        initialValue = 1f, targetValue = if (remainingMs < 10_000L) 1.06f else 1f,
+        animationSpec = infiniteRepeatable(tween(500), RepeatMode.Reverse),
+        label = "timer_pulse_scale",
+    )
+
+    KeyguardPanelSurface { Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(SpaceSection),
+        verticalArrangement = Arrangement.spacedBy(SpaceXxl),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        TonalBanner(colors) {
+            Box(
+                modifier = Modifier
+                    .size(32.dp)
+                    .clip(CircleShape)
+                    .background(colors.accent.copy(alpha = AlphaSubtle)),
+                contentAlignment = Alignment.Center,
+            ) {
+                eventStyleFor(event).icon?.let { Icon(it, null, tint = colors.accent, modifier = Modifier.size(18.dp)) }
+            }
+            Text(
+                event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_timer) }.uppercase(),
+                color = colors.accent,
+                style = MaterialTheme.typography.labelMedium,
+            )
+        }
+
+        Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier.size(SizeAlbumLg)
+                .graphicsLayer { scaleX = pulseScale; scaleY = pulseScale },
+        ) {
+            ProgressRing(
+                progress = elapsedFraction,
+                color = colors.accent,
+                modifier = Modifier.fillMaxSize(),
+            )
+            Text(
+                if (event.isPaused) stringResource(R.string.ax_dynamic_bar_paused) else formatCountdownLong(remainingMs),
+                color = OnCardText,
+                style = MaterialTheme.typography.displayMedium,
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            val toggleAction = event.actions.firstOrNull()
+            if (toggleAction != null) {
+                ExpressivePillButton(
+                    label = if (event.isPaused) stringResource(R.string.ax_dynamic_bar_resume) else stringResource(R.string.ax_dynamic_bar_pause),
+                    icon = if (event.isPaused) Icons.Filled.PlayArrow else Icons.Filled.Pause,
+                    contentColor = colors.onAccent,
+                    backgroundColor = colors.accent,
+                    modifier = Modifier.weight(1f),
+                    onClick = { toggleAction.action.actionIntent?.sendWithBal(context) },
+                )
+            }
+            ExpressivePillButton(
+                label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                icon = Icons.Filled.Stop,
+                contentColor = colors.accent,
+                backgroundColor = colors.tonal,
+                modifier = Modifier.weight(1f),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        }
+    }
+}
+}
+
+@Composable
+private fun KeyguardStopwatchPanel(event: IslandEvent.Stopwatch, interactor: IslandActions) {
+    val context = LocalContext.current
+    val colors = rememberIslandColors(event)
+    var elapsedMs by remember(event.startTimeMs) {
+        mutableLongStateOf((System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L))
+    }
+    if (event.isRunning) {
+        LaunchedEffect(event.startTimeMs) {
+            while (true) {
+                delay(200)
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L)
+            }
+        }
+    }
+
+    val secFraction = if (event.isRunning) (elapsedMs % 60000) / 60000f else 0f
+
+    KeyguardPanelSurface { Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(SpaceSection),
+        verticalArrangement = Arrangement.spacedBy(SpaceXxl),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        TonalBanner(colors) {
+            Box(
+                modifier = Modifier
+                    .size(32.dp)
+                    .clip(CircleShape)
+                    .background(colors.accent.copy(alpha = AlphaSubtle)),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(Icons.Filled.AvTimer, null, tint = colors.accent, modifier = Modifier.size(18.dp))
+            }
+            Text(
+                event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_stopwatch) }.uppercase(),
+                color = colors.accent,
+                style = MaterialTheme.typography.labelMedium,
+            )
+        }
+
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.size(SizeAlbumLg)) {
+            ProgressRing(
+                progress = secFraction,
+                color = colors.accent,
+                modifier = Modifier.fillMaxSize(),
+            )
+            Text(
+                if (event.isRunning) formatStopwatch(elapsedMs) else stringResource(R.string.ax_dynamic_bar_paused),
+                color = OnCardText,
+                style = MaterialTheme.typography.displayMedium,
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            val toggleAction = event.actions.firstOrNull()
+            if (toggleAction != null) {
+                ExpressivePillButton(
+                    label = if (event.isRunning) stringResource(R.string.ax_dynamic_bar_pause) else stringResource(R.string.ax_dynamic_bar_resume),
+                    icon = if (event.isRunning) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                    contentColor = colors.onAccent,
+                    backgroundColor = colors.accent,
+                    modifier = Modifier.weight(1f),
+                    onClick = { toggleAction.action.actionIntent?.sendWithBal(context) },
+                )
+            }
+            ExpressivePillButton(
+                label = stringResource(R.string.ax_dynamic_bar_reset),
+                icon = Icons.Filled.Stop,
+                contentColor = colors.accent,
+                backgroundColor = colors.tonal,
+                modifier = Modifier.weight(1f),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        }
+    }
+}
+}
+
+@Composable
+private fun KeyguardAudioRecordingPanel(event: IslandEvent.AudioRecording, interactor: IslandActions) {
+    val context = LocalContext.current
+    val colors = rememberIslandColors(event)
+    var elapsedMs by remember { mutableLongStateOf(0L) }
+    LaunchedEffect(event.startTimeMs, event.state, event.pausedDurationMs) {
+        if (event.state == RecordingState.RECORDING) {
+            while (true) {
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                    .coerceAtLeast(0L)
+                delay(1000)
+            }
+        } else {
+            elapsedMs = (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                .coerceAtLeast(0L)
+        }
+    }
+
+    val isRecording = event.state == RecordingState.RECORDING
+
+    KeyguardPanelSurface { Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(SpaceSection),
+        verticalArrangement = Arrangement.spacedBy(SpaceXxl),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        TonalBanner(colors) {
+            if (isRecording) PulsingDot(color = colors.accent, size = SpaceMd)
+            Icon(Icons.Filled.Mic, null, tint = colors.accent, modifier = Modifier.size(SizeIconSm))
+            Text(
+                when (event.state) {
+                    RecordingState.RECORDING -> stringResource(R.string.ax_dynamic_bar_recording)
+                    RecordingState.PAUSED -> stringResource(R.string.ax_dynamic_bar_paused)
+                    RecordingState.SAVED -> stringResource(R.string.ax_dynamic_bar_saved)
+                }.uppercase(),
+                color = colors.accent,
+                style = MaterialTheme.typography.labelMedium,
+            )
+        }
+
+        Text(
+            formatElapsedTime(elapsedMs),
+            color = OnCardText,
+            style = MaterialTheme.typography.displayLarge,
+        )
+
+        if (isRecording) {
+            LinearWavyProgressIndicator(
+                modifier = Modifier.fillMaxWidth().clip(ShapeChip),
+                color = colors.accent,
+                trackColor = colors.accent.copy(alpha = AlphaFaint),
+            )
+        } else {
+            LinearWavyProgressIndicator(
+                progress = { 0f },
+                modifier = Modifier.fillMaxWidth().clip(ShapeChip),
+                color = colors.accent.copy(alpha = AlphaDisabled),
+                trackColor = colors.accent.copy(alpha = AlphaFaint),
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(SpaceLg),
+        ) {
+            val pauseResume = event.actions.firstOrNull()
+            if (pauseResume != null) {
+                ExpressivePillButton(
+                    label = if (isRecording) stringResource(R.string.ax_dynamic_bar_pause) else stringResource(R.string.ax_dynamic_bar_resume),
+                    icon = if (isRecording) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+                    contentColor = colors.onAccent,
+                    backgroundColor = colors.accent,
+                    modifier = Modifier.weight(1f),
+                    onClick = { pauseResume.action.actionIntent?.sendWithBal(context) },
+                )
+            }
+            ExpressivePillButton(
+                label = stringResource(R.string.ax_dynamic_bar_stop),
+                icon = Icons.Filled.Stop,
+                contentColor = colors.accent,
+                backgroundColor = colors.tonal,
+                modifier = Modifier.weight(1f),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        }
+    }
+}
+}
+
+@Composable
+private fun KeyguardGenericPanel(
+    event: IslandEvent,
+    interactor: IslandActions,
+    hapticsViewModelFactory: SliderHapticsViewModel.Factory,
+) {
+    val colors = rememberIslandColors(event)
+        KeyguardPanelSurface { Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(SpaceSection),
+            verticalArrangement = Arrangement.spacedBy(SpaceXxl),
+        ) {
+            ExpandedEventContent(event, interactor, hapticsViewModelFactory)
+
+            ExpressivePillButton(
+                label = stringResource(R.string.ax_dynamic_bar_dismiss),
+                contentColor = colors.onAccent,
+                backgroundColor = colors.accent,
+                modifier = Modifier.fillMaxWidth(),
+                onClick = { interactor.dismissEvent(event) },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/MagneticSwipeToDismiss.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/MagneticSwipeToDismiss.kt
new file mode 100644
index 0000000000000..3cc28213b1e1b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/MagneticSwipeToDismiss.kt
@@ -0,0 +1,203 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.changedToDownIgnoreConsumed
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.dp
+import kotlin.math.abs
+import kotlin.math.sign
+import kotlinx.coroutines.launch
+import androidx.compose.ui.input.pointer.PointerInputChange
+
+/**
+ * A child (e.g. media seekbar) can set this to `true` to prevent
+ * [MagneticSwipeToDismiss] from claiming horizontal drags.
+ * Set it on ACTION_DOWN so the lock is active before slop detection.
+ */
+val LocalDismissSwipeLock = compositionLocalOf<MutableState<Boolean>> { mutableStateOf(false) }
+
+private val DETACH_THRESHOLD = 72.dp
+private const val MAGNETIC_PULL = 0.5f
+private val DISMISS_VELOCITY = 500.dp
+private const val SNAP_STIFFNESS = 550f
+private const val SNAP_DAMPING = 0.6f
+private const val FLING_STIFFNESS = 300f
+private const val VELOCITY_SMOOTHING = 0.4f
+
+@Composable
+internal fun MagneticSwipeToDismiss(
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+    allowUpDismiss: Boolean = false,
+    content: @Composable () -> Unit,
+) {
+    val density = LocalDensity.current
+    val haptic = LocalHapticFeedback.current
+    val scope = rememberCoroutineScope()
+    val viewConfig = LocalViewConfiguration.current
+
+    val detachPx = with(density) { DETACH_THRESHOLD.toPx() }
+    val dismissVelPx = with(density) { DISMISS_VELOCITY.toPx() }
+
+    val offsetX = remember { Animatable(0f) }
+    val offsetY = remember { Animatable(0f) }
+    var detached by remember { mutableStateOf(false) }
+    var dismissed by remember { mutableStateOf(false) }
+
+    val swipeLock = remember { mutableStateOf(false) }
+
+    if (dismissed) return
+
+    val absOff = maxOf(abs(offsetX.value), abs(offsetY.value))
+    val progress = (absOff / (detachPx * 4f)).coerceIn(0f, 1f)
+
+    CompositionLocalProvider(LocalDismissSwipeLock provides swipeLock) {
+        Box(
+            modifier =
+                modifier
+                    .graphicsLayer {
+                        translationX = offsetX.value
+                        translationY = offsetY.value
+                        alpha = 1f - progress * 0.5f
+                        scaleX = 1f - progress * 0.04f
+                        scaleY = 1f - progress * 0.04f
+                        rotationZ = (offsetX.value / detachPx).coerceIn(-1f, 1f) * 2f
+                    }
+                    .pointerInput(allowUpDismiss) {
+                        val touchSlop = viewConfig.touchSlop
+
+                        awaitEachGesture {
+                        
+                            val down: PointerInputChange
+                            while (true) {
+                                val event = awaitPointerEvent(PointerEventPass.Initial)
+                                val d = event.changes.firstOrNull {
+                                    it.changedToDownIgnoreConsumed()
+                                }
+                                if (d != null) { down = d; break }
+                            }
+                        
+                            var axis = 0
+                            var velocity = 0f
+                            var prevTime = 0L
+                            detached = false
+
+                            while (true) {
+                                val event = awaitPointerEvent(PointerEventPass.Initial)
+                                val change = event.changes.firstOrNull() ?: break
+
+                                if (!change.pressed) {
+                                
+                                    if (axis != 0) change.consume()
+                                    if (axis == 0) break 
+
+                                    val offset = if (axis == 2) offsetY else offsetX
+                                    val vel = velocity
+                                    val off = offset.value
+                                    scope.launch {
+                                        val shouldDismiss =
+                                            abs(vel) >= dismissVelPx ||
+                                                (detached && abs(off) > detachPx * 0.5f)
+                                        if (shouldDismiss) {
+                                            val target = when (axis) {
+                                                2 -> -size.height * 1.5f 
+                                                else -> {
+                                                    val dir = if (abs(vel) > 100f) sign(vel) else sign(off)
+                                                    dir * size.width * 1.5f
+                                                }
+                                            }
+                                            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                            offset.animateTo(
+                                                target,
+                                                spring(dampingRatio = 1f, stiffness = FLING_STIFFNESS),
+                                            )
+                                            dismissed = true
+                                            onDismiss()
+                                        } else {
+                                            if (detached) {
+                                                haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                            }
+                                            offset.animateTo(0f, spring(SNAP_DAMPING, SNAP_STIFFNESS))
+                                            detached = false
+                                        }
+                                    }
+                                    break
+                                }
+
+                                val dx = change.position.x - down.position.x
+                                val dy = change.position.y - down.position.y
+
+                                if (axis == 0) {
+                                    if (abs(dx) > touchSlop || abs(dy) > touchSlop) {
+                                        val wouldBeHorizontal = abs(dx) >= abs(dy)
+                                        // If a child (seekbar) has locked horizontal swipe, skip.
+                                        if (wouldBeHorizontal && swipeLock.value) {
+                                            break
+                                        }
+                                        axis = if (wouldBeHorizontal) {
+                                            1 
+                                        } else if (allowUpDismiss && dy < 0) {
+                                            2 
+                                        } else {
+                                            break 
+                                        }
+                                    } else {
+                                        continue 
+                                    }
+                                }
+
+                                change.consume()
+
+                                val delta = change.position - change.previousPosition
+                                val dragAmount = if (axis == 2) delta.y else delta.x
+                                val offset = if (axis == 2) offsetY else offsetX
+
+                                val now = change.uptimeMillis
+                                if (prevTime > 0L) {
+                                    val dt = (now - prevTime).coerceAtLeast(1) / 1000f
+                                    val instantVel = dragAmount / dt
+                                    velocity =
+                                        velocity * (1f - VELOCITY_SMOOTHING) +
+                                            instantVel * VELOCITY_SMOOTHING
+                                }
+                                prevTime = now
+
+                                if (!detached) {
+                                    val target = offset.value + dragAmount * MAGNETIC_PULL
+                                    if (abs(target) >= detachPx) {
+                                        detached = true
+                                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                        scope.launch { offset.snapTo(offset.value + dragAmount) }
+                                    } else {
+                                        scope.launch { offset.snapTo(target) }
+                                    }
+                                } else {
+                                    scope.launch { offset.snapTo(offset.value + dragAmount) }
+                                }
+                            }
+                        }
+                    }
+        ) {
+            content()
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/PillIslandContent.kt b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/PillIslandContent.kt
new file mode 100644
index 0000000000000..2adc2abe31bd4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/axdynamicbar/ui/compose/PillIslandContent.kt
@@ -0,0 +1,1419 @@
+package com.android.systemui.axdynamicbar.ui.compose
+
+import android.graphics.drawable.Drawable
+import android.media.AudioManager
+import android.os.SystemClock
+import androidx.compose.ui.platform.LocalContext
+import java.text.NumberFormat
+import com.android.internal.R as InternalR
+import com.android.systemui.common.shared.model.Icon as SysUISharedIcon
+import com.android.systemui.common.ui.compose.Icon as SysUIIcon
+import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.FlashlightOn
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.Mic
+import androidx.compose.material.icons.filled.MicOff
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.rotate
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.res.stringResource
+import com.android.systemui.axdynamicbar.model.IslandEvent
+import com.android.systemui.axdynamicbar.model.RecordingState
+import com.android.systemui.axdynamicbar.shared.*
+import androidx.compose.ui.graphics.graphicsLayer
+import com.android.systemui.res.R
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.sin
+import java.lang.Math.toRadians
+import kotlinx.coroutines.delay
+
+@Composable
+internal fun PillEventIcon(
+    event: IslandEvent,
+    tint: Color? = null,
+    animated: Boolean = true,
+) {
+    if (!animated) {
+        StaticPillEventIcon(event, tint)
+        return
+    }
+    when (event) {
+        is IslandEvent.AudioRecording -> AudioRecordingPillIcon(event, tint)
+        is IslandEvent.Media -> MediaPillIcon(event)
+        is IslandEvent.PromotedOngoing -> PromotedOngoingPillIcon(event, tint)
+        is IslandEvent.Sports -> SportsPillIcon(event)
+        is IslandEvent.NowPlaying -> AnimatedNowPlayingIcon(tint ?: MintAccent)
+        is IslandEvent.Bluetooth -> AnimatedBluetoothIcon(tint ?: BlueAccent)
+        is IslandEvent.Hotspot -> AnimatedHotspotIcon(tint ?: TealAccent)
+        is IslandEvent.Charging -> AnimatedBoltIcon(tint ?: GreenAccent)
+        is IslandEvent.Alarm -> AnimatedBellIcon(tint ?: OrangeAccent, isAnimating = event.isRinging)
+        is IslandEvent.Timer -> AnimatedHourglassIcon(tint ?: BlueAccent, isAnimating = !event.isPaused)
+        is IslandEvent.Stopwatch -> AnimatedTickIcon(tint ?: MintAccent, isRunning = event.isRunning)
+        is IslandEvent.RingerMode -> RingerIcon(event, tint)
+        is IslandEvent.Vpn -> AnimatedShieldIcon(tint ?: IndigoAccent)
+        is IslandEvent.Clipboard -> AnimatedClipboardIcon(tint ?: IndigoAccent)
+        is IslandEvent.Notification -> NotificationPillIcon(event)
+        is IslandEvent.AppSwitch -> AppSwitchPillIcon(event)
+        is IslandEvent.Torch ->
+            Icon(Icons.Filled.FlashlightOn, null, tint = tint ?: YellowAccent, modifier = Modifier.size(SizeBadge))
+        is IslandEvent.BiometricUnlock -> BiometricUnlockIcon(tint)
+        is IslandEvent.KeyguardIndication -> KeyguardIndicationIcon(event, tint)
+        is IslandEvent.AospChip -> AospChipPillIcon(event, tint)
+    }
+}
+
+@Composable
+private fun StaticPillEventIcon(event: IslandEvent, tint: Color? = null) {
+    when (event) {
+        is IslandEvent.Media -> MediaPillIcon(event, animated = false)
+        is IslandEvent.Notification -> NotificationPillIcon(event)
+        is IslandEvent.AppSwitch -> AppSwitchPillIcon(event)
+        is IslandEvent.AospChip -> AospChipPillIcon(event, tint, animated = false)
+        is IslandEvent.PromotedOngoing ->
+            if (event.appIcon != null) {
+                Image(
+                    bitmap = event.appIcon.toScaledBitmap(16.dp),
+                    contentDescription = null,
+                    modifier = Modifier.size(16.dp).clip(ShapeXs),
+                    contentScale = ContentScale.Crop,
+                )
+            } else {
+                Icon(
+                    Icons.Filled.Notifications,
+                    null,
+                    tint = tint ?: BlueAccent,
+                    modifier = Modifier.size(SizeBadge),
+                )
+            }
+        else -> {
+            val style = eventStyleFor(event)
+            style.icon?.let {
+                Icon(
+                    it,
+                    null,
+                    tint = tint ?: style.accent,
+                    modifier = Modifier.size(SizeBadge),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AospChipPillIcon(
+    event: IslandEvent.AospChip,
+    tint: Color? = null,
+    animated: Boolean = true,
+) {
+    val color = tint ?: aospChipAccent(event.active)
+    val context = LocalContext.current
+    val isCountdown = event.active.content is OngoingActivityChipModel.Content.Countdown
+    val isIconOnly = event.active.content is OngoingActivityChipModel.Content.IconOnly
+    val isCall = event.active.key.startsWith("callChip-")
+    val useScreenRecFallback = isCountdown && event.active.key == "ScreenRecord"
+
+    val renderIcon: OngoingActivityChipModel.ChipIcon = when {
+        isCall -> OngoingActivityChipModel.ChipIcon.SingleColorIcon(
+            SysUISharedIcon.Resource(InternalR.drawable.ic_phone, null)
+        )
+        event.active.icon != null -> event.active.icon!!
+        useScreenRecFallback -> OngoingActivityChipModel.ChipIcon.SingleColorIcon(
+            SysUISharedIcon.Resource(R.drawable.ic_screenrecord, null)
+        )
+        else -> return
+    }
+
+    val iconContent: @Composable () -> Unit = {
+        when (renderIcon) {
+            is OngoingActivityChipModel.ChipIcon.SingleColorIcon -> {
+                SysUIIcon(
+                    icon = renderIcon.impl,
+                    tint = color,
+                    modifier = Modifier.size(SizeBadge),
+                )
+            }
+            is OngoingActivityChipModel.ChipIcon.StatusBarView -> {
+                val drawable = renderIcon.impl.drawable
+                if (drawable != null) {
+                    Image(
+                        bitmap = drawable.toScaledBitmap(SizeBadge),
+                        contentDescription = null,
+                        modifier = Modifier.size(SizeBadge),
+                    )
+                }
+            }
+            is OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon -> {
+                val drawable = remember(event.active.managingPackageName) {
+                    event.active.managingPackageName?.let { pkg ->
+                        try { context.packageManager.getApplicationIcon(pkg) } catch (_: Exception) { null }
+                    }
+                }
+                if (drawable != null) {
+                    Image(
+                        bitmap = drawable.toScaledBitmap(SizeBadge),
+                        contentDescription = null,
+                        modifier = Modifier.size(SizeBadge),
+                    )
+                }
+            }
+        }
+    }
+
+    val isScreenRec = event.active.key == "ScreenRecord"
+    when {
+        !animated -> iconContent()
+        isCall -> {
+            val transition = rememberInfiniteTransition(label = "aosp_call_shake")
+            val shake by transition.animateFloat(
+                initialValue = -0.8f,
+                targetValue = 0.8f,
+                animationSpec = infiniteRepeatable(tween(90), RepeatMode.Reverse),
+                label = "aosp_call_shake_anim",
+            )
+            Box(modifier = Modifier.size(SizeBadge).offset(x = shake.dp)) {
+                iconContent()
+            }
+        }
+        isIconOnly -> {
+            val transition = rememberInfiniteTransition(label = "aosp_icononly")
+            val pulseAlpha by transition.animateFloat(
+                initialValue = 1f,
+                targetValue = AlphaDisabled,
+                animationSpec = infiniteRepeatable(tween(900, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "aosp_icononly_alpha",
+            )
+            Box(modifier = Modifier.size(SizeBadge).graphicsLayer { this.alpha = pulseAlpha }) {
+                iconContent()
+            }
+        }
+        isScreenRec -> {
+            val transition = rememberInfiniteTransition(label = "aosp_screenrec")
+            val pulseAlpha by transition.animateFloat(
+                initialValue = 1f,
+                targetValue = AlphaSubtle,
+                animationSpec = infiniteRepeatable(tween(600, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "aosp_screenrec_alpha",
+            )
+            Box(modifier = Modifier.size(SizeBadge).graphicsLayer { this.alpha = pulseAlpha }) {
+                iconContent()
+            }
+        }
+        else -> iconContent()
+    }
+}
+
+@Composable
+private fun aospChipAccent(active: OngoingActivityChipModel.Active): Color {
+    val context = LocalContext.current
+    return Color(active.colors.background(context).defaultColor)
+}
+
+@Composable
+private fun BlinkingDotIcon(color: Color, isAnimating: Boolean = true) {
+    if (isAnimating) {
+        val transition = rememberInfiniteTransition(label = "blink")
+        val alpha by
+            transition.animateFloat(
+                initialValue = 1f,
+                targetValue = AlphaSubtle,
+                animationSpec =
+                    infiniteRepeatable(tween(550, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "blink_alpha",
+            )
+        Canvas(modifier = Modifier.size(SizeBadge)) { drawCircle(color = color.copy(alpha = alpha)) }
+    } else {
+        
+        Canvas(modifier = Modifier.size(SizeBadge)) { drawCircle(color = color.copy(alpha = AlphaTertiary)) }
+    }
+}
+
+@Composable
+private fun AnimatedTrophyIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "trophy")
+    val shimmer by transition.animateFloat(
+        initialValue = 0.6f,
+        targetValue = 1f,
+        animationSpec = infiniteRepeatable(tween(1200, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+        label = "trophy_shimmer",
+    )
+
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        val sw = 1.5f.dp.toPx()
+        val cx = w / 2f
+        val shimColor = color.copy(alpha = shimmer)
+
+        val cupTop = h * 0.12f
+        val cupBot = h * 0.58f
+        val cupLeft = w * 0.25f
+        val cupRight = w * 0.75f
+        val cupPath = Path().apply {
+            moveTo(cupLeft, cupTop)
+            lineTo(cupRight, cupTop)
+            lineTo(cupRight - w * 0.05f, cupBot)
+            quadraticBezierTo(cx, cupBot + h * 0.08f, cupLeft + w * 0.05f, cupBot)
+            close()
+        }
+        drawPath(cupPath, shimColor, style = Stroke(sw, cap = StrokeCap.Round))
+
+        val handleY = cupTop + (cupBot - cupTop) * 0.35f
+        val handleRad = w * 0.12f
+        drawArc(shimColor, 0f, 180f, false, Offset(cupLeft - handleRad * 1.5f, handleY - handleRad), Size(handleRad * 2, handleRad * 2), style = Stroke(sw * 0.8f, cap = StrokeCap.Round))
+        drawArc(shimColor, 180f, 180f, false, Offset(cupRight - handleRad * 0.5f, handleY - handleRad), Size(handleRad * 2, handleRad * 2), style = Stroke(sw * 0.8f, cap = StrokeCap.Round))
+
+        val stemTop = cupBot
+        val stemBot = h * 0.78f
+        drawLine(shimColor, Offset(cx, stemTop), Offset(cx, stemBot), sw, StrokeCap.Round)
+
+        val baseY = stemBot
+        val baseHalf = w * 0.22f
+        drawLine(shimColor, Offset(cx - baseHalf, baseY), Offset(cx + baseHalf, baseY), sw * 1.2f, StrokeCap.Round)
+    }
+}
+
+@Composable
+private fun MediaPillIcon(event: IslandEvent.Media, animated: Boolean = true) {
+    event.albumArt?.let { art ->
+        Image(
+            bitmap = art.toScaledBitmap(16.dp),
+            contentDescription = null,
+            modifier = Modifier.size(16.dp).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    }
+        ?: Box(
+            modifier =
+                Modifier.size(16.dp).clip(CircleShape).background(OrangeAccent.copy(alpha = 0.42f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            WaveformAnimation(
+                OrangeAccent,
+                Modifier.size(10.dp),
+                isAnimating = animated && event.isPlaying,
+                barCount = 3,
+            )
+        }
+}
+
+@Composable
+private fun AnimatedHotspotIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "hotspot")
+    val sweep by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 3f,
+            animationSpec =
+                infiniteRepeatable(tween(2000, easing = LinearEasing), RepeatMode.Restart),
+            label = "hotspot_sweep",
+        )
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val cx = size.width / 2
+        val cy = size.height / 2
+        for (i in 0 until 3) {
+            val r = size.minDimension * (0.18f + i * 0.18f)
+            val a = if (sweep > i) ((sweep - i).coerceIn(0f, 1f) * 0.8f) else AlphaFaint
+            drawArc(
+                color = color.copy(alpha = a),
+                startAngle = 200f,
+                sweepAngle = 140f,
+                useCenter = false,
+                topLeft = Offset(cx - r, cy - r),
+                size = Size(r * 2, r * 2),
+                style = Stroke(SizeStrokeThin.dp.toPx(), cap = StrokeCap.Round),
+            )
+        }
+        drawCircle(color, radius = size.minDimension * 0.1f, center = Offset(cx, cy))
+    }
+}
+
+@Composable
+private fun AnimatedNowPlayingIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "np")
+    val bounce by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1f,
+            animationSpec =
+                infiniteRepeatable(tween(1200, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "np_bounce",
+        )
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        val sw = SizeStrokeThin.dp.toPx()
+        val noteX = w * 0.55f
+        val noteTop = h * 0.15f + bounce * h * 0.08f
+        val noteBottom = h * 0.72f + bounce * h * 0.04f
+        drawLine(color, Offset(noteX, noteTop), Offset(noteX, noteBottom), sw, StrokeCap.Round)
+        drawCircle(color, radius = w * 0.14f, center = Offset(noteX - w * 0.1f, noteBottom))
+        drawLine(
+            color,
+            Offset(noteX, noteTop),
+            Offset(noteX + w * 0.2f, noteTop + h * 0.06f),
+            sw,
+            StrokeCap.Round,
+        )
+    }
+}
+
+@Composable
+private fun AnimatedBluetoothIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "bt")
+    val alpha by
+        transition.animateFloat(
+            initialValue = 0.5f,
+            targetValue = 1f,
+            animationSpec =
+                infiniteRepeatable(tween(1000, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "bt_alpha",
+        )
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val cx = size.width / 2
+        val w = size.width
+        val h = size.height
+        val sw = SizeStrokeThin.dp.toPx()
+        val drawColor = color.copy(alpha = alpha)
+        drawLine(drawColor, Offset(cx, h * 0.1f), Offset(cx, h * 0.9f), sw, StrokeCap.Round)
+        drawLine(drawColor, Offset(cx, h * 0.1f), Offset(cx + w * 0.22f, h * 0.3f), sw, StrokeCap.Round)
+        drawLine(drawColor, Offset(cx + w * 0.22f, h * 0.3f), Offset(cx - w * 0.22f, h * 0.7f), sw, StrokeCap.Round)
+        drawLine(drawColor, Offset(cx, h * 0.9f), Offset(cx + w * 0.22f, h * 0.7f), sw, StrokeCap.Round)
+        drawLine(drawColor, Offset(cx + w * 0.22f, h * 0.7f), Offset(cx - w * 0.22f, h * 0.3f), sw, StrokeCap.Round)
+    }
+}
+
+@Composable
+private fun AnimatedShieldIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "shield")
+    val glow by
+        transition.animateFloat(
+            initialValue = 0.5f,
+            targetValue = 1f,
+            animationSpec =
+                infiniteRepeatable(tween(1200, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "shield_glow",
+        )
+    val shieldPath = remember { Path() }
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        val cx = w / 2
+        shieldPath.rewind()
+        shieldPath.moveTo(cx, h * 0.08f)
+        shieldPath.lineTo(w * 0.15f, h * 0.28f)
+        shieldPath.lineTo(w * 0.15f, h * 0.55f)
+        shieldPath.quadraticTo(w * 0.15f, h * 0.85f, cx, h * 0.95f)
+        shieldPath.quadraticTo(w * 0.85f, h * 0.85f, w * 0.85f, h * 0.55f)
+        shieldPath.lineTo(w * 0.85f, h * 0.28f)
+        shieldPath.close()
+        drawPath(shieldPath, color.copy(alpha = glow * 0.3f))
+        drawPath(shieldPath, color.copy(alpha = glow), style = Stroke(SizeStrokeThin.dp.toPx()))
+        val sw = SizeStrokeThin.dp.toPx()
+        drawLine(color, Offset(cx - w * 0.12f, h * 0.52f), Offset(cx, h * 0.65f), sw, StrokeCap.Round)
+        drawLine(color, Offset(cx, h * 0.65f), Offset(cx + w * 0.18f, h * 0.38f), sw, StrokeCap.Round)
+    }
+}
+
+@Composable
+private fun AnimatedClipboardIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "clip")
+    val slideIn by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1f,
+            animationSpec =
+                infiniteRepeatable(
+                    tween(1500, easing = FastOutSlowInEasing),
+                    RepeatMode.Reverse,
+                ),
+            label = "clip_slide",
+        )
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        val sw = SizeStrokeThin.dp.toPx()
+        drawRoundRect(
+            color = color.copy(alpha = 0.6f),
+            topLeft = Offset(w * 0.18f, h * 0.2f),
+            size = Size(w * 0.64f, h * 0.72f),
+            cornerRadius = CornerRadius(w * 0.08f),
+            style = Stroke(sw),
+        )
+        drawRoundRect(
+            color = color,
+            topLeft = Offset(w * 0.3f, h * 0.1f),
+            size = Size(w * 0.4f, h * 0.15f),
+            cornerRadius = CornerRadius(w * 0.06f),
+        )
+        val lineAlpha = slideIn.coerceIn(0.3f, 1f)
+        val lineY1 = h * 0.48f
+        val lineY2 = h * 0.62f
+        val lineY3 = h * 0.76f
+        val lineLeft = w * 0.3f
+        val lineRight = w * 0.7f
+        drawLine(color.copy(alpha = lineAlpha), Offset(lineLeft, lineY1), Offset(lineRight, lineY1), sw, StrokeCap.Round)
+        drawLine(color.copy(alpha = lineAlpha * 0.7f), Offset(lineLeft, lineY2), Offset(lineRight * 0.85f, lineY2), sw, StrokeCap.Round)
+        drawLine(color.copy(alpha = lineAlpha * 0.4f), Offset(lineLeft, lineY3), Offset(lineRight * 0.6f, lineY3), sw, StrokeCap.Round)
+    }
+}
+
+@Composable
+private fun AnimatedBoltIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "bolt")
+    val glow by
+        transition.animateFloat(
+            initialValue = 0.5f,
+            targetValue = 1f,
+            animationSpec =
+                infiniteRepeatable(tween(800, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "bolt_glow",
+        )
+    val boltPath = remember { Path() }
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        boltPath.rewind()
+        boltPath.moveTo(w * 0.55f, h * 0.05f)
+        boltPath.lineTo(w * 0.25f, h * 0.50f)
+        boltPath.lineTo(w * 0.45f, h * 0.50f)
+        boltPath.lineTo(w * 0.40f, h * 0.95f)
+        boltPath.lineTo(w * 0.75f, h * 0.42f)
+        boltPath.lineTo(w * 0.55f, h * 0.42f)
+        boltPath.close()
+        drawPath(boltPath, color.copy(alpha = glow))
+    }
+}
+
+@Composable
+private fun AnimatedBellIcon(color: Color, isAnimating: Boolean = true) {
+    val swing: Float
+    if (isAnimating) {
+        val transition = rememberInfiniteTransition(label = "bell")
+        val animatedSwing by
+            transition.animateFloat(
+                initialValue = -8f,
+                targetValue = 8f,
+                animationSpec =
+                    infiniteRepeatable(tween(400, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "bell_swing",
+            )
+        swing = animatedSwing
+    } else {
+        swing = 0f
+    }
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        rotate(swing) {
+            val cx = size.width / 2
+
+            drawRoundRect(
+                color = color,
+                topLeft = Offset(cx - size.width * 0.28f, size.height * 0.15f),
+                size = Size(size.width * 0.56f, size.height * 0.55f),
+                cornerRadius = CornerRadius(size.width * 0.15f),
+            )
+
+            drawRoundRect(
+                color = color,
+                topLeft = Offset(cx - size.width * 0.38f, size.height * 0.62f),
+                size = Size(size.width * 0.76f, size.height * 0.12f),
+                cornerRadius = CornerRadius(size.width * 0.06f),
+            )
+
+            drawCircle(color, radius = size.width * 0.08f, center = Offset(cx, size.height * 0.85f))
+        }
+    }
+}
+
+@Composable
+private fun AnimatedHourglassIcon(color: Color, isAnimating: Boolean = true) {
+    val angle: Float
+    if (isAnimating) {
+        val transition = rememberInfiniteTransition(label = "hg")
+        val animatedAngle by
+            transition.animateFloat(
+                initialValue = 0f,
+                targetValue = 180f,
+                animationSpec =
+                    infiniteRepeatable(tween(2000, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "hg_angle",
+            )
+        angle = animatedAngle
+    } else {
+        angle = 0f
+    }
+    val drawColor = if (isAnimating) color else color.copy(alpha = AlphaTertiary)
+    val hgPath = remember { Path() }
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        rotate(angle) {
+            val w = size.width
+            val h = size.height
+            hgPath.rewind()
+            hgPath.moveTo(w * 0.2f, h * 0.1f)
+            hgPath.lineTo(w * 0.8f, h * 0.1f)
+            hgPath.lineTo(w * 0.55f, h * 0.45f)
+            hgPath.lineTo(w * 0.8f, h * 0.9f)
+            hgPath.lineTo(w * 0.2f, h * 0.9f)
+            hgPath.lineTo(w * 0.45f, h * 0.45f)
+            hgPath.close()
+            drawPath(hgPath, drawColor, style = Stroke(SizeStrokeThin.dp.toPx(), cap = StrokeCap.Round))
+
+            drawCircle(
+                drawColor.copy(alpha = AlphaTertiary),
+                radius = w * 0.08f,
+                center = Offset(w / 2, h * 0.72f),
+            )
+        }
+    }
+}
+
+@Composable
+private fun AnimatedTickIcon(color: Color, isRunning: Boolean) {
+    val angle: Float
+    if (isRunning) {
+        val transition = rememberInfiniteTransition(label = "tick")
+        val animatedAngle by
+            transition.animateFloat(
+                initialValue = 0f,
+                targetValue = 360f,
+                animationSpec =
+                    infiniteRepeatable(
+                        tween(1500, easing = LinearEasing),
+                        RepeatMode.Restart,
+                    ),
+                label = "tick_angle",
+            )
+        angle = animatedAngle
+    } else {
+        angle = 0f 
+    }
+    val drawColor = if (isRunning) color else color.copy(alpha = AlphaTertiary)
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val cx = size.width / 2
+        val cy = size.height / 2
+        val r = size.minDimension / 2 * 0.85f
+
+        drawCircle(drawColor.copy(alpha = AlphaDisabled), radius = r, style = Stroke(1.2f.dp.toPx()))
+
+        val rad = toRadians(angle.toDouble() - 90.0)
+        drawLine(
+            drawColor,
+            Offset(cx, cy),
+            Offset(cx + (r * 0.7f * cos(rad)).toFloat(), cy + (r * 0.7f * sin(rad)).toFloat()),
+            strokeWidth = SizeStrokeThin.dp.toPx(),
+            cap = StrokeCap.Round,
+        )
+        drawCircle(drawColor, radius = SizeStrokeThin.dp.toPx(), center = Offset(cx, cy))
+    }
+}
+
+@Composable
+private fun RingerIcon(event: IslandEvent.RingerMode, tint: Color? = null) {
+    val style = eventStyleFor(event)
+    val color = tint ?: style.accent
+    val vector = style.icon ?: return
+    when (event.mode) {
+        AudioManager.RINGER_MODE_VIBRATE -> {
+            val transition = rememberInfiniteTransition(label = "ringer_shake")
+            val anim by transition.animateFloat(
+                initialValue = -0.8f,
+                targetValue = 0.8f,
+                animationSpec = infiniteRepeatable(tween(90), RepeatMode.Reverse),
+                label = "ringer_shake_anim",
+            )
+            Icon(vector, null, tint = color, modifier = Modifier.size(SizeBadge).offset(x = anim.dp))
+        }
+        AudioManager.RINGER_MODE_NORMAL -> {
+            val transition = rememberInfiniteTransition(label = "ringer_normal")
+            val scale by transition.animateFloat(
+                initialValue = 1f,
+                targetValue = 1.12f,
+                animationSpec = infiniteRepeatable(tween(750, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "ringer_normal_scale",
+            )
+            Icon(
+                vector,
+                null,
+                tint = color,
+                modifier = Modifier.size(SizeBadge).graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                },
+            )
+        }
+        AudioManager.RINGER_MODE_SILENT -> {
+            val transition = rememberInfiniteTransition(label = "ringer_silent")
+            val alpha by transition.animateFloat(
+                initialValue = 1f,
+                targetValue = AlphaDisabled,
+                animationSpec = infiniteRepeatable(tween(1200, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "ringer_silent_alpha",
+            )
+            Icon(
+                vector,
+                null,
+                tint = color,
+                modifier = Modifier.size(SizeBadge).graphicsLayer { this.alpha = alpha },
+            )
+        }
+        else -> Icon(vector, null, tint = color, modifier = Modifier.size(SizeBadge))
+    }
+}
+
+@Composable
+private fun AnimatedOngoingIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "ongoing")
+    val rotate by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 360f,
+            animationSpec =
+                infiniteRepeatable(tween(2500, easing = LinearEasing), RepeatMode.Restart),
+            label = "ongoing_rot",
+        )
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val cx = size.width / 2
+        val cy = size.height / 2
+        val r = size.minDimension / 2 * 0.8f
+        val sw = SizeStrokeThin.dp.toPx()
+        drawCircle(color.copy(alpha = AlphaFaint), radius = r, style = Stroke(sw))
+        drawArc(
+            color = color,
+            startAngle = rotate,
+            sweepAngle = 90f,
+            useCenter = false,
+            topLeft = Offset(cx - r, cy - r),
+            size = Size(r * 2, r * 2),
+            style = Stroke(sw, cap = StrokeCap.Round),
+        )
+    }
+}
+
+@Composable
+private fun AnimatedRecentsIcon(color: Color) {
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val w = size.width
+        val h = size.height
+        val sw = SizeStrokeThin.dp.toPx()
+        val pad = w * 0.18f
+        val gap = w * 0.08f
+        val half = (w - pad * 2 - gap) / 2
+        drawRoundRect(color, Offset(pad, pad), Size(half, half), CornerRadius(w * 0.06f), style = Stroke(sw))
+        drawRoundRect(color, Offset(pad + half + gap, pad), Size(half, half), CornerRadius(w * 0.06f), style = Stroke(sw))
+        drawRoundRect(color, Offset(pad, pad + half + gap), Size(half, half), CornerRadius(w * 0.06f), style = Stroke(sw))
+        drawRoundRect(color.copy(alpha = AlphaTertiary), Offset(pad + half + gap, pad + half + gap), Size(half, half), CornerRadius(w * 0.06f), style = Stroke(sw))
+    }
+}
+
+@Composable
+private fun NotificationPillIcon(event: IslandEvent.Notification) {
+    val icon = event.appIcon
+    if (icon != null) {
+        Image(
+            bitmap = icon.toScaledBitmap(16.dp),
+            contentDescription = null,
+            modifier = Modifier.size(16.dp).clip(ShapeXs),
+        )
+    } else {
+        Icon(Icons.Filled.Notifications, null, tint = BlueAccent, modifier = Modifier.size(SizeBadge))
+    }
+}
+
+private val DOWNLOAD_KEYWORDS = Regex(
+    "download",
+    RegexOption.IGNORE_CASE,
+)
+
+@Composable
+private fun PromotedOngoingPillIcon(event: IslandEvent.PromotedOngoing, tint: Color? = null) {
+    val hasProgress = event.progress >= 0f || event.isIndeterminate
+    val color = tint ?: BlueAccent
+
+    val isDownloadLike = hasProgress && (
+        DOWNLOAD_KEYWORDS.containsMatchIn(event.title) ||
+            DOWNLOAD_KEYWORDS.containsMatchIn(event.text) ||
+            DOWNLOAD_KEYWORDS.containsMatchIn(event.shortText)
+    )
+
+    if (isDownloadLike) {
+        AnimatedDownloadIcon(color)
+    } else if (event.appIcon != null) {
+        Image(
+            bitmap = event.appIcon.toScaledBitmap(16.dp),
+            contentDescription = null,
+            modifier = Modifier.size(16.dp).clip(ShapeXs),
+            contentScale = ContentScale.Crop,
+        )
+    } else if (hasProgress) {
+        AnimatedDownloadIcon(color)
+    } else {
+        AnimatedOngoingIcon(color)
+    }
+}
+
+@Composable
+private fun AnimatedDownloadIcon(color: Color) {
+    val transition = rememberInfiniteTransition(label = "download")
+    val bounce by transition.animateFloat(
+        initialValue = -1.5f,
+        targetValue = 1.5f,
+        animationSpec = infiniteRepeatable(
+            tween(800, easing = FastOutSlowInEasing),
+            RepeatMode.Reverse,
+        ),
+        label = "arrow_bounce",
+    )
+
+    Canvas(modifier = Modifier.size(SizeBadge)) {
+        val cx = size.width / 2f
+        val cy = size.height / 2f
+        val sw = 1.6f.dp.toPx()
+        val arrowOffset = bounce.dp.toPx()
+
+        val trayY = size.height * 0.82f
+        val trayHalf = size.width * 0.32f
+        val trayDepth = SizeStrokeWidth.toPx()
+        drawLine(color, Offset(cx - trayHalf, trayY), Offset(cx - trayHalf, trayY + trayDepth), sw, StrokeCap.Round)
+        drawLine(color, Offset(cx - trayHalf, trayY + trayDepth), Offset(cx + trayHalf, trayY + trayDepth), sw, StrokeCap.Round)
+        drawLine(color, Offset(cx + trayHalf, trayY + trayDepth), Offset(cx + trayHalf, trayY), sw, StrokeCap.Round)
+
+        val arrowTop = size.height * 0.12f + arrowOffset
+        val arrowBottom = size.height * 0.62f + arrowOffset
+        drawLine(color, Offset(cx, arrowTop), Offset(cx, arrowBottom), sw, StrokeCap.Round)
+
+        val headSize = size.width * 0.22f
+        drawLine(color, Offset(cx - headSize, arrowBottom - headSize), Offset(cx, arrowBottom), sw, StrokeCap.Round)
+        drawLine(color, Offset(cx + headSize, arrowBottom - headSize), Offset(cx, arrowBottom), sw, StrokeCap.Round)
+    }
+}
+
+@Composable
+private fun PromotedOngoingText(event: IslandEvent.PromotedOngoing, modifier: Modifier, overrideColor: Color? = null) {
+    val color = overrideColor ?: BlueAccent
+    val base = when {
+        event.shortText.isNotEmpty() -> event.shortText
+        event.title.isNotEmpty() -> event.title
+        event.appName.isNotEmpty() -> event.appName
+        else -> ""
+    }
+    val percent = if (event.progress in 0f..1f) "${(event.progress * 100).toInt()}%" else null
+    val label = when {
+        base.isNotEmpty() && percent != null -> "$base · $percent"
+        base.isNotEmpty() -> base
+        percent != null -> percent
+        else -> return
+    }
+    MarqueeLabel(label, color, modifier)
+}
+
+@Composable
+private fun SportsPillIcon(event: IslandEvent.Sports) {
+    val icon = event.team1Icon ?: event.team2Icon ?: event.appIcon
+    if (icon != null) {
+        Image(
+            bitmap = icon.toScaledBitmap(16.dp),
+            contentDescription = null,
+            modifier = Modifier.size(16.dp).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    } else {
+        AnimatedTrophyIcon(accentColorFor(event))
+    }
+}
+
+@Composable
+private fun SportsText(event: IslandEvent.Sports, modifier: Modifier, overrideColor: Color? = null) {
+    val color = overrideColor ?: accentColorFor(event)
+    val scoreText = when {
+        event.score1.isNotEmpty() -> "${event.score1}-${event.score2}"
+        event.team2Name.isEmpty() -> event.team1Name
+        else -> "vs"
+    }
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
+        Text(scoreText, color = color, style = PillAccent, maxLines = 1)
+        event.team2Icon?.let { icon ->
+            Box(modifier = Modifier.padding(start = 4.dp)) {
+                Image(
+                    bitmap = icon.toScaledBitmap(14.dp),
+                    contentDescription = null,
+                    modifier = Modifier.size(14.dp).clip(CircleShape),
+                    contentScale = ContentScale.Crop,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AppSwitchPillIcon(event: IslandEvent.AppSwitch) {
+    val app = event.previousApp ?: event.recentApps.firstOrNull()
+    app?.appIcon?.let {
+        Image(
+            bitmap = it.toScaledBitmap(16.dp),
+            contentDescription = null,
+            modifier = Modifier.size(16.dp).clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+    } ?: AnimatedRecentsIcon(SubtleGray)
+}
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+private fun BiometricUnlockIcon(tint: Color? = null) {
+    val color = tint ?: GreenAccent
+    val motionScheme = MaterialTheme.motionScheme
+    var started by remember { mutableStateOf(false) }
+    LaunchedEffect(Unit) { started = true }
+
+    val sweep by
+        animateFloatAsState(
+            targetValue = if (started) 360f else 0f,
+            animationSpec = motionScheme.defaultSpatialSpec(),
+            label = "bio_sweep",
+        )
+    val checkAlpha by
+        animateFloatAsState(
+            targetValue = if (started) 1f else 0f,
+            animationSpec = tween(250, delayMillis = 500),
+            label = "bio_check",
+        )
+
+    Box(modifier = Modifier.size(18.dp), contentAlignment = Alignment.Center) {
+        Canvas(modifier = Modifier.size(18.dp)) {
+            val inset = 1.dp.toPx()
+            drawArc(
+                color = color,
+                startAngle = -90f,
+                sweepAngle = sweep,
+                useCenter = false,
+                style = Stroke(width = SizeStrokeThin.dp.toPx(), cap = StrokeCap.Round),
+                topLeft = Offset(inset, inset),
+                size = Size(size.width - inset * 2, size.height - inset * 2),
+            )
+        }
+
+        if (checkAlpha < 1f) {
+            Icon(
+                Icons.Filled.Lock,
+                null,
+                tint = color.copy(alpha = 1f - checkAlpha),
+                modifier = Modifier.size(10.dp),
+            )
+        }
+        if (checkAlpha > 0f) {
+            Icon(
+                Icons.Filled.Check,
+                null,
+                tint = color.copy(alpha = checkAlpha),
+                modifier = Modifier.size(10.dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun KeyguardIndicationIcon(event: IslandEvent.KeyguardIndication, tint: Color? = null) {
+    when (event.indicationType) {
+        IslandEvent.KeyguardIndication.IndicationType.BIOMETRIC -> {
+            
+            val color = tint ?: GreenAccent
+            val transition = rememberInfiniteTransition(label = "kg_bio")
+            val sweep by transition.animateFloat(
+                initialValue = 60f, targetValue = 300f,
+                animationSpec = infiniteRepeatable(tween(1200, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+                label = "kg_bio_sweep",
+            )
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                val inset = 1.dp.toPx()
+                drawArc(
+                    color = color,
+                    startAngle = -90f,
+                    sweepAngle = sweep,
+                    useCenter = false,
+                    style = Stroke(width = SizeStrokeThin.dp.toPx(), cap = StrokeCap.Round),
+                    topLeft = Offset(inset, inset),
+                    size = Size(size.width - inset * 2, size.height - inset * 2),
+                )
+            }
+        }
+        IslandEvent.KeyguardIndication.IndicationType.TRUST -> {
+            
+            val color = tint ?: IndigoAccent
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                val w = size.width; val h = size.height
+                val path = Path().apply {
+                    moveTo(w * 0.5f, h * 0.05f)
+                    lineTo(w * 0.9f, h * 0.25f)
+                    lineTo(w * 0.85f, h * 0.65f)
+                    quadraticTo(w * 0.5f, h * 1.0f, w * 0.15f, h * 0.65f)
+                    lineTo(w * 0.1f, h * 0.25f)
+                    close()
+                }
+                drawPath(path, color)
+            }
+        }
+        IslandEvent.KeyguardIndication.IndicationType.ALIGNMENT -> {
+            
+            AnimatedBoltIcon(tint ?: OrangeAccent)
+        }
+        IslandEvent.KeyguardIndication.IndicationType.DISCLOSURE -> {
+            
+            val color = tint ?: IndigoAccent
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                val w = size.width; val h = size.height
+                
+                drawRect(color, Offset(w * 0.15f, h * 0.3f), Size(w * 0.35f, h * 0.65f))
+                drawRect(color, Offset(w * 0.55f, h * 0.1f), Size(w * 0.3f, h * 0.85f))
+                
+                val windowColor = Color.Black.copy(alpha = AlphaDisabled)
+                drawRect(windowColor, Offset(w * 0.25f, h * 0.45f), Size(w * 0.12f, h * 0.1f))
+                drawRect(windowColor, Offset(w * 0.25f, h * 0.65f), Size(w * 0.12f, h * 0.1f))
+                drawRect(windowColor, Offset(w * 0.62f, h * 0.22f), Size(w * 0.12f, h * 0.1f))
+                drawRect(windowColor, Offset(w * 0.62f, h * 0.42f), Size(w * 0.12f, h * 0.1f))
+                drawRect(windowColor, Offset(w * 0.62f, h * 0.62f), Size(w * 0.12f, h * 0.1f))
+            }
+        }
+        IslandEvent.KeyguardIndication.IndicationType.OWNER_INFO -> {
+            
+            val color = tint ?: IndigoAccent
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                val w = size.width; val h = size.height
+                
+                drawCircle(color, radius = w * 0.2f, center = Offset(w * 0.5f, h * 0.3f))
+                
+                drawArc(
+                    color, startAngle = 0f, sweepAngle = -180f, useCenter = true,
+                    topLeft = Offset(w * 0.15f, h * 0.55f),
+                    size = Size(w * 0.7f, h * 0.5f),
+                )
+            }
+        }
+        IslandEvent.KeyguardIndication.IndicationType.PERSISTENT_UNLOCK -> {
+            
+            val color = tint ?: GreenAccent
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                val w = size.width; val h = size.height
+                
+                drawRoundRect(color, Offset(w * 0.2f, h * 0.45f), Size(w * 0.6f, h * 0.48f), CornerRadius(SizeStrokeWidth.toPx()))
+                
+                drawArc(
+                    color, startAngle = -180f, sweepAngle = 180f, useCenter = false,
+                    style = Stroke(width = SizeStrokeThin.dp.toPx(), cap = StrokeCap.Round),
+                    topLeft = Offset(w * 0.28f, h * 0.08f),
+                    size = Size(w * 0.44f, h * 0.44f),
+                )
+            }
+        }
+        IslandEvent.KeyguardIndication.IndicationType.TRANSIENT -> {
+            
+            val color = tint ?: BlueAccent
+            Canvas(modifier = Modifier.size(SizeBadge)) {
+                drawCircle(color, style = Stroke(width = SizeStrokeThin.dp.toPx()))
+                val cx = size.width / 2f; val cy = size.height / 2f
+                drawCircle(Color.White, radius = 0.8.dp.toPx(), center = Offset(cx, cy - 2.2.dp.toPx()))
+                drawLine(
+                    Color.White, Offset(cx, cy - 0.3.dp.toPx()), Offset(cx, cy + 2.8.dp.toPx()),
+                    strokeWidth = 1.2.dp.toPx(), cap = StrokeCap.Round,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun PillEventText(
+    event: IslandEvent,
+    modifier: Modifier,
+    notifCount: Int = 0,
+    overrideColor: Color? = null,
+) {
+    when (event) {
+        is IslandEvent.AudioRecording -> AudioRecText(event, modifier, overrideColor)
+        is IslandEvent.Media -> MediaTitleText(event, modifier, overrideColor)
+        is IslandEvent.PromotedOngoing -> PromotedOngoingText(event, modifier, overrideColor)
+        is IslandEvent.Sports -> SportsText(event, modifier, overrideColor)
+        is IslandEvent.NowPlaying -> MarqueeLabel(
+            "${event.songTitle} · ${event.artist}".trimEnd(' ', '·', ' '),
+            overrideColor ?: MintAccent,
+            modifier,
+        )
+        is IslandEvent.Bluetooth -> BtText(event, modifier, overrideColor)
+        is IslandEvent.Hotspot ->
+            MarqueeLabel(
+                if (event.numDevices > 0) "${stringResource(R.string.ax_dynamic_bar_hotspot)} · ${stringResource(R.string.ax_dynamic_bar_hotspot_devices, event.numDevices)}"
+                else stringResource(R.string.ax_dynamic_bar_hotspot),
+                overrideColor ?: TealAccent,
+                modifier,
+            )
+        is IslandEvent.Charging -> MarqueeLabel("${event.level}%", overrideColor ?: GreenAccent, modifier)
+        is IslandEvent.Alarm ->
+            MarqueeLabel(event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_alarm) }, overrideColor ?: OrangeAccent, modifier)
+        is IslandEvent.Timer -> TimerText(event, modifier, overrideColor)
+        is IslandEvent.Stopwatch -> StopwatchText(event, modifier, overrideColor)
+        is IslandEvent.RingerMode -> MarqueeLabel(event.label, overrideColor ?: eventStyleFor(event).accent, modifier)
+        is IslandEvent.Vpn -> MarqueeLabel(stringResource(R.string.ax_dynamic_bar_vpn_active), overrideColor ?: IndigoAccent, modifier)
+        is IslandEvent.Clipboard ->
+            MarqueeLabel(event.preview.ifEmpty { stringResource(R.string.ax_dynamic_bar_copied) }, overrideColor ?: IndigoAccent, modifier)
+        is IslandEvent.Notification -> {
+            val name = event.title
+            if (name != null) {
+                MarqueeLabel(name, overrideColor ?: BlueAccent, modifier)
+            } else {
+                NotifBellBadge(modifier, notifCount)
+            }
+        }
+        is IslandEvent.AppSwitch ->
+            MarqueeLabel(stringResource(R.string.ax_dynamic_bar_recents), overrideColor ?: SubtleGray, modifier)
+        is IslandEvent.Torch -> {
+            val label =
+                if (event.supportsLevel)
+                    "${(event.level.toFloat() / event.maxLevel * 100).toInt()}%"
+                else stringResource(R.string.ax_dynamic_bar_on)
+            MarqueeLabel(label, overrideColor ?: YellowAccent, modifier)
+        }
+        is IslandEvent.BiometricUnlock -> MarqueeLabel(stringResource(R.string.ax_dynamic_bar_unlocked), overrideColor ?: GreenAccent, modifier)
+        is IslandEvent.KeyguardIndication -> MarqueeLabel(event.text, overrideColor ?: IndigoAccent, modifier)
+        is IslandEvent.AospChip -> AospChipText(event, modifier, overrideColor)
+    }
+}
+
+@Composable
+private fun AospChipText(event: IslandEvent.AospChip, modifier: Modifier, overrideColor: Color? = null) {
+    val color = overrideColor ?: aospChipAccent(event.active)
+    when (val c = event.active.content) {
+        is OngoingActivityChipModel.Content.Text -> MarqueeLabel(c.text, color, modifier)
+        is OngoingActivityChipModel.Content.Timer -> AospChipTimerText(c, color, modifier)
+        is OngoingActivityChipModel.Content.ShortTimeDelta -> AospChipDeltaText(c, color, modifier)
+        is OngoingActivityChipModel.Content.Countdown ->
+            Text(
+                NumberFormat.getIntegerInstance().format(c.secondsUntilStarted),
+                color = color,
+                style = PillMono,
+                modifier = modifier,
+            )
+        is OngoingActivityChipModel.Content.IconOnly -> {}
+    }
+}
+
+@Composable
+private fun AospChipTimerText(content: OngoingActivityChipModel.Content.Timer, color: Color, modifier: Modifier) {
+    var elapsedMs by remember(content.startTimeMs) {
+        mutableLongStateOf((SystemClock.elapsedRealtime() - content.startTimeMs).coerceAtLeast(0L))
+    }
+    LaunchedEffect(content.startTimeMs, content.isEventInFuture) {
+        while (true) {
+            elapsedMs = if (content.isEventInFuture) {
+                (content.startTimeMs - SystemClock.elapsedRealtime()).coerceAtLeast(0L)
+            } else {
+                (SystemClock.elapsedRealtime() - content.startTimeMs).coerceAtLeast(0L)
+            }
+            delay(1000)
+        }
+    }
+    Text(formatElapsedTime(elapsedMs), color = color, style = PillMono, modifier = modifier)
+}
+
+@Composable
+private fun AospChipDeltaText(content: OngoingActivityChipModel.Content.ShortTimeDelta, color: Color, modifier: Modifier) {
+    var text by remember(content.time) { mutableStateOf(formatShortDelta(System.currentTimeMillis() - content.time)) }
+    LaunchedEffect(content.time) {
+        while (true) {
+            text = formatShortDelta(System.currentTimeMillis() - content.time)
+            delay(30_000)
+        }
+    }
+    MarqueeLabel(text, color, modifier)
+}
+
+private fun formatShortDelta(deltaMs: Long): String {
+    val absMs = kotlin.math.abs(deltaMs)
+    val mins = absMs / 60_000L
+    return when {
+        mins < 1L -> "now"
+        mins < 60L -> "${mins}m"
+        mins < 1440L -> "${mins / 60L}h"
+        else -> "${mins / 1440L}d"
+    }
+}
+
+@Composable
+private fun MarqueeLabel(text: String, color: Color, modifier: Modifier = Modifier) {
+    Text(
+        text,
+        color = color,
+        style = PillPrimary,
+        maxLines = 1,
+        overflow = TextOverflow.Clip,
+        modifier = modifier.basicMarquee(iterations = 1),
+    )
+}
+
+@Composable
+private fun AudioRecordingPillIcon(event: IslandEvent.AudioRecording, tint: Color? = null) {
+    val color = tint ?: when (event.state) {
+        RecordingState.RECORDING -> RedAccent
+        RecordingState.PAUSED -> SubtleGray
+        RecordingState.SAVED -> GreenAccent
+    }
+    val vector = when (event.state) {
+        RecordingState.RECORDING -> Icons.Filled.Mic
+        RecordingState.PAUSED -> Icons.Filled.MicOff
+        RecordingState.SAVED -> Icons.Filled.CheckCircle
+    }
+    if (event.state == RecordingState.RECORDING) {
+        val transition = rememberInfiniteTransition(label = "audio_rec")
+        val pulseAlpha by transition.animateFloat(
+            initialValue = 1f,
+            targetValue = AlphaSubtle,
+            animationSpec = infiniteRepeatable(tween(700, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "audio_rec_alpha",
+        )
+        Icon(
+            vector,
+            null,
+            tint = color,
+            modifier = Modifier.size(SizeBadge).graphicsLayer { this.alpha = pulseAlpha },
+        )
+    } else {
+        Icon(vector, null, tint = color, modifier = Modifier.size(SizeBadge))
+    }
+}
+
+@Composable
+private fun AudioRecText(event: IslandEvent.AudioRecording, modifier: Modifier, overrideColor: Color? = null) {
+    when (event.state) {
+        RecordingState.RECORDING, RecordingState.PAUSED -> {
+            var elapsedMs by remember { mutableLongStateOf(0L) }
+            LaunchedEffect(event.startTimeMs, event.state, event.pausedDurationMs) {
+                if (event.state == RecordingState.RECORDING) {
+                    while (true) {
+                        elapsedMs =
+                            (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                                .coerceAtLeast(0L)
+                        delay(1000)
+                    }
+                } else {
+                    elapsedMs =
+                        (System.currentTimeMillis() - event.startTimeMs - event.pausedDurationMs)
+                            .coerceAtLeast(0L)
+                }
+            }
+            val color = overrideColor ?: eventStyleFor(event).accent
+            Text(formatElapsedTime(elapsedMs), color = color, style = PillMono, modifier = modifier)
+        }
+        RecordingState.SAVED -> MarqueeLabel(stringResource(R.string.ax_dynamic_bar_saved), overrideColor ?: GreenAccent, modifier)
+    }
+}
+
+@Composable
+private fun MediaTitleText(event: IslandEvent.Media, modifier: Modifier, overrideColor: Color? = null) {
+    val color = (overrideColor ?: OrangeAccent).copy(
+        alpha = if (event.isPlaying) 1f else AlphaHint
+    )
+    val title = event.track.ifEmpty {
+        event.artist.ifEmpty { "Music" }
+    }
+    Text(
+        text = title,
+        color = color,
+        style = PillPrimary,
+        maxLines = 1,
+        overflow = TextOverflow.Clip,
+        modifier = modifier
+            .widthIn(max = 90.dp)
+            .basicMarquee(
+                initialDelayMillis = 3_000,
+                repeatDelayMillis = 5_000,
+            ),
+    )
+}
+
+@Composable
+private fun BtText(event: IslandEvent.Bluetooth, modifier: Modifier, overrideColor: Color? = null) {
+    val color = overrideColor ?: BlueAccent
+    if (event.batteryLevel >= 0) {
+        Text(
+            "${event.deviceName.take(8)} ${event.batteryLevel}%",
+            color = color,
+            style = MaterialTheme.typography.labelSmall,
+            maxLines = 1,
+            overflow = TextOverflow.Clip,
+            modifier = modifier.basicMarquee(iterations = 1),
+        )
+    } else {
+        MarqueeLabel(event.deviceName.take(12), color, modifier)
+    }
+}
+
+@Composable
+private fun TimerText(event: IslandEvent.Timer, modifier: Modifier, overrideColor: Color? = null) {
+    if (event.endTimeMs > 0L) {
+        val color = overrideColor ?: if (event.isPaused) SubtleGray else BlueAccent
+        if (event.isPaused) {
+            Text(stringResource(R.string.ax_dynamic_bar_paused), color = color, style = PillMono, modifier = modifier)
+        } else {
+            var remainingMs by
+                remember(event.endTimeMs) {
+                    mutableLongStateOf((event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L))
+                }
+            LaunchedEffect(event.endTimeMs) {
+                while (remainingMs > 0L) {
+                    delay(500)
+                    remainingMs = (event.endTimeMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                }
+            }
+            Text(formatCountdownLong(remainingMs), color = color, style = PillMono, modifier = modifier)
+        }
+    } else {
+        MarqueeLabel(event.label.ifEmpty { stringResource(R.string.ax_dynamic_bar_timer) }, overrideColor ?: BlueAccent, modifier)
+    }
+}
+
+@Composable
+private fun StopwatchText(event: IslandEvent.Stopwatch, modifier: Modifier, overrideColor: Color? = null) {
+    val color = overrideColor ?: if (event.isRunning) MintAccent else SubtleGray
+    if (!event.isRunning) {
+        Text(stringResource(R.string.ax_dynamic_bar_paused), color = color, style = PillMono, modifier = modifier)
+    } else {
+        var elapsedMs by
+            remember(event.startTimeMs) {
+                mutableLongStateOf((System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L))
+            }
+        LaunchedEffect(event.startTimeMs) {
+            while (true) {
+                delay(200)
+                elapsedMs = (System.currentTimeMillis() - event.startTimeMs).coerceAtLeast(0L)
+            }
+        }
+        Text(formatStopwatch(elapsedMs), color = color, style = PillMono, modifier = modifier)
+    }
+}
+
+@Composable
+private fun NotifBellBadge(modifier: Modifier, count: Int) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
+        Icon(Icons.Filled.Notifications, null, tint = BlueAccent, modifier = Modifier.size(SizeBadge))
+        if (count > 1) {
+            Box(
+                modifier =
+                    Modifier.align(Alignment.TopEnd)
+                        .offset(x = 5.dp, y = (-3).dp)
+                        .defaultMinSize(minWidth = SpaceLg, minHeight = SpaceLg)
+                        .background(RedAccent, RoundedCornerShape(SpaceSm))
+                        .padding(horizontal = SpaceXxs),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    if (count > 99) "99+" else "$count",
+                    color = chipContentColorOn(RedAccent),
+                    style = TsBadge,
+                    lineHeight = SpaceLg.value.sp,
+                    maxLines = 1,
+                )
+            }
+        }
+    }
+}
+
+
+@Composable
+fun PulsingDot(color: Color, size: Dp = 8.dp, durationMs: Int = 600, minAlpha: Float = AlphaDisabled) {
+    val transition = rememberInfiniteTransition(label = "pulse_${color.value}")
+    val alpha by
+        transition.animateFloat(
+            initialValue = 1f,
+            targetValue = minAlpha,
+            animationSpec =
+                infiniteRepeatable(tween(durationMs, easing = FastOutSlowInEasing), RepeatMode.Reverse),
+            label = "pulse_alpha",
+        )
+    Box(modifier = Modifier.size(size).clip(CircleShape).background(color.copy(alpha = alpha)))
+}
+
+@Composable
+fun WaveformAnimation(color: Color, modifier: Modifier = Modifier.size(34.dp, 20.dp), isAnimating: Boolean = true, barCount: Int = 4) {
+    val phaseState: State<Float>?
+    if (isAnimating) {
+        val transition = rememberInfiniteTransition(label = "waveform")
+        phaseState =
+            transition.animateFloat(
+                initialValue = 0f,
+                targetValue = 2f * PI.toFloat(),
+                animationSpec =
+                    infiniteRepeatable(tween(900, easing = LinearEasing), RepeatMode.Restart),
+                label = "wave_phase",
+            )
+    } else {
+        phaseState = null
+    }
+    Canvas(modifier = modifier) {
+        val phase = phaseState?.value ?: 0f
+        val barW = size.width / (barCount * 2.8f)
+        val maxH = size.height * 0.82f
+        val staticH = if (!isAnimating) maxH * 0.35f else 0f
+        val gap = (size.width - barCount * barW) / (barCount + 1)
+        for (i in 0 until barCount) {
+            val x = gap + i * (barW + gap) + barW / 2f
+            val h = if (isAnimating) maxH * (0.22f + 0.78f * ((sin(phase + i * 0.9f) + 1f) / 2f)) else staticH
+            val y = (size.height - h) / 2f
+            drawLine(
+                color = color,
+                start = Offset(x, y),
+                end = Offset(x, y + h),
+                strokeWidth = barW,
+                cap = StrokeCap.Round,
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
index 1806e4e60b562..30085d7873323 100644
--- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
@@ -31,6 +31,7 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
@@ -48,6 +49,7 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.app.animation.Interpolators;
+import com.android.settingslib.Utils;
 import com.android.systemui.DualToneHandler;
 import com.android.systemui.battery.unified.BatteryColors;
 import com.android.systemui.battery.unified.BatteryDrawableState;
@@ -699,29 +701,43 @@ public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint)
             return;
         }
 
+        // Use default behavior (when NewStatusBarIcons is enabled, Compose battery is used instead)
         if (DarkIconDispatcher.isInAreas(areas, this)) {
             if (darkIntensity < 0.5) {
                 mUnifiedBatteryColors = BatteryColors.DARK_THEME_COLORS;
             } else {
                 mUnifiedBatteryColors = BatteryColors.LIGHT_THEME_COLORS;
             }
-
-            mUnifiedBattery.setColors(mUnifiedBatteryColors);
         } else  {
             // Same behavior as the legacy code when not isInArea
             mUnifiedBatteryColors = BatteryColors.DARK_THEME_COLORS;
-            mUnifiedBattery.setColors(mUnifiedBatteryColors);
         }
+
+        mUnifiedBattery.setColors(mUnifiedBatteryColors);
     }
 
     private void onDarkChangedLegacy(ArrayList<Rect> areas, float darkIntensity, int tint) {
-        float intensity = DarkIconDispatcher.isInAreas(areas, this) ? darkIntensity : 0;
-        int nonAdaptedSingleToneColor = mDualToneHandler.getSingleColor(intensity);
-        int nonAdaptedForegroundColor = mDualToneHandler.getFillColor(intensity);
-        int nonAdaptedBackgroundColor = mDualToneHandler.getBackgroundColor(intensity);
+        // Check if accent color tinting is enabled
+        boolean useAccentColor = Settings.System.getIntForUser(
+                getContext().getContentResolver(),
+                Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT,
+                0,
+                UserHandle.USER_CURRENT) == 1;
+
+        if (useAccentColor) {
+            // Use system accent color for battery tinting
+            int accentColor = Utils.getColorAccentDefaultColor(getContext());
+            updateColors(accentColor, accentColor, accentColor);
+        } else {
+            // Use default behavior
+            float intensity = DarkIconDispatcher.isInAreas(areas, this) ? darkIntensity : 0;
+            int nonAdaptedSingleToneColor = mDualToneHandler.getSingleColor(intensity);
+            int nonAdaptedForegroundColor = mDualToneHandler.getFillColor(intensity);
+            int nonAdaptedBackgroundColor = mDualToneHandler.getBackgroundColor(intensity);
 
-        updateColors(nonAdaptedForegroundColor, nonAdaptedBackgroundColor,
-                nonAdaptedSingleToneColor);
+            updateColors(nonAdaptedForegroundColor, nonAdaptedBackgroundColor,
+                    nonAdaptedSingleToneColor);
+        }
     }
 
     public void setStaticColor(boolean isStaticColor) {
diff --git a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt
index 9f594feb03ab9..69f66d090e418 100644
--- a/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt
+++ b/packages/SystemUI/src/com/android/systemui/battery/unified/BatteryDrawableState.kt
@@ -140,10 +140,35 @@ sealed interface BatteryColors {
         override val errorFill = Color.parseColor("#C5221F")
     }
 
+    /** Custom BatteryColors implementation that uses accent color */
+    class AccentColors(private val accentColor: Int) : BatteryColors {
+        override val fg: Int = accentColor
+        // 22% alpha accent color for background
+        override val bg: Int = Color.argb(
+            (0.22f * 255).toInt(),
+            Color.red(accentColor),
+            Color.green(accentColor),
+            Color.blue(accentColor)
+        )
+        // Use accent color for fill
+        override val fill: Int = accentColor
+        override val fillOnly: Int = accentColor
+        // Use accent color for all states
+        override val activeFill: Int = accentColor
+        override val warnFill: Int = accentColor
+        override val errorFill: Int = accentColor
+    }
+
     companion object {
         /** For use from java */
         @JvmField val LIGHT_THEME_COLORS = LightThemeColors
 
         @JvmField val DARK_THEME_COLORS = DarkThemeColors
+
+        /** Create a BatteryColors instance using accent color */
+        @JvmStatic
+        fun createAccentColors(accentColor: Int): BatteryColors {
+            return AccentColors(accentColor)
+        }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
index 87e9784ddbc9f..946088779a8b4 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
@@ -23,6 +23,8 @@ import android.content.Context
 import android.graphics.Point
 import android.hardware.biometrics.BiometricFingerprintConstants
 import android.hardware.biometrics.BiometricSourceType
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.DisplayMetrics
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.repeatOnLifecycle
@@ -102,6 +104,10 @@ constructor(
     private var udfpsController: UdfpsController? = null
     private var udfpsRadius: Float = -1f
 
+    private val isRippleEnabled: Boolean
+        get() = Settings.System.getIntForUser(context.contentResolver,
+            Settings.System.ENABLE_RIPPLE_EFFECT, 1, UserHandle.USER_CURRENT) == 1
+
     override fun start() {
         init()
     }
@@ -150,7 +156,7 @@ constructor(
         val keyguardNotShowing = !keyguardStateController.isShowing
         val unlockNotAllowed =
             !keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(biometricSourceType)
-        if (keyguardNotShowing || unlockNotAllowed) {
+        if (keyguardNotShowing || unlockNotAllowed || !isRippleEnabled) {
             logger.notShowingUnlockRipple(keyguardNotShowing, unlockNotAllowed)
             return
         }
@@ -192,6 +198,8 @@ constructor(
     }
 
     private fun showUnlockedRipple() {
+        if (!isRippleEnabled) return
+
         notificationShadeWindowController.setForcePluginOpen(true, this)
 
         // This code path is not used if the KeyguardTransitionRepository is managing the light
@@ -213,6 +221,14 @@ constructor(
     }
 
     override fun onKeyguardFadingAwayChanged() {
+        if (!isRippleEnabled) {
+            // reset and hide the scrim so it doesn't appears on
+            // the next notification shade usage
+            lightRevealScrim.revealAmount = 1f
+            startLightRevealScrimOnKeyguardFadingAway = false
+            return
+        }
+
         if (ambientAod()) {
             return
         }
@@ -259,7 +275,7 @@ constructor(
      * Whether we're animating the light reveal scrim from a call to [onKeyguardFadingAwayChanged].
      */
     fun isAnimatingLightRevealScrim(): Boolean {
-        return lightRevealScrimAnimator?.isRunning ?: false
+        return if (!isRippleEnabled) false else (lightRevealScrimAnimator?.isRunning ?: false)
     }
 
     override fun onStartedGoingToSleep() {
@@ -340,13 +356,16 @@ constructor(
         object : UdfpsController.Callback {
             override fun onFingerDown() {
                 // only show dwell ripple for device entry
-                if (keyguardUpdateMonitor.isFingerprintDetectionRunning) {
+                if (keyguardUpdateMonitor.isFingerprintDetectionRunning &&
+                        udfpsController?.isAnimationEnabled() == false) {
                     showDwellRipple()
                 }
             }
 
             override fun onFingerUp() {
-                mView.retractDwellRipple()
+                if (udfpsController?.isAnimationEnabled() == false) {
+                    mView.retractDwellRipple()
+                }
             }
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt
index 5b665ed550e10..895779840b805 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt
@@ -32,7 +32,7 @@ import com.android.app.animation.Interpolators
 import com.android.settingslib.Utils
 import com.android.systemui.surfaceeffects.ripple.RippleShader
 
-private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f
+private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.7f
 
 /**
  * Handles two ripple effects: dwell ripple and unlocked ripple
@@ -76,7 +76,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
     private var radius: Float = 0f
         set(value) {
             field = value * .9f
-            rippleShader.rippleSize.setMaxSize(field * 2f, field * 2f)
+            rippleShader.rippleSize.setMaxSize(field * 2.2f, field * 2.2f)
         }
     private var origin: Point = Point()
         set(value) {
@@ -95,7 +95,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
 
         dwellShader.color = 0xffffffff.toInt() // default color
         dwellShader.progress = 0f
-        dwellShader.distortionStrength = .4f
+        dwellShader.distortionStrength = .8f
         dwellPaint.shader = dwellShader
         visibility = GONE
     }
@@ -109,7 +109,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
         origin = location
         radius = maxOf(location.x, location.y, width - location.x, height - location.y).toFloat()
         dwellOrigin = location
-        dwellRadius = sensorRadius * 1.5f
+        dwellRadius = sensorRadius * 1.7f
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/MtkUdfpsScrimController.java b/packages/SystemUI/src/com/android/systemui/biometrics/MtkUdfpsScrimController.java
new file mode 100644
index 0000000000000..0252ad14bd441
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/MtkUdfpsScrimController.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2026 The LineageOS project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.biometrics;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+
+/**
+ * Controller for managing the UDFPS HBM (High Brightness Mode) Scrim on MediaTek devices lacking LHBM support.
+ *
+ * Logic reversed from Smali: Lcom/android/systemui/biometrics/PriUdfpsScrimController; from LAVA
+ */
+public class MtkUdfpsScrimController {
+    private static MtkUdfpsScrimController mInstance;
+
+    // Accessed directly by UdfpsController
+    public View mScrimView;
+    public WindowManager mWindowManager;
+
+    private final Context mContext;
+
+    public MtkUdfpsScrimController(Context context) {
+        mContext = context;
+    }
+
+    public static MtkUdfpsScrimController getInstance(Context context) {
+        if (mInstance == null) {
+            mInstance = new MtkUdfpsScrimController(context);
+        }
+        return mInstance;
+    }
+
+    /**
+     * Calculates the alpha (transparency) for the HBM overlay based on screen brightness.
+     * The formula ensures the sensor gets a consistent amount of light.
+     *
+     * @param brightness Current system brightness (0-255)
+     * @return Alpha value (0.0f to 1.0f)
+     */
+    public float calculateAlpha(int brightness) {
+        float alpha = 1.0f - (brightness / 255.0f);
+
+        if (brightness < 25) {
+            // Make alpha 5% more transparent when brightness is under 25.
+            alpha = alpha * 0.95f;
+        }
+
+        Log.d("MtkUdfpsScrimController", "Requested Brightness value: " + brightness);
+        Log.d("MtkUdfpsScrimController", "Alpha Value: " + alpha);
+
+        // Ensure we stay in bounds
+        return Math.max(0.0f, Math.min(1.0f, alpha));
+    }
+
+    public int getSystemBrightness() {
+        if (mContext == null) {
+            return 127;
+        }
+
+        // Try Float first
+        float brightFloat = Settings.System.getFloat(
+            mContext.getContentResolver(),
+            "screen_brightness_float",
+            -1.0f
+        );
+
+        if (brightFloat >= 0.0f) {
+            return (int) (brightFloat * 255.0f);
+        }
+
+        // Fallback
+        return Settings.System.getInt(
+            mContext.getContentResolver(),
+            Settings.System.SCREEN_BRIGHTNESS,
+            127
+        );
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimation.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimation.java
new file mode 100644
index 0000000000000..90f107dd4cf7a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimation.java
@@ -0,0 +1,321 @@
+/**
+ * Copyright (C) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.biometrics;
+
+import static android.content.Intent.ACTION_USER_SWITCHED;
+
+import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;
+import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInProgressOffset;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.DisplayUtils;
+import android.util.Log;
+import android.util.MathUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.graphics.Rect;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.res.R;
+import com.android.systemui.biometrics.AuthController;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.statusbar.policy.KeyguardStateController;
+
+public class UdfpsAnimation extends ImageView {
+
+    private static final boolean DEBUG = false;
+    private static final String LOG_TAG = "UdfpsAnimations";
+
+    private boolean mShowing = false;
+    private Context mContext;
+    private int mAnimationSize;
+    private int mAnimationOffset;
+    private AnimationDrawable recognizingAnim;
+
+    private final WindowManager.LayoutParams mAnimParams = new WindowManager.LayoutParams();
+    private WindowManager mWindowManager;
+
+    private boolean mIsKeyguard;
+
+    private final int mMaxBurnInOffsetX;
+    private final int mMaxBurnInOffsetY;
+
+    private static final String UDFPS_ANIMATIONS_PACKAGE = "com.matrixx.udfps.animations";
+
+    private final KeyguardStateController mKeyguardStateController;
+    private final AuthController mAuthController;
+    private final FingerprintSensorPropertiesInternal mProps;
+
+    private boolean mAnimationAdded = false;
+
+    // Default values from dimens
+    private final int mDefaultAnimationSize;
+    private final int mDefaultAnimationOffset;
+
+    private final KeyguardStateController.Callback keyguardStateCallback = new KeyguardStateController.Callback() {
+        @Override
+        public void onKeyguardFadingAwayChanged() {
+            removeAnimation();
+        }
+        @Override
+        public void onKeyguardGoingAwayChanged() {
+            removeAnimation();
+        }
+    };
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (Intent.ACTION_USER_SWITCHED.equals(action)) {
+                updateAnimationStyle();
+                updateAnimationDimensions();
+            }
+        }
+    };
+
+    public UdfpsAnimation(Context context, WindowManager windowManager,
+           FingerprintSensorPropertiesInternal props, AuthController authController) {
+        super(context);
+        mContext = context;
+        mAuthController = authController;
+        mProps = props;
+
+        mWindowManager = windowManager;
+
+        mKeyguardStateController = Dependency.get(KeyguardStateController.class);
+
+        float scaleFactor = getDisplayFactor();
+
+        mMaxBurnInOffsetX = (int) (context.getResources()
+            .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_x) * scaleFactor);
+        mMaxBurnInOffsetY = (int) (context.getResources()
+            .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y) * scaleFactor);
+
+        mDefaultAnimationSize = mContext.getResources().getDimensionPixelSize(R.dimen.udfps_animation_size);
+        mDefaultAnimationOffset = mContext.getResources().getDimensionPixelSize(R.dimen.udfps_animation_offset);
+
+        updateAnimationDimensions();
+
+        mAnimParams.format = PixelFormat.TRANSLUCENT;
+        mAnimParams.type = WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; // it must be behind Udfps icon
+        mAnimParams.flags =  WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+        mAnimParams.gravity = Gravity.TOP | Gravity.CENTER;
+
+        updatePosition();
+
+        setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+    }
+
+    private void updateAnimationDimensions() {
+        int sizeScale = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.UDFPS_ANIM_SIZE, 50, UserHandle.USER_CURRENT);
+        
+        int offsetScale = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.UDFPS_ANIM_OFFSET, 0, UserHandle.USER_CURRENT);
+
+        mAnimationSize = (int) (mDefaultAnimationSize * (0.5f + (sizeScale / 100.0f)));
+        
+        float density = mContext.getResources().getDisplayMetrics().density;
+        mAnimationOffset = mDefaultAnimationOffset + (int) (offsetScale * density);
+
+        mAnimParams.height = mAnimationSize;
+        mAnimParams.width = mAnimationSize;
+
+        if (DEBUG) {
+            Log.d(LOG_TAG, "updateAnimationDimensions: sizeScale=" + sizeScale + 
+                           ", offsetScale=" + offsetScale +
+                           ", mAnimationSize=" + mAnimationSize + 
+                           ", mAnimationOffset=" + mAnimationOffset);
+        }
+
+        if (mShowing) {
+            updatePosition();
+            try {
+                mWindowManager.updateViewLayout(this, mAnimParams);
+            } catch (RuntimeException e) {
+                Log.e(LOG_TAG, "Error updating view layout", e);
+            }
+        }
+    }
+
+    private void addAnimation() {
+        if (!mAnimationAdded) {
+            IntentFilter filter = new IntentFilter(ACTION_USER_SWITCHED);
+            mContext.registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, filter, null, null);
+
+            updateAnimationStyle();
+            updateAnimationDimensions();
+
+            mKeyguardStateController.addCallback(keyguardStateCallback);
+            mAnimationAdded = true;
+        }
+    }
+
+    private void updateAnimationStyle() {
+        int value = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.UDFPS_ANIM_STYLE, 0, UserHandle.USER_CURRENT);
+        mContext.getMainExecutor().execute(() -> {
+            updateAnimationStyle(value);
+        });
+    }
+
+    private void updateAnimationStyle(int styleIdx) {
+        setBackground(null);
+        if (recognizingAnim != null) {
+            recognizingAnim.stop();
+            clearAnimation();
+            recognizingAnim = null;
+        }
+        Drawable bgDrawable = getBgDrawable(styleIdx);
+        if (styleIdx != 0 && bgDrawable != null) {
+            setBackground(bgDrawable);
+            recognizingAnim = bgDrawable instanceof AnimationDrawable ? (AnimationDrawable) bgDrawable : null;
+        }
+    }
+
+    private Drawable getBgDrawable(int styleIdx) {
+        Resources mApkResources = null;
+        try {
+            mApkResources = mContext.getPackageManager().getResourcesForApplication(UDFPS_ANIMATIONS_PACKAGE);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(LOG_TAG, "Failed to load package resources", e);
+            return null;
+        }
+        String[] mStyleNames = null;
+        if (mApkResources != null) {
+            int res = mApkResources.getIdentifier("udfps_animation_styles",
+                    "array", UDFPS_ANIMATIONS_PACKAGE);
+            if (res == 0) return null;
+            mStyleNames = mApkResources.getStringArray(res);
+        }
+        if (mStyleNames == null || styleIdx >= mStyleNames.length) {
+            return null;
+        }
+        String drawableName = mStyleNames[styleIdx];
+        if (DEBUG) Log.i(LOG_TAG, "Updating animation style to:" + drawableName);
+        try {
+            int resId = mApkResources.getIdentifier(drawableName, "drawable", UDFPS_ANIMATIONS_PACKAGE);
+            if (DEBUG) Log.i(LOG_TAG, "Got resource id: "+ resId +" from package");
+            if (resId == 0) return null;
+            return mApkResources.getDrawable(resId);
+        } catch (Resources.NotFoundException e) {
+            Log.w(LOG_TAG, "Drawable resource not found: " + drawableName, e);
+            return null;
+        }
+    }
+
+    public boolean isAnimationEnabled() {
+        return recognizingAnim != null;
+    }
+
+    private float getDisplayFactor() {
+        return DisplayUtils.getScaleFactor(mContext);
+    }
+
+    public void updatePosition() {
+        Point displaySize = new Point();
+        mWindowManager.getDefaultDisplay().getRealSize(displaySize);
+        boolean isFullResolution = displaySize.y > 3000; 
+        Point udfpsLocation = mAuthController.getUdfpsLocation();
+        float scaleFactor = getDisplayFactor();
+        float udfpsRadius = isFullResolution ? mAuthController.getUdfpsRadius() : mProps.getLocation().sensorRadius;
+        float udfpsLocationY = isFullResolution && udfpsLocation != null ? udfpsLocation.y : mProps.getLocation().sensorLocationY;
+        
+        mAnimParams.y = (int) (udfpsLocationY * scaleFactor) - (int) (udfpsRadius * scaleFactor)
+                        - (mAnimationSize / 2) + mAnimationOffset;
+        if (DEBUG) {
+            Log.d(LOG_TAG, "updatePosition: displaySize=" + displaySize + 
+                           ", isFullResolution=" + isFullResolution + 
+                           ", udfpsLocation=" + udfpsLocation + 
+                           ", udfpsRadius=" + udfpsRadius + 
+                           ", scaleFactor=" + scaleFactor + 
+                           ", udfpsLocationY=" + udfpsLocationY + 
+                           ", mAnimationOffset=" + mAnimationOffset + 
+                           ", mAnimParams.y=" + mAnimParams.y);
+        }
+    }
+
+    public void show() {
+        if (mShowing || !mIsKeyguard || recognizingAnim == null) return;
+        try {
+            if (getWindowToken() == null) {
+                mWindowManager.addView(this, mAnimParams);
+            } else {
+                mWindowManager.updateViewLayout(this, mAnimParams);
+            }
+            mShowing = true;
+            recognizingAnim.start();
+        } catch (RuntimeException e) {
+            Log.e(LOG_TAG, "Error adding view to WindowManager", e);
+        }
+    }
+
+    public void hide() {
+        if (!mShowing && getWindowToken() == null) return;
+        try {
+            if (recognizingAnim != null) {
+                recognizingAnim.stop();
+                recognizingAnim.selectDrawable(0);
+                clearAnimation();
+            }
+            mWindowManager.removeView(this);
+            mShowing = false;
+        } catch (RuntimeException e) {
+            Log.e(LOG_TAG, "Error removing view from WindowManager", e);
+        }
+    }
+
+    public void removeAnimation() {
+        hide();
+        if (mAnimationAdded) {
+            mContext.unregisterReceiver(mIntentReceiver);
+            mKeyguardStateController.removeCallback(keyguardStateCallback);
+            mAnimationAdded = false;
+        }
+    }
+
+    public void setIsKeyguard(boolean isKeyguard) {
+        mIsKeyguard = isKeyguard;
+        if (mIsKeyguard) {
+            addAnimation();
+        } else {
+            removeAnimation();
+        }
+    }
+
+    public void onSettingsChanged() {
+        updateAnimationDimensions();
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
index c906e65941321..9f06170c46a60 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
@@ -24,6 +24,7 @@
 import static android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_KEYGUARD;
 import static android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_ENROLLING;
 import static android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_FIND_SENSOR;
+import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT;
 
 import static com.android.internal.util.LatencyTracker.ACTION_UDFPS_ILLUMINATE;
 import static com.android.internal.util.LatencyTracker.ACTION_UDFPS_OVERLAY_ATTACHED_AFTER_GOING_TO_SLEEP;
@@ -34,9 +35,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.hardware.biometrics.BiometricFingerprintConstants;
 import android.hardware.biometrics.BiometricPrompt;
+import android.hardware.biometrics.BiometricSourceType;
 import android.hardware.biometrics.SensorProperties;
 import android.hardware.display.DisplayManager;
 import android.hardware.fingerprint.FingerprintManager;
@@ -50,6 +53,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.os.PowerManagerInternal;
 import android.os.Trace;
 import android.os.VibrationAttributes;
 import android.os.VibrationEffect;
@@ -70,10 +74,14 @@
 import com.android.internal.logging.InstanceId;
 import com.android.internal.util.LatencyTracker;
 import com.android.keyguard.KeyguardUpdateMonitor;
+import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.keyguard.UserActivityNotifier;
+import com.android.server.LocalServices;
 import com.android.systemui.Dumpable;
 import com.android.systemui.Flags;
 import com.android.systemui.animation.ActivityTransitionAnimator;
+import com.android.systemui.biometrics.AuthController;
+import com.android.systemui.biometrics.MtkUdfpsScrimController;
 import com.android.systemui.biometrics.dagger.BiometricsBackground;
 import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor;
 import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
@@ -194,6 +202,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
     @NonNull private final BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor;
     @NonNull private final CoroutineScope mScope;
     @NonNull private final InputManager mInputManager;
+    @NonNull private final AuthController mAuthController;
     @NonNull private final SelectedUserInteractor mSelectedUserInteractor;
     @NonNull private final MSDLPlayer mMsdlPlayer;
     private final boolean mIgnoreRefreshRate;
@@ -234,6 +243,16 @@ public class UdfpsController implements DozeReceiver, Dumpable {
     private boolean mOnFingerDown;
     private boolean mAttemptedToDismissKeyguard;
     private final Set<Callback> mCallbacks = new HashSet<>();
+    PowerManagerInternal mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);
+
+    private boolean mUseMtkGhbmDimming;
+
+    private UdfpsAnimation mUdfpsAnimation;
+    private boolean mKeyguardCallbackRegistered = false;
+
+    private boolean mDisableSmartPixels;
+    private boolean mSmartPixelsFlag;
+    private boolean mSmartPixelsEnabled;
 
     @VisibleForTesting
     public static final VibrationAttributes UDFPS_VIBRATION_ATTRIBUTES =
@@ -256,6 +275,9 @@ public class UdfpsController implements DozeReceiver, Dumpable {
     private final ScreenLifecycle.Observer mScreenObserver = new ScreenLifecycle.Observer() {
         @Override
         public void onScreenTurnedOn() {
+            if (mDisableSmartPixels) {
+                isSmartPixelsEnabled();
+            }
             mScreenOn = true;
             if (mAodInterruptRunnable != null) {
                 mAodInterruptRunnable.run();
@@ -292,6 +314,56 @@ public void onViewAttachedToWindow(@NonNull View v) {
                 public void onViewDetachedFromWindow(@NonNull View v) {}
             };
 
+    private ConfigurationController.ConfigurationListener mConfigurationListener =
+            new ConfigurationController.ConfigurationListener() {
+                @Override
+                public void onThemeChanged() {
+                    updateUdfpsAnimation();
+                }
+
+                @Override
+                public void onUiModeChanged() {
+                    updateUdfpsAnimation();
+                }
+
+                @Override
+                public void onConfigChanged(Configuration newConfig) {
+                    updateUdfpsAnimation();
+                }
+            };
+
+    private final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() {
+        @Override
+        public void onBiometricAuthFailed(@NonNull BiometricSourceType type) {
+            if (type == FINGERPRINT && mOverlay != null) {
+                mFgExecutor.execute(() -> hideUdfpsAnimation());
+            }
+        }
+
+        @Override
+        public void onBiometricError(int msgId, String errString,
+                @NonNull BiometricSourceType type) {
+            if (type == FINGERPRINT && mOverlay != null) {
+                mFgExecutor.execute(() -> hideUdfpsAnimation());
+            }
+        }
+
+        @Override
+        public void onLockedOutStateChanged(@NonNull BiometricSourceType type) {
+            if (type == FINGERPRINT && mOverlay != null) {
+                mFgExecutor.execute(() -> hideUdfpsAnimation());
+            }
+        }
+
+        @Override
+        public void onBiometricAuthenticated(int userId, BiometricSourceType type,
+                boolean isStrongBiometric) {
+            if (mOverlay != null) {
+                mFgExecutor.execute(() -> hideUdfpsAnimation());
+            }
+        }
+    };
+
     @Override
     public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
         final int touchConfigId = mContext.getResources().getInteger(
@@ -731,7 +803,8 @@ public UdfpsController(@NonNull @Main Context context,
             @Application CoroutineScope scope,
             UserActivityNotifier userActivityNotifier,
             Lazy<WakefulnessLifecycle> wakefulnessLifecycle,
-            MSDLPlayer msdlPlayer) {
+            MSDLPlayer msdlPlayer,
+            @NonNull AuthController authController) {
         mContext = context;
         mExecution = execution;
         mVibrator = vibrator;
@@ -760,13 +833,7 @@ public UdfpsController(@NonNull @Main Context context,
         mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
         mLatencyTracker = latencyTracker;
         mActivityTransitionAnimator = activityTransitionAnimator;
-        mSensorProps = new FingerprintSensorPropertiesInternal(
-                -1 /* sensorId */,
-                SensorProperties.STRENGTH_CONVENIENCE,
-                0 /* maxEnrollmentsPerUser */,
-                new ArrayList<>() /* componentInfo */,
-                FingerprintSensorProperties.TYPE_UNKNOWN,
-                false /* resetLockoutRequiresHardwareAuthToken */);
+        mSensorProps = findFirstUdfps();
 
         mBiometricExecutor = biometricsExecutor;
         mPrimaryBouncerInteractor = primaryBouncerInteractor;
@@ -789,6 +856,8 @@ public UdfpsController(@NonNull @Main Context context,
 
         mDumpManager.registerDumpable(TAG, this);
 
+        mAuthController = authController;
+
         mOrientationListener = new BiometricDisplayListener(
                 context,
                 displayManager,
@@ -817,6 +886,53 @@ public UdfpsController(@NonNull @Main Context context,
         if (mWakefulnessLifecycle != null) {
             mWakefulnessLifecycle.addObserver(mWakefulnessLifecycleObserver);
         }
+
+        mDisableSmartPixels = mContext.getResources().getBoolean(com.android.systemui.res.R.bool.config_disableSmartPixelsOnUDFPS);
+
+        mUseMtkGhbmDimming = mContext.getResources().getBoolean(
+            com.android.systemui.res.R.bool.config_udfpsMtkGhbmDimming);
+
+        if (com.android.internal.util.matrixx.Utils.isPackageInstalled(mContext,
+                "com.matrixx.udfps.animations")) {
+
+            updateUdfpsAnimation();
+            mConfigurationController.addCallback(mConfigurationListener);
+        }
+    }
+
+    private void updateUdfpsAnimation() {
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.removeAnimation();
+            mUdfpsAnimation = null;
+        }
+        mUdfpsAnimation = new UdfpsAnimation(mContext, mWindowManager, mSensorProps, mAuthController);
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.updatePosition();
+        }
+    }
+
+    private void isSmartPixelsEnabled() {
+        if (!mSmartPixelsFlag) {
+            mSmartPixelsEnabled = Settings.Secure.getIntForUser(
+                    mContext.getContentResolver(), Settings.Secure.SMART_PIXEL_FILTER_ENABLED,
+                    0, mContext.getUserId()) != 0;
+        }
+    }
+
+    private void disableSmartPixels() {
+        if (mSmartPixelsEnabled) {
+            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SMART_PIXEL_FILTER_ENABLED,
+                    0, mContext.getUserId());
+        }
+    }
+
+    private void enableSmartPixels() {
+        if (mSmartPixelsEnabled) {
+            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.SMART_PIXEL_FILTER_ENABLED,
+                    1, mContext.getUserId());
+        }
     }
 
     /**
@@ -837,6 +953,17 @@ public void playStartHaptic() {
         }
     }
 
+    @Nullable
+    private FingerprintSensorPropertiesInternal findFirstUdfps() {
+        for (FingerprintSensorPropertiesInternal props :
+                mFingerprintManager.getSensorPropertiesInternal()) {
+            if (props.isAnyUdfpsType()) {
+                return props;
+            }
+        }
+        return null;
+    }
+
     @Override
     public void dozeTimeTick() {
 
@@ -860,6 +987,11 @@ private void showUdfpsOverlay(@NonNull UdfpsControllerOverlay overlay) {
 
         mOverlay = overlay;
         final int requestReason = overlay.getRequestReason();
+
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.setIsKeyguard(requestReason == REASON_AUTH_KEYGUARD);
+        }
+
         if (requestReason == REASON_AUTH_KEYGUARD
                 && !mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {
             Log.d(TAG, "Attempting to showUdfpsOverlay when fingerprint detection"
@@ -880,6 +1012,11 @@ private void showUdfpsOverlay(@NonNull UdfpsControllerOverlay overlay) {
         } else {
             Log.d(TAG, "showUdfpsOverlay | the overlay is already showing");
         }
+
+        if (!mKeyguardCallbackRegistered) {
+            mKeyguardUpdateMonitor.registerCallback(mKeyguardCallback);
+            mKeyguardCallbackRegistered = true;
+        }
     }
 
     private void hideUdfpsOverlay() {
@@ -891,13 +1028,28 @@ private void hideUdfpsOverlay() {
             if (oldView != null) {
                 onFingerUp(mOverlay.getRequestId(), oldView);
             }
+
+            // Ensure HBM views are removed from WindowManager
+            if (mUseMtkGhbmDimming) {
+                View hbmView = mOverlay.getHbmView();
+                if (hbmView != null) {
+                    hbmView.setVisibility(View.GONE);
+                }
+            }
+
             final boolean removed = mOverlay.hide();
             mKeyguardViewManager.hideAlternateBouncer(true);
+            hideUdfpsAnimation();
             Log.v(TAG, "hideUdfpsOverlay | removing window: " + removed);
         } else {
             Log.v(TAG, "hideUdfpsOverlay | the overlay is already hidden");
         }
 
+        if (mKeyguardCallbackRegistered) {
+            mKeyguardUpdateMonitor.removeCallback(mKeyguardCallback);
+            mKeyguardCallbackRegistered = false;
+        }
+
         mOverlay = null;
         mOrientationListener.disable();
     }
@@ -982,7 +1134,7 @@ private boolean isScreenOffUnlockEnabled() {
                 && Settings.Secure.getIntForUser(
                         mContext.getContentResolver(),
                         Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,
-                        0,
+                        mContext.getResources().getBoolean(R.bool.config_screen_off_udfps_default_on) ? 1 : 0,
                         mContext.getUserId()) != 0;
     }
 
@@ -1091,6 +1243,24 @@ private void onFingerDown(
                     + " current: " + mOverlay.getRequestId());
             return;
         }
+
+        final View view = mOverlay.getTouchOverlay();
+
+        if (mPowerManagerInternal != null) {
+            mPowerManagerInternal.setPowerMode(PowerManagerInternal.MODE_LAUNCH, true);
+        }
+
+        if (view != null && view.getViewRootImpl() != null) {
+            view.getViewRootImpl().notifyRendererOfExpensiveFrame();
+        }
+
+        if (mDisableSmartPixels) {
+            if (!mSmartPixelsFlag && mSmartPixelsEnabled) {
+                disableSmartPixels();
+            }
+            mSmartPixelsFlag = true;
+        }
+
         if (isOptical()) {
             mLatencyTracker.onActionStart(ACTION_UDFPS_ILLUMINATE);
         }
@@ -1111,9 +1281,32 @@ private void onFingerDown(
         mOnFingerDown = true;
         mFingerprintManager.onPointerDown(requestId, mSensorProps.sensorId, pointerId, x, y,
                 minor, major, orientation, time, gestureStart, isAod);
+
+        if (mUseMtkGhbmDimming && mOverlay != null) {
+            View hbmView = mOverlay.getHbmView(); // Ensure UdfpsControllerOverlay exposes this
+            WindowManager.LayoutParams hbmParams = mOverlay.getHbmLayoutParamsFull();
+
+            if (hbmView != null && hbmParams != null) {
+                MtkUdfpsScrimController mtkController = MtkUdfpsScrimController.getInstance(mContext);
+
+                int brightness = mtkController.getSystemBrightness();
+                float alpha = mtkController.calculateAlpha(brightness);
+
+                Log.d(TAG, "UDFPS Scrim: Brightness=" + brightness + " CalculatedAlpha=" + alpha);
+
+                if (hbmView.getVisibility() != View.VISIBLE) {
+                    hbmView.setVisibility(View.VISIBLE);
+                }
+
+                if (Math.abs(hbmParams.alpha - alpha) > 0.001f) {
+                    hbmParams.alpha = alpha;
+                    mWindowManager.updateViewLayout(hbmView, hbmParams);
+                }
+            }
+        }
+
         Trace.endAsyncSection("UdfpsController.e2e.onPointerDown", 0);
 
-        final View view = mOverlay.getTouchOverlay();
         if (isOptical() && view instanceof UdfpsTouchOverlay udfpsView) {
             if (mIgnoreRefreshRate) {
                 dispatchOnUiReady(requestId);
@@ -1122,11 +1315,16 @@ private void onFingerDown(
             }
         }
 
+        if (view != null && view.getViewRootImpl() != null) {
+            view.getViewRootImpl().notifyRendererOfExpensiveFrame();
+        }
+
         if (isOptical()) {
             for (Callback cb : mCallbacks) {
                 cb.onFingerDown();
             }
         }
+        showUdfpsAnimation();
     }
 
     private void onFingerUp(long requestId, @NonNull View view) {
@@ -1159,6 +1357,14 @@ private void onFingerUp(
         mExecution.assertIsMainThread();
         mActivePointerId = MotionEvent.INVALID_POINTER_ID;
         mAcquiredReceived = false;
+
+        if (mDisableSmartPixels) {
+            if (mSmartPixelsFlag && mSmartPixelsEnabled) {
+                enableSmartPixels();
+            }
+            mSmartPixelsFlag = false;
+        }
+
         if (mOnFingerDown) {
             mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId, pointerId, x,
                     y, minor, major, orientation, time, gestureStart, isAod);
@@ -1167,10 +1373,39 @@ private void onFingerUp(
                     cb.onFingerUp();
                 }
             }
+            hideUdfpsAnimation();
         }
         mOnFingerDown = false;
+
+        if (mUseMtkGhbmDimming && mOverlay != null) {
+            View hbmView = mOverlay.getHbmView();
+            if (hbmView != null) {
+                hbmView.setVisibility(View.GONE);
+            }
+        }
+
         unconfigureDisplay(view);
         cancelAodSendFingerUpAction();
+        if (mPowerManagerInternal != null) {
+            mPowerManagerInternal.setPowerMode(PowerManagerInternal.MODE_LAUNCH, false);
+        }
+
+    }
+
+    public boolean isAnimationEnabled() {
+        return mUdfpsAnimation != null && mUdfpsAnimation.isAnimationEnabled();
+    }
+
+    private void showUdfpsAnimation() {
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.show();
+        }
+    }
+
+    private void hideUdfpsAnimation() {
+        if (mUdfpsAnimation != null) {
+            mUdfpsAnimation.hide();
+        }
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
index a80a96dc53f4f..ffdb2741125e9 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
@@ -19,6 +19,7 @@ package com.android.systemui.biometrics
 import android.annotation.SuppressLint
 import android.annotation.UiThread
 import android.content.Context
+import android.graphics.Color
 import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_BP
@@ -131,8 +132,54 @@ constructor(
         null
     }
 
-    private val coreLayoutParams =
-        WindowManager.LayoutParams(
+    private val useMtkGhbmDimming = context.resources.getBoolean(
+        com.android.systemui.res.R.bool.config_udfpsMtkGhbmDimming
+    )
+
+    private val hbmDimLayerName = context.resources.getString(
+        com.android.systemui.res.R.string.config_udfpsHbmDimLayer
+    )
+
+    val hbmView: View? = if (useMtkGhbmDimming) {
+        View(context).apply {
+            setBackgroundColor(Color.BLACK)
+            visibility = View.INVISIBLE
+        }
+    } else null
+
+    private val dimView: View? = if (useMtkGhbmDimming) {
+        View(context).apply {
+            setBackgroundColor(Color.TRANSPARENT)
+        }
+    } else null
+
+    private var isAddDimView: Boolean = false
+
+    private val coreLayoutParams: WindowManager.LayoutParams = if (useMtkGhbmDimming) {
+            WindowManager.LayoutParams(
+                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+                0 /* flags set in computeLayoutParams() */,
+                PixelFormat.TRANSLUCENT
+            ).apply {
+                title = TAG
+                fitInsetsTypes = 0
+                gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
+                layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+
+                flags = (WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED or
+                    WindowManager.LayoutParams.FLAG_SPLIT_TOUCH or
+                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+
+                privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+                // Avoid announcing window title.
+                accessibilityTitle = " "
+
+                inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
+            }
+    } else {
+            WindowManager.LayoutParams(
                 WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
                 0 /* flags set in computeLayoutParams() */,
                 PixelFormat.TRANSLUCENT,
@@ -151,6 +198,92 @@ constructor(
                 accessibilityTitle = " "
                 inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
             }
+    }
+
+    // HBM Params (The high brightness layer)
+    private val hbmLayoutParams: WindowManager.LayoutParams? = if (useMtkGhbmDimming) {
+            WindowManager.LayoutParams(
+                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+                0 /* flags set in computeLayoutParams() */,
+                PixelFormat.TRANSLUCENT
+            ).apply {
+                title = hbmDimLayerName
+                fitInsetsTypes = 0
+                alpha = 0.1f
+                gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
+                layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+
+                flags = (WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED or
+                    WindowManager.LayoutParams.FLAG_SPLIT_TOUCH or
+                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+
+                privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+                // Avoid announcing window title.
+                accessibilityTitle = " "
+
+                inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
+            }
+    } else {
+        null
+    }
+
+    // HBM Full Params
+    val hbmLayoutParamsFull: WindowManager.LayoutParams? = if (useMtkGhbmDimming) {
+            WindowManager.LayoutParams(
+                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+                0 /* flags set in computeLayoutParams() */,
+                PixelFormat.TRANSLUCENT
+            ).apply {
+                title = hbmDimLayerName
+                fitInsetsTypes = 0
+                alpha = 0.1f
+                gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
+                layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+
+                flags = (WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED or
+                    WindowManager.LayoutParams.FLAG_SPLIT_TOUCH or
+                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+
+                privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+                // Avoid announcing window title.
+                accessibilityTitle = " "
+
+                inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
+            }
+    } else {
+        null
+    }
+
+    // Dim Params
+    private val dimLayoutParams: WindowManager.LayoutParams? = if (useMtkGhbmDimming) {
+            WindowManager.LayoutParams(
+                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+                0 /* flags set in computeLayoutParams() */,
+                PixelFormat.TRANSLUCENT
+            ).apply {
+                title = "UdfpsDim"
+                fitInsetsTypes = 0
+                gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
+                layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+
+                flags = (WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED or
+                    WindowManager.LayoutParams.FLAG_SPLIT_TOUCH or
+                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+
+                privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+                accessibilityTitle = " "
+
+                inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
+            }
+    } else {
+        null
+    }
 
     /** If the overlay is currently showing. */
     val isShowing: Boolean
@@ -266,7 +399,35 @@ constructor(
                 if (Build.IS_DEBUGGABLE) {
                     Log.d(TAG, "adding view=$view")
                 }
-                windowManager.addView(view, coreLayoutParams.updateDimensions(animation))
+
+                if (useMtkGhbmDimming) {
+                    hbmLayoutParams?.updateDimensions(animation)
+                    hbmLayoutParamsFull?.updateDimensions(animation)
+                    dimLayoutParams?.updateDimensions(animation)
+
+                    try {
+                        windowManager.addView(hbmView, hbmLayoutParams)
+                        windowManager.addView(dimView, dimLayoutParams)
+                        isAddDimView = true
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Failed to add vendor HBM/Dim views", e)
+                    }
+
+                    windowManager.addView(view, coreLayoutParams.updateDimensions(animation))
+
+                    if (requestReason == REASON_ENROLL_FIND_SENSOR || requestReason == REASON_ENROLL_ENROLLING) {
+                        val child = view.findViewById<View>(R.id.udfps_enroll_accessibility_view)
+                        child?.let {
+                            val lp = it.layoutParams
+                            lp.width = sensorBounds.width()
+                            lp.height = sensorBounds.height()
+                            it.layoutParams = lp
+                            it.requestLayout()
+                        }
+                    }
+                } else {
+                    windowManager.addView(view, coreLayoutParams.updateDimensions(animation))
+                }
             }
         if (powerInteractor.detailedWakefulness.value.isAwake()) {
             // Device is awake, so we add the view immediately.
@@ -297,6 +458,12 @@ constructor(
                 // no need to update any layouts. Instead the correct params will be used when the
                 // view is eventually added.
                 windowManager.updateViewLayout(it, coreLayoutParams.updateDimensions(null))
+
+                if (useMtkGhbmDimming && isAddDimView) {
+                    hbmLayoutParamsFull?.updateDimensions(null)
+                    windowManager.updateViewLayout(hbmView, hbmLayoutParams)
+                    windowManager.updateViewLayout(dimView, dimLayoutParams)
+                }
             }
         }
     }
@@ -320,6 +487,17 @@ constructor(
                 }
                 windowManager.removeView(this)
             }
+
+            if (useMtkGhbmDimming && isAddDimView) {
+                try {
+                    windowManager.removeView(hbmView)
+                    windowManager.removeView(dimView)
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to remove HBM/Dim views", e)
+                }
+                isAddDimView = false
+            }
+
             Trace.setCounter("UdfpsAddView", 0)
             setOnTouchListener(null)
             setOnHoverListener(null)
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsFpIconDrawable.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsFpIconDrawable.kt
new file mode 100644
index 0000000000000..b5c0a9c05edfc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsFpIconDrawable.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.biometrics
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.PixelFormat
+import android.graphics.drawable.BitmapDrawable
+import android.util.Log
+
+/**
+ * Draws udfps fingerprint if sensor isn't illuminating.
+ */
+class UdfpsFpIconDrawable(context: Context) : UdfpsIconDrawable(context) {
+    
+    companion object {
+        private const val TAG = "UdfpsFpIconDrawable"
+    }
+    
+    override fun draw(canvas: Canvas) {
+        try {
+            val udfpsDrawable = getUdfpsDrawable()
+            udfpsDrawable?.apply {
+                if (this is BitmapDrawable) {
+                    val bitmap = this.bitmap
+                    if (bitmap == null || bitmap.isRecycled) {
+                        Log.w(TAG, "Skipping draw - bitmap is null or recycled")
+                        return
+                    }
+                }
+                
+                setBounds(bounds)
+                draw(canvas)
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error drawing UDFPS icon: ${e.message}", e)
+        }
+    }
+    
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
index e670fe7d7618c..1b20ba432cf2d 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHelper.kt
@@ -108,7 +108,7 @@ class UdfpsHelper(
         override fun onDisplayAdded(displayId: Int) {}
 
         override fun onDisplayChanged(displayId: Int) {
-            if (displayId == Display.DEFAULT_DISPLAY) {
+            if (displayId == Display.DEFAULT_DISPLAY && view.isAttachedToWindow) {
                 brightnessToAlpha()
                 windowManager.updateViewLayout(view, dimLayoutParams)
             }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsIconDrawable.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsIconDrawable.java
new file mode 100644
index 0000000000000..310a7f13f68f9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsIconDrawable.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright (C) 2024-2025 crDroid Android Project
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.biometrics;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ColorFilter;
+import android.graphics.Rect;
+import android.graphics.drawable.AnimatedImageDrawable;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+
+import com.android.internal.util.matrixx.Utils;
+import com.android.systemui.Dependency;
+import com.android.systemui.res.R;
+import com.android.systemui.tuner.TunerService;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Abstract base class for drawable displayed when the finger is not touching the
+ * sensor area.
+ */
+public abstract class UdfpsIconDrawable extends Drawable {
+
+    private static final String TAG = "UdfpsIconDrawable";
+    private static final boolean DEBUG = false;
+    
+    private static final String UDFPS_ICON = "system:" + Settings.System.UDFPS_ICON;
+    private static final String UDFPS_ICON_TYPE = "system:" + Settings.System.UDFPS_ICON_TYPE;
+    private static final String UDFPS_CUSTOM_ICON_PATH = "system:" + Settings.System.UDFPS_CUSTOM_FP_ICON_PATH;
+    
+    private static final int ICON_TYPE_PREBUILT = 0;
+    private static final int ICON_TYPE_CUSTOM = 1;
+    private static final int MAX_IMAGE_SIZE = 2 * 1024 * 1024;
+    private static final int MAX_DIMENSION = 400;
+    
+    private final String udfpsResourcesPackage = "com.matrixx.udfps.icons";
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+
+    @NonNull private final Context mContext;
+    private Drawable mUdfpsDrawable;
+    private Resources udfpsRes;
+    private String[] mUdfpsIcons;
+    private String mLastLoadedCustomPath = null;
+    private int mCurrentIconType = ICON_TYPE_PREBUILT;
+    private boolean mIsVisible = true;
+    private boolean mIsDestroyed = false;
+
+    private TunerService.Tunable mTunable;
+
+    public UdfpsIconDrawable(@NonNull Context context) {
+        mContext = context;
+        init();
+    }
+
+    private void init() {
+        if (Utils.isPackageInstalled(mContext, udfpsResourcesPackage)) {
+            try {
+                PackageManager pm = mContext.getPackageManager();
+                udfpsRes = pm.getResourcesForApplication(udfpsResourcesPackage);
+                int res = udfpsRes.getIdentifier("udfps_icons", "array", udfpsResourcesPackage);
+                mUdfpsIcons = udfpsRes.getStringArray(res);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e(TAG, "UDFPS package not found", e);
+            }
+        }
+
+        mCurrentIconType = Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.System.UDFPS_ICON_TYPE,
+                ICON_TYPE_PREBUILT,
+                UserHandle.USER_CURRENT
+        );
+
+        mTunable = (key, newValue) -> {
+            if (mIsDestroyed) return;
+            
+            if (UDFPS_ICON_TYPE.equals(key)) {
+                int iconType = newValue == null ? ICON_TYPE_PREBUILT : Integer.parseInt(newValue);
+                mCurrentIconType = iconType;
+
+                if (mCurrentIconType == ICON_TYPE_PREBUILT) {
+                    runOnMainThread(() -> {
+                        if (!mIsDestroyed) {
+                            Settings.System.putStringForUser(
+                                    mContext.getContentResolver(),
+                                    Settings.System.UDFPS_CUSTOM_FP_ICON_PATH,
+                                    null,
+                                    UserHandle.USER_CURRENT
+                            );
+                        }
+                    });
+                    mLastLoadedCustomPath = null;
+                }
+
+                updateIcon();
+            } else if (UDFPS_ICON.equals(key)) {
+                if (mCurrentIconType == ICON_TYPE_PREBUILT) {
+                    updateIcon();
+                }
+            } else if (UDFPS_CUSTOM_ICON_PATH.equals(key)) {
+                String newPath = newValue;
+                if (mCurrentIconType == ICON_TYPE_CUSTOM &&
+                    (newPath == null || !newPath.equals(mLastLoadedCustomPath))) {
+                    mLastLoadedCustomPath = null;
+                    updateIcon();
+                }
+            }
+        };
+
+        Dependency.get(TunerService.class).addTunable(
+                mTunable,
+                UDFPS_ICON_TYPE,
+                UDFPS_ICON,
+                UDFPS_CUSTOM_ICON_PATH
+        );
+        
+        updateIcon();
+    }
+
+    private void runOnMainThread(Runnable runnable) {
+        if (mIsDestroyed) return;
+        
+        if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
+            runnable.run();
+        } else {
+            mMainHandler.post(runnable);
+        }
+    }
+
+    private void updateIcon() {
+        if (mIsDestroyed) return;
+        
+        Drawable oldDrawable = mUdfpsDrawable;
+        
+        if (mCurrentIconType == ICON_TYPE_CUSTOM) {
+            loadCustomIcon();
+        } else {
+            loadPrebuiltIcon();
+        }
+        
+        runOnMainThread(() -> {
+            if (!mIsDestroyed) {
+                invalidateSelf();
+                if (oldDrawable != null && oldDrawable != mUdfpsDrawable) {
+                    mMainHandler.postDelayed(() -> cleanupDrawable(oldDrawable), 100);
+                }
+            }
+        });
+    }
+
+    private void loadPrebuiltIcon() {
+        int selectedIcon = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.UDFPS_ICON, 0,
+                UserHandle.USER_CURRENT);
+        
+        if (selectedIcon == 0 || udfpsRes == null || mUdfpsIcons == null) {
+            mUdfpsDrawable = null;
+            return;
+        }
+        
+        mUdfpsDrawable = loadDrawable(udfpsRes, mUdfpsIcons[selectedIcon]);
+    }
+
+    public void onVisibilityChanged(boolean visible) {
+        if (mIsDestroyed) return;
+        
+        mIsVisible = visible;
+        if (mUdfpsDrawable instanceof AnimatedImageDrawable) {
+            AnimatedImageDrawable anim = (AnimatedImageDrawable) mUdfpsDrawable;
+            try {
+                if (visible && !anim.isRunning()) {
+                    anim.start();
+                    if (DEBUG) Log.d(TAG, "Animation started - visibility changed");
+                } else if (!visible && anim.isRunning()) {
+                    anim.stop();
+                    if (DEBUG) Log.d(TAG, "Animation stopped - visibility changed");
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Error handling animation visibility", e);
+            }
+        }
+    }
+
+    private void loadCustomIcon() {
+        String path = Settings.System.getStringForUser(mContext.getContentResolver(),
+                Settings.System.UDFPS_CUSTOM_FP_ICON_PATH,
+                UserHandle.USER_CURRENT);
+        
+        if (path == null || path.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "No custom icon path set");
+            mUdfpsDrawable = null;
+            return;
+        }
+
+        if (path.equals(mLastLoadedCustomPath) && mUdfpsDrawable != null) {
+            if (DEBUG) Log.d(TAG, "Custom icon already loaded for path: " + path);
+            return;
+        }
+
+        if (DEBUG) Log.d(TAG, "Loading custom icon from: " + path);
+        
+        File imageFile = new File(path);
+        if (!isValidImageFile(imageFile)) {
+            Log.w(TAG, "Custom icon file validation failed: " + path);
+            mUdfpsDrawable = null;
+            return;
+        }
+
+        mLastLoadedCustomPath = path;
+
+        String extension = getFileExtension(path);
+        boolean isAnimated = extension.matches("\\.(gif|webp)$");
+
+        if (isAnimated) {
+            if (loadAnimatedCustomIcon(imageFile, path)) {
+                if (DEBUG) Log.d(TAG, "Successfully loaded animated custom icon");
+                return;
+            }
+            if (DEBUG) Log.d(TAG, "Falling back to static image loading for: " + path);
+        }
+        
+        loadStaticCustomIcon(path);
+        if (mUdfpsDrawable != null) {
+            if (DEBUG) Log.d(TAG, "Successfully loaded static custom icon");
+        } else {
+            Log.w(TAG, "Failed to load custom icon from: " + path);
+            mLastLoadedCustomPath = null;
+        }
+    }
+
+    private boolean isValidImageFile(File imageFile) {
+        if (!imageFile.exists()) {
+            Log.w(TAG, "Custom icon file does not exist: " + imageFile.getAbsolutePath());
+            return false;
+        }
+        
+        if (!imageFile.canRead()) {
+            Log.w(TAG, "Custom icon file is not readable: " + imageFile.getAbsolutePath());
+            return false;
+        }
+        
+        long fileSize = imageFile.length();
+        if (fileSize > MAX_IMAGE_SIZE) {
+            Log.w(TAG, "Custom icon file too large: " + fileSize + " bytes");
+            return false;
+        }
+        
+        if (fileSize == 0) {
+            Log.w(TAG, "Custom icon file is empty");
+            return false;
+        }
+        
+        String name = imageFile.getName().toLowerCase();
+        return name.endsWith(".png") || name.endsWith(".jpg") || 
+               name.endsWith(".jpeg") || name.endsWith(".gif") || 
+               name.endsWith(".webp");
+    }
+
+    private String getFileExtension(String path) {
+        if (path == null) return "";
+        String lower = path.toLowerCase();
+        if (lower.endsWith(".gif")) return ".gif";
+        if (lower.endsWith(".webp")) return ".webp";
+        if (lower.endsWith(".png")) return ".png";
+        if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return ".jpg";
+        return "";
+    }
+
+    private boolean loadAnimatedCustomIcon(File imageFile, String path) {
+        try {
+            android.graphics.ImageDecoder.Source source = 
+                    android.graphics.ImageDecoder.createSource(imageFile);
+            Drawable drawable = android.graphics.ImageDecoder.decodeDrawable(source);
+            
+            if (drawable == null) {
+                Log.w(TAG, "ImageDecoder returned null drawable for: " + path);
+                return false;
+            }
+            
+            mUdfpsDrawable = drawable;
+            
+            if (drawable instanceof AnimatedImageDrawable) {
+                AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) drawable;
+                animDrawable.setRepeatCount(AnimatedImageDrawable.REPEAT_INFINITE);
+                
+                if (mIsVisible && !animDrawable.isRunning()) {
+                    animDrawable.start();
+                    if (DEBUG) Log.d(TAG, "Animation started for custom icon: " + path);
+                }
+            }
+            
+            if (DEBUG) Log.d(TAG, "Animated custom icon loaded successfully: " + path);
+            return true;
+            
+        } catch (IOException e) {
+            Log.e(TAG, "IOException loading animated custom icon: " + e.getMessage());
+            return false;
+        } catch (Exception e) {
+            Log.e(TAG, "Error loading animated custom icon: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private int calculateInSampleSize(BitmapFactory.Options options, int maxSize) {
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+        
+        if (height > maxSize || width > maxSize) {
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+            
+            while ((halfHeight / inSampleSize) >= maxSize && (halfWidth / inSampleSize) >= maxSize) {
+                inSampleSize *= 2;
+            }
+        }
+        return inSampleSize;
+    }
+
+    private void loadStaticCustomIcon(String path) {
+        Bitmap bitmap = null;
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(path, options);
+            
+            if (options.outWidth <= 0 || options.outHeight <= 0) {
+                Log.w(TAG, "Invalid custom icon dimensions");
+                mUdfpsDrawable = null;
+                return;
+            }
+            
+            options.inSampleSize = calculateInSampleSize(options, MAX_DIMENSION);
+            options.inJustDecodeBounds = false;
+            options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            options.inMutable = false;
+            
+            bitmap = BitmapFactory.decodeFile(path, options);
+            if (bitmap == null || bitmap.isRecycled() || 
+                bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0) {
+                Log.w(TAG, "Failed to decode custom icon bitmap");
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    bitmap.recycle();
+                }
+                mUdfpsDrawable = null;
+                return;
+            }
+            
+            Bitmap immutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+            if (immutableBitmap == null) {
+                Log.w(TAG, "Failed to create immutable copy of bitmap");
+                if (!bitmap.isRecycled()) {
+                    bitmap.recycle();
+                }
+                mUdfpsDrawable = null;
+                return;
+            }
+            
+            if (!bitmap.isRecycled()) {
+                bitmap.recycle();
+            }
+            
+            mUdfpsDrawable = new BitmapDrawable(mContext.getResources(), immutableBitmap);
+            if (DEBUG) Log.d(TAG, "Static custom icon loaded successfully: " + path);
+            
+        } catch (OutOfMemoryError e) {
+            Log.e(TAG, "OutOfMemoryError loading static custom icon: " + e.getMessage());
+            if (bitmap != null && !bitmap.isRecycled()) {
+                try {
+                    bitmap.recycle();
+                } catch (Exception ex) {
+                }
+            }
+            mUdfpsDrawable = null;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load static custom icon: " + e.getMessage());
+            if (bitmap != null && !bitmap.isRecycled()) {
+                try {
+                    bitmap.recycle();
+                } catch (Exception ex) {
+                }
+            }
+            mUdfpsDrawable = null;
+        }
+    }
+
+    private void cleanupDrawable(Drawable drawable) {
+        if (drawable == null || drawable == mUdfpsDrawable) {
+            return;
+        }
+        
+        try {
+            if (drawable instanceof AnimatedImageDrawable) {
+                AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) drawable;
+                if (animDrawable.isRunning()) {
+                    animDrawable.stop();
+                }
+            }
+            
+            drawable.setCallback(null);
+            
+            if (drawable instanceof BitmapDrawable) {
+                BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
+                Bitmap bitmap = bitmapDrawable.getBitmap();
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    if (DEBUG) Log.d(TAG, "Bitmap cleanup delegated to GC");
+                }
+            }
+        } catch (Exception e) {
+            if (DEBUG) Log.e(TAG, "Error during drawable cleanup", e);
+        }
+    }
+
+    public void destroy() {
+        mIsDestroyed = true;
+        
+        try {
+            Dependency.get(TunerService.class).removeTunable(mTunable);
+        } catch (Exception e) {
+            Log.e(TAG, "Error removing tunable: " + e.getMessage());
+        }
+        
+        mMainHandler.removeCallbacksAndMessages(null);
+        
+        if (mUdfpsDrawable != null) {
+            cleanupDrawable(mUdfpsDrawable);
+            mUdfpsDrawable = null;
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        if (mUdfpsDrawable != null && !mIsDestroyed) {
+            mUdfpsDrawable.setAlpha(alpha);
+            invalidateSelf();
+        }
+    }
+
+    Drawable getUdfpsDrawable() {
+        if (mUdfpsDrawable instanceof BitmapDrawable) {
+            Bitmap bitmap = ((BitmapDrawable) mUdfpsDrawable).getBitmap();
+            if (bitmap == null || bitmap.isRecycled()) {
+                if (DEBUG) Log.w(TAG, "Drawable has recycled bitmap, returning null");
+                mUdfpsDrawable = null;
+                return null;
+            }
+        }
+        return mUdfpsDrawable;
+    }
+
+    private Drawable loadDrawable(Resources res, String resName) {
+        if (res == null || resName == null) {
+            return null;
+        }
+        int resId = res.getIdentifier(resName, "drawable", udfpsResourcesPackage);
+        return resId != 0 ? ResourcesCompat.getDrawable(res, resId, null) : null;
+    }
+
+    @Override
+    public void setBounds(int left, int top, int right, int bottom) {
+        super.setBounds(left, top, right, bottom);
+        if (mUdfpsDrawable != null && !mIsDestroyed) {
+            mUdfpsDrawable.setBounds(left, top, right, bottom);
+        }
+    }
+
+    @Override
+    public void setBounds(Rect bounds) {
+        super.setBounds(bounds);
+        if (mUdfpsDrawable != null && !mIsDestroyed) {
+            mUdfpsDrawable.setBounds(bounds);
+        }
+    }
+
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        if (mUdfpsDrawable != null && !mIsDestroyed) {
+            mUdfpsDrawable.setBounds(bounds);
+        }
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+    }
+
+    @Override
+    public int getOpacity() {
+        return 0;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
index 3bfdddea37d55..dae25f71af0f9 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
@@ -41,7 +41,7 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb
     /**
      * Notifies {@link UdfpsView} when to enable GHBM illumination.
      */
-    interface GhbmIlluminationListener {
+    public interface GhbmIlluminationListener {
         /**
          * @param surface the surface for which GHBM should be enabled.
          * @param onDisplayConfigured a runnable that should be run after GHBM is enabled.
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt
index adc276e4e44e4..0c51d1bde4efa 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/PromptRepository.kt
@@ -149,17 +149,9 @@ constructor(
 
     private val _faceSettings =
         _userId.map { id -> faceSettings.forUser(id) }.distinctUntilChanged()
-    private val _faceSettingAlwaysRequireConfirmation =
-        _faceSettings.flatMapLatest { it.alwaysRequireConfirmationInApps }.distinctUntilChanged()
 
-    private val _isConfirmationRequired = _promptInfo.map { it?.isConfirmationRequested ?: false }
     override val isConfirmationRequired =
-        combine(_isConfirmationRequired, _faceSettingAlwaysRequireConfirmation) {
-                appRequiresConfirmation,
-                forceRequireConfirmation ->
-                forceRequireConfirmation || appRequiresConfirmation
-            }
-            .distinctUntilChanged()
+        _faceSettings.flatMapLatest { it.alwaysRequireConfirmationInApps }.distinctUntilChanged()
 
     override fun setPrompt(
         promptInfo: PromptInfo,
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt
index c500857679fd7..4d291e85dffc1 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt
@@ -26,6 +26,7 @@ import android.transition.TransitionManager
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.view.ViewOutlineProvider
 import android.view.WindowInsets
 import android.view.accessibility.AccessibilityManager
@@ -35,6 +36,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.constraintlayout.widget.Guideline
 import androidx.core.animation.addListener
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import com.android.app.tracing.coroutines.launchTraced as launch
 import com.android.systemui.biometrics.Utils
@@ -51,6 +53,7 @@ import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.res.R
 import com.android.systemui.utils.windowmanager.WindowManagerUtils
+import com.android.systemui.util.kotlin.Quint
 import kotlin.math.abs
 import kotlinx.coroutines.flow.combine
 
@@ -91,6 +94,8 @@ object BiometricViewSizeBinder {
         val rightGuideline = view.requireViewById<Guideline>(R.id.rightGuideline)
         val midGuideline = view.findViewById<Guideline>(R.id.midGuideline)
 
+        val indicatorView = view.requireViewById<View>(R.id.indicator)
+        val scrollView = view.requireViewById<View>(R.id.scrollView)
         val iconHolderView = view.requireViewById<View>(R.id.biometric_icon)
         val panelView = view.requireViewById<View>(R.id.panel)
         val cornerRadius = view.resources.getDimension(R.dimen.biometric_dialog_corner_size)
@@ -469,6 +474,116 @@ object BiometricViewSizeBinder {
                     }
                 }
 
+                lifecycleScope.launch {
+                    combine(
+                        viewModel.isUdfpsIndicating,
+                        viewModel.position,
+                        viewModel.iconViewModel.iconPosition,
+                        viewModel.iconViewModel.iconSize,
+                        viewModel.indicatorMessageWidthPx,
+                        ::Quint
+                    )
+                        .collect {
+                            (
+                                isUdfpsIndicating,
+                                position,
+                                iconPosition,
+                                iconSize,
+                                indicatorMessageWidthPx
+                            ) ->
+                            if (!isUdfpsIndicating) return@collect
+                            when (position) {
+                                PromptPosition.Bottom -> {
+                                    val indicatorMarginTop =
+                                        (indicatorView.layoutParams as MarginLayoutParams).topMargin
+                                    val indicatorHeight = indicatorView.measuredHeight +
+                                        indicatorMarginTop
+                                    val bottomInset = Utils.getNavbarInsets(view.context).bottom
+                                    val marginBottom = view.resources.getDimensionPixelSize(
+                                        R.dimen.biometric_indicator_above_margin_bottom
+                                    )
+                                    // move the indicator text above udfps icon if we don't have
+                                    // enough space
+                                    if (indicatorHeight + bottomInset > iconPosition.bottom) {
+                                        mediumConstraintSet.apply {
+                                            clear(
+                                                R.id.indicator,
+                                                ConstraintSet.TOP
+                                            )
+                                            setVerticalBias(
+                                                R.id.indicator,
+                                                1.0f
+                                            )
+                                            setVerticalBias(
+                                                R.id.scrollView,
+                                                0f
+                                            )
+                                            connect(
+                                                R.id.indicator,
+                                                ConstraintSet.BOTTOM,
+                                                R.id.biometric_icon,
+                                                ConstraintSet.TOP
+                                            )
+                                            setMargin(
+                                                R.id.indicator,
+                                                ConstraintSet.BOTTOM,
+                                                marginBottom
+                                            )
+                                            setMargin(
+                                                R.id.scrollView,
+                                                ConstraintSet.BOTTOM,
+                                                indicatorMarginTop
+                                            )
+                                        }
+                                        indicatorView
+                                            .updateLayoutParams<ConstraintLayout.LayoutParams> {
+                                                topToBottom = ConstraintLayout.LayoutParams.UNSET
+                                                bottomToTop = R.id.biometric_icon
+                                                bottomMargin = marginBottom
+                                            }
+                                        scrollView
+                                            .updateLayoutParams<ConstraintLayout.LayoutParams> {
+                                                bottomMargin = indicatorMarginTop
+                                            }
+                                    }
+                                }
+                                // prevent the text from going out of screen bounds as it is
+                                // centered below the udfps icon in landscape positions
+                                PromptPosition.Right -> {
+                                    val rightInset = Utils.getNavbarInsets(view.context).right
+                                    val rightMargin = iconPosition.right - (
+                                        (indicatorMessageWidthPx - iconSize.first) / 2
+                                    ) - rightInset
+                                    if (rightMargin < 0) {
+                                        indicatorView.setPadding(
+                                            0,
+                                            indicatorView.paddingTop,
+                                            -rightMargin,
+                                            indicatorView.paddingBottom
+                                        )
+                                    }
+                                }
+                                PromptPosition.Left -> {
+                                    val leftInset = Utils.getNavbarInsets(view.context).left
+                                    val leftMargin = iconPosition.left - (
+                                        (indicatorMessageWidthPx - iconSize.first) / 2
+                                    ) - leftInset
+                                    if (leftMargin < 0) {
+                                        indicatorView.setPadding(
+                                            -leftMargin,
+                                            indicatorView.paddingTop,
+                                            0,
+                                            indicatorView.paddingBottom
+                                        )
+                                    }
+                                }
+                                // ignore top position as we typically don't allow 180 degree
+                                // rotation on udfps devices
+                                else -> return@collect
+                            }
+                        }
+                }
+
                 lifecycleScope.launch {
                     viewModel.iconViewModel.iconSize.collect { iconSize ->
                         iconHolderView.layoutParams.width = iconSize.first
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/view/UdfpsTouchOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/view/UdfpsTouchOverlay.kt
index a7c9ffdec058b..3cb87968adee2 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/view/UdfpsTouchOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/view/UdfpsTouchOverlay.kt
@@ -42,6 +42,7 @@ class UdfpsTouchOverlay(context: Context, attrs: AttributeSet?) : FrameLayout(co
         private set
 
     override fun onFinishInflate() {
+        super.onFinishInflate()
         ghbmView = findViewById(R.id.hbm_view)
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt
index 72ad37583be03..47d2e17d71692 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt
@@ -308,10 +308,7 @@ constructor(
      * If the API caller or the user's personal preferences require explicit confirmation after
      * successful authentication. Confirmation always required when in explicit flow.
      */
-    val isConfirmationRequired: Flow<Boolean> =
-        combine(_isOverlayTouched, size) { isOverlayTouched, size ->
-            !isOverlayTouched && size.isNotSmall
-        }
+    val isConfirmationRequired: Flow<Boolean> = promptSelectorInteractor.isConfirmationRequired
 
     /**
      * When fingerprint and face modalities are enrolled, indicates whether only face auth has
@@ -676,6 +673,31 @@ constructor(
             size.isMedium && authState.isNotAuthenticated && credentialAllowed && !fallbackVisible
         }
 
+    val isUdfpsIndicating: Flow<Boolean> =
+        combine(
+            modalities,
+            isIndicatorMessageVisible
+        ) { modalities, isIndicatorMessageVisible ->
+            modalities.hasUdfps && isIndicatorMessageVisible
+        }
+
+    val indicatorMessageWidthPx: Flow<Int> =
+        message.map { message ->
+            val maxWidth =
+                context.resources.getDimensionPixelSize(
+                    R.dimen.biometric_dialog_indicator_max_width
+                )
+            val attributes =
+                context.obtainStyledAttributes(
+                    R.style.TextAppearance_AuthCredential_Indicator,
+                    intArrayOf(android.R.attr.textSize)
+                )
+            val paint = TextPaint().apply {
+                textSize = attributes.getDimensionPixelSize(0, 0).toFloat()
+            }
+            maxOf(maxWidth, paint.measureText(message.message).toInt())
+        }
+
     private val history = PromptHistoryImpl()
     private var messageJob: Job? = null
 
@@ -853,11 +875,9 @@ constructor(
     }
 
     private suspend fun needsExplicitConfirmation(modality: BiometricModality): Boolean {
-        val confirmationRequired = isConfirmationRequired.first()
-
         // Only worry about confirmationRequired if face was used to unlock
         if (modality == BiometricModality.Face) {
-            return confirmationRequired
+            return isConfirmationRequired.first()
         }
         // fingerprint only never requires confirmation
         return false
diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt
index d581951757a84..c228ff307d5e6 100644
--- a/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt
@@ -31,7 +31,7 @@ import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.view.accessibility.AccessibilityNodeInfo
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction
 import android.widget.Button
-import android.widget.CompoundButton
+import com.google.android.material.materialswitch.MaterialSwitch
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
@@ -133,11 +133,11 @@ constructor(
 
     // UI Components
     private lateinit var contentView: View
-    private lateinit var bluetoothToggle: CompoundButton
+    private lateinit var bluetoothToggle: MaterialSwitch
     private lateinit var seeAllButton: View
     private lateinit var pairNewDeviceButton: View
     private lateinit var deviceListView: RecyclerView
-    private lateinit var autoOnToggle: CompoundButton
+    private lateinit var autoOnToggle: MaterialSwitch
     private lateinit var autoOnToggleLayout: View
     private lateinit var autoOnToggleInfoTextView: TextView
     private lateinit var audioSharingButton: Button
diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt
index 4da52c0202939..b7527a130bec0 100644
--- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerMessageInteractor.kt
@@ -343,7 +343,16 @@ constructor(
                     setMessage(message)
                 }
             }
-        countDownTimerUtil.startNewTimer(secondsBeforeLockoutReset * 1000, 1000, callback)
+        //At the start, cancel current Timer
+        cancelCurrentTimer()
+        currentTimer = countDownTimerUtil.startNewTimer(secondsBeforeLockoutReset * 1000, 1000, callback)
+    }
+
+    /*cancel current Timer*/
+    var currentTimer: CountDownTimer? = null
+    private fun cancelCurrentTimer() {
+        currentTimer?.cancel()
+        currentTimer = null
     }
 
     fun onPrimaryAuthIncorrectAttempt() {
@@ -479,6 +488,8 @@ constructor(
                 if (showing) {
                     bouncerMessage
                 } else {
+                    //cancel countdown timer when bouncer is hidden (success unlock or dismiss)
+                    cancelCurrentTimer()
                     null
                 }
             }
diff --git a/packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt b/packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt
index 9ee47cf167674..9815e8a8cc620 100644
--- a/packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt
+++ b/packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt
@@ -20,6 +20,7 @@ import android.content.ContentResolver
 import android.content.Context
 import android.database.ContentObserver
 import android.os.UserHandle
+import android.provider.Settings
 import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import androidx.annotation.VisibleForTesting
@@ -33,6 +34,7 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.interaction.DragInteraction
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
@@ -72,16 +74,22 @@ import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.RoundRect
 import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.graphics.drawscope.scale
 import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.input.pointer.pointerInteropFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
@@ -98,6 +106,8 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.app.tracing.coroutines.launchTraced as launch
+import com.android.compose.PlatformSlider
+import com.android.compose.PlatformSliderDefaults
 import com.android.compose.modifiers.padding
 import com.android.compose.modifiers.sliderPercentage
 import com.android.compose.modifiers.thenIf
@@ -124,6 +134,7 @@ import com.android.systemui.haptics.slider.SeekableSliderTrackerConfig
 import com.android.systemui.haptics.slider.SliderHapticFeedbackConfig
 import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
 import com.android.systemui.lifecycle.rememberViewModel
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CustomColorScheme
 import com.android.systemui.qs.ui.compose.borderOnFocus
 import com.android.systemui.res.R
 import com.android.systemui.utils.PolicyRestriction
@@ -150,6 +161,23 @@ fun BrightnessSlider(
     showToast: () -> Unit = {},
     hapticsViewModelFactory: SliderHapticsViewModel.Factory,
 ) {
+    val context = LocalContext.current
+    val cr = context.contentResolver
+
+    var hapticsEnabled by remember { mutableStateOf(readEnableHaptics(cr)) }
+    var useAxStyle by remember { mutableStateOf(readUseAxStyle(cr)) }
+    var showAutoBrightness by remember { mutableStateOf(readShowAutoBrightness(cr)) }
+
+    val shapeMode = rememberSliderShapeMode()
+    val trackCornerDp: Dp = when (shapeMode) {
+        1 -> 28.dp  /* Circle */
+        2 -> 12.dp  /* Rounded Square */
+        3 -> 0.dp /* Square */
+        else -> Dimensions.SliderTrackRoundedCorner
+    }
+
+    val brightnessGradient = brightnessSliderGradient()
+
     var value by remember(gammaValue) { mutableIntStateOf(gammaValue) }
     val animatedValue by
         animateFloatAsState(targetValue = value.toFloat(), label = "BrightnessSliderAnimatedValue")
@@ -158,19 +186,190 @@ fun BrightnessSlider(
     val enabled = !isRestricted
     val contentDescription = stringResource(R.string.accessibility_brightness)
     val interactionSource = remember { MutableInteractionSource() }
-    val hapticsViewModel: SliderHapticsViewModel =
-        rememberViewModel(traceName = "SliderHapticsViewModel") {
-            hapticsViewModelFactory.create(
-                interactionSource,
-                floatValueRange,
-                Orientation.Horizontal,
-                SliderHapticFeedbackConfig(
-                    maxVelocityToScale = 1f /* slider progress(from 0 to 1) per sec */
-                ),
-                SeekableSliderTrackerConfig(),
+    
+    val hapticsViewModel: SliderHapticsViewModel? =
+        if (hapticsEnabled) {
+            rememberViewModel(traceName = "SliderHapticsViewModel") {
+                hapticsViewModelFactory.create(
+                    interactionSource,
+                    floatValueRange,
+                    Orientation.Horizontal,
+                    SliderHapticFeedbackConfig(
+                        maxVelocityToScale = 1f /* slider progress(from 0 to 1) per sec */
+                    ),
+                    SeekableSliderTrackerConfig(),
+                )
+            }
+        } else {
+            null
+        }
+
+    val hasAutoBrightness = context.resources.getBoolean(
+        com.android.internal.R.bool.config_automatic_brightness_available
+    )
+
+    DisposableEffect(Unit) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    hapticsEnabled = readEnableHaptics(cr)
+                    useAxStyle = readUseAxStyle(cr)
+                    showAutoBrightness = readShowAutoBrightness(cr)
+                }
+            }
+        }
+
+        cr.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_BRIGHTNESS_SLIDER_HAPTIC),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        cr.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_BRIGHTNESS_SLIDER_STYLE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        cr.registerContentObserver(
+            LineageSettings.Secure.getUriFor(LineageSettings.Secure.QS_SHOW_AUTO_BRIGHTNESS),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            cr.unregisterContentObserver(observer)
+        }
+    }
+
+    if (useAxStyle) {
+        val iconRes by
+            remember(gammaValue, valueRange) {
+                derivedStateOf {
+                    val percentage =
+                        (value - valueRange.first) * 100f / (valueRange.last - valueRange.first)
+                    iconResProvider(percentage)
+                }
+            }
+        val axIconRes = if (autoMode) R.drawable.ic_qs_brightness_auto_on else iconRes
+        val axIconSize = 56.dp
+        val iconTapScope = rememberCoroutineScope()
+        val axTrackColor = brightnessGradient?.brush?.let { null } ?: CustomColorScheme.current.qsTileColor
+        val sliderColors = PlatformSliderDefaults.defaultPlatformSliderColors().copy(
+            trackColor = axTrackColor ?: CustomColorScheme.current.qsTileColor,
+        )
+
+        Box(modifier = modifier) {
+            PlatformSlider(
+                value = animatedValue,
+                onValueChange = {
+                    if (enabled && !overriddenByAppState) {
+                        hapticsViewModel?.onValueChange(it)
+                        value = it.toInt()
+                        onDrag(value)
+                    }
+                },
+                onValueChangeFinished = {
+                    if (enabled && !overriddenByAppState) {
+                        hapticsViewModel?.onValueChangeEnded()
+                        onStop(value)
+                    }
+                },
+                valueRange = floatValueRange,
+                enabled = enabled,
+                interactionSource = interactionSource,
+                colors = sliderColors,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(axIconSize)
+                    .sysuiResTag("slider")
+                    .semantics(mergeDescendants = true) {
+                        this.text = AnnotatedString(contentDescription)
+                    }
+                    .sliderPercentage {
+                        (value - valueRange.first).toFloat() / (valueRange.last - valueRange.first)
+                    }
+                    .then(
+                        if (brightnessGradient != null) {
+                            // Draw gradient over the active portion of the AX style track
+                            Modifier.drawWithContent {
+                                drawContent()
+                                val fraction = (value - valueRange.first).toFloat() / (valueRange.last - valueRange.first)
+                                val activeEnd = (size.width * fraction).coerceAtLeast(0f)
+                                if (activeEnd > 0f) {
+                                    val cornerRadius = CornerRadius(28.dp.toPx())
+                                    val clipPath = Path().apply {
+                                        addRoundRect(
+                                            RoundRect(
+                                                left = 0f,
+                                                top = 0f,
+                                                right = activeEnd.coerceAtMost(size.width),
+                                                bottom = size.height,
+                                                radiusX = cornerRadius.x,
+                                                radiusY = cornerRadius.y,
+                                            )
+                                        )
+                                    }
+                                    clipPath(clipPath) {
+                                        drawRect(
+                                            brush = brightnessGradient.brush,
+                                            topLeft = Offset.Zero,
+                                            size = Size(activeEnd.coerceAtMost(size.width), size.height)
+                                        )
+                                    }
+                                }
+                            }
+                        } else Modifier
+                    )
+                    .thenIf(isRestricted) {
+                        Modifier.clickable {
+                            if (restriction is PolicyRestriction.Restricted) {
+                                onRestrictedClick(restriction)
+                            }
+                        }
+                    },
+                icon = { _ ->
+                    Icon(
+                        painter = painterResource(axIconRes),
+                        contentDescription = null,
+                        modifier = Modifier.size(24.dp),
+                    )
+                },
             )
+
+            Box(
+                modifier = Modifier
+                    .align(Alignment.CenterStart)
+                    .size(axIconSize)
+                    .clip(CircleShape)
+                    .then(
+                        if (brightnessGradient != null) {
+                            // Draw gradient brush over the thumb circle
+                            Modifier.drawWithContent {
+                                drawContent()
+                                drawRect(brush = brightnessGradient.brush)
+                            }
+                        } else Modifier
+                    )
+                    .pointerInput(Unit) {
+                        detectTapGestures {
+                            iconTapScope.launch { onIconClick() }
+                        }
+                    }
+            )
+        }
+
+        val currentShowToast by rememberUpdatedState(showToast)
+        LaunchedEffect(interactionSource, overriddenByAppState) {
+            interactionSource.interactions.collect { interaction ->
+                if (interaction is DragInteraction.Start && overriddenByAppState) {
+                    currentShowToast()
+                }
+            }
         }
-    val colors = colors()
+        return
+    }
+
+    val colors = colors(brightnessGradient)
+
+    val trackShape = RoundedCornerShape(trackCornerDp)
 
     // The value state is recreated every time gammaValue changes, so we recreate this derivedState
     // We have to use value as that's the value that changes when the user is dragging (gammaValue
@@ -183,7 +382,6 @@ fun BrightnessSlider(
                 iconResProvider(percentage)
             }
         }
-    val context = LocalContext.current
     val painter: Painter by
         produceState<Painter>(
             initialValue = ColorPainter(Color.Transparent),
@@ -218,31 +416,6 @@ fun BrightnessSlider(
         }
     }
 
-    val cr = context.contentResolver
-    val hasAutoBrightness = context.resources.getBoolean(
-        com.android.internal.R.bool.config_automatic_brightness_available
-    )
-    var showAutoBrightness by remember { mutableStateOf(readShowAutoBrightness(cr)) }
-
-    DisposableEffect(Unit) {
-        val observer = object : ContentObserver(null) {
-            override fun onChange(selfChange: Boolean) {
-                context.mainExecutor.execute {
-                    showAutoBrightness = readShowAutoBrightness(cr)
-                }
-            }
-        }
-
-        cr.registerContentObserver(
-            LineageSettings.Secure.getUriFor(LineageSettings.Secure.QS_SHOW_AUTO_BRIGHTNESS),
-            false, observer, UserHandle.USER_ALL
-        )
-
-        onDispose {
-            cr.unregisterContentObserver(observer)
-        }
-    }
-
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
@@ -255,7 +428,7 @@ fun BrightnessSlider(
             onValueChange = {
                 if (enabled) {
                     if (!overriddenByAppState) {
-                        hapticsViewModel.onValueChange(it)
+                        hapticsViewModel?.onValueChange(it)
                         value = it.toInt()
                         onDrag(value)
                     }
@@ -264,7 +437,7 @@ fun BrightnessSlider(
             onValueChangeFinished = {
                 if (enabled) {
                     if (!overriddenByAppState) {
-                        hapticsViewModel.onValueChangeEnded()
+                        hapticsViewModel?.onValueChangeEnded()
                         onStop(value)
                     }
                 }
@@ -288,12 +461,7 @@ fun BrightnessSlider(
                     },
             interactionSource = interactionSource,
             thumb = {
-                SliderDefaults.Thumb(
-                    interactionSource = interactionSource,
-                    enabled = enabled,
-                    thumbSize = DpSize(ThumbWidth, ThumbHeight),
-                    colors = colors,
-                )
+                Box(modifier = Modifier.size(0.dp))
             },
             track = { sliderState ->
                 var showIconActive by remember { mutableStateOf(true) }
@@ -323,8 +491,7 @@ fun BrightnessSlider(
                     }
                 }
 
-                SliderDefaults.Track(
-                    sliderState = sliderState,
+                Box(
                     modifier =
                         Modifier.motionTestValues {
                                 (iconActiveAlphaAnimatable.isRunning ||
@@ -337,19 +504,50 @@ fun BrightnessSlider(
                                     BrightnessSliderMotionTestKeys.InactiveIconAlpha
                             }
                             .height(TrackHeight)
+                            .fillMaxWidth()
                             .drawWithContent {
-                                drawContent()
-
-                                val yOffset = size.height / 2 - IconSize.toSize().height / 2
-                                val activeTrackStart = 0f
-                                val activeTrackEnd =
-                                    size.width * sliderState.coercedValueAsFraction -
-                                        ThumbTrackGapSize.toPx()
-                                val inactiveTrackStart = activeTrackEnd + ThumbTrackGapSize.toPx() * 2
-                                val inactiveTrackEnd = size.width
+                                val trackHeight = size.height
+                                val trackWidth = size.width
+                                val activeTrackEnd = trackWidth * sliderState.coercedValueAsFraction
+                                
+                                val cornerRadius = CornerRadius(trackCornerDp.toPx())
+                                
+                                drawRoundRect(
+                                    color = colors.inactiveTrackColor,
+                                    topLeft = Offset(0f, 0f),
+                                    size = Size(trackWidth, trackHeight),
+                                    cornerRadius = cornerRadius
+                                )
+                                
+                                if (activeTrackEnd > 0f) {
+                                    if (brightnessGradient != null) {
+                                        // Draw gradient over the active track portion
+                                        val outline = trackShape.createOutline(
+                                            Size(activeTrackEnd.coerceAtMost(trackWidth), trackHeight),
+                                            layoutDirection,
+                                            this
+                                        )
+                                        val clipPath = outline.asPath()
+                                        clipPath(clipPath) {
+                                            drawRect(
+                                                brush = brightnessGradient.brush,
+                                                topLeft = Offset.Zero,
+                                                size = Size(activeTrackEnd.coerceAtMost(trackWidth), trackHeight)
+                                            )
+                                        }
+                                    } else {
+                                        drawRoundRect(
+                                            color = colors.activeTrackColor,
+                                            topLeft = Offset(0f, 0f),
+                                            size = Size(activeTrackEnd, trackHeight),
+                                            cornerRadius = cornerRadius
+                                        )
+                                    }
+                                }
 
-                                val activeTrackWidth = activeTrackEnd - activeTrackStart
-                                val inactiveTrackWidth = inactiveTrackEnd - inactiveTrackStart
+                                val yOffset = trackHeight / 2 - IconSize.toSize().height / 2
+                                val activeTrackWidth = activeTrackEnd
+                                val inactiveTrackWidth = trackWidth - activeTrackEnd
 
                                 if (
                                     IconSize.toSize().width <
@@ -357,7 +555,7 @@ fun BrightnessSlider(
                                 ) {
                                     showIconActive = false
                                     trackIcon(
-                                        Offset(inactiveTrackEnd, yOffset),
+                                        Offset(trackWidth, yOffset),
                                         inactiveIconColor,
                                         iconInactiveAlphaAnimatable.value,
                                     )
@@ -371,19 +569,18 @@ fun BrightnessSlider(
                                         iconActiveAlphaAnimatable.value,
                                     )
                                 }
-                            },
-                    trackCornerSize = SliderTrackRoundedCorner,
-                    trackInsideCornerSize = 2.dp,
-                    drawStopIndicator = null,
-                    thumbTrackGapSize = ThumbTrackGapSize,
-                    colors = colors,
+                            }
                 )
             },
         )
 
         if (hasAutoBrightness && showAutoBrightness) {
             Spacer(modifier = Modifier.width(10.dp))
-            drawAutoBrightnessButton(autoMode = autoMode, onIconClick = onIconClick)
+            drawAutoBrightnessButton(
+                autoMode = autoMode,
+                hapticsEnabled = hapticsEnabled,
+                onIconClick = onIconClick
+            )
         }
     }
 
@@ -399,11 +596,208 @@ fun BrightnessSlider(
     }
 }
 
-private fun Modifier.sliderBackground(color: Color) = drawWithCache {
+fun Outline.asPath(): Path {
+    return when (this) {
+        is Outline.Generic -> path
+        is Outline.Rounded -> Path().apply { addRoundRect(roundRect) }
+        is Outline.Rectangle -> Path().apply { addRect(rect) }
+    }
+}
+
+@Composable
+fun rememberSliderShapeMode(): Int {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readShapeMode(): Int {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_BRIGHTNESS_SLIDER_SHAPE, 0,
+                UserHandle.USER_CURRENT
+            )
+        } catch (_: Throwable) {
+            0
+        }
+    }
+
+    var shapeMode by remember { mutableIntStateOf(readShapeMode()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    shapeMode = readShapeMode()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_BRIGHTNESS_SLIDER_SHAPE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return shapeMode
+}
+
+private data class BrightnessGradient(
+    val brush: Brush,
+)
+
+@Composable
+private fun rememberSliderGradient(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_BRIGHTNESS_SLIDER_GRADIENT, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var enabled by remember { mutableStateOf(readEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+                override fun onChange(selfChange: Boolean) {
+                    enabled = readEnabled()
+                }
+            }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_BRIGHTNESS_SLIDER_GRADIENT),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return enabled
+}
+
+@Composable
+private fun rememberGradientColorMode(): Int {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readMode(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_COLOR_MODE, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var mode by remember { mutableIntStateOf(readMode()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                mode = readMode()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_COLOR_MODE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return mode
+}
+
+@Composable
+private fun rememberGradientCustomColors(): Pair<Color, Color> {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readStart(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_START_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    fun readEnd(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_END_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var startInt by remember { mutableIntStateOf(readStart()) }
+    var endInt by remember { mutableIntStateOf(readEnd()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                startInt = readStart()
+                endInt = readEnd()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_START_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_END_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    val start = if (startInt != 0) Color(startInt) else MaterialTheme.colorScheme.primary
+    val end = if (endInt != 0) Color(endInt) else MaterialTheme.colorScheme.secondary
+    return start to end
+}
+
+@Composable
+private fun brightnessSliderGradient(): BrightnessGradient? {
+    if (!rememberSliderGradient()) return null
+
+    val mode = rememberGradientColorMode()
+    val colors = if (mode == 1) {
+        val (start, end) = rememberGradientCustomColors()
+        listOf(start, end)
+    } else {
+        listOf(
+            MaterialTheme.colorScheme.primary,
+            MaterialTheme.colorScheme.secondary
+        )
+    }
+
+    return BrightnessGradient(
+        brush = Brush.horizontalGradient(colors)
+    )
+}
+
+private fun Modifier.sliderBackground(color: Color, corner: Dp) = drawWithCache {
     val offsetAround = SliderBackgroundFrameSize.toSize()
     val newSize = Size(size.width + 2 * offsetAround.width, size.height + 2 * offsetAround.height)
     val offset = Offset(-offsetAround.width, -offsetAround.height)
-    val cornerRadius = CornerRadius(SliderBackgroundRoundedCorner.toPx())
+    val cornerRadius = CornerRadius(corner.toPx())
     onDrawBehind {
         drawRoundRect(color = color, topLeft = offset, size = newSize, cornerRadius = cornerRadius)
     }
@@ -419,9 +813,30 @@ private fun readShowAutoBrightness(cr: ContentResolver): Boolean =
         false
     }
 
+private fun readEnableHaptics(cr: ContentResolver): Boolean =
+    try {
+        Settings.System.getIntForUser(
+            cr, Settings.System.QS_BRIGHTNESS_SLIDER_HAPTIC,
+            1, UserHandle.USER_CURRENT
+        ) != 0
+    } catch (_: Throwable) {
+        false
+    }
+
+private fun readUseAxStyle(cr: ContentResolver): Boolean =
+    try {
+        Settings.System.getIntForUser(
+            cr, Settings.System.QS_BRIGHTNESS_SLIDER_STYLE,
+            0, UserHandle.USER_CURRENT
+        ) != 0
+    } catch (_: Throwable) {
+        false
+    }
+
 @Composable
 private fun drawAutoBrightnessButton(
     autoMode: Boolean,
+    hapticsEnabled: Boolean,
     onIconClick: suspend () -> Unit,
 ) {
     val view = LocalView.current
@@ -433,11 +848,20 @@ private fun drawAutoBrightnessButton(
             22.5.dp
         }
     )
+    val shapeMode = rememberSliderShapeMode()
+    val autoIconShape = when (shapeMode) {
+        1 -> CircleShape
+        2 -> RoundedCornerShape(12.dp)
+        3 -> RoundedCornerShape(0.dp)
+        else -> RoundedCornerShape(animatedCornerRadius)
+    }
+    val brightnessGradient = brightnessSliderGradient()
+    val autoIconBrush: Brush? = if (autoMode) brightnessGradient?.brush else null
     val backgroundColor by animateColorAsState(
         targetValue = if (autoMode) {
-            MaterialTheme.colorScheme.primary
+            if (autoIconBrush == null) MaterialTheme.colorScheme.primary else Color.Unspecified
         } else {
-            LocalAndroidColorScheme.current.surfaceEffect1
+            CustomColorScheme.current.qsTileColor
         }
     )
     val iconTint by animateColorAsState(
@@ -460,14 +884,22 @@ private fun drawAutoBrightnessButton(
 
     Box(
         modifier = Modifier
-            .size(45.dp)
-            .clip(RoundedCornerShape(animatedCornerRadius))
-            .background(backgroundColor)
+            .size(TrackHeight)
+            .clip(autoIconShape)
+            .then(
+                if (autoIconBrush != null) {
+                    Modifier.background(autoIconBrush)
+                } else {
+                    Modifier.background(backgroundColor)
+                }
+            )
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null, // Disable ripple effect
                 onClick = {
-                    view.performHapticFeedback(hapticConstant)
+                    if (hapticsEnabled) {
+                        view.performHapticFeedback(hapticConstant)
+                    }
                     coroutineScope.launch { onIconClick() }
                 }
             ),
@@ -476,7 +908,8 @@ private fun drawAutoBrightnessButton(
         Icon(
             painter = painterResource(painterRes),
             contentDescription = stringResource(R.string.accessibility_adaptive_brightness),
-            tint = iconTint
+            tint = iconTint,
+            modifier = Modifier.size(IconSize.width, IconSize.height)
         )
     }
 }
@@ -504,6 +937,20 @@ fun BrightnessSliderContainer(
 
     var dragging by remember { mutableStateOf(false) }
 
+    val shapeMode = rememberSliderShapeMode()
+    val trackCornerDp: Dp = when (shapeMode) {
+        1 -> 28.dp  /* Circle */
+        2 -> 12.dp  /* Rounded Square */
+        3 -> 0.dp /* Square */
+        else -> Dimensions.SliderTrackRoundedCorner
+    }
+    val bgCornerDp: Dp = when (shapeMode) {
+        1 -> 50.dp  /* Circle */
+        2 -> 24.dp  /* Rounded Square */
+        3 -> 0.dp /* Square */
+        else -> Dimensions.SliderBackgroundRoundedCorner
+    }
+
     // Use dragging instead of viewModel.showMirror so the color starts changing as soon as the
     // dragging state changes. If not, we may be waiting for the background to finish fading in
     // when stopping dragging
@@ -541,10 +988,10 @@ fun BrightnessSliderContainer(
             modifier =
                 Modifier.borderOnFocus(
                         color = MaterialTheme.colorScheme.secondary,
-                        cornerSize = CornerSize(SliderTrackRoundedCorner),
+                        cornerSize = CornerSize(trackCornerDp),
                     )
                     .then(if (viewModel.showMirror) Modifier.drawInOverlay() else Modifier)
-                    .sliderBackground(containerColor)
+                    .sliderBackground(containerColor, bgCornerDp)
                     .fillMaxWidth()
                     .pointerInteropFilter {
                         if (
@@ -578,8 +1025,8 @@ private object Dimensions {
     val SliderBackgroundRoundedCorner = 24.dp
     val SliderTrackRoundedCorner = 12.dp
     val IconSize = DpSize(28.dp, 28.dp)
-    val IconPadding = 6.dp
-    val ThumbTrackGapSize = 6.dp
+    val IconPadding = 10.dp
+    val ThumbTrackGapSize = 0.dp
 
     val ThumbHeight : Dp
         @Composable
@@ -619,10 +1066,12 @@ object BrightnessSliderMotionTestKeys {
 }
 
 @Composable
-private fun colors(): SliderColors {
-    return SliderDefaults.colors()
+private fun colors(brightnessGradient: BrightnessGradient?): SliderColors {
+    val base = SliderDefaults.colors()
+    return base
         .copy(
-            inactiveTrackColor = LocalAndroidColorScheme.current.surfaceEffect1,
+            activeTrackColor = if (brightnessGradient != null) Color.Transparent else base.activeTrackColor,
+            inactiveTrackColor = CustomColorScheme.current.qsTileColor,
             activeTickColor = MaterialTheme.colorScheme.onPrimary,
             inactiveTickColor = MaterialTheme.colorScheme.onSurface,
         )
diff --git a/packages/SystemUI/src/com/android/systemui/brightness/ui/viewmodel/BrightnessSliderViewModel.kt b/packages/SystemUI/src/com/android/systemui/brightness/ui/viewmodel/BrightnessSliderViewModel.kt
index 36efeaa1bca9b..e3026ba28a917 100644
--- a/packages/SystemUI/src/com/android/systemui/brightness/ui/viewmodel/BrightnessSliderViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/brightness/ui/viewmodel/BrightnessSliderViewModel.kt
@@ -21,6 +21,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.FloatRange
 import androidx.annotation.StringRes
 import androidx.compose.runtime.getValue
+import androidx.core.content.res.ResourcesCompat
 import com.android.systemui.brightness.domain.interactor.BrightnessPolicyEnforcementInteractor
 import com.android.systemui.brightness.domain.interactor.ScreenBrightnessInteractor
 import com.android.systemui.brightness.shared.model.GammaBrightness
@@ -28,7 +29,6 @@ import com.android.systemui.classifier.Classifier
 import com.android.systemui.classifier.domain.interactor.FalsingInteractor
 import com.android.systemui.common.shared.model.Icon
 import com.android.systemui.common.shared.model.asIcon
-import com.android.systemui.graphics.ImageLoader
 import com.android.systemui.haptics.slider.compose.ui.SliderHapticsViewModel
 import com.android.systemui.lifecycle.ExclusiveActivatable
 import com.android.systemui.lifecycle.Hydrator
@@ -62,7 +62,6 @@ constructor(
     private val falsingInteractor: FalsingInteractor,
     @Assisted private val supportsMirroring: Boolean,
     private val brightnessWarningToast: BrightnessWarningToast,
-    private val imageLoader: ImageLoader,
 ) : ExclusiveActivatable() {
 
     init {
@@ -110,13 +109,13 @@ constructor(
 
     suspend fun loadImage(@DrawableRes resId: Int, context: Context): Icon.Loaded? {
         return withTimeoutOrNull(500L) {
-            imageLoader
-                .loadDrawable(
-                    android.graphics.drawable.Icon.createWithResource(context, resId),
-                    maxHeight = 200,
-                    maxWidth = 200,
-                )
-                ?.asIcon(null, resId)
+            val drawable = ResourcesCompat.getDrawable(
+                context.resources,
+                resId,
+                context.theme
+            ) ?: return@withTimeoutOrNull null
+
+            drawable.asIcon(null, resId)
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/charging/NTRippleView.kt b/packages/SystemUI/src/com/android/systemui/charging/NTRippleView.kt
new file mode 100644
index 0000000000000..e7163be46b0c3
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/charging/NTRippleView.kt
@@ -0,0 +1,356 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.charging
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
+import android.animation.ValueAnimator
+import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.util.Log
+import android.util.MathUtils
+import android.view.Display
+import android.view.View
+import android.view.WindowManager
+import android.view.animation.PathInterpolator
+
+import com.android.app.animation.Interpolators
+
+import com.android.systemui.res.R
+import com.android.systemui.assist.ui.CircularCornerPathRenderer
+import com.android.systemui.assist.ui.DisplayUtils
+import com.android.systemui.assist.ui.EdgeLight
+import com.android.systemui.assist.ui.PerimeterPathGuide
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+class NTRippleView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : View(context, attrs) {
+
+    companion object {
+        private const val TAG = "NTRippleView"
+        private const val DECODE_BITMAP_MAX_THREAD_POOL = 2
+        private const val RES_END_INDEX = 40
+        private val RIPPLE_RES_IDS = intArrayOf(
+            R.drawable.nt_charge_ripple_01,
+            R.drawable.nt_charge_ripple_02,
+            R.drawable.nt_charge_ripple_03,
+            R.drawable.nt_charge_ripple_04,
+            R.drawable.nt_charge_ripple_05,
+            R.drawable.nt_charge_ripple_06,
+            R.drawable.nt_charge_ripple_07,
+            R.drawable.nt_charge_ripple_08,
+            R.drawable.nt_charge_ripple_09,
+            R.drawable.nt_charge_ripple_10,
+            R.drawable.nt_charge_ripple_11,
+            R.drawable.nt_charge_ripple_12,
+            R.drawable.nt_charge_ripple_13,
+            R.drawable.nt_charge_ripple_14,
+            R.drawable.nt_charge_ripple_15,
+            R.drawable.nt_charge_ripple_16,
+            R.drawable.nt_charge_ripple_17,
+            R.drawable.nt_charge_ripple_18,
+            R.drawable.nt_charge_ripple_19,
+            R.drawable.nt_charge_ripple_20,
+            R.drawable.nt_charge_ripple_21,
+            R.drawable.nt_charge_ripple_22,
+            R.drawable.nt_charge_ripple_23,
+            R.drawable.nt_charge_ripple_24,
+            R.drawable.nt_charge_ripple_25,
+            R.drawable.nt_charge_ripple_26,
+            R.drawable.nt_charge_ripple_27,
+            R.drawable.nt_charge_ripple_28,
+            R.drawable.nt_charge_ripple_29,
+            R.drawable.nt_charge_ripple_30,
+            R.drawable.nt_charge_ripple_31,
+            R.drawable.nt_charge_ripple_32,
+            R.drawable.nt_charge_ripple_33,
+            R.drawable.nt_charge_ripple_34,
+            R.drawable.nt_charge_ripple_35,
+            R.drawable.nt_charge_ripple_36,
+            R.drawable.nt_charge_ripple_37,
+            R.drawable.nt_charge_ripple_38,
+            R.drawable.nt_charge_ripple_39,
+            R.drawable.nt_charge_ripple_40,
+            R.drawable.nt_charge_ripple_41
+        )
+    }
+
+    private val ripplePaint = Paint().apply {
+        style = Paint.Style.STROKE
+        strokeJoin = Paint.Join.MITER
+        isAntiAlias = true
+        color = 0xFFFFFFFF.toInt()
+    }
+
+    private val animator = ValueAnimator.ofInt(0, RES_END_INDEX).apply {
+        duration = 1100L
+        interpolator = Interpolators.LINEAR
+    }
+
+    private val darkOverlayAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
+        duration = 300L
+        interpolator = PathInterpolator(0.4f, 0f, 0f, 1f)
+    }
+
+    private val darkOverlayReverseAnimator = ValueAnimator.ofFloat(1f, 0f).apply {
+        duration = 300L
+        startDelay = 800L
+        interpolator = PathInterpolator(0.2f, 0f, 0f, 1f)
+    }
+
+    private val outlineStep1Animator = ValueAnimator.ofFloat(0f, 0.1f).apply {
+        duration = 300L
+        interpolator = PathInterpolator(0.4f, 0f, 0f, 1f)
+    }
+
+    private val outlineStep2Animator = ValueAnimator.ofFloat(0.1f, 1f).apply {
+        duration = 800L
+        interpolator = PathInterpolator(0.2f, 0f, 0f, 1f)
+    }
+
+    private val invocationLights = ArrayList<EdgeLight>().apply {
+        repeat(2) { add(EdgeLight(0, 0f, 0f)) }
+    }
+
+    private val pngFadeOutAnimator = ValueAnimator.ofInt(255, 0).apply {
+        duration = 300L
+        startDelay = 800L
+        interpolator = PathInterpolator(0.4f, 0f, 0.2f, 1f)
+    }
+
+    private val bitmapPaint = Paint().apply {
+        isAntiAlias = true
+    }
+
+    private var currentAlpha = 0f
+    private var currentIndex = 0
+    private var strokeWidth = DisplayUtils.convertDpToPx(4f, context)
+    private var images: MutableList<Bitmap?> = ArrayList()
+    private var glare: Bitmap? = null
+    private var executorService: ExecutorService? = null
+    private val path = Path()
+    private val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+    private lateinit var guide: PerimeterPathGuide
+    private var currentPngAlpha = 255
+
+    init {
+        ripplePaint.strokeWidth = strokeWidth.toFloat()
+        
+        val width = DisplayUtils.getWidth(context)
+        val height = DisplayUtils.getHeight(context)
+        guide = PerimeterPathGuide(
+            context,
+            CircularCornerPathRenderer(context),
+            strokeWidth / 2,
+            width,
+            height
+        )
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration?) {
+        super.onConfigurationChanged(newConfig)
+    }
+
+    fun preloadRes() {
+        images = ArrayList<Bitmap?>(RES_END_INDEX + 1).apply {
+            repeat(RES_END_INDEX + 1) { add(null) }
+        }
+        startLoadExecutor()
+        glare = BitmapFactory.decodeResource(resources, R.drawable.nt_charge_glare)
+    }
+
+    private fun releaseRes() {
+        images.forEachIndexed { index, bitmap ->
+            bitmap?.recycle()
+            images[index] = null
+        }
+        images.clear()
+        glare?.recycle()
+        glare = null
+        executorService?.shutdown()
+        executorService = null
+    }
+
+    fun startRipple(onAnimationEnd: Runnable? = null) {
+        if (animator.isRunning) return
+
+        animator.addUpdateListener { 
+            currentIndex = it.animatedValue as Int
+            invalidate()
+            if (currentIndex > 0) {
+                images[currentIndex - 1]?.recycle()
+            }
+        }
+
+        animator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                onAnimationEnd?.run()
+                releaseRes()
+            }
+
+            override fun onAnimationCancel(animation: Animator) {
+                onAnimationEnd?.run()
+                releaseRes()
+            }
+        })
+
+        val updateListener = ValueAnimator.AnimatorUpdateListener { 
+            onInvocationProgress(it.animatedValue as Float)
+            invalidate()
+        }
+
+        outlineStep1Animator.addUpdateListener(updateListener)
+        outlineStep2Animator.addUpdateListener(updateListener)
+
+        val alphaUpdateListener = ValueAnimator.AnimatorUpdateListener {
+            currentAlpha = it.animatedValue as Float
+            invalidate()
+        }
+
+        darkOverlayAnimator.addUpdateListener(alphaUpdateListener)
+        darkOverlayReverseAnimator.addUpdateListener(alphaUpdateListener)
+
+        currentIndex = 0
+        currentAlpha = 0f
+
+        val pngAlphaUpdateListener = ValueAnimator.AnimatorUpdateListener {
+            currentPngAlpha = it.animatedValue as Int
+            invalidate()
+        }
+
+        pngFadeOutAnimator.addUpdateListener(pngAlphaUpdateListener)
+
+        AnimatorSet().apply {
+            playSequentially(
+                AnimatorSet().apply { playTogether(outlineStep1Animator, darkOverlayAnimator) },
+                AnimatorSet().apply { playTogether(animator, outlineStep2Animator, darkOverlayReverseAnimator, pngFadeOutAnimator) }
+            )
+            start()
+        }
+    }
+
+    fun rippleInProgress(): Boolean {
+        return animator.isRunning
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val min = MathUtils.min(width, height).toFloat()
+        val max = MathUtils.max(width, height).toFloat()
+
+        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            val display: Display? = windowManager.defaultDisplay
+            Log.d(TAG, "rotate ${display?.rotation}")
+            canvas.rotate(-90f, min / 2, min / 2)
+            display?.rotation?.takeIf { it == 3 }?.let {
+                canvas.scale(1f, -1f, height / 2f, width / 2f)
+            }
+        }
+
+        if (currentIndex >= images.size) return
+
+        canvas.drawARGB((currentAlpha * 255 * 0.2f).toInt(), 0, 0, 0)
+        
+        images.getOrNull(currentIndex)?.let { bitmap ->
+        if (!bitmap.isRecycled) {
+            bitmapPaint.alpha = currentPngAlpha
+            canvas.drawBitmap(bitmap, null, Rect(0, 0, min.toInt(), max.toInt()), bitmapPaint)
+        }
+    }
+
+        ripplePaint.alpha = (currentAlpha * 255).toInt()
+        invocationLights.forEach { renderLight(it, canvas) }
+
+        glare?.takeIf { !it.isRecycled }?.let {
+            canvas.drawBitmap(
+                it,
+                (min - it.width) / 2,
+                max - (it.height / 2),
+                ripplePaint
+            )
+        }
+    }
+
+    private fun onInvocationProgress(progress: Float) {
+        val totalWidth = guide.run {
+            getRegionWidth(PerimeterPathGuide.Region.BOTTOM) +
+            getRegionWidth(PerimeterPathGuide.Region.LEFT) +
+            getRegionWidth(PerimeterPathGuide.Region.BOTTOM_LEFT) * 2
+        }
+        
+        val lerp = MathUtils.lerp(0f, totalWidth, progress)
+        val regionWidth = guide.getRegionWidth(PerimeterPathGuide.Region.BOTTOM) / 2
+        
+        setLight(0, regionWidth, regionWidth + lerp)
+        setLight(1, regionWidth - lerp, regionWidth)
+    }
+
+    private fun renderLight(light: EdgeLight, canvas: Canvas) {
+        if (light.length > 0) {
+            guide.strokeSegment(path, light.start, light.start + light.length)
+            canvas.drawPath(path, ripplePaint)
+        }
+    }
+
+    private fun setLight(index: Int, start: Float, end: Float) {
+        invocationLights[index].setEndpoints(start, end)
+    }
+
+    private fun startLoadExecutor() {
+        if (executorService != null) return
+        
+        executorService = Executors.newFixedThreadPool(DECODE_BITMAP_MAX_THREAD_POOL)
+        
+        (0..RES_END_INDEX).forEach { i ->
+            executorService?.execute(DecodeBitmapTask(images, resources, i))
+        }
+    }
+
+    private inner class DecodeBitmapTask(
+        private val images: MutableList<Bitmap?>,
+        private val resources: Resources,
+        private val index: Int
+    ) : Runnable {
+
+        override fun run() {
+            try {
+                if (index in RIPPLE_RES_IDS.indices) {
+                    val resId = RIPPLE_RES_IDS[index]
+                    resources.openRawResource(resId).use { stream ->
+                        images[index] = BitmapFactory.decodeStream(stream)
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to decode bitmap at index $index", e)
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt b/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt
index 718ef51aa1613..91da0a4fb4a2b 100644
--- a/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt
+++ b/packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt
@@ -105,10 +105,10 @@ class WiredChargingRippleController @Inject constructor(
                     return
                 }
 
-                if (!pluggedIn && nowPluggedIn) {
+               /* if (!pluggedIn && nowPluggedIn) {
                     startRippleWithDebounce()
                 }
-                pluggedIn = nowPluggedIn
+                pluggedIn = nowPluggedIn */
             }
         }
         batteryController.addCallback(batteryStateChangeCallback)
diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
index 047d15daf6f80..5b63e592ac94b 100644
--- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
@@ -21,6 +21,8 @@
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Color;
+import android.provider.Settings;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
@@ -44,12 +46,18 @@
  * @hide
  */
 final class WirelessChargingLayout extends FrameLayout {
-    private static final long CIRCLE_RIPPLE_ANIMATION_DURATION = 1500;
+    private static final long CIRCLE_RIPPLE_ANIMATION_DURATION = 2200;
     private static final long ROUNDED_BOX_RIPPLE_ANIMATION_DURATION = 3000;
+    private static final long NT_ANIMATION_DURATION = 1100;
     private static final int SCRIM_COLOR = 0x4C000000;
-    private static final int SCRIM_FADE_DURATION = 300;
+    private static final int SCRIM_FADE_DURATION = 400;
+    
+    private static final int RIPPLE_SHAPE_CIRCLE = 0;
+    private static final int RIPPLE_SHAPE_ROUNDED_BOX = 1;
+    private static final int RIPPLE_SHAPE_PNG = 2;
+    
     private RippleView mRippleView;
-    // This is only relevant to the rounded box ripple.
+    private NTRippleView mNTRippleView;
     private RippleShader.SizeAtProgress[] mSizeAtProgressArray;
 
     WirelessChargingLayout(Context context, int transmittingBatteryLevel, int batteryLevel,
@@ -60,23 +68,89 @@ final class WirelessChargingLayout extends FrameLayout {
 
     private WirelessChargingLayout(Context context) {
         super(context);
-        init(context, null, /* isDozing= */ false, RippleShape.CIRCLE);
+        RippleShape shape = getRippleShapeFromSettings(context);
+        init(context, null, /* isDozing= */ false, shape);
     }
 
     private WirelessChargingLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init(context, attrs, /* isDozing= */false, RippleShape.CIRCLE);
+        RippleShape shape = getRippleShapeFromSettings(context);
+        init(context, attrs, /* isDozing= */false, shape);
     }
 
     private void init(Context c, AttributeSet attrs, boolean isDozing, RippleShape rippleShape) {
         init(c, attrs, -1, -1, isDozing, rippleShape);
     }
 
+    private RippleShape getRippleShapeFromSettings(Context context) {
+        int shapeValue = Settings.System.getIntForUser(
+                context.getContentResolver(),
+                Settings.System.WIRELESS_CHARGING_RIPPLE_SHAPE,
+                RIPPLE_SHAPE_CIRCLE,
+                UserHandle.USER_CURRENT);
+        
+        switch (shapeValue) {
+            case RIPPLE_SHAPE_ROUNDED_BOX:
+                return RippleShape.ROUNDED_BOX;
+            case RIPPLE_SHAPE_PNG:
+                return RippleShape.CIRCLE;
+            case RIPPLE_SHAPE_CIRCLE:
+            default:
+                return RippleShape.CIRCLE;
+        }
+    }
+
+    private long getAnimationDuration(int shapeValue) {
+        switch (shapeValue) {
+            case RIPPLE_SHAPE_ROUNDED_BOX:
+                return ROUNDED_BOX_RIPPLE_ANIMATION_DURATION;
+            case RIPPLE_SHAPE_PNG:
+                return NT_ANIMATION_DURATION;
+            case RIPPLE_SHAPE_CIRCLE:
+            default:
+                return CIRCLE_RIPPLE_ANIMATION_DURATION;
+        }
+    }
+
+    private int getDynamicRippleColor(Context context, int batteryLevel) {
+        int accent = Utils.getColorAttr(context, android.R.attr.colorAccent).getDefaultColor();
+        int darkRed = Color.parseColor("#8B0000");
+        int red = Color.parseColor("#FF0000");
+        int orange = Color.parseColor("#FF9500");
+        int yellow = Color.parseColor("#FFD600");
+
+        if (batteryLevel < 0 || batteryLevel > 100) {
+                return accent;
+        }
+
+        if (batteryLevel <= 20) {
+                return darkRed;
+        } else if (batteryLevel <= 40) {
+                return red;
+        } else if (batteryLevel <= 60) {
+                return orange;
+        } else if (batteryLevel <= 70) {
+                return yellow;
+        } else {
+                return accent;
+        }
+    }
+
     private void init(Context context, AttributeSet attrs, int transmittingBatteryLevel,
             int batteryLevel, boolean isDozing, RippleShape rippleShape) {
         final boolean showTransmittingBatteryLevel =
                 (transmittingBatteryLevel != WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL);
 
+        int shapeValue = Settings.System.getIntForUser(
+                context.getContentResolver(),
+                Settings.System.WIRELESS_CHARGING_RIPPLE_SHAPE,
+                RIPPLE_SHAPE_CIRCLE,
+                UserHandle.USER_CURRENT);
+        
+        final long animationDuration = getAnimationDuration(shapeValue);
+        rippleShape = getRippleShapeFromSettings(context);
+        final boolean isNtAnimation = (shapeValue == RIPPLE_SHAPE_PNG);
+
         // set style based on background
         int style = R.style.ChargingAnim_WallpaperBackground;
         if (isDozing) {
@@ -85,12 +159,25 @@ private void init(Context context, AttributeSet attrs, int transmittingBatteryLe
 
         inflate(new ContextThemeWrapper(context, style), R.layout.wireless_charging_layout, this);
 
-        // amount of battery:
         final TextView percentage = findViewById(R.id.wireless_charging_percentage);
+        final ImageView chargingIcon = findViewById(R.id.wireless_charging_icon);
 
         if (batteryLevel != WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL) {
+            int dynamicColor;
+
+            if (isNtAnimation) {
+                dynamicColor = Color.WHITE;
+            } else if (isDynamicColorEnabled(context)) {
+                dynamicColor = getDynamicRippleColor(context, batteryLevel);
+            } else {
+                dynamicColor = Utils.getColorAttr(context, android.R.attr.colorAccent).getDefaultColor();
+            }
+        
+            percentage.setTextColor(dynamicColor);
             percentage.setText(NumberFormat.getPercentInstance().format(batteryLevel / 100f));
             percentage.setAlpha(0);
+        
+            chargingIcon.setColorFilter(dynamicColor);
         }
 
         final long chargingAnimationFadeStartOffset = context.getResources().getInteger(
@@ -102,6 +189,17 @@ private void init(Context context, AttributeSet attrs, int transmittingBatteryLe
         final float batteryLevelTextSizeEnd = context.getResources().getFloat(
                 R.dimen.wireless_charging_anim_battery_level_text_size_end) * (
                 showTransmittingBatteryLevel ? 0.75f : 1.0f);
+        final float batteryPadding = context.getResources().getFloat(
+                R.dimen.wireless_charging_padding);
+        final int sidePadding = Math.round(
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, batteryPadding,
+                        getResources().getDisplayMetrics()));
+
+        if (batteryLevel != WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL) {
+            percentage.setText(NumberFormat.getPercentInstance().format(batteryLevel / 100f));
+            percentage.setAlpha(0);
+            chargingIcon.setPadding(sidePadding, 0, 0, 0);
+        }
 
         // Animation Scale: battery percentage text scales from 0% to 100%
         ValueAnimator textSizeAnimator = ObjectAnimator.ofFloat(percentage, "textSize",
@@ -124,72 +222,128 @@ private void init(Context context, AttributeSet attrs, int transmittingBatteryLe
         textFadeAnimator.setInterpolator(Interpolators.LINEAR);
         textFadeAnimator.setStartDelay(chargingAnimationFadeStartOffset);
 
+        // Animation Scale: battery icon scales from 0% to 100%
+        ValueAnimator battSizeAnimator = ObjectAnimator.ofFloat(chargingIcon, "batterySize",
+                batteryLevelTextSizeStart, batteryLevelTextSizeEnd);
+        battSizeAnimator.setInterpolator(new PathInterpolator(0, 0, 0, 1));
+        battSizeAnimator.setDuration(context.getResources().getInteger(
+                R.integer.wireless_charging_battery_level_text_scale_animation_duration));
+
+        // Animation Opacity: battery icon transitions from 0 to 1 opacity
+        ValueAnimator OpacityAnimatorBattIcon = ObjectAnimator.ofFloat(chargingIcon, "alpha", 0, 1);
+        OpacityAnimatorBattIcon.setInterpolator(Interpolators.LINEAR);
+        OpacityAnimatorBattIcon.setDuration(context.getResources().getInteger(
+                R.integer.wireless_charging_battery_level_text_opacity_duration));
+        OpacityAnimatorBattIcon.setStartDelay(context.getResources().getInteger(
+                R.integer.wireless_charging_anim_opacity_offset));
+
+        // Animation Opacity: battery icon fades from 1 to 0 opacity
+        ValueAnimator FadeAnimatorBattIcon = ObjectAnimator.ofFloat(chargingIcon, "alpha", 1, 0);
+        FadeAnimatorBattIcon.setDuration(chargingAnimationFadeDuration);
+        FadeAnimatorBattIcon.setInterpolator(Interpolators.LINEAR);
+        FadeAnimatorBattIcon.setStartDelay(chargingAnimationFadeStartOffset);
+
         // play all animations together
         AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.playTogether(textSizeAnimator, textOpacityAnimator, textFadeAnimator);
+        animatorSet.playTogether(textSizeAnimator, textOpacityAnimator, textFadeAnimator, battSizeAnimator, OpacityAnimatorBattIcon, FadeAnimatorBattIcon);
 
         // For tablet docking animation, we don't play the background scrim.
         // TODO(b/270524780): use utility to check for tablet instead. 
         if (!Utilities.isLargeScreen(context)) {
-            ValueAnimator scrimFadeInAnimator = ObjectAnimator.ofArgb(this,
-                    "backgroundColor", Color.TRANSPARENT, SCRIM_COLOR);
+            ValueAnimator scrimFadeInAnimator = ObjectAnimator.ofArgb(
+                    this, "backgroundColor", Color.TRANSPARENT, SCRIM_COLOR);
             scrimFadeInAnimator.setDuration(SCRIM_FADE_DURATION);
             scrimFadeInAnimator.setInterpolator(Interpolators.LINEAR);
-            ValueAnimator scrimFadeOutAnimator = ObjectAnimator.ofArgb(this,
-                    "backgroundColor", SCRIM_COLOR, Color.TRANSPARENT);
-            scrimFadeOutAnimator.setDuration(SCRIM_FADE_DURATION);
-            scrimFadeOutAnimator.setInterpolator(Interpolators.LINEAR);
-            scrimFadeOutAnimator.setStartDelay((rippleShape == RippleShape.CIRCLE
-                    ? CIRCLE_RIPPLE_ANIMATION_DURATION : ROUNDED_BOX_RIPPLE_ANIMATION_DURATION)
-                    - SCRIM_FADE_DURATION);
+
+            long scrimFadeDuration;
+            long scrimFadeStartDelay;
+
+            if (isNtAnimation) {
+                scrimFadeDuration = 300;
+                scrimFadeStartDelay = 800;
+            } else if (rippleShape == RippleShape.CIRCLE) {
+                scrimFadeDuration = 550;
+                scrimFadeStartDelay = animationDuration - 1000;
+            } else {
+                scrimFadeDuration = 850;
+                scrimFadeStartDelay = animationDuration - 1700;
+            }
+
+            ValueAnimator scrimFadeOutAnimator = ObjectAnimator.ofArgb(
+                    this, "backgroundColor", SCRIM_COLOR, Color.TRANSPARENT);
+            scrimFadeOutAnimator.setDuration(scrimFadeDuration);
+            scrimFadeOutAnimator.setInterpolator(new PathInterpolator(0.4f, 0f, 0.2f, 1f));
+            scrimFadeOutAnimator.setStartDelay(scrimFadeStartDelay);
+
             AnimatorSet animatorSetScrim = new AnimatorSet();
             animatorSetScrim.playTogether(scrimFadeInAnimator, scrimFadeOutAnimator);
             animatorSetScrim.start();
         }
 
-        mRippleView = findViewById(R.id.wireless_charging_ripple);
-        mRippleView.setupShader(rippleShape);
-        int color = Utils.getColorAttr(mRippleView.getContext(),
-                android.R.attr.colorAccent).getDefaultColor();
-        if (mRippleView.getRippleShape() == RippleShape.ROUNDED_BOX) {
-            mRippleView.setDuration(ROUNDED_BOX_RIPPLE_ANIMATION_DURATION);
-            mRippleView.setSparkleStrength(0.22f);
-            mRippleView.setColor(color, 102); // 40% of opacity.
-            mRippleView.setBaseRingFadeParams(
-                    /* fadeInStart = */ 0f,
-                    /* fadeInEnd = */ 0f,
-                    /* fadeOutStart = */ 0.2f,
-                    /* fadeOutEnd= */ 0.47f
-            );
-            mRippleView.setSparkleRingFadeParams(
-                    /* fadeInStart = */ 0f,
-                    /* fadeInEnd = */ 0f,
-                    /* fadeOutStart = */ 0.2f,
-                    /* fadeOutEnd= */ 1f
-            );
-            mRippleView.setCenterFillFadeParams(
-                    /* fadeInStart = */ 0f,
-                    /* fadeInEnd = */ 0f,
-                    /* fadeOutStart = */ 0f,
-                    /* fadeOutEnd= */ 0.2f
-            );
-            mRippleView.setBlur(6.5f, 2.5f);
+        if (isNtAnimation) {
+            setupAdvancedPngAnimation(context);
+            RippleView rippleView = findViewById(R.id.wireless_charging_ripple);
+            if (rippleView != null) {
+                ((FrameLayout) rippleView.getParent()).removeView(rippleView);
+            }
         } else {
-            mRippleView.setDuration(CIRCLE_RIPPLE_ANIMATION_DURATION);
-            mRippleView.setColor(color, RippleShader.RIPPLE_DEFAULT_ALPHA);
-        }
+            NTRippleView ntRippleView = findViewById(R.id.wireless_charging_nt_ripple);
+            if (ntRippleView != null) {
+                ntRippleView.setVisibility(View.GONE);
+            }
+            
+            int color;
+            if (isDynamicColorEnabled(context)) {
+                color = getDynamicRippleColor(context, batteryLevel);
+            } else {
+                color = Utils.getColorAttr(context, android.R.attr.colorAccent).getDefaultColor();
+            }
 
-        OnAttachStateChangeListener listener = new OnAttachStateChangeListener() {
-            @Override
-            public void onViewAttachedToWindow(View view) {
-                mRippleView.startRipple();
-                mRippleView.removeOnAttachStateChangeListener(this);
+            mRippleView = findViewById(R.id.wireless_charging_ripple);
+            if (mRippleView != null) {
+                mRippleView.setupShader(rippleShape);
+            
+            if (mRippleView.getRippleShape() == RippleShape.ROUNDED_BOX) {
+                mRippleView.setDuration(ROUNDED_BOX_RIPPLE_ANIMATION_DURATION);
+                mRippleView.setSparkleStrength(0.3f);
+                mRippleView.setColor(color, 110); // 43% of opacity.
+                mRippleView.setBaseRingFadeParams(
+                        /* fadeInStart = */ 0f,
+                        /* fadeInEnd = */ 0f,
+                        /* fadeOutStart = */ 0.2f,
+                        /* fadeOutEnd= */ 0.47f
+                );
+                mRippleView.setSparkleRingFadeParams(
+                        /* fadeInStart = */ 0f,
+                        /* fadeInEnd = */ 0f,
+                        /* fadeOutStart = */ 0.2f,
+                        /* fadeOutEnd= */ 1f
+                );
+                mRippleView.setCenterFillFadeParams(
+                        /* fadeInStart = */ 0f,
+                        /* fadeInEnd = */ 0f,
+                        /* fadeOutStart = */ 0f,
+                        /* fadeOutEnd= */ 0.2f
+                );
+                mRippleView.setBlur(6.5f, 2.5f);
+            } else {
+                mRippleView.setDuration(CIRCLE_RIPPLE_ANIMATION_DURATION);
+                mRippleView.setColor(color, RippleShader.RIPPLE_DEFAULT_ALPHA);
             }
 
-            @Override
-            public void onViewDetachedFromWindow(View view) {}
-        };
-        mRippleView.addOnAttachStateChangeListener(listener);
+            OnAttachStateChangeListener listener = new OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    mRippleView.startRipple();
+                    mRippleView.removeOnAttachStateChangeListener(this);
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View view) {}
+            };
+            mRippleView.addOnAttachStateChangeListener(listener);
+            }
+        }
 
         if (!showTransmittingBatteryLevel) {
             animatorSet.start();
@@ -221,7 +375,7 @@ public void onViewDetachedFromWindow(View view) {}
                 context.getResources().getInteger(R.integer.wireless_charging_anim_opacity_offset));
 
         // Animation Opacity: transmitting battery percentage text fades from 1 to 0 opacity
-        ValueAnimator textFadeAnimatorTransmitting = ObjectAnimator.ofFloat(transmittingPercentage,
+        ValueAnimator textFadeAnimatorTransmitting = ObjectAnimator.ofFloat(transmittingPercentage, 
                 "alpha", 1, 0);
         textFadeAnimatorTransmitting.setDuration(chargingAnimationFadeDuration);
         textFadeAnimatorTransmitting.setInterpolator(Interpolators.LINEAR);
@@ -229,19 +383,19 @@ public void onViewDetachedFromWindow(View view) {}
 
         // play all animations together
         AnimatorSet animatorSetTransmitting = new AnimatorSet();
-        animatorSetTransmitting.playTogether(textSizeAnimatorTransmitting,
+        animatorSetTransmitting.playTogether(textSizeAnimatorTransmitting, 
                 textOpacityAnimatorTransmitting, textFadeAnimatorTransmitting);
 
         // transmitting battery icon
         final ImageView chargingViewIcon = findViewById(R.id.reverse_wireless_charging_icon);
         chargingViewIcon.setVisibility(VISIBLE);
         final int padding = Math.round(
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, batteryLevelTextSizeEnd,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, batteryLevelTextSizeEnd, 
                         getResources().getDisplayMetrics()));
         chargingViewIcon.setPadding(padding, 0, padding, 0);
 
         // Animation Opacity: transmitting battery icon transitions from 0 to 1 opacity
-        ValueAnimator textOpacityAnimatorIcon = ObjectAnimator.ofFloat(chargingViewIcon, "alpha", 0,
+        ValueAnimator textOpacityAnimatorIcon = ObjectAnimator.ofFloat(chargingViewIcon, "alpha", 0, 
                 1);
         textOpacityAnimatorIcon.setInterpolator(Interpolators.LINEAR);
         textOpacityAnimatorIcon.setDuration(context.getResources().getInteger(
@@ -250,7 +404,7 @@ public void onViewDetachedFromWindow(View view) {}
                 context.getResources().getInteger(R.integer.wireless_charging_anim_opacity_offset));
 
         // Animation Opacity: transmitting battery icon fades from 1 to 0 opacity
-        ValueAnimator textFadeAnimatorIcon = ObjectAnimator.ofFloat(chargingViewIcon, "alpha", 1,
+        ValueAnimator textFadeAnimatorIcon = ObjectAnimator.ofFloat(chargingViewIcon, "alpha", 1, 
                 0);
         textFadeAnimatorIcon.setDuration(chargingAnimationFadeDuration);
         textFadeAnimatorIcon.setInterpolator(Interpolators.LINEAR);
@@ -265,6 +419,28 @@ public void onViewDetachedFromWindow(View view) {}
         animatorSetIcon.start();
     }
 
+    private void setupAdvancedPngAnimation(Context context) {
+        mNTRippleView = findViewById(R.id.wireless_charging_nt_ripple);
+        if (mNTRippleView == null) {
+            return;
+        }
+
+        mNTRippleView.setVisibility(View.VISIBLE);
+        mNTRippleView.preloadRes();
+
+        OnAttachStateChangeListener listener = new OnAttachStateChangeListener() {
+            @Override
+            public void onViewAttachedToWindow(View view) {
+                mNTRippleView.startRipple(null);
+                mNTRippleView.removeOnAttachStateChangeListener(this);
+            }
+
+            @Override
+            public void onViewDetachedFromWindow(View view) {}
+        };
+        mNTRippleView.addOnAttachStateChangeListener(listener);
+    }
+
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         if (mRippleView != null) {
@@ -313,4 +489,9 @@ private void updateRippleSizeAtProgressList(float width, float height) {
 
         mRippleView.setSizeAtProgresses(mSizeAtProgressArray);
     }
+
+    private boolean isDynamicColorEnabled(Context context) {
+        return Settings.System.getIntForUser(context.getContentResolver(),
+            Settings.System.WIRELESS_CHARGING_DYNAMIC_COLOR, 1, UserHandle.USER_CURRENT) == 1;
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java
index e05bfd96107fd..fdc612a9530c2 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java
@@ -32,6 +32,7 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.UserHandle;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 
@@ -129,6 +130,10 @@ public void onPrimaryClipChanged() {
         if (!mClipboardManagerForUser.hasPrimaryClip()) {
             return;
         }
+        if (Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SHOW_CLIPBOARD_OVERLAY, 1, UserHandle.USER_CURRENT) == 0) {
+            return;
+        }
 
         String clipSource = mClipboardManagerForUser.getPrimaryClipSource();
         ClipData clipData = mClipboardManagerForUser.getPrimaryClip();
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/AODStyle.java b/packages/SystemUI/src/com/android/systemui/clocks/AODStyle.java
new file mode 100644
index 0000000000000..275073c604d2c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/AODStyle.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2023-2024 the risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.clocks;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.android.settingslib.drawable.CircleFramedDrawable;
+
+import com.android.systemui.res.R;
+import com.android.systemui.Dependency;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.tuner.TunerService;
+
+public class AODStyle extends RelativeLayout implements TunerService.Tunable {
+
+    private static final String CUSTOM_AOD_IMAGE_URI_KEY = "system:custom_aod_image_uri";
+    private static final String CUSTOM_AOD_IMAGE_ENABLED_KEY = "system:custom_aod_image_enabled";
+
+    private final Context mContext;
+    private final TunerService mTunerService;
+
+    private final StatusBarStateController mStatusBarStateController;
+
+    private boolean mDozing;
+
+    private ImageView mAodImageView;
+    private String mImagePath;
+    private String mCurrImagePath;
+    private boolean mAodImageEnabled;
+    private boolean mImageLoaded = false;
+    private boolean mCustomClockEnabled;
+
+    // Burn-in protection
+    private static final int BURN_IN_PROTECTION_INTERVAL = 10000; // 10 seconds
+    private static final int BURN_IN_PROTECTION_MAX_SHIFT = 4; // 4 pixels
+    private final Handler mBurnInProtectionHandler = new Handler();
+    private int mCurrentShiftX = 0;
+    private int mCurrentShiftY = 0;
+    
+    private final Runnable mBurnInProtectionRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (mDozing) {
+                mCurrentShiftX = (int) (Math.random() * BURN_IN_PROTECTION_MAX_SHIFT * 2) - BURN_IN_PROTECTION_MAX_SHIFT;
+                mCurrentShiftY = (int) (Math.random() * BURN_IN_PROTECTION_MAX_SHIFT * 2) - BURN_IN_PROTECTION_MAX_SHIFT;
+                if (mAodImageView != null) {
+                    mAodImageView.setTranslationX(mCurrentShiftX);
+                    mAodImageView.setTranslationY(mCurrentShiftY);
+                }
+                invalidate();
+                mBurnInProtectionHandler.postDelayed(this, BURN_IN_PROTECTION_INTERVAL);
+            }
+        }
+    };
+
+    private final StatusBarStateController.StateListener mStatusBarStateListener =
+            new StatusBarStateController.StateListener() {
+        @Override
+        public void onStateChanged(int newState) {}
+
+        @Override
+        public void onDozingChanged(boolean dozing) {
+            if (mDozing == dozing) {
+                return;
+            }
+            mDozing = dozing;
+            updateAodImageView();
+            if (mDozing) {
+                startBurnInProtection();
+            } else {
+                stopBurnInProtection();
+            }
+        }
+    };
+
+    public AODStyle(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        mTunerService = Dependency.get(TunerService.class);
+        mTunerService.addTunable(this, ClockStyle.CLOCK_STYLE_KEY, CUSTOM_AOD_IMAGE_URI_KEY, CUSTOM_AOD_IMAGE_ENABLED_KEY);
+        mStatusBarStateController = Dependency.get(StatusBarStateController.class);
+        mStatusBarStateController.addCallback(mStatusBarStateListener);
+        mStatusBarStateListener.onDozingChanged(mStatusBarStateController.isDozing());
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mAodImageView = findViewById(R.id.custom_aod_image_view);
+        loadAodImage();
+    }
+    
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mStatusBarStateController.removeCallback(mStatusBarStateListener);
+        mTunerService.removeTunable(this);
+        mBurnInProtectionHandler.removeCallbacks(mBurnInProtectionRunnable);
+        if (mAodImageView != null) {
+            mAodImageView.animate().cancel();
+            mAodImageView.setImageDrawable(null);
+        }
+    }
+
+    private void startBurnInProtection() {
+        mBurnInProtectionHandler.post(mBurnInProtectionRunnable);
+    }
+
+    private void stopBurnInProtection() {
+        mBurnInProtectionHandler.removeCallbacks(mBurnInProtectionRunnable);
+        if (mAodImageView != null) {
+            mAodImageView.setTranslationX(0);
+            mAodImageView.setTranslationY(0);
+        }
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case ClockStyle.CLOCK_STYLE_KEY:
+                int clockStyle = TunerService.parseInteger(newValue, 0);
+                mCustomClockEnabled = clockStyle != 0;
+                break;
+            case CUSTOM_AOD_IMAGE_URI_KEY:
+                mImagePath = newValue;
+                if (mImagePath != null && !mImagePath.isEmpty() 
+                    && !mImagePath.equals(mCurrImagePath)) {
+                    mCurrImagePath = mImagePath;
+                    mImageLoaded = false;
+                    loadAodImage();
+                }
+                break;
+            case CUSTOM_AOD_IMAGE_ENABLED_KEY:
+                mAodImageEnabled = TunerService.parseIntegerSwitch(
+                    newValue, false) && mCustomClockEnabled;
+                break;
+        }
+    }
+
+    private void updateAodImageView() {
+        if (mAodImageView == null || !mAodImageEnabled) {
+            if (mAodImageView != null) mAodImageView.setVisibility(View.GONE);
+            return;
+        }
+        loadAodImage();
+        if (mDozing) {
+            mAodImageView.setVisibility(View.VISIBLE);
+            mAodImageView.setScaleX(0f);
+            mAodImageView.setScaleY(0f);
+            mAodImageView.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .setDuration(500)
+                .withEndAction(this::startBurnInProtection)
+                .start();
+        } else {
+            mAodImageView.animate()
+                .scaleX(0f)
+                .scaleY(0f)
+                .setDuration(250)
+                .withEndAction(() -> {
+                    mAodImageView.setVisibility(View.GONE);
+                    stopBurnInProtection();
+                })
+                .start();
+        }
+    }
+
+    private void loadAodImage() {
+        if (mAodImageView == null || mCurrImagePath == null || mCurrImagePath.isEmpty() || mImageLoaded) return;
+        Bitmap bitmap = null;
+        try {
+            bitmap = BitmapFactory.decodeFile(mCurrImagePath);
+            if (bitmap != null) {
+                int targetSize = (int) mContext.getResources().getDimension(R.dimen.custom_aod_image_size);
+                Bitmap scaledBitmap = Bitmap.createScaledBitmap(bitmap, targetSize, targetSize, true);
+                try (java.io.ByteArrayOutputStream stream = new java.io.ByteArrayOutputStream()) {
+                    scaledBitmap.compress(Bitmap.CompressFormat.WEBP_LOSSLESS, 90, stream);
+                    byte[] byteArray = stream.toByteArray();
+                    Bitmap compressedBitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
+                    Drawable roundedImg = new CircleFramedDrawable(compressedBitmap, targetSize);
+                    mAodImageView.setImageDrawable(roundedImg);
+                    scaledBitmap.recycle();
+                    compressedBitmap.recycle();
+                    mImageLoaded = true;
+                }
+            } else {
+                mImageLoaded = false;
+                mAodImageView.setVisibility(View.GONE);
+            }
+        } catch (Exception e) {
+            mImageLoaded = false;
+            mAodImageView.setVisibility(View.GONE);
+        } finally {
+            if (bitmap != null) {
+                bitmap.recycle();
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/AnalogClockView.java b/packages/SystemUI/src/com/android/systemui/clocks/AnalogClockView.java
new file mode 100644
index 0000000000000..274701adafa80
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/AnalogClockView.java
@@ -0,0 +1,100 @@
+package com.android.systemui.clocks;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.Calendar;
+
+public class AnalogClockView extends View {
+    private Paint mPaint;
+    private float centerX, centerY, radius;
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    public AnalogClockView(Context context) {
+        super(context);
+        init();
+    }
+
+    public AnalogClockView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public AnalogClockView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);  // Smooth edges
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                invalidate(); // Redraw the view
+                handler.postDelayed(this, 1000); // Update every second
+            }
+        }, 1000);
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+        centerX = width / 2;
+        centerY = height / 2;
+        radius = Math.min(centerX, centerY) - 20; // Leave margin
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        // Keep the wallpaper background (no transparent background here)
+
+        // Draw clock face with hour markers
+        mPaint.setColor(0xFFFFFFFF); // White color for hour markers
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setStrokeWidth(5);
+        for (int i = 0; i < 12; i++) {
+            float angle = (float) (Math.PI / 6 * i); // 30 degrees per hour
+            float startX = (float) (centerX + radius * 0.85 * Math.cos(angle));
+            float startY = (float) (centerY + radius * 0.85 * Math.sin(angle));
+            float endX = (float) (centerX + radius * 0.95 * Math.cos(angle));
+            float endY = (float) (centerY + radius * 0.95 * Math.sin(angle));
+            canvas.drawRect(startX - 5, startY - 5, endX + 5, endY + 5, mPaint);
+        }
+
+        // Get current time
+        Calendar calendar = Calendar.getInstance();
+        int hour = calendar.get(Calendar.HOUR);
+        int minute = calendar.get(Calendar.MINUTE);
+
+        // Draw hour hand
+        mPaint.setColor(0xFFFFFFFF); // White color for clock hands
+        mPaint.setStrokeWidth(12);
+        float hourAngle = (float) (Math.PI / 6 * (hour + minute / 60.0)); // Convert time to angle
+        canvas.save();
+        canvas.rotate((float) Math.toDegrees(hourAngle), centerX, centerY);
+        canvas.drawLine(centerX, centerY, centerX, centerY - radius * 0.5f, mPaint);
+        canvas.restore();
+
+        // Draw minute hand
+        mPaint.setStrokeWidth(8);
+        float minuteAngle = (float) (Math.PI / 30 * minute); // Convert time to angle
+        canvas.save();
+        canvas.rotate((float) Math.toDegrees(minuteAngle), centerX, centerY);
+        canvas.drawLine(centerX, centerY, centerX, centerY - radius * 0.7f, mPaint);
+        canvas.restore();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        handler.removeCallbacksAndMessages(null); // Stop updates when detached
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/ClockStyle.java b/packages/SystemUI/src/com/android/systemui/clocks/ClockStyle.java
new file mode 100644
index 0000000000000..599216e25b5cc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/ClockStyle.java
@@ -0,0 +1,668 @@
+/*
+ * Copyright (C) 2023-2024 the risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.clocks;
+
+import android.app.KeyguardManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.ViewStub;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextClock;
+import android.widget.TextView;
+
+import com.android.systemui.clocks.UserProfileUtils;
+import com.android.systemui.res.R;
+import com.android.systemui.Dependency;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.tuner.TunerService;
+
+public class ClockStyle extends RelativeLayout implements TunerService.Tunable {
+
+    private static final int[] CLOCK_LAYOUTS = {
+            0,
+            R.layout.keyguard_clock_oos, // 1
+            R.layout.keyguard_clock_oos2, // 2
+            R.layout.keyguard_clock_center, // 3
+            R.layout.keyguard_clock_simple, // 4
+            R.layout.keyguard_clock_miui, // 5
+            R.layout.keyguard_clock_ide, // 6
+            R.layout.keyguard_clock_moto, // 7
+            R.layout.keyguard_clock_stylish, // 8
+            R.layout.keyguard_clock_stylish2, // 9
+            R.layout.keyguard_clock_stylish3, // 10
+            R.layout.keyguard_clock_stylish4, // 11
+            R.layout.keyguard_clock_stylish5, // 12
+            R.layout.keyguard_clock_stylish6, // 13
+            R.layout.keyguard_clock_stylish7, // 14
+            R.layout.keyguard_clock_stylish8, // 15
+            R.layout.keyguard_clock_stylish9, // 16
+            R.layout.keyguard_clock_stylish10, // 17
+            R.layout.keyguard_clock_word, // 18
+            R.layout.keyguard_clock_life, // 19
+            R.layout.keyguard_clock_a9, // 20
+            R.layout.keyguard_clock_nos1, // 21
+            R.layout.keyguard_clock_nos2, // 22
+            R.layout.keyguard_clock_num, // 23
+            R.layout.keyguard_clock_accent, // 24
+            R.layout.keyguard_clock_analog, // 25
+            R.layout.keyguard_clock_block, // 26
+            R.layout.keyguard_clock_bubble, // 27
+            R.layout.keyguard_clock_label, // 28
+            R.layout.keyguard_clock_ios, // 29
+            R.layout.keyguard_clock_taden, // 30
+            R.layout.keyguard_clock_mont, // 31
+            R.layout.keyguard_clock_encode, // 32
+            R.layout.keyguard_clock_nos3, // 33
+            R.layout.keyguard_anci_clock_outline, // 34
+            R.layout.keyguard_anci_clock_ovalium, // 35
+            R.layout.keyguard_anci_clock_rectangle, // 36
+            R.layout.keyguard_anci_clock_wallet, // 37
+            R.layout.keyguard_anci_clockdate_clavicula, // 38
+            R.layout.keyguard_anci_clockdate_kln, // 39
+            R.layout.keyguard_anci_clockdate_miring, // 40
+            R.layout.keyguard_anci_clockdate_scapula, // 41
+            R.layout.keyguard_anci_clockdate_sternum, // 42
+            R.layout.keyguard_sparkCircle, // 43
+            R.layout.keyguard_sparkList, // 44
+            R.layout.keyguard_clock_miui2, // 45
+            R.layout.keyguard_clock_ios2, // 46
+            R.layout.keyguard_clock_ios3, // 47
+            R.layout.keyguard_clock_ios4, // 48
+            R.layout.keyguard_clock_ios5, // 49
+            R.layout.keyguard_clock_ios6, // 50
+            R.layout.keyguard_clock_ios7, // 51
+            R.layout.keyguard_clock_ios8, // 52
+            R.layout.keyguard_clock_ios9, // 53
+            R.layout.keyguard_clock_ios10, // 54
+            R.layout.keyguard_clock_ios11, // 55
+            R.layout.keyguard_clock_ios12, // 56
+            R.layout.keyguard_clock_big1, // 57
+            R.layout.keyguard_clock_big2, // 58
+            R.layout.keyguard_clock_big3, // 59
+            R.layout.keyguard_clock_sweet, // 60
+            R.layout.keyguard_clock_pixel, // 61
+            R.layout.keyguard_clock_samurai, // 62
+            R.layout.keyguard_clock_gateway, // 63
+    };
+
+    private final static int[] mCenterClocks = {2, 3, 5, 6, 7, 9, 10, 11, 12, 13,
+        14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26 , 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43};
+
+    private static final int[] mNoColorClocks = {1, 2, 25, 26};
+
+    public static final String CLOCK_STYLE_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_STYLE;
+    public static final String CLOCK_COLOR_MODE_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_COLOR_MODE;
+    public static final String CLOCK_CUSTOM_COLOR_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_CUSTOM_COLOR;
+    public static final String CLOCK_TEXT_OPACITY_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_OPACITY;
+    public static final String CLOCK_FRAME_MARGIN_TOP_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_MARGIN_TOP;
+    public static final String CLOCK_SIZE_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_SIZE;
+    public static final String CLOCK_AOD_ANIM_KEY = Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_AOD_ANIM;
+
+    public static final String COLOR_MODE_DEFAULT = "default";
+    public static final String COLOR_MODE_ACCENT = "accent";
+    public static final String COLOR_MODE_CUSTOM = "custom";
+
+    private static final int DEFAULT_STYLE = 0; // Disabled
+    private static final int DEFAULT_OPACITY = 100;
+    private static final int DEFAULT_MARGIN_TOP = 15;
+    private static final int DEFAULT_CUSTOM_COLOR = Color.WHITE;
+    private static final int AOD_OPACITY_CAP = 70;
+    private static final int DEFAULT_CLOCK_SIZE = 100;
+    private static final int MIN_CLOCK_SIZE = 50;
+    private static final int MAX_CLOCK_SIZE = 150;
+
+    private static final long AOD_UPDATE_INTERVAL_MILLIS = 60_000L;
+
+    private static final long UPDATE_INTERVAL_MILLIS = 15_000L;
+
+    private static final float AOD_SCALE_DOWN = 0.85f;
+    private static final long AOD_ANIM_OUT_MS = 300L;
+    private static final long AOD_ANIM_IN_MS  = 400L;
+
+    private boolean mAodAnimEnabled = true;
+
+    private final Context mContext;
+    private final KeyguardManager mKeyguardManager;
+    private final TunerService mTunerService;
+
+    private View currentClockView;
+    private ViewStub mClockStub;
+    private ViewGroup mClockContainer;
+
+    private int mClockStyle;
+    private String mColorMode = COLOR_MODE_DEFAULT;
+    private int mCustomColor = DEFAULT_CUSTOM_COLOR;
+    private int mClockOpacity = DEFAULT_OPACITY;
+    private int mClockFrameMarginTop = DEFAULT_MARGIN_TOP;
+    private int mClockSizeScale = DEFAULT_CLOCK_SIZE;
+
+    private long lastUpdateTimeMillis = 0;
+
+    private final StatusBarStateController mStatusBarStateController;
+    private boolean mDozing;
+
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    // Burn-in protection
+    private static final int BURN_IN_PROTECTION_INTERVAL = 10_000;
+    private static final int BURN_IN_PROTECTION_MAX_SHIFT = 4;
+    private int mCurrentShiftX = 0;
+    private int mCurrentShiftY = 0;
+
+    private boolean mCallbacksRegistered = false;
+
+    private final BroadcastReceiver mScreenReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (Intent.ACTION_SCREEN_ON.equals(action)) {
+                forceTimeUpdate();
+            } else if (Intent.ACTION_TIME_TICK.equals(action)
+                    || Intent.ACTION_TIME_CHANGED.equals(action)) {
+                onTimeChanged();
+            } else if ("com.android.systemui.doze.pulse".equals(action)) {
+                onTimeChanged();
+            }
+        }
+    };
+
+    private final Runnable mAodTickRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (!mDozing || mClockStyle == 0) return;
+
+            forceTimeUpdate();
+
+            long now = System.currentTimeMillis();
+            long nextMinute = ((now / AOD_UPDATE_INTERVAL_MILLIS) + 1) * AOD_UPDATE_INTERVAL_MILLIS;
+            mHandler.postDelayed(this, nextMinute - now);
+        }
+    };
+
+    private final Runnable mBurnInProtectionRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (!mDozing) return;
+            mCurrentShiftX = (int) (Math.random() * BURN_IN_PROTECTION_MAX_SHIFT * 2)
+                    - BURN_IN_PROTECTION_MAX_SHIFT;
+            mCurrentShiftY = (int) (Math.random() * BURN_IN_PROTECTION_MAX_SHIFT * 2)
+                    - BURN_IN_PROTECTION_MAX_SHIFT;
+            if (currentClockView != null) {
+                currentClockView.setTranslationX(mCurrentShiftX);
+                currentClockView.setTranslationY(mCurrentShiftY);
+            }
+            invalidate();
+            mHandler.postDelayed(this, BURN_IN_PROTECTION_INTERVAL);
+        }
+    };
+
+    private final StatusBarStateController.StateListener mStatusBarStateListener =
+            new StatusBarStateController.StateListener() {
+        @Override
+        public void onStateChanged(int newState) {}
+
+        @Override
+        public void onDozingChanged(boolean dozing) {
+            if (mDozing == dozing) return;
+            mDozing = dozing;
+            animateAodTransition(dozing);
+            applyClockAlpha();
+            applyTextClockColor(currentClockView != null ? currentClockView : ClockStyle.this);
+            if (mDozing) {
+                startBurnInProtection();
+                startAodTick();
+            } else {
+                stopBurnInProtection();
+                stopAodTick();
+                forceTimeUpdate();
+            }
+        }
+    };
+
+    public ClockStyle(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        mKeyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+        mTunerService = Dependency.get(TunerService.class);
+        mStatusBarStateController = Dependency.get(StatusBarStateController.class);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mClockStub = findViewById(R.id.clock_view_stub);
+        updateClockView();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (!mCallbacksRegistered) {
+            mTunerService.addTunable(this,
+                    CLOCK_STYLE_KEY,
+                    CLOCK_COLOR_MODE_KEY,
+                    CLOCK_CUSTOM_COLOR_KEY,
+                    CLOCK_TEXT_OPACITY_KEY,
+                    CLOCK_FRAME_MARGIN_TOP_KEY,
+                    CLOCK_SIZE_KEY,
+                    CLOCK_AOD_ANIM_KEY);
+            mStatusBarStateController.addCallback(mStatusBarStateListener);
+            mDozing = mStatusBarStateController.isDozing();
+            mStatusBarStateListener.onDozingChanged(mDozing);
+
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_SCREEN_ON);
+            filter.addAction(Intent.ACTION_TIME_TICK);
+            filter.addAction(Intent.ACTION_TIME_CHANGED);
+            filter.addAction("com.android.systemui.doze.pulse");
+            mContext.registerReceiver(mScreenReceiver, filter, Context.RECEIVER_EXPORTED);
+            mCallbacksRegistered = true;
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mCallbacksRegistered) {
+            mStatusBarStateController.removeCallback(mStatusBarStateListener);
+            mTunerService.removeTunable(this);
+            mHandler.removeCallbacks(mBurnInProtectionRunnable);
+            mHandler.removeCallbacks(mAodTickRunnable);
+            mContext.unregisterReceiver(mScreenReceiver);
+            mCallbacksRegistered = false;
+        }
+    }
+
+    private void startAodTick() {
+        if (mClockStyle == 0) return;
+        mHandler.removeCallbacks(mAodTickRunnable);
+        long now = System.currentTimeMillis();
+        long nextMinute = ((now / AOD_UPDATE_INTERVAL_MILLIS) + 1) * AOD_UPDATE_INTERVAL_MILLIS;
+        mHandler.postDelayed(mAodTickRunnable, nextMinute - now);
+    }
+
+    private void stopAodTick() {
+        mHandler.removeCallbacks(mAodTickRunnable);
+    }
+
+    private void startBurnInProtection() {
+        if (mClockStyle == 0) return;
+        mHandler.removeCallbacks(mBurnInProtectionRunnable);
+        mHandler.postDelayed(mBurnInProtectionRunnable, BURN_IN_PROTECTION_INTERVAL);
+    }
+
+    private void stopBurnInProtection() {
+        if (mClockStyle == 0) return;
+        mHandler.removeCallbacks(mBurnInProtectionRunnable);
+        if (currentClockView != null) {
+            currentClockView.setTranslationX(0);
+            currentClockView.setTranslationY(0);
+        }
+    }
+
+    private void updateTextClockViews(View view) {
+        if (view instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) view;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                updateTextClockViews(vg.getChildAt(i));
+            }
+        }
+        if (view instanceof TextClock) {
+            TextClock tc = (TextClock) view;
+            if (tc.getTag(R.id.original_typeface) != null) {
+                tc.setTypeface((Typeface) tc.getTag(R.id.original_typeface));
+            }
+            tc.refreshTime();
+        }
+    }
+
+    public void onTimeChanged() {
+        long now = System.currentTimeMillis();
+        if (now - lastUpdateTimeMillis >= UPDATE_INTERVAL_MILLIS) {
+            forceTimeUpdate();
+        }
+    }
+
+    private void forceTimeUpdate() {
+        if (currentClockView != null) {
+            restoreAllFonts(currentClockView);
+            updateTextClockViews(currentClockView);
+            lastUpdateTimeMillis = System.currentTimeMillis();
+        }
+    }
+
+    private void restoreAllFonts(View view) {
+        if (view instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) view;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                restoreAllFonts(vg.getChildAt(i));
+            }
+        }
+        if (view instanceof TextClock) {
+            TextClock tc = (TextClock) view;
+            if (tc.getTag(R.id.original_typeface) != null) {
+                tc.setTypeface((Typeface) tc.getTag(R.id.original_typeface));
+            }
+        } else if (view instanceof TextView) {
+            TextView tv = (TextView) view;
+            if (tv.getTag(R.id.original_typeface) != null) {
+                tv.setTypeface((Typeface) tv.getTag(R.id.original_typeface));
+            }
+        }
+    }
+
+    private int resolveClockColor() {
+        switch (mColorMode) {
+            case COLOR_MODE_ACCENT:
+                return mContext.getColor(
+                        mContext.getResources().getIdentifier(
+                                "system_accent1_100", "color", "android"));
+            case COLOR_MODE_CUSTOM:
+                return mCustomColor;
+            case COLOR_MODE_DEFAULT:
+            default:
+                return mContext.getColor(android.R.color.white);
+        }
+    }
+
+    private void applyClockAlpha() {
+        if (currentClockView == null) return;
+        int effective = (mDozing && mClockOpacity > AOD_OPACITY_CAP) ? AOD_OPACITY_CAP : mClockOpacity;
+        currentClockView.setAlpha(effective / 100f);
+    }
+
+    private void updateClockAppearance() {
+        if (currentClockView == null) return;
+        applyClockAlpha();
+        applyTextClockColor(currentClockView);
+        applyClockScaleAfterLayout(currentClockView);
+    }
+
+    private void updateClockTextColor() {
+        if (currentClockView == null) return;
+        applyTextClockColor(currentClockView);
+    }
+
+    private float getScaleFactor() {
+        int clamped = Math.max(MIN_CLOCK_SIZE, Math.min(MAX_CLOCK_SIZE, mClockSizeScale));
+        return clamped / 100f;
+    }
+
+    private void applyClockScale() {
+        if (currentClockView == null) return;
+        float scale = getScaleFactor();
+        currentClockView.setScaleX(scale);
+        currentClockView.setScaleY(scale);
+        currentClockView.setPivotX(currentClockView.getWidth() / 2f);
+        currentClockView.setPivotY(0f);
+    }
+
+    private void animateAodTransition(boolean toAod) {
+        if (currentClockView == null || !mAodAnimEnabled) return;
+        currentClockView.animate().cancel();
+        if (toAod) {
+            currentClockView.animate()
+                    .scaleX(AOD_SCALE_DOWN)
+                    .scaleY(AOD_SCALE_DOWN)
+                    .alpha(0f)
+                    .setDuration(AOD_ANIM_OUT_MS)
+                    .setInterpolator(new android.view.animation.AccelerateInterpolator(1.5f))
+                    .withEndAction(() -> {
+                        applyClockAlpha();
+                        currentClockView.setScaleX(AOD_SCALE_DOWN);
+                        currentClockView.setScaleY(AOD_SCALE_DOWN);
+                    })
+                    .start();
+        } else {
+            currentClockView.setScaleX(AOD_SCALE_DOWN);
+            currentClockView.setScaleY(AOD_SCALE_DOWN);
+            float targetScale = getScaleFactor();
+            currentClockView.animate()
+                    .scaleX(targetScale)
+                    .scaleY(targetScale)
+                    .alpha(mClockOpacity / 100f)
+                    .setDuration(AOD_ANIM_IN_MS)
+                    .setInterpolator(new android.view.animation.OvershootInterpolator(1.2f))
+                    .start();
+        }
+    }
+
+    private void applyClockScaleAfterLayout(final View view) {
+        if (view == null) return;
+        if (view.getWidth() > 0) {
+            applyClockScale();
+        } else {
+            view.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                @Override
+                public void onLayoutChange(View v, int l, int t, int r, int b,
+                        int ol, int ot, int or, int ob) {
+                    v.removeOnLayoutChangeListener(this);
+                    applyClockScale();
+                }
+            });
+        }
+    }
+
+    private void preloadFonts(View view) {
+        if (view instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) view;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                preloadFonts(vg.getChildAt(i));
+            }
+        }
+        if (view instanceof TextClock) {
+            TextClock tc = (TextClock) view;
+            Typeface tf = tc.getTypeface();
+            if (tf != null) {
+                tc.setTag(R.id.original_typeface, tf);
+                tc.setTypeface(tf);
+            }
+        } else if (view instanceof TextView) {
+            TextView tv = (TextView) view;
+            Typeface tf = tv.getTypeface();
+            if (tf != null) {
+                tv.setTag(R.id.original_typeface, tf);
+                tv.setTypeface(tf);
+            }
+        }
+    }
+
+    private void applyTextClockColor(View view) {
+        if (view == null) return;
+        if (isNoColorClock(mClockStyle)) return;
+        if (view instanceof ViewGroup) {
+            ViewGroup vg = (ViewGroup) view;
+            for (int i = 0; i < vg.getChildCount(); i++) {
+                applyTextClockColor(vg.getChildAt(i));
+            }
+        }
+        if (!(view instanceof TextClock)) return;
+        TextClock tc = (TextClock) view;
+        
+        if (tc.getTag(R.id.original_typeface) == null && tc.getTypeface() != null) {
+            tc.setTag(R.id.original_typeface, tc.getTypeface());
+        }
+        
+        if (tc.getTag(R.id.original_text_color) == null) {
+            tc.setTag(R.id.original_text_color, tc.getCurrentTextColor());
+        }
+        
+        if (tc.getTag(R.id.original_typeface) != null) {
+            tc.setTypeface((Typeface) tc.getTag(R.id.original_typeface));
+        }
+        
+        int originalColor = (Integer) tc.getTag(R.id.original_text_color);
+        int whiteColor    = mContext.getColor(android.R.color.white);
+        boolean isWhiteOriginal = (originalColor & 0x00FFFFFF) == (whiteColor & 0x00FFFFFF);
+        if (mDozing) {
+            tc.setTextColor(whiteColor);
+            return;
+        }
+        if (!isWhiteOriginal) {
+           tc.setTextColor(originalColor);
+           return;
+        }
+        tc.setTextColor(resolveClockColor());
+    }
+
+    private void updateClockFrameMargin() {
+        View clockFrame = findViewById(R.id.clock_frame);
+        if (clockFrame != null) {
+            ViewGroup.MarginLayoutParams params =
+                    (ViewGroup.MarginLayoutParams) clockFrame.getLayoutParams();
+            int marginPx = (int) (mClockFrameMarginTop
+                    * mContext.getResources().getDisplayMetrics().density);
+            params.topMargin = marginPx;
+            clockFrame.setLayoutParams(params);
+        }
+    }
+
+    private void updateClockView() {
+        if (currentClockView != null) {
+            ViewParent parent = currentClockView.getParent();
+            if (parent instanceof ViewGroup) {
+                ((ViewGroup) parent).removeView(currentClockView);
+            }
+            currentClockView = null;
+        }
+        if (mClockStyle > 0 && mClockStyle < CLOCK_LAYOUTS.length) {
+            if (mClockStub != null) {
+                mClockStub.setLayoutResource(CLOCK_LAYOUTS[mClockStyle]);
+                currentClockView = mClockStub.inflate();
+                mClockContainer = (ViewGroup) currentClockView.getParent();
+                mClockStub = null;
+            } else if (mClockContainer != null) {
+                currentClockView = LayoutInflater.from(mContext)
+                        .inflate(CLOCK_LAYOUTS[mClockStyle], mClockContainer, false);
+                mClockContainer.addView(currentClockView);
+            }
+            
+            if (currentClockView != null) {
+                preloadFonts(currentClockView);
+            }
+            
+            ImageView userProfileIcon = currentClockView.findViewById(R.id.user_profile_icon);
+            if (userProfileIcon != null) {
+                Drawable profileDrawable = UserProfileUtils.getUserProfileIcon(mContext);
+                userProfileIcon.setImageDrawable(profileDrawable);
+            }
+            
+            TextView userNameView = currentClockView.findViewById(R.id.user_name);
+            if (userNameView != null) {
+                String username = UserProfileUtils.getUsername(mContext);
+                userNameView.setText(username);
+            }
+            
+            TextView deviceNameView = currentClockView.findViewById(R.id.device_name);
+            if (deviceNameView != null) {
+                String deviceName = UserProfileUtils.getDeviceName();
+                deviceNameView.setText(deviceName);
+            }
+            if (currentClockView != null) {
+                int gravity = isCenterClock(mClockStyle) ? Gravity.CENTER : Gravity.START;
+                if (currentClockView instanceof LinearLayout) {
+                    ((LinearLayout) currentClockView).setGravity(gravity);
+                }
+                updateClockAppearance();
+                updateClockFrameMargin();
+            }
+        }
+        forceTimeUpdate();
+        setVisibility(mClockStyle != 0 ? View.VISIBLE : View.GONE);
+
+        if (mDozing && mClockStyle != 0) {
+            startAodTick();
+        }
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case CLOCK_STYLE_KEY:
+                mClockStyle = TunerService.parseInteger(newValue, DEFAULT_STYLE);
+                if (mClockStyle != 0) {
+                    Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                            Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE, 0,
+                            UserHandle.USER_CURRENT);
+                }
+                updateClockView();
+                break;
+            case CLOCK_COLOR_MODE_KEY:
+                mColorMode = (newValue != null) ? newValue : COLOR_MODE_DEFAULT;
+                updateClockTextColor();
+                break;
+            case CLOCK_CUSTOM_COLOR_KEY:
+                mCustomColor = TunerService.parseInteger(newValue, DEFAULT_CUSTOM_COLOR);
+                if (COLOR_MODE_CUSTOM.equals(mColorMode)) {
+                    updateClockTextColor();
+                }
+                break;
+            case CLOCK_TEXT_OPACITY_KEY:
+                mClockOpacity = TunerService.parseInteger(newValue, DEFAULT_OPACITY);
+                mClockOpacity = Math.max(0, Math.min(100, mClockOpacity));
+                applyClockAlpha();
+                break;
+            case CLOCK_FRAME_MARGIN_TOP_KEY:
+                mClockFrameMarginTop = TunerService.parseInteger(newValue, DEFAULT_MARGIN_TOP);
+                mClockFrameMarginTop = Math.max(0, Math.min(100, mClockFrameMarginTop));
+                updateClockFrameMargin();
+                break;
+            case CLOCK_SIZE_KEY:
+                mClockSizeScale = TunerService.parseInteger(newValue, DEFAULT_CLOCK_SIZE);
+                mClockSizeScale = Math.max(MIN_CLOCK_SIZE, Math.min(MAX_CLOCK_SIZE, mClockSizeScale));
+                applyClockScale();
+                break;
+            case CLOCK_AOD_ANIM_KEY:
+                mAodAnimEnabled = TunerService.parseInteger(newValue, 1) != 0;
+                break;
+        }
+    }
+
+    private boolean isCenterClock(int clockStyle) {
+        for (int centerClock : mCenterClocks) {
+            if (centerClock == clockStyle) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isNoColorClock(int clockStyle) {
+        for (int noColorClock : mNoColorClocks) {
+            if (noColorClock == clockStyle) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/NothingAnalogClockView.java b/packages/SystemUI/src/com/android/systemui/clocks/NothingAnalogClockView.java
new file mode 100644
index 0000000000000..8faeb31fe5655
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/NothingAnalogClockView.java
@@ -0,0 +1,141 @@
+package com.android.systemui.clocks;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.Calendar;
+
+public class NothingAnalogClockView extends View {
+
+    private Paint mPaint;
+    private float centerX, centerY, width, height;
+
+    public NothingAnalogClockView(Context context) {
+        super(context);
+        init();
+    }
+
+    public NothingAnalogClockView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public NothingAnalogClockView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true); // Smooth edges for drawing
+        mPaint.setStrokeCap(Paint.Cap.ROUND); // Rounded ends for clock hands
+
+        // Refresh the clock every second
+        postInvalidateOnAnimation();
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+
+        this.width = width;
+        this.height = height;
+
+        centerX = width / 2f;
+        centerY = height / 2f;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        // Get current time
+        Calendar calendar = Calendar.getInstance();
+        int hour = calendar.get(Calendar.HOUR);
+        int minute = calendar.get(Calendar.MINUTE);
+        int second = calendar.get(Calendar.SECOND);
+
+        // Draw clock ticks in a rectangular shape
+        drawRectangularTicks(canvas);
+
+        // Draw hour hand
+        drawHourHand(canvas, hour, minute);
+
+        // Draw minute hand
+        drawMinuteHand(canvas, minute);
+
+        // Draw second hand
+        drawSecondHand(canvas, second);
+
+        // Trigger continuous updates
+        postInvalidateDelayed(16); // Smooth 60 FPS animation
+    }
+
+    private void drawRectangularTicks(Canvas canvas) {
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setColor(0xFFFFFFFF); // White color for ticks
+
+        // Rectangular bounds (inset from edges)
+        float horizontalInset = width * 0.1f;
+        float verticalInset = height * 0.2f;
+
+        for (int i = 0; i < 60; i++) {
+            float angle = (float) (Math.PI / 30 * i);
+            float startX, startY, endX, endY;
+
+            if (i % 5 == 0) {
+                // Major ticks (longer and thicker)
+                mPaint.setStrokeWidth(6);
+                startX = (float) (centerX + (width / 2 - horizontalInset) * Math.cos(angle));
+                startY = (float) (centerY + (height / 2 - verticalInset) * Math.sin(angle));
+                endX = (float) (centerX + (width / 2 - horizontalInset * 1.5) * Math.cos(angle));
+                endY = (float) (centerY + (height / 2 - verticalInset * 1.5) * Math.sin(angle));
+            } else {
+                // Minor ticks (shorter and thinner)
+                mPaint.setStrokeWidth(2);
+                startX = (float) (centerX + (width / 2 - horizontalInset) * Math.cos(angle));
+                startY = (float) (centerY + (height / 2 - verticalInset) * Math.sin(angle));
+                endX = (float) (centerX + (width / 2 - horizontalInset * 1.2) * Math.cos(angle));
+                endY = (float) (centerY + (height / 2 - verticalInset * 1.2) * Math.sin(angle));
+            }
+
+            canvas.drawLine(startX, startY, endX, endY, mPaint);
+        }
+    }
+
+    private void drawHourHand(Canvas canvas, int hour, int minute) {
+        float hourAngle = (float) (Math.PI / 6 * (hour + minute / 60.0));
+        mPaint.setColor(0xFFFFFFFF); // White color for hour hand
+        mPaint.setStrokeWidth(12);
+
+        float endX = (float) (centerX + (width * 0.25f) * Math.cos(hourAngle - Math.PI / 2));
+        float endY = (float) (centerY + (height * 0.25f) * Math.sin(hourAngle - Math.PI / 2));
+
+        canvas.drawLine(centerX, centerY, endX, endY, mPaint);
+    }
+
+    private void drawMinuteHand(Canvas canvas, int minute) {
+        float minuteAngle = (float) (Math.PI / 30 * minute);
+        mPaint.setColor(0xFFFFFFFF); // White color for minute hand
+        mPaint.setStrokeWidth(8);
+
+        float endX = (float) (centerX + (width * 0.4f) * Math.cos(minuteAngle - Math.PI / 2));
+        float endY = (float) (centerY + (height * 0.4f) * Math.sin(minuteAngle - Math.PI / 2));
+
+        canvas.drawLine(centerX, centerY, endX, endY, mPaint);
+    }
+
+    private void drawSecondHand(Canvas canvas, int second) {
+        float secondAngle = (float) (Math.PI / 30 * second);
+        mPaint.setColor(0xFFFF0000); // Red color for second hand
+        mPaint.setStrokeWidth(4);
+
+        float endX = (float) (centerX + (width * 0.45f) * Math.cos(secondAngle - Math.PI / 2));
+        float endY = (float) (centerY + (height * 0.45f) * Math.sin(secondAngle - Math.PI / 2));
+
+        canvas.drawLine(centerX, centerY, endX, endY, mPaint);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/UserProfileUtils.java b/packages/SystemUI/src/com/android/systemui/clocks/UserProfileUtils.java
new file mode 100644
index 0000000000000..db99ca56c2d56
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/UserProfileUtils.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024-2025 Project Infinity X
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.clocks;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.content.pm.UserInfo;
+import android.os.SystemProperties;
+import android.util.Log;
+import com.android.internal.util.UserIcons;
+import com.android.settingslib.drawable.CircleFramedDrawable;
+
+public class UserProfileUtils {
+
+    private static final String TAG = "UserProfileUtils";
+
+    public static Drawable getUserProfileIcon(Context context) {
+        if (context == null) {
+            Log.e(TAG, "Context is null");
+            return null;
+        }
+
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (userManager == null) {
+            Log.e(TAG, "UserManager is null");
+            return null;
+        }
+
+        int userId = UserHandle.USER_CURRENT;
+        if (userId < 0) {
+            userId = UserHandle.myUserId();
+        }
+
+        Bitmap userIcon = userManager.getUserIcon(userId);
+        if (userIcon == null) {
+            try {
+                userIcon = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(
+                        context.getResources(), userId, false));
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to get default user icon: " + e.getMessage());
+                return null;
+            }
+        }
+
+        return CircleFramedDrawable.getInstance(context, userIcon);
+    }
+
+    public static String getUsername(Context context) {
+        if (context == null) {
+            Log.e(TAG, "Context is null");
+            return "User";
+        }
+
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (userManager == null) {
+            Log.e(TAG, "UserManager is null");
+            return "User";
+        }
+
+        int userId = UserHandle.USER_CURRENT;
+        if (userId < 0) {
+            userId = UserHandle.myUserId();
+        }
+
+        UserInfo userInfo = userManager.getUserInfo(userId);
+        if (userInfo == null) {
+            Log.e(TAG, "UserInfo is null for userId: " + userId);
+            return "User";
+        }
+
+        return userInfo.name;
+    }
+
+    public static String getDeviceName() {
+        String marketName = SystemProperties.get("ro.product.marketname");
+        String modelName = SystemProperties.get("ro.product.model");
+        String romDevice = SystemProperties.get("ro.lunaris.device");
+
+        if (marketName != null && !marketName.isEmpty()) {
+            return marketName;
+        } else if (modelName != null && !modelName.isEmpty()) {
+            return modelName;
+        } else if (romDevice != null && !romDevice.isEmpty()) {
+            return romDevice;
+        } else {
+            Log.d(TAG, "No device name property found, using default.");
+            return " ";
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/clocks/WordClockView.java b/packages/SystemUI/src/com/android/systemui/clocks/WordClockView.java
new file mode 100644
index 0000000000000..62211f7b34a3c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/clocks/WordClockView.java
@@ -0,0 +1,78 @@
+package com.android.systemui.clocks;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class WordClockView extends TextView {
+    private final Handler handler = new Handler(Looper.getMainLooper());
+    private final Runnable updateTimeRunnable = new Runnable() {
+        @Override
+        public void run() {
+            updateClock();
+            handler.postDelayed(this, 1000);
+        }
+    };
+
+    public WordClockView(Context context) {
+        super(context);
+        init();
+    }
+
+    public WordClockView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public WordClockView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        updateClock();
+        handler.post(updateTimeRunnable);
+    }
+
+    private void updateClock() {
+        String currentTime = new SimpleDateFormat("hh:mm a", Locale.getDefault()).format(new Date());
+        String[] timeParts = currentTime.split(":");
+        String hour = timeParts[0];
+        String minute = timeParts[1].split(" ")[0];
+
+        String hourInWords = convertToWords(Integer.parseInt(hour));
+        String minuteInWords = convertToWords(Integer.parseInt(minute));
+
+        // Set only the hour and minute in words
+        setText(hourInWords + "\n" + minuteInWords);
+    }
+
+    private String convertToWords(int num) {
+        String[] words = {
+                "Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
+                "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen",
+                "Seventeen", "Eighteen", "Nineteen", "Twenty", "Twenty-One", "Twenty-Two",
+                "Twenty-Three", "Twenty-Four", "Twenty-Five", "Twenty-Six", "Twenty-Seven",
+                "Twenty-Eight", "Twenty-Nine", "Thirty", "Thirty-One", "Thirty-Two",
+                "Thirty-Three", "Thirty-Four", "Thirty-Five", "Thirty-Six", "Thirty-Seven",
+                "Thirty-Eight", "Thirty-Nine", "Forty", "Forty-One", "Forty-Two",
+                "Forty-Three", "Forty-Four", "Forty-Five", "Forty-Six", "Forty-Seven",
+                "Forty-Eight", "Forty-Nine", "Fifty", "Fifty-One", "Fifty-Two", "Fifty-Three",
+                "Fifty-Four", "Fifty-Five", "Fifty-Six", "Fifty-Seven", "Fifty-Eight",
+                "Fifty-Nine"
+        };
+        return num < words.length ? words[num] : "";
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        handler.removeCallbacks(updateTimeRunnable); // Stop updates when view is detached
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/common/ringer/RingerModeInteractor.kt b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerModeInteractor.kt
new file mode 100644
index 0000000000000..e12297b2cbe72
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerModeInteractor.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.common.ringer
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioManager
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.Channel.Factory.CONFLATED
+import android.os.Vibrator
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.VolumeOff
+import androidx.compose.material.icons.filled.VolumeUp
+import androidx.compose.material.icons.filled.Vibration
+import androidx.compose.ui.graphics.vector.ImageVector
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.*
+import kotlin.math.roundToInt
+
+interface RingerModeInteractor {
+    val ringerMode: Flow<Int>
+    val targetPositionFlow: Flow<Float>
+    val dndMode: Flow<Boolean>
+    fun isDndEnabled(): Boolean
+    fun toggleDnd()
+
+    fun getCurrentMode(): Int
+    fun setRingerMode(mode: Int)
+    fun getAvailableRingerModes(): List<RingerModeOption>
+    fun getNumberOfModes(): Int
+    fun getMaxOffset(): Float
+    fun getTargetPosition(currentMode: Int): Float
+    fun snapMode(offset: Float): Int
+}
+
+data class RingerModeOption(
+    val mode: Int,
+    val icon: ImageVector,
+    val label: String
+)
+
+class RingerModeInteractorImpl(
+    private val context: Context,
+    private val audioManager: AudioManager,
+    private val notificationManager: NotificationManager
+) : RingerModeInteractor {
+
+    private val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
+    private val hasVibrator: Boolean = vibrator?.hasVibrator() == true
+
+    override val ringerMode: Flow<Int> = callbackFlow {
+        trySend(audioManager.ringerMode)
+
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                if (intent?.action == AudioManager.RINGER_MODE_CHANGED_ACTION) {
+                    trySend(audioManager.ringerMode)
+                }
+            }
+        }
+
+        val filter = IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION)
+        context.registerReceiver(receiver, filter)
+        awaitClose { context.unregisterReceiver(receiver) }
+    }.distinctUntilChanged()
+
+    override val dndMode: Flow<Boolean> = callbackFlow {
+        trySend(isDndEnabled())
+        
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                if (intent?.action == NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED) {
+                    trySend(isDndEnabled())
+                }
+            }
+        }
+        
+        val filter = IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED)
+        context.registerReceiver(receiver, filter)
+        
+        awaitClose {
+            context.unregisterReceiver(receiver)
+        }
+    }.distinctUntilChanged()
+
+    override fun getCurrentMode(): Int = audioManager.ringerModeInternal
+
+    override fun setRingerMode(mode: Int) {
+        audioManager.ringerModeInternal = mode
+    }
+
+    override fun getAvailableRingerModes(): List<RingerModeOption> {
+        val modes = mutableListOf(
+            RingerModeOption(AudioManager.RINGER_MODE_SILENT, Icons.Filled.VolumeOff, "Silent"),
+            RingerModeOption(AudioManager.RINGER_MODE_NORMAL, Icons.Filled.VolumeUp, "Normal")
+        )
+
+        if (hasVibrator) {
+            modes.add(1, RingerModeOption(AudioManager.RINGER_MODE_VIBRATE, Icons.Filled.Vibration, "Vibrate"))
+        }
+
+        return modes
+    }
+
+    override fun getNumberOfModes(): Int = getAvailableRingerModes().size
+
+    override fun getMaxOffset(): Float = (getNumberOfModes() - 1).coerceAtLeast(1).toFloat()
+
+    override fun getTargetPosition(currentMode: Int): Float {
+        val modes = getAvailableRingerModes()
+        val idx = modes.indexOfFirst { it.mode == currentMode }.takeIf { it >= 0 } ?: 0
+        return idx.toFloat()
+    }
+
+    override fun snapMode(offset: Float): Int {
+        val modes = getAvailableRingerModes()
+        val maxIndex = (modes.size - 1).coerceAtLeast(0)
+        val snappedIndex = offset.roundToInt().coerceIn(0, maxIndex)
+        return modes[snappedIndex].mode
+    }
+
+    override val targetPositionFlow: Flow<Float> =
+        ringerMode.map { getTargetPosition(it) }.distinctUntilChanged()
+
+    override fun isDndEnabled(): Boolean = 
+        notificationManager.currentInterruptionFilter != NotificationManager.INTERRUPTION_FILTER_ALL
+    
+    override fun toggleDnd() {
+        val newFilter = if (isDndEnabled()) {
+            NotificationManager.INTERRUPTION_FILTER_ALL
+        } else {
+            NotificationManager.INTERRUPTION_FILTER_PRIORITY
+        }
+        notificationManager.setInterruptionFilter(newFilter)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderInterfaces.kt b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderInterfaces.kt
new file mode 100644
index 0000000000000..01e5b193c4d21
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderInterfaces.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.common.ringer
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.unit.Dp
+
+interface RingerSliderTheme {
+    @get:Composable
+    val activeBg: Color
+    
+    @get:Composable
+    val activeBgBrush: Brush?
+        get() = null
+
+    @get:Composable
+    val neutralBg: Color
+    
+    @get:Composable
+    val activeIcon: Color
+    
+    @get:Composable
+    val neutralIcon: Color
+    
+    @get:Composable
+    val dndBg: Color
+    
+    @get:Composable
+    val dndIcon: Color
+
+    val dozeStroke: Dp
+}
+
+interface RingerSliderDimens {
+    val totalWidth: Dp?
+    val thumbSize: Dp
+    val iconSize: Dp
+    val thumbPadding: Dp
+    val dotSize: Dp
+}
diff --git a/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderWidget.kt b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderWidget.kt
new file mode 100644
index 0000000000000..c8f662039279f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/common/ringer/RingerSliderWidget.kt
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.common.ringer
+
+import androidx.compose.animation.*
+import androidx.compose.animation.core.*
+import androidx.compose.foundation.*
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.*
+import androidx.compose.foundation.gestures.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.draw.*
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.input.pointer.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import kotlin.math.roundToInt
+
+@Composable
+fun RingerSliderWidget(
+    interactor: RingerModeInteractor,
+    theme: RingerSliderTheme,
+    dimens: RingerSliderDimens,
+    modifier: Modifier = Modifier,
+    isDozing: Boolean = false,
+    border: Modifier = Modifier,
+    containerShape: Shape = RoundedCornerShape(24.dp),
+    thumbShape: Shape = RoundedCornerShape(16.dp),
+    onLongClick: (() -> Unit)? = null
+) {
+    val availableModes = interactor.getAvailableRingerModes()
+    val numModes = interactor.getNumberOfModes()
+    val maxOffset = interactor.getMaxOffset()
+    val isDndEnabled by interactor.dndMode.collectAsState(initial = interactor.isDndEnabled())
+    
+    val targetPosition by interactor.targetPositionFlow.collectAsState(
+        initial = interactor.getTargetPosition(interactor.getCurrentMode())
+    )
+
+    var dragOffset by remember { mutableStateOf(targetPosition) }
+    var isDragging by remember { mutableStateOf(false) }
+
+    val animatedPosition by animateFloatAsState(
+        targetValue = if (isDragging) dragOffset else targetPosition,
+        animationSpec = tween(
+            durationMillis = 250,
+            easing = LinearOutSlowInEasing
+        ),
+        label = "ringer_position"
+    )
+
+    LaunchedEffect(targetPosition) {
+        if (!isDragging) dragOffset = targetPosition
+    }
+
+    val interactionSource = remember { MutableInteractionSource() }
+
+    Box(
+        modifier = modifier
+            .height(dimens.thumbSize)
+            .background(
+                when {
+                    isDozing -> Color.Transparent
+                    isDndEnabled -> theme.dndBg
+                    else -> theme.neutralBg
+                },
+                containerShape
+            )
+            .clip(containerShape)
+            .then(
+                if (isDozing)
+                    Modifier.border(theme.dozeStroke, Color.White, containerShape)
+                else border
+            )
+.pointerInput(Unit) {
+    detectTapGestures(
+        onTap = { tapOffset ->
+            if (isDndEnabled) return@detectTapGestures
+
+            val sectionWidth = size.width / numModes.toFloat()
+            val snappedIndex = (tapOffset.x / sectionWidth).toInt().coerceIn(0, numModes - 1)
+
+            dragOffset = snappedIndex.toFloat()
+
+            interactor.setRingerMode(availableModes[snappedIndex].mode)
+        },
+        onLongPress = {
+            onLongClick?.invoke()
+        }
+    )
+}
+            .pointerInput(Unit) {
+                detectDragGestures(
+                    onDragStart = { isDragging = true },
+                    onDragEnd = {
+                        isDragging = false
+                        if (isDndEnabled) return@detectDragGestures
+
+                        interactor.setRingerMode(interactor.snapMode(dragOffset))
+                    },
+                    onDragCancel = { 
+                        isDragging = false
+                    }
+                ) { change, dragAmount ->
+                    if (isDndEnabled) {
+                        change.consume()
+                        return@detectDragGestures
+                    }
+                    change.consume()
+                    val trackWidth = size.width - dimens.thumbSize.toPx()
+                    val pixelPerUnit = trackWidth / maxOffset
+                    dragOffset = (dragOffset + (dragAmount.x / pixelPerUnit))
+                        .coerceIn(0f, maxOffset)
+                }
+            },
+        contentAlignment = Alignment.CenterStart
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            val currentIndex = animatedPosition.roundToInt()
+            availableModes.forEachIndexed { index, _ ->
+                val dotAlpha by animateFloatAsState(
+                    targetValue = if (isDndEnabled) 0f else if (currentIndex == index) 0f else 0.4f,
+                    animationSpec = tween(durationMillis = 200),
+                    label = "dot_alpha"
+                )
+                Box(
+                    modifier = Modifier
+                        .size(dimens.dotSize)
+                        .graphicsLayer { alpha = dotAlpha }
+                        .background(
+                            if (isDozing) Color.White else if (isDndEnabled) theme.dndIcon else theme.neutralIcon,
+                            RoundedCornerShape(50)
+                        )
+                )
+            }
+        }
+
+        BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+            val totalWidth = maxWidth
+            val step = if (numModes > 1) (totalWidth - dimens.thumbSize) / (numModes - 1) else 0.dp
+            val thumbOffset = if (isDndEnabled) {
+                (totalWidth - dimens.thumbSize) / 2f
+            } else {
+                step * animatedPosition
+            }
+            
+            Box(
+                modifier = Modifier
+                    .offset(x = thumbOffset)
+                    .size(dimens.thumbSize)
+                    .padding(dimens.thumbPadding)
+                    .background(
+                        when {
+                            isDozing -> Color.Transparent
+                            isDndEnabled -> theme.dndBg
+                            else -> Color.Transparent
+                        },
+                        thumbShape
+                    )
+                    .then(
+                        if (!isDozing && !isDndEnabled) {
+                            val brush = theme.activeBgBrush
+                            if (brush != null) {
+                                Modifier.background(brush, thumbShape)
+                            } else {
+                                Modifier.background(theme.activeBg, thumbShape)
+                            }
+                        } else Modifier
+                    )
+                    .then(
+                        when {
+                            isDozing ->
+                            Modifier.border(theme.dozeStroke, Color.White, thumbShape)
+                            isDndEnabled ->
+                                Modifier.border(2.dp, theme.dndBg, thumbShape)
+                            else ->
+                                Modifier.border(2.dp, theme.activeBgBrush ?: SolidColor(theme.activeBg), thumbShape)
+                        }
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                val currentIndex = animatedPosition.roundToInt().coerceIn(0, numModes - 1)
+                Icon(
+                    imageVector = when {
+                        isDndEnabled -> Icons.Filled.DoNotDisturb
+                        else -> availableModes[currentIndex].icon
+                    },
+                    contentDescription = null,
+                    tint = when {
+                        isDozing -> Color.White
+                        isDndEnabled -> theme.dndIcon
+                        else -> theme.activeIcon
+                    },
+                    modifier = Modifier.size(dimens.iconSize)
+                )
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/header/DaylightHeaderProvider.java b/packages/SystemUI/src/com/android/systemui/crdroid/header/DaylightHeaderProvider.java
new file mode 100644
index 0000000000000..05a3ef33f3df5
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/header/DaylightHeaderProvider.java
@@ -0,0 +1,482 @@
+/*
+ *  Copyright (C) 2015 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.android.systemui.crdroid.header;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.database.ContentObserver;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.Log;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.SparseArray;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import com.android.systemui.res.R;
+import com.android.internal.util.matrixx.Utils;
+
+public class DaylightHeaderProvider implements
+        StatusBarHeaderMachine.IStatusBarHeaderProvider {
+
+    public static final String TAG = "DaylightHeaderProvider";
+    private static final boolean DEBUG = false;
+
+    private class DaylightHeaderInfo {
+        public int mType = 0;
+        public int mHour = -1;
+        public int mDay = -1;
+        public int mMonth = -1;
+        public String mImage;
+    }
+    // default in SystemUI
+    private static final String HEADER_PACKAGE_DEFAULT = "com.android.systemui";
+
+    private Context mContext;
+    private List<DaylightHeaderInfo> mHeadersList;
+    private Resources mRes;
+    private String mPackageName;
+    private String mHeaderName;
+    private String mSettingHeaderPackage;
+    private PendingIntent mAlarmIntent;
+    private boolean mRandomMode;
+    private int mHeaderIndex;
+    private boolean mLinearMode;
+    private int mAlarmIntervalMinutes = 0;
+
+    public DaylightHeaderProvider(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public String getName() {
+        return "daylight";
+    }
+
+    @Override
+    public void settingsChanged(Uri uri) {
+        final String settingHeaderPackage = Settings.System.getStringForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK,
+                UserHandle.USER_CURRENT);
+        final boolean customHeader = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0,
+                UserHandle.USER_CURRENT) == 1;
+
+        if (customHeader) {
+            stopAlarm();
+            if (settingHeaderPackage == null) {
+                loadDefaultHeaderPackage();
+            } else if (mSettingHeaderPackage == null || !settingHeaderPackage.equals(mSettingHeaderPackage)) {
+                mSettingHeaderPackage = settingHeaderPackage;
+                loadCustomHeaderPackage();
+            }
+            startAlarm();
+        }
+    }
+
+    @Override
+    public void enableProvider() {
+        settingsChanged(null);
+    }
+
+    @Override
+    public void disableProvider() {
+        stopAlarm();
+   }
+
+    private void stopAlarm() {
+        if (mAlarmIntent != null) {
+            final AlarmManager alarmManager = (AlarmManager) mContext
+                    .getSystemService(Context.ALARM_SERVICE);
+            if (DEBUG) Log.i(TAG, "stop alarm");
+            alarmManager.cancel(mAlarmIntent);
+            mAlarmIntent.cancel();
+            mAlarmIntent = null;
+        }
+    }
+
+    private void startAlarm() {
+        // TODO: actually this should find out the next needed alarm
+        // instead of forcing it every interval
+        final Calendar c = Calendar.getInstance();
+        final AlarmManager alarmManager = (AlarmManager) mContext
+                .getSystemService(Context.ALARM_SERVICE);
+
+        if (mAlarmIntent != null) {
+            alarmManager.cancel(mAlarmIntent);
+            mAlarmIntent.cancel();
+        }
+
+        Intent intent = new Intent(StatusBarHeaderMachine.STATUS_BAR_HEADER_UPDATE_ACTION);
+        mAlarmIntent = PendingIntent.getBroadcast(mContext, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
+
+        if (mAlarmIntervalMinutes == 0) {
+            c.add(Calendar.HOUR_OF_DAY, 1);
+            c.set(Calendar.MINUTE, 0);
+        }
+        long alarmStart = c.getTimeInMillis();
+        long interval = mAlarmIntervalMinutes == 0 ? AlarmManager.INTERVAL_HOUR : mAlarmIntervalMinutes * 60 * 1000;
+        
+        if (DEBUG) Log.i(TAG, "start alarm at " + new Date(alarmStart) + " with interval of " + interval);
+        
+        alarmManager.setInexactRepeating(AlarmManager.RTC, alarmStart, interval, mAlarmIntent);
+    }
+
+    private void loadCustomHeaderPackage() {
+        if (DEBUG) Log.i(TAG, "Load header pack " + mSettingHeaderPackage);
+        int idx = mSettingHeaderPackage.indexOf("/");
+        
+        if (idx != -1) {
+            String[] parts = mSettingHeaderPackage.split("/");
+            mPackageName = parts[0];
+            mHeaderName = parts[1];
+        } else {
+            mPackageName = mSettingHeaderPackage;
+            mHeaderName = null;
+        }
+        
+        try {
+            PackageManager packageManager = mContext.getPackageManager();
+            mRes = packageManager.getResourcesForApplication(mPackageName);
+            loadHeaders();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load header pack " + mHeaderName, e);
+            mRes = null;
+        }
+        
+        if (mRes == null) {
+            Log.w(TAG, "Header pack loading failed - loading default");
+            loadDefaultHeaderPackage();
+        }
+    }
+
+    private void loadDefaultHeaderPackage() {
+        if (DEBUG) Log.i(TAG, "Load default header pack");
+        mPackageName = HEADER_PACKAGE_DEFAULT;
+        mHeaderName = null;
+        mSettingHeaderPackage = mPackageName;
+        
+        try {
+            PackageManager packageManager = mContext.getPackageManager();
+            mRes = packageManager.getResourcesForApplication(mPackageName);
+            loadHeaders();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load default header pack", e);
+            mRes = null;
+        }
+        
+        if (mRes == null) {
+            Log.w(TAG, "No default package found or failed to load");
+        }
+    }
+
+    private void loadHeaders() throws XmlPullParserException, IOException {
+        mHeadersList = new ArrayList<>();
+        XmlPullParser parser = null;
+
+        try (InputStream in = (mHeaderName == null)
+                ? mRes.getAssets().open("daylight_header.xml")
+                : mRes.getAssets().open(mHeaderName.substring(mHeaderName.lastIndexOf(".") + 1) + ".xml")) {
+
+            if (mHeaderName == null) {
+                if (DEBUG) Log.i(TAG, "Load header pack config daylight_header.xml");
+            } else {
+                if (DEBUG) Log.i(TAG, "Load header pack config " + mHeaderName.substring(mHeaderName.lastIndexOf(".") + 1) + ".xml");
+            }
+
+            XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+            parser = factory.newPullParser();
+            parser.setInput(in, "UTF-8");
+            loadResourcesFromXmlParser(parser);
+
+        } catch (IOException | XmlPullParserException e) {
+            Log.e(TAG, "Error loading headers", e);
+            throw e;
+        } finally {
+            if (parser instanceof XmlResourceParser) {
+                ((XmlResourceParser) parser).close();
+            }
+        }
+    }
+
+    private void loadResourcesFromXmlParser(XmlPullParser parser) throws XmlPullParserException, IOException {
+        int eventType = parser.getEventType();
+        mRandomMode = false;
+        mLinearMode = false;
+        mAlarmIntervalMinutes = 0;
+        
+        do {
+            if (eventType != XmlPullParser.START_TAG) {
+                eventType = parser.next();
+                continue;
+            }
+            
+            String name = parser.getName();
+            
+            if (name.equalsIgnoreCase("day_header")) {
+                if (mRandomMode) continue;
+                
+                DaylightHeaderInfo headerInfo = new DaylightHeaderInfo();
+                headerInfo.mHour = -1;
+                headerInfo.mType = 0;
+                
+                String day = parser.getAttributeValue(null, "day");
+                if (day != null) headerInfo.mDay = Integer.parseInt(day);
+                
+                String month = parser.getAttributeValue(null, "month");
+                if (month != null) headerInfo.mMonth = Integer.parseInt(month);
+                
+                String hour = parser.getAttributeValue(null, "hour");
+                if (hour != null) headerInfo.mHour = Integer.parseInt(hour);
+                
+                String image = parser.getAttributeValue(null, "image");
+                if (image != null) headerInfo.mImage = image;
+                
+                if (headerInfo.mImage != null && headerInfo.mDay != -1 && headerInfo.mMonth != -1) {
+                    mHeadersList.add(headerInfo);
+                }
+            
+            } else if (name.equalsIgnoreCase("hour_header")) {
+                if (mRandomMode) continue;
+                
+                DaylightHeaderInfo headerInfo = new DaylightHeaderInfo();
+                headerInfo.mType = 1;
+                
+                String hour = parser.getAttributeValue(null, "hour");
+                if (hour != null) headerInfo.mHour = Integer.parseInt(hour);
+                
+                String image = parser.getAttributeValue(null, "image");
+                if (image != null) headerInfo.mImage = image;
+                
+                if (headerInfo.mImage != null && headerInfo.mHour != -1) {
+                    mHeadersList.add(headerInfo);
+                }
+            
+            } else if (name.equalsIgnoreCase("random_header") || name.equalsIgnoreCase("list_header")) {
+                mRandomMode = name.equalsIgnoreCase("random_header");
+                mLinearMode = name.equalsIgnoreCase("list_header");
+                
+                if (mRandomMode && DEBUG) Log.i(TAG, "Load random mode header pack");
+                if (mLinearMode && DEBUG) Log.i(TAG, "Load linear mode header pack");
+                
+                DaylightHeaderInfo headerInfo = new DaylightHeaderInfo();
+                headerInfo.mType = 2;
+                
+                String image = parser.getAttributeValue(null, "image");
+                if (image != null) headerInfo.mImage = image;
+                
+                if (headerInfo.mImage != null) mHeadersList.add(headerInfo);
+            
+            } else if (name.equalsIgnoreCase("change_interval")) {
+                String intervalMinutes = parser.getAttributeValue(null, "minutes");
+                mAlarmIntervalMinutes = Integer.parseInt(intervalMinutes);
+                if (DEBUG) Log.i(TAG, "Set change interval to " + mAlarmIntervalMinutes);
+            }
+            
+            eventType = parser.next();
+        
+        } while (eventType != XmlPullParser.END_DOCUMENT);
+
+        if (mRandomMode) {
+            Collections.shuffle(mHeadersList);
+        }
+        
+        if (!mLinearMode && !mRandomMode) {
+            mAlarmIntervalMinutes = 0;
+        }
+    }
+
+    /**
+     * header with biggest hour
+     */
+    private DaylightHeaderInfo getLastHourHeader(List<DaylightHeaderInfo> headerList) {
+        if (headerList == null || headerList.size() == 0) {
+            return null;
+        }
+        Iterator<DaylightHeaderInfo> nextHeader = headerList.iterator();
+        int hour = -1;
+        DaylightHeaderInfo last = null;
+        while(nextHeader.hasNext()) {
+            DaylightHeaderInfo header = nextHeader.next();
+            if (header.mHour == -1) {
+                continue;
+            }
+            if (last == null) {
+                last = header;
+                hour = last.mHour;
+            } else if (header.mHour > hour) {
+                last = header;
+                hour = last.mHour;
+            }
+        }
+        return last;
+    }
+
+    /**
+     * header with lowest hour
+     */
+    private DaylightHeaderInfo getFirstHourHeader(List<DaylightHeaderInfo> headerList) {
+        if (headerList == null || headerList.size() == 0) {
+            return null;
+        }
+        Iterator<DaylightHeaderInfo> nextHeader = headerList.iterator();
+        DaylightHeaderInfo first = null;
+        int hour = -1;
+        while(nextHeader.hasNext()) {
+            DaylightHeaderInfo header = nextHeader.next();
+            if (header.mHour == -1) {
+                continue;
+            }
+            if (first == null) {
+                first = header;
+                hour = first.mHour;
+            } else if (header.mHour < hour) {
+                first = header;
+                hour = first.mHour;
+            }
+        }
+        return first;
+    }
+
+    @Override
+    public Drawable getCurrent(final Calendar now) {
+        if (!Utils.isPackageInstalled(mContext, mPackageName)) {
+            Log.w(TAG, "Header pack no longer available - loading default " + mPackageName);
+            loadDefaultHeaderPackage();
+        }
+        if (mRes == null || mHeadersList == null || mHeadersList.size() == 0) {
+            return null;
+        }
+        try {
+            if (mRandomMode || mLinearMode) {
+                DaylightHeaderInfo header = mHeadersList.get(mHeaderIndex);
+                mHeaderIndex++;
+                if (mHeaderIndex == mHeadersList.size()) {
+                    if (mRandomMode) {
+                        if (DEBUG) Log.i(TAG, "Shuffle random mode header pack");
+                        Collections.shuffle(mHeadersList);
+                    }
+                    mHeaderIndex = 0;
+                }
+                if (DEBUG) Log.i(TAG, "Current header " + header.mImage);
+                return mRes.getDrawable(mRes.getIdentifier(header.mImage, "drawable", mPackageName), null);
+            }
+            // first check day headers
+            if (DEBUG) Log.i(TAG, "Check day headers");
+            List<DaylightHeaderInfo> todayHeaders = getTodayHeaders(now);
+            if (todayHeaders.size() != 0) {
+                DaylightHeaderInfo first = getFirstHourHeader(todayHeaders);
+                DaylightHeaderInfo last = getLastHourHeader(todayHeaders);
+                // no day header with hour so just use one
+                if (first == null || last == null) {
+                    if (DEBUG) Log.i(TAG, "Current day header " + todayHeaders.get(0).mImage);
+                    return mRes.getDrawable(mRes.getIdentifier(todayHeaders.get(0).mImage, "drawable", mPackageName), null);
+                }
+                DaylightHeaderInfo matching = getMatchingHeader(now, todayHeaders);
+                if (DEBUG) Log.i(TAG, "Current day header " + matching.mImage);
+                return mRes.getDrawable(mRes.getIdentifier(matching.mImage, "drawable", mPackageName), null);
+            }
+            if (DEBUG) Log.i(TAG, "Check hour headers");
+            List<DaylightHeaderInfo> hourHeaders = getHourHeaders();
+            if (hourHeaders.size() != 0) {
+                DaylightHeaderInfo matching = getMatchingHeader(now, hourHeaders);
+                if (DEBUG) Log.i(TAG, "Current hour header " + matching.mImage);
+                return mRes.getDrawable(mRes.getIdentifier(matching.mImage, "drawable", mPackageName), null);
+            }
+        } catch(Resources.NotFoundException e) {
+            Log.w(TAG, "No drawable found for " + now +" in " + mPackageName);
+        }
+        return null;
+    }
+
+    private boolean isItToday(final Calendar now, DaylightHeaderInfo headerInfo) {
+        return now.get(Calendar.MONTH) +1 == headerInfo.mMonth && now
+                    .get(Calendar.DAY_OF_MONTH) == headerInfo.mDay;
+    }
+
+    private List<DaylightHeaderInfo> getTodayHeaders(final Calendar now) {
+        List<DaylightHeaderInfo> todayHeaders = new ArrayList<DaylightHeaderInfo>();
+        Iterator<DaylightHeaderInfo> nextHeader = mHeadersList.iterator();
+        while(nextHeader.hasNext()) {
+            DaylightHeaderInfo header = nextHeader.next();
+            if (header.mType == 0) {
+                if (isItToday(now, header)){
+                    todayHeaders.add(header);
+                }
+            }
+        }
+        return todayHeaders;
+    }
+
+    private List<DaylightHeaderInfo> getHourHeaders() {
+        List<DaylightHeaderInfo> hourHeaders = new ArrayList<DaylightHeaderInfo>();
+        Iterator<DaylightHeaderInfo> nextHeader = mHeadersList.iterator();
+        while(nextHeader.hasNext()) {
+            DaylightHeaderInfo header = nextHeader.next();
+            if (header.mType == 1) {
+                hourHeaders.add(header);
+            }
+        }
+        return hourHeaders;
+    }
+
+    private DaylightHeaderInfo getMatchingHeader(final Calendar now, List<DaylightHeaderInfo> headerList) {
+        DaylightHeaderInfo first = getFirstHourHeader(headerList);
+        DaylightHeaderInfo last = getLastHourHeader(headerList);
+        DaylightHeaderInfo prev = first;
+
+        Iterator<DaylightHeaderInfo> nextHeader = headerList.iterator();
+        while(nextHeader.hasNext()) {
+            DaylightHeaderInfo header = nextHeader.next();
+            final int hour = now.get(Calendar.HOUR_OF_DAY);
+            if (header.mHour > hour) {
+                if (header == first) {
+                    // if before first return last
+                    return last;
+                }
+                // on the first bigger one return prev
+                return prev;
+            }
+            prev = header;
+        }
+        return last;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/header/FileHeaderProvider.java b/packages/SystemUI/src/com/android/systemui/crdroid/header/FileHeaderProvider.java
new file mode 100644
index 0000000000000..c5f0d9fe4397d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/header/FileHeaderProvider.java
@@ -0,0 +1,252 @@
+/*
+ *  Copyright (C) 2018 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.android.systemui.crdroid.header;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.AnimatedImageDrawable;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.Log;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+
+import com.android.systemui.res.R;
+
+public class FileHeaderProvider implements
+        StatusBarHeaderMachine.IStatusBarHeaderProvider {
+
+    public static final String TAG = "FileHeaderProvider";
+    private static final boolean DEBUG = false;
+    private static final String HEADER_FILE_NAME = "custom_file_header_image";
+
+    private Context mContext;
+    private Drawable mImage = null;
+    private String mLastLoadedPath = null;
+    private boolean mIsEnabled = false;
+
+    public FileHeaderProvider(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public String getName() {
+        return "file";
+    }
+
+    @Override
+    public void settingsChanged(Uri uri) {
+        String newPath = getCustomHeaderPath();
+        if (newPath != null && !newPath.equals(mLastLoadedPath)) {
+            cleanupCurrentImage();
+            mLastLoadedPath = null;
+            if (mIsEnabled && isCustomHeaderEnabled()) {
+                loadHeaderImage();
+            }
+        }
+    }
+    
+    private boolean isCustomHeaderEnabled() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0,
+                UserHandle.USER_CURRENT) == 1;
+    }
+    
+    private String getCustomHeaderPath() {
+        return Settings.System.getStringForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_FILE_HEADER_IMAGE,
+                UserHandle.USER_CURRENT);
+    }
+
+    @Override
+    public void enableProvider() {
+        mIsEnabled = true;
+        if (isCustomHeaderEnabled()) {
+            loadHeaderImage();
+            if (mImage instanceof AnimatedImageDrawable) {
+                AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) mImage;
+                if (!animDrawable.isRunning()) {
+                    animDrawable.start();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void disableProvider() {
+        mIsEnabled = false;
+        if (mImage instanceof AnimatedImageDrawable) {
+            try {
+                AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) mImage;
+                if (animDrawable.isRunning()) {
+                    animDrawable.stop();
+                }
+            } catch (Exception e) {
+                if (DEBUG) Log.e(TAG, "Error stopping animation", e);
+            }
+        }
+        cleanupCurrentImage();
+    }
+
+    private void cleanupCurrentImage() {
+        if (mImage != null) {
+            if (mImage instanceof AnimatedImageDrawable) {
+                try {
+                    AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) mImage;
+                    if (animDrawable.isRunning()) {
+                        animDrawable.stop();
+                    }
+                } catch (Exception e) {
+                    if (DEBUG) Log.e(TAG, "Error stopping animation during cleanup", e);
+                }
+            }
+            
+            if (mImage instanceof BitmapDrawable) {
+                Bitmap bitmap = ((BitmapDrawable) mImage).getBitmap();
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    bitmap.recycle();
+                }
+            }
+            
+            mImage = null;
+        }
+    }
+
+    private void loadHeaderImage() {
+        if (mContext == null) return;
+        
+        String path = getCustomHeaderPath();
+        if (path == null || path.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "No custom header path set");
+            return;
+        }
+
+        if (path.equals(mLastLoadedPath) && mImage != null) {
+            if (DEBUG) Log.d(TAG, "Image already loaded for path: " + path);
+            return;
+        }
+
+        if (!path.equals(mLastLoadedPath)) {
+            cleanupCurrentImage();
+        }
+
+        mLastLoadedPath = path;
+        
+        File imageFile = new File(path);
+        if (!imageFile.exists()) {
+            Log.w(TAG, "Image file does not exist: " + path);
+            return;
+        }
+
+        String lowerPath = path.toLowerCase();
+        boolean isGif = lowerPath.endsWith(".gif");
+        boolean isWebp = lowerPath.endsWith(".webp");
+
+        if (isGif || isWebp) {
+            if (loadAnimatedImage(imageFile, path)) {
+                return;
+            }
+            if (DEBUG) Log.d(TAG, "Falling back to static image loading");
+        }
+        
+        loadStaticImage(path);
+    }
+
+    private boolean loadAnimatedImage(File imageFile, String path) {
+        try {
+            android.graphics.ImageDecoder.Source source = 
+                    android.graphics.ImageDecoder.createSource(imageFile);
+            Drawable drawable = android.graphics.ImageDecoder.decodeDrawable(source);
+            
+            if (drawable == null) {
+                Log.w(TAG, "ImageDecoder returned null drawable");
+                return false;
+            }
+            
+            mImage = drawable;
+            
+            if (drawable instanceof AnimatedImageDrawable && mIsEnabled) {
+                AnimatedImageDrawable animDrawable = (AnimatedImageDrawable) drawable;
+                animDrawable.setRepeatCount(AnimatedImageDrawable.REPEAT_INFINITE);
+                if (!animDrawable.isRunning()) {
+                    animDrawable.start();
+                    if (DEBUG) Log.d(TAG, "Animation started for: " + path);
+                }
+            }
+            
+            if (DEBUG) Log.d(TAG, "Animated image loaded successfully: " + path);
+            return true;
+            
+        } catch (IOException e) {
+            Log.e(TAG, "IOException loading animated image: " + e.getMessage());
+            return false;
+        } catch (Exception e) {
+            Log.e(TAG, "Error loading animated image: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private void loadStaticImage(String path) {
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(path, options);
+            
+            if (options.outWidth <= 0 || options.outHeight <= 0) {
+                Log.w(TAG, "Invalid image dimensions");
+                return;
+            }
+            options.inJustDecodeBounds = false;
+            options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            
+            Bitmap bitmap = BitmapFactory.decodeFile(path, options);
+            if (bitmap == null) {
+                Log.w(TAG, "Failed to decode bitmap from file: " + path);
+                return;
+            }
+            
+            mImage = new BitmapDrawable(mContext.getResources(), bitmap);
+            if (DEBUG) Log.d(TAG, "Static image loaded successfully: " + path);
+            
+        } catch (OutOfMemoryError e) {
+            Log.e(TAG, "OutOfMemoryError loading static image: " + e.getMessage());
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load static header image: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public Drawable getCurrent(final Calendar now) {
+        if (mImage == null && isCustomHeaderEnabled()) {
+            loadHeaderImage();
+        }
+        return mImage;
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/header/StaticHeaderProvider.java b/packages/SystemUI/src/com/android/systemui/crdroid/header/StaticHeaderProvider.java
new file mode 100644
index 0000000000000..9cae280eb8dec
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/header/StaticHeaderProvider.java
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (C) 2017 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.android.systemui.crdroid.header;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import java.util.Calendar;
+
+import com.android.systemui.res.R;
+import com.android.internal.util.matrixx.Utils;
+
+public class StaticHeaderProvider implements
+        StatusBarHeaderMachine.IStatusBarHeaderProvider {
+
+    public static final String TAG = "StaticHeaderProvider";
+    private static final boolean DEBUG = false;
+
+    private Context mContext;
+    private Resources mRes;
+    private String mImage;
+    private String mPackageName;
+
+    public StaticHeaderProvider(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public String getName() {
+        return "static";
+    }
+
+    @Override
+    public void settingsChanged(Uri uri) {
+        final boolean customHeader = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0,
+                UserHandle.USER_CURRENT) == 1;
+        String imageUrl = Settings.System.getStringForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER_IMAGE,
+                UserHandle.USER_CURRENT);
+
+        if (imageUrl != null && customHeader) {
+            int idx = imageUrl.indexOf("/");
+            if (idx != -1) {
+                String[] parts = imageUrl.split("/");
+                mPackageName = parts[0];
+                mImage = parts[1];
+                loadHeaderImage();
+            }
+        }
+    }
+
+    @Override
+    public void enableProvider() {
+        settingsChanged(null);
+    }
+
+    @Override
+    public void disableProvider() {
+    }
+
+    private void loadHeaderImage() {
+        if (DEBUG) Log.i(TAG, "Load header image " + " " + mPackageName + " " + mImage);
+
+        try {
+            PackageManager packageManager = mContext.getPackageManager();
+            mRes = packageManager.getResourcesForApplication(mPackageName);
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load icon pack " + mPackageName, e);
+            mRes = null;
+        }
+    }
+
+    @Override
+    public Drawable getCurrent(final Calendar now) {
+        if (mRes == null) {
+            return null;
+        }
+        if (!Utils.isPackageInstalled(mContext, mPackageName)) {
+            Log.w(TAG, "Header pack image " + mImage + " no longer available");
+            return null;
+        }
+        try {
+            return mRes.getDrawable(mRes.getIdentifier(mImage, "drawable", mPackageName), null);
+        } catch(Resources.NotFoundException e) {
+            Log.w(TAG, "No drawable found for " + now +" in " + mPackageName);
+        }
+        return null;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/header/StatusBarHeaderMachine.java b/packages/SystemUI/src/com/android/systemui/crdroid/header/StatusBarHeaderMachine.java
new file mode 100644
index 0000000000000..b8c7fa86498b0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/header/StatusBarHeaderMachine.java
@@ -0,0 +1,308 @@
+/*
+ *  Copyright (C) 2015 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.android.systemui.crdroid.header;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.Log;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.SparseArray;
+
+import java.util.Calendar;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Iterator;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.HashMap;
+
+public class StatusBarHeaderMachine {
+
+    private static final String TAG = "StatusBarHeaderMachine";
+    private static final boolean DEBUG = false;
+
+    public interface IStatusBarHeaderProvider {
+        public Drawable getCurrent(final Calendar time);
+
+        public String getName();
+
+        public void settingsChanged(Uri uri);
+
+        public void enableProvider();
+
+        public void disableProvider();
+    }
+
+    public interface IStatusBarHeaderMachineObserver {
+        public void updateHeader(Drawable headerImage, boolean force);
+
+        public void disableHeader();
+
+        public void refreshHeader();
+    }
+
+    private Context mContext;
+    private Map<String, IStatusBarHeaderProvider> mProviders = new HashMap<String, IStatusBarHeaderProvider>();
+    private List<IStatusBarHeaderMachineObserver> mObservers = new ArrayList<IStatusBarHeaderMachineObserver>();
+    private Handler mHandler = new Handler();
+    private boolean mAttached;
+    private boolean mScreenOn = true;
+    private String mDefaultProviderName;
+    private String mCurrentProviderName;
+
+    // broadcast providers sent when they update the header image
+    public static final String STATUS_BAR_HEADER_UPDATE_ACTION = "com.android.systemui.crdroid.header.STATUS_BAR_HEADER_UPDATE";
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (STATUS_BAR_HEADER_UPDATE_ACTION.equals(intent.getAction())) {
+                if (mScreenOn) {
+                    if (DEBUG) Log.i(TAG, "status bar header background alarm triggered");
+                    doUpdateStatusHeaderObservers(false);
+                }
+            } else if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
+                mScreenOn = false;
+            } else if (Intent.ACTION_SCREEN_ON.equals(intent.getAction())) {
+                // we use ineact alarms so we cant be sure they have been sent during
+                // screen off (sleep) - so update it on screen on
+                if (!mScreenOn) {
+                    if (DEBUG) Log.i(TAG, "status bar header background SCREEN_ON triggered");
+                    mScreenOn = true;
+                    doUpdateStatusHeaderObservers(true);
+                }
+            }
+        }
+    };
+
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER),
+                    false, this, UserHandle.USER_ALL);
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK),
+                    false, this, UserHandle.USER_ALL);
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER_IMAGE),
+                    false, this, UserHandle.USER_ALL);
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER),
+                    false, this, UserHandle.USER_ALL);
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW),
+                    false, this, UserHandle.USER_ALL);
+            mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_FILE_HEADER_IMAGE),
+                    false, this, UserHandle.USER_ALL);
+        }
+
+        void unobserve() {
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            final boolean customHeader = Settings.System.getIntForUser(mContext.getContentResolver(),
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER, 0,
+                    UserHandle.USER_CURRENT) == 1;
+            if (customHeader && uri.equals(Settings.System.getUriFor(
+                    Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW))) {
+                doRefreshStatusHeaderObservers();
+            } else {
+                IStatusBarHeaderProvider provider = getCurrentProvider();
+                // forward to current active provider
+                if (provider != null) {
+                    try {
+                        provider.settingsChanged(uri);
+                    } catch (Exception e) {
+                        // just in case
+                    }
+                }
+                updateEnablement();
+            }
+        }
+    }
+
+    private SettingsObserver mSettingsObserver = new SettingsObserver(null);
+
+    public StatusBarHeaderMachine(Context context) {
+        mContext = context;
+        DaylightHeaderProvider defaultProvider = new DaylightHeaderProvider(context);
+        addProvider(defaultProvider);
+        mDefaultProviderName = defaultProvider.getName();
+        mCurrentProviderName = mDefaultProviderName;
+        addProvider(new StaticHeaderProvider(context));
+        addProvider(new FileHeaderProvider(context));
+        mSettingsObserver.observe();
+    }
+
+    public Drawable getCurrent() {
+        final Calendar now = Calendar.getInstance();
+        IStatusBarHeaderProvider provider = getCurrentProvider();
+        if (provider != null) {
+            try {
+                if (DEBUG) Log.i(TAG, "get current from provider " + provider.getName());
+                return provider.getCurrent(now);
+            } catch (Exception e) {
+                // just in case
+            }
+        }
+        return null;
+    }
+
+    public void addProvider(IStatusBarHeaderProvider provider) {
+        if (!mProviders.containsKey(provider.getName())) {
+            mProviders.put(provider.getName(), provider);
+        }
+    }
+
+    public void addObserver(IStatusBarHeaderMachineObserver observer) {
+        if (DEBUG) Log.i(TAG, "addObserver " + observer);
+
+        if (!mObservers.contains(observer)) {
+            mObservers.add(observer);
+        }
+    }
+
+    public void removeObserver(IStatusBarHeaderMachineObserver observer) {
+        mObservers.remove(observer);
+        mSettingsObserver.unobserve();
+    }
+
+    private void doUpdateStatusHeaderObservers(final boolean force) {
+        if (DEBUG) Log.i(TAG, "updateHeader");
+        Iterator<IStatusBarHeaderMachineObserver> nextObserver = mObservers
+                .iterator();
+        while (nextObserver.hasNext()) {
+            IStatusBarHeaderMachineObserver observer = nextObserver.next();
+            try {
+                observer.updateHeader(getCurrent(), force);
+            } catch (Exception e) {
+                // just in case
+            }
+        }
+    }
+
+    private void doDisableStatusHeaderObservers() {
+        Iterator<IStatusBarHeaderMachineObserver> nextObserver = mObservers
+                .iterator();
+        while (nextObserver.hasNext()) {
+            IStatusBarHeaderMachineObserver observer = nextObserver.next();
+            try {
+                observer.disableHeader();
+            } catch (Exception e) {
+                // just in case
+            }
+        }
+    }
+
+    private void doRefreshStatusHeaderObservers() {
+        if (DEBUG) Log.i(TAG, "refreshHeader");
+        Iterator<IStatusBarHeaderMachineObserver> nextObserver = mObservers
+                .iterator();
+        while (nextObserver.hasNext()) {
+            IStatusBarHeaderMachineObserver observer = nextObserver.next();
+            try {
+                observer.refreshHeader();
+            } catch (Exception e) {
+                // just in case
+            }
+        }
+    }
+
+    public void updateEnablement() {
+        final boolean customHeader = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER, 0,
+                UserHandle.USER_CURRENT) == 1;
+        final String providerName = Settings.System.getStringForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER,
+                UserHandle.USER_CURRENT);
+
+        if (providerName != null && !providerName.equals(mCurrentProviderName)) {
+            Iterator<IStatusBarHeaderProvider> nextProvider = mProviders
+                    .values().iterator();
+            while (nextProvider.hasNext()) {
+                IStatusBarHeaderProvider provider = nextProvider.next();
+                if (!provider.getName().equals(providerName)) {
+                    if (DEBUG) Log.i(TAG, "disable provider " + provider.getName());
+                    provider.disableProvider();
+                }
+            }
+            mCurrentProviderName = providerName;
+        }
+
+        IStatusBarHeaderProvider provider = getCurrentProvider();
+        if (provider == null) {
+            Log.w(TAG, "updateEnablement: no active provider");
+            return;
+        }
+        if (customHeader) {
+            if (DEBUG) Log.i(TAG, "enable provider " + provider.getName());
+            provider.enableProvider();
+
+            if (!mAttached) {
+                // we dont want to wait for the alarm
+                doUpdateStatusHeaderObservers(true);
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(Intent.ACTION_SCREEN_ON);
+                filter.addAction(Intent.ACTION_SCREEN_OFF);
+                filter.addAction(STATUS_BAR_HEADER_UPDATE_ACTION);
+                mContext.registerReceiver(mBroadcastReceiver, filter, Context.RECEIVER_EXPORTED);
+                mAttached = true;
+            } else {
+                // we dont want to wait for the alarm if provider has changed its header image
+                doUpdateStatusHeaderObservers(true);
+            }
+        } else {
+            if (DEBUG) Log.i(TAG, "disable provider " + provider.getName());
+            provider.disableProvider();
+
+            if (mAttached) {
+                mContext.unregisterReceiver(mBroadcastReceiver);
+                doDisableStatusHeaderObservers();
+                mAttached = false;
+            }
+        }
+    }
+
+    private IStatusBarHeaderProvider getCurrentProvider() {
+        if (mProviders.size() == 1) {
+            return mProviders.get(mDefaultProviderName);
+        }
+
+        if (mCurrentProviderName == null || !mProviders.containsKey(mCurrentProviderName)) {
+            return mProviders.get(mDefaultProviderName);
+        }
+        return mProviders.get(mCurrentProviderName);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoDialog.java b/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoDialog.java
new file mode 100644
index 0000000000000..4cfe9fd48d118
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoDialog.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2014 The NamelessRom Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.crdroid.onthego;
+
+import android.app.Dialog;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.CompoundButton;
+import android.widget.SeekBar;
+import android.widget.Switch;
+
+import com.android.systemui.res.R;
+
+import com.android.internal.util.matrixx.OnTheGoUtils;
+
+public class OnTheGoDialog extends Dialog {
+
+    protected final Context mContext;
+    protected final Handler mHandler = new Handler();
+
+    private final int mOnTheGoDialogLongTimeout;
+    private final int mOnTheGoDialogShortTimeout;
+
+    private final Runnable mDismissDialogRunnable = new Runnable() {
+        public void run() {
+            if (OnTheGoDialog.this.isShowing()) {
+                OnTheGoDialog.this.dismiss();
+            }
+        }
+    };
+
+    public OnTheGoDialog(Context ctx) {
+        super(ctx);
+        mContext = ctx;
+        final Resources r = mContext.getResources();
+        mOnTheGoDialogLongTimeout =
+                r.getInteger(R.integer.quick_settings_onthego_dialog_long_timeout);
+        mOnTheGoDialogShortTimeout =
+                r.getInteger(R.integer.quick_settings_onthego_dialog_short_timeout);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Window window = getWindow();
+        window.setType(WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY);
+        window.getAttributes().privateFlags |=
+                WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
+        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+        window.requestFeature(Window.FEATURE_NO_TITLE);
+
+        setContentView(R.layout.quick_settings_onthego_dialog);
+        setCanceledOnTouchOutside(true);
+
+        final ContentResolver resolver = mContext.getContentResolver();
+
+        final SeekBar mSlider = (SeekBar) findViewById(R.id.alpha_slider);
+        final float value = Settings.System.getFloat(resolver,
+                Settings.System.ON_THE_GO_ALPHA,
+                0.5f);
+        final int progress = ((int) (value * 100));
+        mSlider.setProgress(progress);
+        mSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
+                sendAlphaBroadcast(String.valueOf(i + 10));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+                removeAllOnTheGoDialogCallbacks();
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                dismissOnTheGoDialog(mOnTheGoDialogShortTimeout);
+            }
+        });
+
+        if (!OnTheGoUtils.hasFrontCamera(getContext())) {
+            findViewById(R.id.onthego_category_1).setVisibility(View.GONE);
+        } else {
+            final Switch mServiceToggle = (Switch) findViewById(R.id.onthego_service_toggle);
+            final boolean restartService = Settings.System.getInt(resolver,
+                    Settings.System.ON_THE_GO_SERVICE_RESTART, 0) == 1;
+            mServiceToggle.setChecked(restartService);
+            mServiceToggle.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    Settings.System.putInt(resolver,
+                            Settings.System.ON_THE_GO_SERVICE_RESTART,
+                            (b ? 1 : 0));
+                    dismissOnTheGoDialog(mOnTheGoDialogShortTimeout);
+                }
+            });
+
+            final Switch mCamSwitch = (Switch) findViewById(R.id.onthego_camera_toggle);
+            final boolean useFrontCam = (Settings.System.getInt(resolver,
+                    Settings.System.ON_THE_GO_CAMERA,
+                    0) == 1);
+            mCamSwitch.setChecked(useFrontCam);
+            mCamSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    Settings.System.putInt(resolver,
+                            Settings.System.ON_THE_GO_CAMERA,
+                            (b ? 1 : 0));
+                    sendCameraBroadcast();
+                    dismissOnTheGoDialog(mOnTheGoDialogShortTimeout);
+                }
+            });
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        dismissOnTheGoDialog(mOnTheGoDialogLongTimeout);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        removeAllOnTheGoDialogCallbacks();
+    }
+
+    private void dismissOnTheGoDialog(int timeout) {
+        removeAllOnTheGoDialogCallbacks();
+        mHandler.postDelayed(mDismissDialogRunnable, timeout);
+    }
+
+    private void removeAllOnTheGoDialogCallbacks() {
+        mHandler.removeCallbacks(mDismissDialogRunnable);
+    }
+
+    private void sendAlphaBroadcast(String i) {
+        final float value = (Float.parseFloat(i) / 100);
+        final Intent alphaBroadcast = new Intent();
+        alphaBroadcast.setAction(OnTheGoService.ACTION_TOGGLE_ALPHA);
+        alphaBroadcast.putExtra(OnTheGoService.EXTRA_ALPHA, value);
+        mContext.sendBroadcast(alphaBroadcast);
+    }
+
+    private void sendCameraBroadcast() {
+        final Intent cameraBroadcast = new Intent();
+        cameraBroadcast.setAction(OnTheGoService.ACTION_TOGGLE_CAMERA);
+        mContext.sendBroadcast(cameraBroadcast);
+    }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoService.java b/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoService.java
new file mode 100644
index 0000000000000..9e024626718fe
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/crdroid/onthego/OnTheGoService.java
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2014 The NamelessRom Project
+ *           (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.crdroid.onthego;
+
+import android.Manifest;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.PixelFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
+import com.android.systemui.res.R;
+
+import com.android.internal.util.matrixx.OnTheGoUtils;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class OnTheGoService extends Service {
+
+    private static final String  TAG   = "OnTheGoService";
+    private static final boolean DEBUG = false;
+
+    private static final int ONTHEGO_NOTIFICATION_ID = 81333378;
+    private static final String ONTHEGO_CHANNEL_ID = "onthego_notif";
+
+    public static final String ACTION_START          = "start";
+    public static final String ACTION_STOP           = "stop";
+    public static final String ACTION_TOGGLE_ALPHA   = "toggle_alpha";
+    public static final String ACTION_TOGGLE_CAMERA  = "toggle_camera";
+    public static final String ACTION_TOGGLE_OPTIONS = "toggle_options";
+    public static final String EXTRA_ALPHA           = "extra_alpha";
+
+    private static final int CAMERA_BACK  = 0;
+    private static final int CAMERA_FRONT = 1;
+
+    private static final int NOTIFICATION_STARTED = 0;
+    private static final int NOTIFICATION_RESTART = 1;
+    private static final int NOTIFICATION_ERROR   = 2;
+
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Object  mRestartObject = new Object();
+
+    private FrameLayout mOverlay;
+    private boolean isOverlayAdded = false;
+
+    private NotificationManager mNotificationManager;
+    private NotificationChannel mNotificationChannel;
+
+    private CameraDevice mCameraDevice;
+    private CameraCaptureSession mCaptureSession;
+    private CaptureRequest.Builder mPreviewRequestBuilder;
+    private String mCameraId;
+    private TextureView mTextureView;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        unregisterReceivers();
+        resetViews();
+    }
+
+    private void registerReceivers() {
+        final IntentFilter alphaFilter = new IntentFilter(ACTION_TOGGLE_ALPHA);
+        registerReceiver(mAlphaReceiver, alphaFilter, Context.RECEIVER_NOT_EXPORTED);
+        final IntentFilter cameraFilter = new IntentFilter(ACTION_TOGGLE_CAMERA);
+        registerReceiver(mCameraReceiver, cameraFilter, Context.RECEIVER_NOT_EXPORTED);
+    }
+
+    private void unregisterReceivers() {
+        try {
+            unregisterReceiver(mAlphaReceiver);
+        } catch (Exception ignored) { }
+        try {
+            unregisterReceiver(mCameraReceiver);
+        } catch (Exception ignored) { }
+    }
+
+    private final BroadcastReceiver mAlphaReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final float intentAlpha = intent.getFloatExtra(EXTRA_ALPHA, 0.5f);
+            toggleOnTheGoAlpha(intentAlpha);
+        }
+    };
+
+    private final BroadcastReceiver mCameraReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            synchronized (mRestartObject) {
+                final ContentResolver resolver = getContentResolver();
+                final boolean restartService = Settings.System.getInt(resolver,
+                        Settings.System.ON_THE_GO_SERVICE_RESTART, 0) == 1;
+                if (restartService) {
+                    restartOnTheGo();
+                } else {
+                    stopOnTheGo(true);
+                }
+            }
+        }
+    };
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        logDebug("onStartCommand called");
+
+        if (intent == null || !OnTheGoUtils.hasCamera(this)) {
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+
+        final String action = intent.getAction();
+
+        if (action != null && !action.isEmpty()) {
+            logDebug("Action: " + action);
+            if (action.equals(ACTION_START)) {
+                startOnTheGo();
+            } else if (action.equals(ACTION_STOP)) {
+                stopOnTheGo(false);
+            } else if (action.equals(ACTION_TOGGLE_OPTIONS)) {
+                new OnTheGoDialog(this).show();
+            }
+        } else {
+            logDebug("Action is NULL or EMPTY!");
+            stopSelf();
+        }
+
+        return START_NOT_STICKY;
+    }
+
+    private void startOnTheGo() {
+        if (mNotificationManager != null) {
+            logDebug("Starting while active, stopping.");
+            stopOnTheGo(false);
+            return;
+        }
+
+        resetViews();
+        registerReceivers();
+        setupViews(false);
+
+        createNotification(NOTIFICATION_STARTED);
+    }
+
+    private void stopOnTheGo(boolean shouldRestart) {
+        unregisterReceivers();
+        resetViews();
+
+        // Cancel notification
+        if (mNotificationManager != null) {
+            mNotificationManager.cancel(ONTHEGO_NOTIFICATION_ID);
+            mNotificationManager.deleteNotificationChannel(ONTHEGO_CHANNEL_ID);
+            mNotificationManager = null;
+        }
+
+        if (shouldRestart) {
+            createNotification(NOTIFICATION_RESTART);
+        }
+
+        stopSelf();
+    }
+
+    private void restartOnTheGo() {
+        resetViews();
+        mHandler.removeCallbacks(mRestartRunnable);
+        mHandler.postDelayed(mRestartRunnable, 750);
+    }
+
+    private final Runnable mRestartRunnable = new Runnable() {
+        @Override
+        public void run() {
+            synchronized (mRestartObject) {
+                setupViews(true);
+            }
+        }
+    };
+
+    private void toggleOnTheGoAlpha() {
+        final float alpha = Settings.System.getFloat(getContentResolver(),
+                Settings.System.ON_THE_GO_ALPHA,
+                0.5f);
+        toggleOnTheGoAlpha(alpha);
+    }
+
+    private void toggleOnTheGoAlpha(float alpha) {
+        Settings.System.putFloat(getContentResolver(),
+                Settings.System.ON_THE_GO_ALPHA,
+                alpha);
+
+        if (mOverlay != null) {
+            mOverlay.setAlpha(alpha);
+        }
+    }
+
+    private void setupViews(final boolean isRestarting) {
+        logDebug("Setup Views with Camera2");
+
+        CameraManager manager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
+
+        try {
+            for (String cameraId : manager.getCameraIdList()) {
+                CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
+
+                int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
+                int preferredFacing = Settings.System.getInt(getContentResolver(),
+                        Settings.System.ON_THE_GO_CAMERA, 0);
+
+                if ((preferredFacing == 1 && lensFacing == CameraCharacteristics.LENS_FACING_FRONT) ||
+                    (preferredFacing == 0 && lensFacing == CameraCharacteristics.LENS_FACING_BACK)) {
+                    mCameraId = cameraId;
+                    break;
+                }
+            }
+
+            if (mCameraId == null) {
+                logDebug("No suitable camera found");
+                createNotification(NOTIFICATION_ERROR);
+                stopOnTheGo(true);
+                return;
+            }
+
+            mTextureView = new TextureView(this);
+            mTextureView.setSurfaceTextureListener(textureListener);
+
+            mOverlay = new FrameLayout(this);
+            mOverlay.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT
+            ));
+            mOverlay.addView(mTextureView);
+
+            WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
+            WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+                    WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
+                            WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL |
+                            WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    PixelFormat.TRANSLUCENT
+            );
+            if (!isOverlayAdded) {
+                wm.addView(mOverlay, params);
+                isOverlayAdded = true;
+            }
+
+            toggleOnTheGoAlpha();
+
+        } catch (CameraAccessException e) {
+            logDebug("CameraAccessException: " + e.getMessage());
+            createNotification(NOTIFICATION_ERROR);
+            stopOnTheGo(true);
+        }
+    }
+
+    private final TextureView.SurfaceTextureListener textureListener = new TextureView.SurfaceTextureListener() {
+        @Override
+        public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+            openCamera();
+        }
+
+        @Override
+        public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {}
+
+        @Override
+        public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+            closeCamera();
+            return true;
+        }
+
+        @Override
+        public void onSurfaceTextureUpdated(SurfaceTexture surface) {}
+    };
+
+    private void openCamera() {
+        if (mCameraDevice != null) return;
+        CameraManager manager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
+        try {
+            if (checkSelfPermission(Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+                logDebug("Camera permission not granted");
+                stopOnTheGo(true);
+                return;
+            }
+
+            manager.openCamera(mCameraId, new CameraDevice.StateCallback() {
+                @Override
+                public void onOpened(@NonNull CameraDevice camera) {
+                    mCameraDevice = camera;
+                    startCameraPreview();
+                }
+
+                @Override
+                public void onDisconnected(@NonNull CameraDevice camera) {
+                    camera.close();
+                    mCameraDevice = null;
+                }
+
+                @Override
+                public void onError(@NonNull CameraDevice camera, int error) {
+                    logDebug("Camera error: " + error);
+                    camera.close();
+                    mCameraDevice = null;
+                    createNotification(NOTIFICATION_ERROR);
+                    stopOnTheGo(true);
+                }
+            }, mHandler);
+        } catch (CameraAccessException e) {
+            logDebug("Failed to open camera: " + e.getMessage());
+        }
+    }
+
+    private void startCameraPreview() {
+        try {
+            SurfaceTexture texture = mTextureView.getSurfaceTexture();
+            if (texture == null) {
+                logDebug("SurfaceTexture is null. Skipping preview.");
+                return;
+            }
+            texture.setDefaultBufferSize(1080, 1920);
+
+            Surface surface = new Surface(texture);
+            mPreviewRequestBuilder = mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+            mPreviewRequestBuilder.addTarget(surface);
+
+            mCameraDevice.createCaptureSession(
+                Arrays.asList(surface),
+                new CameraCaptureSession.StateCallback() {
+                    @Override
+                    public void onConfigured(@NonNull CameraCaptureSession session) {
+                        mCaptureSession = session;
+                        try {
+                            mCaptureSession.setRepeatingRequest(mPreviewRequestBuilder.build(),
+                                    null, mHandler);
+                        } catch (CameraAccessException e) {
+                            logDebug("Preview session error: " + e.getMessage());
+                        }
+                    }
+
+                    @Override
+                    public void onConfigureFailed(@NonNull CameraCaptureSession session) {
+                        logDebug("CaptureSession configuration failed");
+                    }
+                }, mHandler);
+
+        } catch (CameraAccessException e) {
+            logDebug("CameraAccessException in preview: " + e.getMessage());
+        }
+    }
+
+    private void closeCamera() {
+        if (mCaptureSession != null) {
+            mCaptureSession.close();
+            mCaptureSession = null;
+        }
+        if (mCameraDevice != null) {
+            mCameraDevice.close();
+            mCameraDevice = null;
+        }
+    }
+
+    private void resetViews() {
+        closeCamera();
+        WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
+        if (mOverlay != null) {
+            if (isOverlayAdded) {
+                wm.removeView(mOverlay);
+                isOverlayAdded = false;
+            }
+            mOverlay.removeAllViews();
+            mOverlay = null;
+        }
+    }
+
+    private void createNotification(final int type) {
+        final Resources r = getResources();
+        final Notification.Builder builder = new Notification.Builder(this, ONTHEGO_CHANNEL_ID)
+                .setTicker(r.getString(
+                        (type == 1 ? R.string.onthego_notif_camera_changed :
+                                (type == 2 ? R.string.onthego_notif_error
+                                        : R.string.onthego_notif_ticker))
+                ))
+                .setContentTitle(r.getString(
+                        (type == 1 ? R.string.onthego_notif_camera_changed :
+                                (type == 2 ? R.string.onthego_notif_error
+                                        : R.string.onthego_notif_title))
+                ))
+                .setSmallIcon(com.android.systemui.res.R.drawable.ic_lock_onthego)
+                .setWhen(System.currentTimeMillis())
+                .setOngoing(!(type == 1 || type == 2));
+
+        if (type == 1 || type == 2) {
+            final ComponentName cn = new ComponentName("com.android.systemui",
+                    "com.android.systemui.spark.onthego.OnTheGoService");
+            final Intent startIntent = new Intent();
+            startIntent.setComponent(cn);
+            startIntent.setAction(ACTION_START);
+            final PendingIntent startPendIntent = PendingIntent.getService(this, 0, startIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+            builder.addAction(com.android.internal.R.drawable.ic_media_play,
+                    r.getString(R.string.onthego_notif_restart), startPendIntent);
+        } else {
+            final Intent stopIntent = new Intent(this, OnTheGoService.class)
+                    .setAction(OnTheGoService.ACTION_STOP);
+            final PendingIntent stopPendIntent = PendingIntent.getService(this, 0, stopIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+            final Intent optionsIntent = new Intent(this, OnTheGoService.class)
+                    .setAction(OnTheGoService.ACTION_TOGGLE_OPTIONS);
+            final PendingIntent optionsPendIntent = PendingIntent.getService(this, 0, optionsIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+            builder
+                    .addAction(com.android.internal.R.drawable.ic_media_stop,
+                            r.getString(R.string.onthego_notif_stop), stopPendIntent)
+                    .addAction(com.android.internal.R.drawable.ic_text_dot,
+                            r.getString(R.string.onthego_notif_options), optionsPendIntent);
+        }
+
+        final Notification notif = builder.build();
+
+        mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationChannel = new NotificationChannel(ONTHEGO_CHANNEL_ID,
+                r.getString(R.string.onthego_channel_name),
+                NotificationManager.IMPORTANCE_LOW);
+        mNotificationManager.createNotificationChannel(mNotificationChannel);
+
+        mNotificationManager.notify(ONTHEGO_NOTIFICATION_ID, notif);
+    }
+
+    private void logDebug(String msg) {
+        if (DEBUG) {
+            Log.e(TAG, msg);
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressController.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressController.java
new file mode 100644
index 0000000000000..c1b9eab4cd612
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressController.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.PixelFormat;
+import android.os.BatteryManager;
+import android.os.Handler;
+import android.view.WindowManager;
+
+import com.android.systemui.CoreStartable;
+import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.cutoutprogress.ring.CutoutRingView;
+import com.android.systemui.statusbar.notification.collection.NotifPipeline;
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;
+
+import javax.inject.Inject;
+
+@SysUISingleton
+public class CutoutProgressController implements CoreStartable {
+
+    private static final int WINDOW_TYPE = 2024;
+
+    private final Context mContext;
+    private final NotifPipeline mPipeline;
+    private final Handler mMainHandler;
+
+    private final CutoutProgressSettings mSettings;
+    private final DownloadStateTracker mTracker;
+    private CutoutRingView mRingView;
+
+    private boolean mOverlayAttached = false;
+    private boolean mListenerRegistered = false;
+    private boolean mBatteryReceiverRegistered = false;
+    private boolean mIsFullyCharged = false;
+
+    private final BroadcastReceiver mBatteryReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS,
+                    BatteryManager.BATTERY_STATUS_UNKNOWN);
+            int level  = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+            int scale  = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
+            int pct    = scale > 0 ? level * 100 / scale : 0;
+
+            boolean charging = status == BatteryManager.BATTERY_STATUS_CHARGING
+                            || status == BatteryManager.BATTERY_STATUS_FULL;
+
+            if (!mSettings.isEnabled()) {
+                mMainHandler.post(() -> {
+                    mRingView.setChargingState(false, 0);
+                    mRingView.setBatteryIndicatorState(false, 0);
+                });
+                return;
+            }
+
+            boolean chargingRingOn   = mSettings.isChargingRingEnabled();
+            boolean batteryIndOn     = mSettings.isBatteryIndicatorEnabled();
+            boolean pulseEnabled     = mSettings.isChargingPulseEnabled();
+
+            mMainHandler.post(() -> {
+                mRingView.setChargingPulseEnabled(pulseEnabled);
+                if (charging) {
+                    mRingView.setBatteryIndicatorState(false, 0);
+                    mRingView.setChargingState(chargingRingOn, pct);
+                } else {
+                    mRingView.setChargingState(false, 0);
+                    mRingView.setBatteryIndicatorState(batteryIndOn, pct);
+                }
+            });
+        }
+    };
+
+    @Inject
+    public CutoutProgressController(
+            Context context,
+            NotifPipeline notifPipeline,
+            @Main Handler mainHandler) {
+        mContext = context;
+        mPipeline = notifPipeline;
+        mMainHandler = mainHandler;
+        mSettings = new CutoutProgressSettings(
+                context.getContentResolver(), mainHandler);
+        mTracker = new DownloadStateTracker();
+    }
+
+    @Override
+    public void start() {
+        mRingView = new CutoutRingView(mContext);
+        mRingView.applySettings(mSettings);
+        bindTrackerToView();
+        mSettings.observe(this::onSettingsChanged);
+        onSettingsChanged();
+    }
+
+    private void onSettingsChanged() {
+        mRingView.applySettings(mSettings);
+
+        if (mSettings.isEnabled()) {
+            enableFeature();
+        } else {
+            disableFeature();
+        }
+    }
+
+    private void enableFeature() {
+        attachOverlay();
+        registerPipelineListener();
+        registerBatteryReceiver();
+    }
+
+    private void disableFeature() {
+        mTracker.reset();
+        detachOverlay();
+        unregisterBatteryReceiver();
+    }
+
+    private void attachOverlay() {
+        if (mOverlayAttached) return;
+
+        WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WINDOW_TYPE,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                        | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                        | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+                        | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+                PixelFormat.TRANSLUCENT);
+
+        params.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        params.setTitle("CutoutProgressOverlay");
+
+        WindowManager wm = mContext.getSystemService(WindowManager.class);
+        if (wm != null) {
+            wm.addView(mRingView, params);
+            mOverlayAttached = true;
+        }
+    }
+
+    private void detachOverlay() {
+        if (!mOverlayAttached) return;
+        WindowManager wm = mContext.getSystemService(WindowManager.class);
+        if (wm != null) {
+            wm.removeView(mRingView);
+            mOverlayAttached = false;
+        }
+    }
+
+    private void registerPipelineListener() {
+        if (mListenerRegistered) return;
+        mListenerRegistered = true;
+
+        mPipeline.addCollectionListener(new NotifCollectionListener() {
+
+            @Override
+            public void onEntryAdded(NotificationEntry entry) {
+                if (!mSettings.isEnabled()) return;
+                mTracker.onNotificationChanged(entry);
+            }
+
+            @Override
+            public void onEntryUpdated(NotificationEntry entry) {
+                if (!mSettings.isEnabled()) return;
+                mTracker.onNotificationChanged(entry);
+            }
+
+            @Override
+            public void onEntryRemoved(NotificationEntry entry, int reason) {
+                if (!mSettings.isEnabled()) return;
+                mTracker.onNotificationRemoved(entry, reason);
+            }
+        });
+    }
+
+    private void registerBatteryReceiver() {
+        if (mBatteryReceiverRegistered) return;
+        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        mContext.registerReceiver(mBatteryReceiver, filter);
+        mBatteryReceiverRegistered = true;
+    }
+
+    private void unregisterBatteryReceiver() {
+        if (!mBatteryReceiverRegistered) return;
+        mContext.unregisterReceiver(mBatteryReceiver);
+        mBatteryReceiverRegistered = false;
+        mMainHandler.post(() -> {
+            mRingView.setChargingState(false, 0);
+            mRingView.setBatteryIndicatorState(false, 0);
+        });
+    }
+
+    private void bindTrackerToView() {
+        mTracker.setOnProgress(progress ->
+                mMainHandler.post(() -> mRingView.setProgress(progress)));
+
+        mTracker.setOnComplete(() ->
+                mMainHandler.post(() -> mRingView.setProgress(100)));
+
+        mTracker.setOnError(() ->
+                mMainHandler.post(() -> mRingView.showError()));
+
+        mTracker.setOnCountChanged(count ->
+                mMainHandler.post(() -> mRingView.setDownloadCount(count)));
+
+        mTracker.setOnLabelChanged(label ->
+                mMainHandler.post(() -> mRingView.setFilenameHint(label)));
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressSettings.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressSettings.java
new file mode 100644
index 0000000000000..5964e9c4d31ce
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/CutoutProgressSettings.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress;
+
+import android.content.ContentResolver;
+import android.database.ContentObserver;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+public final class CutoutProgressSettings {
+
+    public static final String KEY_ENABLED = "cutout_progress_enabled";
+
+    public static final String KEY_RING_COLOR_MODE = "cutout_progress_ring_color_mode";
+
+    public static final String KEY_RING_COLOR = "cutout_progress_ring_color";
+
+    public static final String KEY_ERROR_COLOR = "cutout_progress_error_color";
+
+    public static final String KEY_FINISH_FLASH_COLOR = "cutout_progress_finish_flash_color";
+
+    public static final String KEY_STROKE_WIDTH_DP10 = "cutout_progress_stroke_width_dp10";
+
+    public static final String KEY_RING_GAP_X1000 = "cutout_progress_ring_gap_x1000";
+
+    public static final String KEY_OPACITY = "cutout_progress_opacity";
+
+    public static final String KEY_CLOCKWISE = "cutout_progress_clockwise";
+
+    public static final String KEY_FINISH_STYLE = "cutout_progress_finish_style";
+
+    public static final String KEY_FINISH_HOLD_MS = "cutout_progress_finish_hold_ms";
+
+    public static final String KEY_FINISH_EXIT_MS = "cutout_progress_finish_exit_ms";
+
+    public static final String KEY_FINISH_USE_FLASH = "cutout_progress_finish_use_flash";
+
+    public static final String KEY_COMPLETION_PULSE = "cutout_progress_completion_pulse";
+
+    public static final String KEY_PATH_MODE = "cutout_progress_path_mode";
+
+    public static final String KEY_RING_SCALE_X_X1000 = "cutout_progress_ring_scale_x_x1000";
+
+    public static final String KEY_RING_SCALE_Y_X1000 = "cutout_progress_ring_scale_y_x1000";
+
+    public static final String KEY_RING_OFFSET_X_DP10 = "cutout_progress_ring_offset_x_dp10";
+
+    public static final String KEY_RING_OFFSET_Y_DP10 = "cutout_progress_ring_offset_y_dp10";
+
+    public static final String KEY_BG_RING_ENABLED = "cutout_progress_bg_ring_enabled";
+
+    public static final String KEY_BG_RING_COLOR = "cutout_progress_bg_ring_color";
+
+    public static final String KEY_BG_RING_OPACITY = "cutout_progress_bg_ring_opacity";
+
+    public static final String KEY_MIN_VIS_ENABLED = "cutout_progress_min_vis_enabled";
+
+    public static final String KEY_MIN_VIS_MS = "cutout_progress_min_vis_ms";
+
+    public static final String KEY_SHOW_COUNT_BADGE = "cutout_progress_show_count_badge";
+
+    public static final String KEY_BADGE_OFFSET_X_DP10 = "cutout_progress_badge_offset_x_dp10";
+
+    public static final String KEY_BADGE_OFFSET_Y_DP10 = "cutout_progress_badge_offset_y_dp10";
+
+    public static final String KEY_BADGE_TEXT_SIZE_SP10 = "cutout_progress_badge_text_size_sp10";
+
+    public static final String KEY_PERCENT_ENABLED = "cutout_progress_percent_enabled";
+
+    public static final String KEY_PERCENT_SIZE_SP10 = "cutout_progress_percent_size_sp10";
+
+    public static final String KEY_PERCENT_BOLD = "cutout_progress_percent_bold";
+
+    public static final String KEY_PERCENT_POSITION = "cutout_progress_percent_position";
+
+    public static final String KEY_PERCENT_OFFSET_X = "cutout_progress_percent_offset_x";
+
+    public static final String KEY_PERCENT_OFFSET_Y = "cutout_progress_percent_offset_y";
+
+    public static final String KEY_FILENAME_ENABLED = "cutout_progress_filename_enabled";
+
+    public static final String KEY_FILENAME_SIZE_SP10 = "cutout_progress_filename_size_sp10";
+
+    public static final String KEY_FILENAME_BOLD = "cutout_progress_filename_bold";
+
+    public static final String KEY_FILENAME_POSITION = "cutout_progress_filename_position";
+
+    public static final String KEY_FILENAME_OFFSET_X = "cutout_progress_filename_offset_x";
+
+    public static final String KEY_FILENAME_OFFSET_Y = "cutout_progress_filename_offset_y";
+
+    public static final String KEY_FILENAME_MAX_CHARS = "cutout_progress_filename_max_chars";
+
+    public static final String KEY_FILENAME_TRUNCATE = "cutout_progress_filename_truncate";
+
+    public static final String KEY_PROGRESS_EASING = "cutout_progress_easing";
+
+    public static final String KEY_CHARGING_RING_ENABLED = "cutout_progress_charging_ring_enabled";
+
+    public static final String KEY_CHARGING_PULSE_ENABLED = "cutout_progress_charging_pulse_enabled";
+
+    public static final String KEY_BATTERY_INDICATOR_ENABLED = "cutout_progress_battery_indicator_enabled";
+
+    public static final int RING_COLOR_MODE_ACCENT = 0;
+    public static final int RING_COLOR_MODE_RAINBOW = 1;
+    public static final int RING_COLOR_MODE_CUSTOM = 2;
+    private static final boolean DEF_ENABLED = false;
+    private static final int DEF_RING_COLOR_MODE = RING_COLOR_MODE_ACCENT;
+    private static final int DEF_RING_COLOR = 0xFF2196F3;
+    private static final int DEF_ERROR_COLOR = 0xFFF44336;
+    private static final int DEF_FINISH_FLASH_COLOR = Color.WHITE;
+    private static final float DEF_STROKE_DP = 2.0f;
+    private static final float DEF_RING_GAP = 1.155f;
+    private static final int DEF_OPACITY = 90;
+    private static final boolean DEF_CLOCKWISE = true;
+    private static final int DEF_FINISH_STYLE = 0;
+    private static final int DEF_FINISH_HOLD_MS = 500;
+    private static final int DEF_FINISH_EXIT_MS = 500;
+    private static final boolean DEF_FINISH_USE_FLASH = true;
+    private static final boolean DEF_COMPLETION_PULSE = true;
+    private static final boolean DEF_PATH_MODE = false;
+    private static final float DEF_RING_SCALE = 1.0f;
+    private static final float DEF_RING_OFFSET = 0.0f;
+    private static final boolean DEF_BG_RING_ENABLED = true;
+    private static final int DEF_BG_RING_COLOR = 0xFF808080;
+    private static final int DEF_BG_RING_OPACITY = 30;
+    private static final boolean DEF_MIN_VIS_ENABLED = true;
+    private static final int DEF_MIN_VIS_MS = 500;
+    private static final boolean DEF_SHOW_COUNT_BADGE = false;
+    private static final float DEF_BADGE_OFFSET = 0.0f;
+    private static final float DEF_BADGE_TEXT_SP = 10.0f;
+    private static final boolean DEF_PERCENT_ENABLED = false;
+    private static final float DEF_PERCENT_SP = 8.0f;
+    private static final boolean DEF_PERCENT_BOLD = true;
+    private static final int DEF_PERCENT_POSITION = 0;
+    private static final boolean DEF_FILENAME_ENABLED = false;
+    private static final float DEF_FILENAME_SP = 7.0f;
+    private static final boolean DEF_FILENAME_BOLD = false;
+    private static final int DEF_FILENAME_POSITION  = 4;
+    private static final int DEF_FILENAME_MAX_CHARS = 20;
+    private static final int DEF_FILENAME_TRUNCATE = 0;
+    private static final int DEF_EASING = 0;
+    private static final boolean DEF_CHARGING_RING_ENABLED = true;
+    private static final boolean DEF_CHARGING_PULSE_ENABLED = true;
+    private static final boolean DEF_BATTERY_INDICATOR_ENABLED = false;
+
+    static final String[] POSITION_NAMES = {
+            "right", "left", "top", "bottom",
+            "top_right", "top_left", "bottom_right", "bottom_left"
+    };
+
+    static final String[] FINISH_STYLE_NAMES = { "pop", "segmented", "snap" };
+
+    static final String[] EASING_NAMES = {
+            "linear", "accelerate", "decelerate", "ease_in_out"
+    };
+
+    static final String[] TRUNCATE_MODE_NAMES = { "middle", "start", "end" };
+
+    private final ContentResolver mCr;
+    private final Handler mHandler;
+    private ContentObserver mObserver;
+    private Runnable mCallback;
+
+    public CutoutProgressSettings(ContentResolver cr, Handler handler) {
+        mCr = cr;
+        mHandler = handler;
+    }
+
+    public void observe(Runnable onChange) {
+        mCallback = onChange;
+        mObserver = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                if (mCallback != null) mCallback.run();
+            }
+        };
+        Uri base = Settings.Secure.getUriFor("cutout_progress_enabled").buildUpon()
+                .path("").build();
+        mCr.registerContentObserver(
+                Settings.Secure.CONTENT_URI, true, mObserver);
+    }
+
+    public void stopObserving() {
+        if (mObserver != null) {
+            mCr.unregisterContentObserver(mObserver);
+            mObserver = null;
+        }
+    }
+
+    public boolean isEnabled() {
+        return getInt(KEY_ENABLED, DEF_ENABLED ? 1 : 0) != 0;
+    }
+
+    public int getRingColorMode() {
+        return clamp(getInt(KEY_RING_COLOR_MODE, DEF_RING_COLOR_MODE),
+                RING_COLOR_MODE_ACCENT, RING_COLOR_MODE_CUSTOM);
+    }
+
+    public int getRingColor() {
+        return getInt(KEY_RING_COLOR, DEF_RING_COLOR);
+    }
+
+    public int getErrorColor() {
+        return getInt(KEY_ERROR_COLOR, DEF_ERROR_COLOR);
+    }
+
+    public int getFinishFlashColor() {
+        return getInt(KEY_FINISH_FLASH_COLOR, DEF_FINISH_FLASH_COLOR);
+    }
+
+    public float getStrokeWidthDp() {
+        return getInt(KEY_STROKE_WIDTH_DP10, (int)(DEF_STROKE_DP * 10)) / 10f;
+    }
+
+    public float getRingGap() {
+        return getInt(KEY_RING_GAP_X1000, (int)(DEF_RING_GAP * 1000)) / 1000f;
+    }
+
+    public int getOpacity() {
+        return clamp(getInt(KEY_OPACITY, DEF_OPACITY), 0, 100);
+    }
+
+    public boolean isClockwise() {
+        return getInt(KEY_CLOCKWISE, DEF_CLOCKWISE ? 1 : 0) != 0;
+    }
+
+    public String getFinishStyle() {
+        int idx = clamp(getInt(KEY_FINISH_STYLE, DEF_FINISH_STYLE), 0,
+                FINISH_STYLE_NAMES.length - 1);
+        return FINISH_STYLE_NAMES[idx];
+    }
+
+    public int getFinishHoldMs() {
+        return getInt(KEY_FINISH_HOLD_MS, DEF_FINISH_HOLD_MS);
+    }
+
+    public int getFinishExitMs() {
+        return getInt(KEY_FINISH_EXIT_MS, DEF_FINISH_EXIT_MS);
+    }
+
+    public boolean isFinishUseFlash() {
+        return getInt(KEY_FINISH_USE_FLASH, DEF_FINISH_USE_FLASH ? 1 : 0) != 0;
+    }
+
+    public boolean isCompletionPulse() {
+        return getInt(KEY_COMPLETION_PULSE, DEF_COMPLETION_PULSE ? 1 : 0) != 0;
+    }
+
+    public boolean isPathMode() {
+        return getInt(KEY_PATH_MODE, DEF_PATH_MODE ? 1 : 0) != 0;
+    }
+
+    public float getRingScaleX() {
+        return getInt(KEY_RING_SCALE_X_X1000, (int)(DEF_RING_SCALE * 1000)) / 1000f;
+    }
+
+    public float getRingScaleY() {
+        return getInt(KEY_RING_SCALE_Y_X1000, (int)(DEF_RING_SCALE * 1000)) / 1000f;
+    }
+
+    public float getRingOffsetXDp() {
+        return getInt(KEY_RING_OFFSET_X_DP10, (int)(DEF_RING_OFFSET * 10)) / 10f;
+    }
+
+    public float getRingOffsetYDp() {
+        return getInt(KEY_RING_OFFSET_Y_DP10, (int)(DEF_RING_OFFSET * 10)) / 10f;
+    }
+
+    public boolean isBgRingEnabled() {
+        return getInt(KEY_BG_RING_ENABLED, DEF_BG_RING_ENABLED ? 1 : 0) != 0;
+    }
+
+    public int getBgRingColor() {
+        return getInt(KEY_BG_RING_COLOR, DEF_BG_RING_COLOR);
+    }
+
+    public int getBgRingOpacity() {
+        return clamp(getInt(KEY_BG_RING_OPACITY, DEF_BG_RING_OPACITY), 0, 100);
+    }
+
+    public boolean isMinVisEnabled() {
+        return getInt(KEY_MIN_VIS_ENABLED, DEF_MIN_VIS_ENABLED ? 1 : 0) != 0;
+    }
+
+    public int getMinVisMs() {
+        return getInt(KEY_MIN_VIS_MS, DEF_MIN_VIS_MS);
+    }
+
+    public boolean isShowCountBadge() {
+        return getInt(KEY_SHOW_COUNT_BADGE, DEF_SHOW_COUNT_BADGE ? 1 : 0) != 0;
+    }
+
+    public float getBadgeOffsetXDp() {
+        return getInt(KEY_BADGE_OFFSET_X_DP10, (int)(DEF_BADGE_OFFSET * 10)) / 10f;
+    }
+
+    public float getBadgeOffsetYDp() {
+        return getInt(KEY_BADGE_OFFSET_Y_DP10, (int)(DEF_BADGE_OFFSET * 10)) / 10f;
+    }
+
+    public float getBadgeTextSizeSp() {
+        return getInt(KEY_BADGE_TEXT_SIZE_SP10, (int)(DEF_BADGE_TEXT_SP * 10)) / 10f;
+    }
+
+    public boolean isPercentEnabled() {
+        return getInt(KEY_PERCENT_ENABLED, DEF_PERCENT_ENABLED ? 1 : 0) != 0;
+    }
+
+    public float getPercentTextSizeSp() {
+        return getInt(KEY_PERCENT_SIZE_SP10, (int)(DEF_PERCENT_SP * 10)) / 10f;
+    }
+
+    public boolean isPercentBold() {
+        return getInt(KEY_PERCENT_BOLD, DEF_PERCENT_BOLD ? 1 : 0) != 0;
+    }
+
+    public String getPercentPosition() {
+        int idx = clamp(getInt(KEY_PERCENT_POSITION, DEF_PERCENT_POSITION), 0,
+                POSITION_NAMES.length - 1);
+        return POSITION_NAMES[idx];
+    }
+
+    public float getPercentOffsetXDp() {
+        return getInt(KEY_PERCENT_OFFSET_X, 0) / 10f;
+    }
+
+    public float getPercentOffsetYDp() {
+        return getInt(KEY_PERCENT_OFFSET_Y, 0) / 10f;
+    }
+
+    public boolean isFilenameEnabled() {
+        return getInt(KEY_FILENAME_ENABLED, DEF_FILENAME_ENABLED ? 1 : 0) != 0;
+    }
+
+    public float getFilenameTextSizeSp() {
+        return getInt(KEY_FILENAME_SIZE_SP10, (int)(DEF_FILENAME_SP * 10)) / 10f;
+    }
+
+    public boolean isFilenameBold() {
+        return getInt(KEY_FILENAME_BOLD, DEF_FILENAME_BOLD ? 1 : 0) != 0;
+    }
+
+    public String getFilenamePosition() {
+        int idx = clamp(getInt(KEY_FILENAME_POSITION, DEF_FILENAME_POSITION), 0,
+                POSITION_NAMES.length - 1);
+        return POSITION_NAMES[idx];
+    }
+
+    public float getFilenameOffsetXDp() {
+        return getInt(KEY_FILENAME_OFFSET_X, 0) / 10f;
+    }
+
+    public float getFilenameOffsetYDp() {
+        return getInt(KEY_FILENAME_OFFSET_Y, 0) / 10f;
+    }
+
+    public int getFilenameMaxChars() {
+        return getInt(KEY_FILENAME_MAX_CHARS, DEF_FILENAME_MAX_CHARS);
+    }
+
+    public String getFilenameTruncateMode() {
+        int idx = clamp(getInt(KEY_FILENAME_TRUNCATE, DEF_FILENAME_TRUNCATE), 0,
+                TRUNCATE_MODE_NAMES.length - 1);
+        return TRUNCATE_MODE_NAMES[idx];
+    }
+
+    public String getProgressEasing() {
+        int idx = clamp(getInt(KEY_PROGRESS_EASING, DEF_EASING), 0,
+                EASING_NAMES.length - 1);
+        return EASING_NAMES[idx];
+    }
+
+    public boolean isChargingRingEnabled() {
+        return getInt(KEY_CHARGING_RING_ENABLED, DEF_CHARGING_RING_ENABLED ? 1 : 0) != 0;
+    }
+
+    public boolean isChargingPulseEnabled() {
+        return getInt(KEY_CHARGING_PULSE_ENABLED, DEF_CHARGING_PULSE_ENABLED ? 1 : 0) != 0;
+    }
+
+    public boolean isBatteryIndicatorEnabled() {
+        return getInt(KEY_BATTERY_INDICATOR_ENABLED, DEF_BATTERY_INDICATOR_ENABLED ? 1 : 0) != 0;
+    }
+
+    public void setBatteryIndicatorEnabled(boolean value) {
+        putInt(KEY_BATTERY_INDICATOR_ENABLED, value ? 1 : 0);
+    }
+
+    public void setEnabled(boolean value) {
+        putInt(KEY_ENABLED, value ? 1 : 0);
+    }
+
+    public void setRingColorMode(int mode) {
+        putInt(KEY_RING_COLOR_MODE, clamp(mode, RING_COLOR_MODE_ACCENT, RING_COLOR_MODE_CUSTOM));
+    }
+
+    public void setRingColor(int argb) {
+        putInt(KEY_RING_COLOR, argb);
+    }
+
+    public void setOpacity(int opacity) {
+        putInt(KEY_OPACITY, clamp(opacity, 0, 100));
+    }
+
+    public void setClockwise(boolean cw) {
+        putInt(KEY_CLOCKWISE, cw ? 1 : 0);
+    }
+
+    public void setFinishStyle(int styleIndex) {
+        putInt(KEY_FINISH_STYLE, clamp(styleIndex, 0, FINISH_STYLE_NAMES.length - 1));
+    }
+
+    private int getInt(String key, int def) {
+        return Settings.Secure.getInt(mCr, key, def);
+    }
+
+    private void putInt(String key, int value) {
+        Settings.Secure.putInt(mCr, key, value);
+    }
+
+    private static int clamp(int v, int lo, int hi) {
+        return Math.max(lo, Math.min(hi, v));
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/DownloadStateTracker.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/DownloadStateTracker.java
new file mode 100644
index 0000000000000..be2e4af909329
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/DownloadStateTracker.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress;
+
+import android.os.Bundle;
+
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class DownloadStateTracker {
+
+    private static final String EXTRA_PROGRESS = "android.progress";
+    private static final String EXTRA_PROGRESS_MAX = "android.progressMax";
+    private static final String EXTRA_TITLE = "android.title";
+
+    private static final long STALE_TIMEOUT_MS = 5 * 60 * 1000L;
+
+    private static final int ERROR_THRESHOLD_PCT = 5;
+
+    private static final int REASON_APP_CANCEL = 8;
+    private static final int REASON_APP_CANCEL_ALL = 9;
+
+    private static final int RESET_DROP_PCT = 25;
+
+    private static final class DownloadSnapshot {
+        final String pkg;
+        String label;
+        int progress;
+        long updatedAt;
+
+        DownloadSnapshot(String pkg, String label, int progress) {
+            this.pkg = pkg;
+            this.label = label;
+            this.progress = progress;
+            this.updatedAt = System.currentTimeMillis();
+        }
+    }
+
+    private final ConcurrentHashMap<String, DownloadSnapshot> mActive =
+            new ConcurrentHashMap<>();
+
+    public interface IntCallback { void onValue(int value); }
+    public interface StringCallback { void onValue(String value); }
+
+    private IntCallback mOnProgress;
+    private Runnable mOnComplete;
+    private Runnable mOnError;
+    private IntCallback mOnCountChanged;
+    private StringCallback mOnLabelChanged;
+
+    public void setOnProgress(IntCallback cb) { mOnProgress = cb; }
+    public void setOnComplete(Runnable cb) { mOnComplete = cb; }
+    public void setOnError(Runnable cb) { mOnError = cb; }
+    public void setOnCountChanged(IntCallback cb) { mOnCountChanged = cb; }
+    public void setOnLabelChanged(StringCallback cb) { mOnLabelChanged = cb; }
+
+    public void onNotificationChanged(NotificationEntry entry) {
+        Bundle extras = entry.getSbn().getNotification().extras;
+        if (extras == null) return;
+
+        int rawProgress = extras.getInt(EXTRA_PROGRESS, -1);
+        int rawMax = extras.getInt(EXTRA_PROGRESS_MAX, -1);
+
+        String id = entryKey(entry);
+        String pkg = entry.getSbn().getPackageName();
+
+        if (rawProgress < 0 || rawMax <= 0) {
+            if (mActive.remove(id) != null) {
+                notifyCountChanged();
+                publishAggregated();
+                fireComplete();
+            }
+            return;
+        }
+
+        int pct = clamp(rawProgress * 100 / rawMax, 0, 100);
+        String label = charSeqStr(extras.getCharSequence(EXTRA_TITLE));
+
+        DownloadSnapshot existing = mActive.get(id);
+        boolean isNew = existing == null;
+        boolean isReset = existing != null && (existing.progress - pct) >= RESET_DROP_PCT;
+
+        if (isReset) mActive.remove(id);
+        pruneStale(pkg, id);
+
+        if (isNew || isReset || existing.progress != pct) {
+            String usedLabel = (label != null) ? label
+                    : (existing != null ? existing.label : null);
+            mActive.put(id, new DownloadSnapshot(pkg, usedLabel, pct));
+            publishAggregated();
+            if (isNew || isReset) notifyCountChanged();
+        }
+
+        if (pct >= 100) {
+            mActive.remove(id);
+            notifyCountChanged();
+            publishAggregated();
+            fireComplete();
+        }
+    }
+
+    public void onNotificationRemoved(NotificationEntry entry, int reason) {
+        DownloadSnapshot snap = mActive.remove(entryKey(entry));
+        if (snap == null) return;
+
+        notifyCountChanged();
+        publishAggregated();
+
+        if (snap.progress >= 100) {
+            fireComplete();
+        } else if (reason == REASON_APP_CANCEL || reason == REASON_APP_CANCEL_ALL) {
+            fireComplete();
+        } else if (snap.progress >= ERROR_THRESHOLD_PCT) {
+            fireError();
+        }
+    }
+
+    public void reset() {
+        mActive.clear();
+        notifyCountChanged();
+        fire(mOnProgress, 0);
+        fire(mOnLabelChanged, null);
+    }
+
+    public int getActiveCount() {
+        return mActive.size();
+    }
+
+    private String entryKey(NotificationEntry e) {
+        return e.getSbn().getPackageName() + ":" + e.getSbn().getId();
+    }
+
+    private void pruneStale(String pkg, String currentId) {
+        long now = System.currentTimeMillis();
+        for (java.util.Map.Entry<String, DownloadSnapshot> e : mActive.entrySet()) {
+            if (!e.getKey().equals(currentId)
+                    && e.getValue().pkg.equals(pkg)
+                    && now - e.getValue().updatedAt > STALE_TIMEOUT_MS) {
+                mActive.remove(e.getKey());
+            }
+        }
+    }
+
+    private void publishAggregated() {
+        int avg = 0;
+        if (!mActive.isEmpty()) {
+            int sum = 0;
+            for (DownloadSnapshot s : mActive.values()) sum += s.progress;
+            avg = sum / mActive.size();
+        }
+        fire(mOnProgress, avg);
+        publishBestLabel();
+    }
+
+    private void publishBestLabel() {
+        DownloadSnapshot best = null;
+        for (DownloadSnapshot s : mActive.values()) {
+            if (best == null || s.progress > best.progress) best = s;
+        }
+        String lbl = null;
+        if (best != null && best.label != null
+                && !best.label.toLowerCase().contains("untitled")) {
+            lbl = best.label;
+        }
+        fire(mOnLabelChanged, lbl);
+    }
+
+    private void notifyCountChanged() { fire(mOnCountChanged, mActive.size()); }
+    private void fireComplete() { if (mOnComplete != null) mOnComplete.run(); }
+    private void fireError() { if (mOnError != null) mOnError.run(); }
+
+    private void fire(IntCallback cb, int v) { if (cb != null) cb.onValue(v); }
+    private void fire(StringCallback cb, String v) { if (cb != null) cb.onValue(v); }
+
+    private static String charSeqStr(CharSequence cs) {
+        return cs != null ? cs.toString() : null;
+    }
+
+    private static int clamp(int v, int lo, int hi) {
+        return Math.max(lo, Math.min(hi, v));
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/dagger/CutoutProgressModule.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/dagger/CutoutProgressModule.java
new file mode 100644
index 0000000000000..3d5d4c8b37fce
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/dagger/CutoutProgressModule.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.dagger;
+
+import com.android.systemui.CoreStartable;
+import com.android.systemui.cutoutprogress.CutoutProgressController;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.ClassKey;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class CutoutProgressModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(CutoutProgressController.class)
+    abstract CoreStartable bindCutoutProgressController(CutoutProgressController controller);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CapsuleRingRenderer.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CapsuleRingRenderer.java
new file mode 100644
index 0000000000000..e100dde1ba48a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CapsuleRingRenderer.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PathMeasure;
+import android.graphics.RectF;
+
+public final class CapsuleRingRenderer implements RingViewRenderer {
+
+    private final Path mOutline = new Path();
+    private final PathMeasure mMeasure = new PathMeasure();
+    private final Path mWorkPath = new Path();
+    private float mTotalLength = 0f;
+
+    @Override
+    public void updateBounds(RectF bounds) {
+        mOutline.reset();
+        buildCapsule(bounds);
+        mMeasure.setPath(mOutline, false);
+        mTotalLength = mMeasure.getLength();
+    }
+
+    private void buildCapsule(RectF b) {
+        float r = Math.min(b.width(), b.height()) / 2f;
+        float cx = b.centerX();
+
+        mOutline.moveTo(cx, b.top);
+
+        if (b.width() >= b.height()) {
+            mOutline.lineTo(b.right - r, b.top);
+            mOutline.arcTo(b.right - 2*r, b.top, b.right, b.bottom, -90f, 180f, false);
+            mOutline.lineTo(b.left + r, b.bottom);
+            mOutline.arcTo(b.left, b.top, b.left + 2*r, b.bottom, 90f, 180f, false);
+        } else {
+            mOutline.arcTo(b.left, b.top, b.right, b.top + 2*r, -90f, 90f, false);
+            mOutline.lineTo(b.right, b.bottom - r);
+            mOutline.arcTo(b.left, b.bottom - 2*r, b.right, b.bottom, 0f, 180f, false);
+            mOutline.lineTo(b.left, b.top + r);
+            mOutline.arcTo(b.left, b.top, b.right, b.top + 2*r, 180f,  90f, false);
+        }
+        mOutline.close();
+    }
+
+    @Override
+    public void drawFullRing(Canvas canvas, Paint paint) {
+        if (mTotalLength == 0f) return;
+        canvas.drawPath(mOutline, paint);
+    }
+
+    @Override
+    public void drawProgress(Canvas canvas, float sweepFraction,
+                             boolean clockwise, Paint paint) {
+        if (mTotalLength == 0f) return;
+        if (sweepFraction >= 1f) { drawFullRing(canvas, paint); return; }
+        float len = Math.max(0f, Math.min(1f, sweepFraction)) * mTotalLength;
+        mWorkPath.reset();
+        if (clockwise) {
+            mMeasure.getSegment(0f, len, mWorkPath, true);
+        } else {
+            mMeasure.getSegment(mTotalLength - len, mTotalLength, mWorkPath, true);
+        }
+        canvas.drawPath(mWorkPath, paint);
+    }
+
+    @Override
+    public void drawSegmented(Canvas canvas,
+                              int segments, float gapDeg, float arcDeg,
+                              int highlight,
+                              Paint basePaint, Paint shinePaint, float alpha) {
+        if (mTotalLength == 0f) return;
+        float totalDeg = segments * (arcDeg + gapDeg);
+        float segLen = mTotalLength * (arcDeg / totalDeg);
+        float gapLen = mTotalLength * (gapDeg / totalDeg);
+
+        for (int i = 0; i < segments; i++) {
+            float start = i * (segLen + gapLen);
+            mWorkPath.reset();
+            mMeasure.getSegment(start, start + segLen, mWorkPath, true);
+
+            if (i == highlight || i == highlight - 1) {
+                Paint tmp = new Paint(shinePaint);
+                tmp.setAlpha((int)(255 * alpha));
+                canvas.drawPath(mWorkPath, tmp);
+            } else {
+                canvas.drawPath(mWorkPath, basePaint);
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CircleRingRenderer.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CircleRingRenderer.java
new file mode 100644
index 0000000000000..1cda0ec70db67
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CircleRingRenderer.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+
+public final class CircleRingRenderer implements RingViewRenderer {
+
+    private final RectF mBounds = new RectF();
+
+    @Override
+    public void updateBounds(RectF bounds) {
+        mBounds.set(bounds);
+    }
+
+    @Override
+    public void drawFullRing(Canvas canvas, Paint paint) {
+        canvas.drawArc(mBounds, 0f, 360f, false, paint);
+    }
+
+    @Override
+    public void drawProgress(Canvas canvas, float sweepFraction,
+                             boolean clockwise, Paint paint) {
+        float sweep  = 360f * Math.max(0f, Math.min(1f, sweepFraction));
+        float actual = clockwise ? sweep : -sweep;
+        canvas.drawArc(mBounds, -90f, actual, false, paint);
+    }
+
+    @Override
+    public void drawSegmented(Canvas canvas,
+                              int segments, float gapDeg, float arcDeg,
+                              int highlight,
+                              Paint basePaint, Paint shinePaint, float alpha) {
+        for (int i = 0; i < segments; i++) {
+            float startAngle = -90f + i * (arcDeg + gapDeg);
+            if (i == highlight || i == highlight - 1) {
+                Paint tmp = new Paint(shinePaint);
+                tmp.setAlpha((int)(255 * alpha));
+                canvas.drawArc(mBounds, startAngle, arcDeg, false, tmp);
+            } else {
+                canvas.drawArc(mBounds, startAngle, arcDeg, false, basePaint);
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CountBadgePainter.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CountBadgePainter.java
new file mode 100644
index 0000000000000..b1726b0fea4e6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CountBadgePainter.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Typeface;
+
+import androidx.core.graphics.ColorUtils;
+
+public final class CountBadgePainter {
+
+    private static final float H_PAD_DP = 6f;
+    private static final float V_PAD_DP = 3f;
+    private static final float MIN_WIDTH_DP = 20f;
+    private static final float DARKEN_AMOUNT = 0.75f;
+    private static final float BRIGHTEN_AMOUNT = 0.80f;
+    private static final float LIGHT_THRESHOLD = 0.40f;
+    private static final int BG_ALPHA = 230;
+
+    private final float mDp;
+    private final Paint mBgPaint;
+    private final Paint mTextPaint;
+    private final RectF mRect = new RectF();
+
+    private int mLastCount = Integer.MIN_VALUE;
+    private String mLastText = "";
+
+    public CountBadgePainter(float density) {
+        mDp = density;
+
+        mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mBgPaint.setStyle(Paint.Style.FILL);
+
+        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setSubpixelText(true);
+        mTextPaint.setTypeface(Typeface.DEFAULT_BOLD);
+    }
+
+    public void applyConfig(int baseColor, float textSizeSp, float density) {
+        double lum = ColorUtils.calculateLuminance(baseColor);
+        mBgPaint.setColor(darken(baseColor, DARKEN_AMOUNT));
+        int textColor = lum > LIGHT_THRESHOLD
+                ? Color.WHITE : brighten(baseColor, BRIGHTEN_AMOUNT);
+        mTextPaint.setColor(textColor);
+        mTextPaint.setTextSize(textSizeSp * density);
+    }
+
+    public void draw(Canvas canvas, float cx, float topY, int count, int opacityPercent) {
+        if (count != mLastCount) {
+            mLastCount = count;
+            mLastText  = String.valueOf(count);
+        }
+
+        float textW = mTextPaint.measureText(mLastText);
+        float hPad = H_PAD_DP * mDp;
+        float vPad = V_PAD_DP * mDp;
+        float height = mTextPaint.getTextSize() + vPad * 2f;
+        float width = Math.max(textW + hPad * 2f, MIN_WIDTH_DP * mDp);
+
+        mRect.set(cx - width / 2f, topY, cx + width / 2f, topY + height);
+
+        int baseAlpha = clamp(opacityPercent, 0, 100) * 255 / 100;
+        mBgPaint.setAlpha(baseAlpha * BG_ALPHA / 255);
+        mTextPaint.setAlpha(baseAlpha);
+
+        canvas.drawRoundRect(mRect, height / 2f, height / 2f, mBgPaint);
+
+        Paint.FontMetrics fm = mTextPaint.getFontMetrics();
+        float textY = mRect.centerY() - (fm.ascent + fm.descent) / 2f;
+        canvas.drawText(mLastText, cx, textY, mTextPaint);
+    }
+
+    private static int darken(int color, float fraction) {
+        float[] hsl = new float[3];
+        ColorUtils.colorToHSL(color, hsl);
+        hsl[2] *= (1f - fraction);
+        return ColorUtils.HSLToColor(hsl);
+    }
+
+    private static int brighten(int color, float fraction) {
+        float[] hsl = new float[3];
+        ColorUtils.colorToHSL(color, hsl);
+        hsl[2] += (1f - hsl[2]) * fraction;
+        return ColorUtils.HSLToColor(hsl);
+    }
+
+    private static int clamp(int v, int lo, int hi) {
+        return Math.max(lo, Math.min(hi, v));
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CutoutRingView.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CutoutRingView.java
new file mode 100644
index 0000000000000..a449318009169
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/CutoutRingView.java
@@ -0,0 +1,915 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.graphics.SweepGradient;
+import android.graphics.Typeface;
+import android.text.TextPaint;
+import android.util.TypedValue;
+import android.view.DisplayCutout;
+import android.view.Surface;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.animation.LinearInterpolator;
+
+import com.android.systemui.cutoutprogress.CutoutProgressSettings;
+
+import java.util.Objects;
+
+public final class CutoutRingView extends View {
+
+    private static final long BURN_IN_HIDE_MS = 10_000L;
+
+    private static final long CHARGING_PULSE_INTERVAL_MS = 1500L;
+    private static final long CHARGING_PULSE_DURATION_MS = 900L;
+
+    private static final int[] RAINBOW_COLORS = {
+            0xFFFF0000,
+            0xFFFF7F00,
+            0xFFFFFF00,
+            0xFF00FF00,
+            0xFF00FFFF,
+            0xFF0000FF,
+            0xFF8B00FF,
+            0xFFFF0000,
+    };
+
+    private final float mDp;
+
+    private final Path mCutoutPath = new Path();
+    private final Path mScaledPath = new Path();
+    private final Matrix mScaleMatrix = new Matrix();
+    private final RectF mPathBounds = new RectF();
+    private final RectF mArcBounds = new RectF();
+    private boolean mHasCutout = false;
+
+    private final OverlayAnimationHelper mAnim;
+    private RingViewRenderer mRenderer;
+    private final CountBadgePainter mBadge;
+
+    private final Paint mRingPaint = makePaint();
+    private final Paint mShinePaint = makePaint();
+    private final Paint mErrorPaint = makePaint();
+    private final Paint mAnimPaint = makePaint();
+    private final Paint mBgPaint = makePaint();
+    private final Paint mChargingPaint = makePaint();
+    private final TextPaint mPercentPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+    private final TextPaint mFilenamePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+
+    private final Paint mRainbowPaint = makePaint();
+    private SweepGradient mRainbowShader = null;
+    private float mRainbowCx = Float.NaN;
+    private float mRainbowCy = Float.NaN;
+
+    private int mProgress = 0;
+    private int mDownloadCount = 0;
+    private String mFilenameHint = null;
+
+    private long mDownloadStartMs = 0L;
+    private long mLastProgressMs = 0L;
+    private Runnable mPendingFinish = null;
+
+    private boolean mIsCharging = false;
+    private int mBatteryPct = 0;
+    private boolean mChargingPulseEnabled = true;
+    private float mChargingPulsePhase = 0f;
+    private ValueAnimator mChargingPulseAnim = null;
+    private float mChargingDisplayPct = 0f;
+    private ValueAnimator mChargingLevelAnim = null;
+
+    private boolean mIsBatteryIndicatorActive = false;
+    private int mBatteryIndicatorPct = 0;
+    private float mBatteryDisplayPct = 0f;
+    private ValueAnimator mBatteryLevelAnim = null;
+
+    private int sCfgRingColorMode;
+    private int sCfgRingColor;
+    private int sCfgErrorColor;
+    private int sCfgFlashColor;
+    private float sCfgStrokeDp;
+    private float sCfgRingGap;
+    private int sCfgOpacity;
+    private boolean sCfgClockwise;
+    private String sCfgFinishStyle;
+    private int sCfgFinishHoldMs;
+    private int sCfgFinishExitMs;
+    private boolean sCfgFinishFlash;
+    private boolean sCfgPulse;
+    private boolean sCfgPathMode;
+    private float sCfgScaleX;
+    private float sCfgScaleY;
+    private float sCfgOffsetXDp;
+    private float sCfgOffsetYDp;
+    private boolean sCfgBgRing;
+    private int sCfgBgColor;
+    private int sCfgBgOpacity;
+    private boolean sCfgMinVis;
+    private int sCfgMinVisMs;
+    private boolean sCfgShowBadge;
+    private float sCfgBadgeOffXDp;
+    private float sCfgBadgeOffYDp;
+    private float sCfgBadgeSp;
+    private boolean sCfgPct;
+    private float sCfgPctSp;
+    private boolean sCfgPctBold;
+    private String sCfgPctPos;
+    private float sCfgPctOffXDp;
+    private float sCfgPctOffYDp;
+    private boolean sCfgFname;
+    private float sCfgFnameSp;
+    private boolean sCfgFnameBold;
+    private String sCfgFnamePos;
+    private float sCfgFnameOffXDp;
+    private float sCfgFnameOffYDp;
+    private int sCfgFnameMaxChars;
+    private String  sCfgFnameTruncate;
+    private String  sCfgEasing;
+    private boolean sCfgChargingRing;
+    private boolean sCfgChargingPulse;
+
+    public CutoutRingView(Context ctx) {
+        super(ctx);
+        mDp = ctx.getResources().getDisplayMetrics().density;
+        mAnim = new OverlayAnimationHelper(this);
+        mRenderer = new CircleRingRenderer();
+        mBadge = new CountBadgePainter(mDp);
+        initPaints();
+    }
+
+    public void applySettings(CutoutProgressSettings s) {
+        sCfgRingColorMode = s.getRingColorMode();
+        sCfgRingColor = s.getRingColor();
+        sCfgErrorColor = s.getErrorColor();
+        sCfgFlashColor = s.getFinishFlashColor();
+        sCfgStrokeDp = s.getStrokeWidthDp();
+        sCfgRingGap = s.getRingGap();
+        sCfgOpacity = s.getOpacity();
+        sCfgClockwise = s.isClockwise();
+        sCfgFinishStyle  = s.getFinishStyle();
+        sCfgFinishHoldMs = s.getFinishHoldMs();
+        sCfgFinishExitMs = s.getFinishExitMs();
+        sCfgFinishFlash = s.isFinishUseFlash();
+        sCfgPulse = s.isCompletionPulse();
+        sCfgPathMode = s.isPathMode();
+        sCfgScaleX = s.getRingScaleX();
+        sCfgScaleY = s.getRingScaleY();
+        sCfgOffsetXDp = s.getRingOffsetXDp();
+        sCfgOffsetYDp = s.getRingOffsetYDp();
+        sCfgBgRing = s.isBgRingEnabled();
+        sCfgBgColor = s.getBgRingColor();
+        sCfgBgOpacity = s.getBgRingOpacity();
+        sCfgMinVis = s.isMinVisEnabled();
+        sCfgMinVisMs = s.getMinVisMs();
+        sCfgShowBadge = s.isShowCountBadge();
+        sCfgBadgeOffXDp = s.getBadgeOffsetXDp();
+        sCfgBadgeOffYDp = s.getBadgeOffsetYDp();
+        sCfgBadgeSp = s.getBadgeTextSizeSp();
+        sCfgPct = s.isPercentEnabled();
+        sCfgPctSp = s.getPercentTextSizeSp();
+        sCfgPctBold = s.isPercentBold();
+        sCfgPctPos = s.getPercentPosition();
+        sCfgPctOffXDp = s.getPercentOffsetXDp();
+        sCfgPctOffYDp = s.getPercentOffsetYDp();
+        sCfgFname = s.isFilenameEnabled();
+        sCfgFnameSp = s.getFilenameTextSizeSp();
+        sCfgFnameBold = s.isFilenameBold();
+        sCfgFnamePos = s.getFilenamePosition();
+        sCfgFnameOffXDp = s.getFilenameOffsetXDp();
+        sCfgFnameOffYDp = s.getFilenameOffsetYDp();
+        sCfgFnameMaxChars= s.getFilenameMaxChars();
+        sCfgFnameTruncate= s.getFilenameTruncateMode();
+        sCfgEasing = s.getProgressEasing();
+        sCfgChargingRing = s.isChargingRingEnabled();
+        sCfgChargingPulse = s.isChargingPulseEnabled();
+
+        boolean needPath = sCfgPathMode;
+        if (needPath && !(mRenderer instanceof CapsuleRingRenderer)) {
+            mRenderer = new CapsuleRingRenderer();
+        } else if (!needPath && !(mRenderer instanceof CircleRingRenderer)) {
+            mRenderer = new CircleRingRenderer();
+        }
+
+        if (!sCfgChargingRing && mIsCharging) {
+            stopChargingAnimations();
+        }
+        mChargingPulseEnabled = sCfgChargingPulse;
+
+        if (sCfgRingColorMode != CutoutProgressSettings.RING_COLOR_MODE_RAINBOW) {
+            mRainbowShader = null;
+            mRainbowCx = Float.NaN;
+        }
+
+        refreshPaints();
+        recalcScaledPath();
+        invalidate();
+    }
+
+    private int resolveRingColor() {
+        switch (sCfgRingColorMode) {
+            case CutoutProgressSettings.RING_COLOR_MODE_ACCENT:
+                return resolveAccentColor();
+            case CutoutProgressSettings.RING_COLOR_MODE_RAINBOW:
+                return RAINBOW_COLORS[0];
+            default:
+                return sCfgRingColor;
+        }
+    }
+
+    private int resolveAccentColor() {
+        TypedValue tv = new TypedValue();
+        boolean resolved = getContext().getTheme()
+                .resolveAttribute(android.R.attr.colorAccent, tv, true);
+        int base = resolved ? tv.data : 0xFF2196F3;
+
+        boolean isDark = (getContext().getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+
+        if (isDark) {
+            return lightenColor(base, 0.50f);
+        } else {
+            return base;
+        }
+    }
+
+    private static int lightenColor(int color, float fraction) {
+        int r = Color.red(color);
+        int g = Color.green(color);
+        int b = Color.blue(color);
+        r = (int)(r + (255 - r) * fraction);
+        g = (int)(g + (255 - g) * fraction);
+        b = (int)(b + (255 - b) * fraction);
+        return Color.argb(Color.alpha(color),
+                Math.min(255, r), Math.min(255, g), Math.min(255, b));
+    }
+
+    private SweepGradient requireRainbowShader(float cx, float cy) {
+        if (mRainbowShader == null
+                || Math.abs(cx - mRainbowCx) > 0.5f
+                || Math.abs(cy - mRainbowCy) > 0.5f) {
+            mRainbowShader = new SweepGradient(cx, cy, RAINBOW_COLORS, null);
+            mRainbowCx = cx;
+            mRainbowCy = cy;
+        }
+        return mRainbowShader;
+    }
+
+    private void applyRainbowShader(Paint paint, float cx, float cy) {
+        SweepGradient shader = requireRainbowShader(cx, cy);
+        Matrix m = new Matrix();
+        m.setRotate(-90f, cx, cy);
+        shader.setLocalMatrix(m);
+        paint.setShader(shader);
+    }
+
+    private static void clearShader(Paint paint) {
+        paint.setShader(null);
+    }
+
+    public void setChargingState(boolean charging, int batteryPct) {
+        boolean wasCharging = mIsCharging;
+        mIsCharging = charging;
+        mBatteryPct = batteryPct;
+
+        if (!charging) {
+            stopChargingAnimations();
+            invalidate();
+            return;
+        }
+
+        if (!wasCharging) {
+            mChargingDisplayPct = 0f;
+        }
+
+        animateChargingLevelTo(batteryPct);
+
+        if (mChargingPulseEnabled && sCfgChargingPulse && mChargingPulseAnim == null) {
+            startChargingPulse();
+        }
+        invalidate();
+    }
+
+    public void setBatteryIndicatorState(boolean active, int batteryPct) {
+        boolean wasActive = mIsBatteryIndicatorActive;
+        mIsBatteryIndicatorActive = active;
+        mBatteryIndicatorPct = batteryPct;
+
+        if (!active) {
+            stopBatteryIndicatorAnim();
+            invalidate();
+            return;
+        }
+
+        if (!wasActive) {
+            mBatteryDisplayPct = 0f;
+        }
+
+        animateBatteryLevelTo(batteryPct);
+        invalidate();
+    }
+
+    public void setChargingPulseEnabled(boolean enabled) {
+        mChargingPulseEnabled = enabled;
+        sCfgChargingPulse = enabled;
+        if (!enabled) {
+            stopChargingPulse();
+        } else if (mIsCharging && mChargingPulseAnim == null) {
+            startChargingPulse();
+        }
+    }
+
+    private void animateChargingLevelTo(int targetPct) {
+        if (mChargingLevelAnim != null) mChargingLevelAnim.cancel();
+        float start = mChargingDisplayPct;
+        float end = Math.max(0f, Math.min(100f, targetPct));
+        if (Math.abs(end - start) < 0.5f) {
+            mChargingDisplayPct = end;
+            invalidate();
+            return;
+        }
+        long dur = (long)(Math.abs(end - start) * 12f);
+        dur = Math.max(200L, Math.min(dur, 1200L));
+        mChargingLevelAnim = ValueAnimator.ofFloat(start, end);
+        mChargingLevelAnim.setDuration(dur);
+        mChargingLevelAnim.setInterpolator(new LinearInterpolator());
+        mChargingLevelAnim.addUpdateListener(a -> {
+            mChargingDisplayPct = (float) a.getAnimatedValue();
+            invalidate();
+        });
+        mChargingLevelAnim.start();
+    }
+
+    private void startChargingPulse() {
+        stopChargingPulse();
+        mChargingPulseAnim = ValueAnimator.ofFloat(0f, 1f);
+        mChargingPulseAnim.setDuration(CHARGING_PULSE_DURATION_MS);
+        mChargingPulseAnim.setRepeatCount(ValueAnimator.INFINITE);
+        mChargingPulseAnim.setRepeatMode(ValueAnimator.REVERSE);
+        mChargingPulseAnim.setInterpolator(new LinearInterpolator());
+        mChargingPulseAnim.setStartDelay(0);
+        mChargingPulseAnim.addUpdateListener(a -> {
+            mChargingPulsePhase = (float) a.getAnimatedValue();
+            invalidate();
+        });
+        mChargingPulseAnim.start();
+    }
+
+    private void stopChargingPulse() {
+        if (mChargingPulseAnim != null) {
+            mChargingPulseAnim.cancel();
+            mChargingPulseAnim = null;
+        }
+        mChargingPulsePhase = 0f;
+    }
+
+    private void stopChargingAnimations() {
+        stopChargingPulse();
+        if (mChargingLevelAnim != null) {
+            mChargingLevelAnim.cancel();
+            mChargingLevelAnim = null;
+        }
+        mChargingDisplayPct = 0f;
+    }
+
+    private void animateBatteryLevelTo(int targetPct) {
+        if (mBatteryLevelAnim != null) mBatteryLevelAnim.cancel();
+        float start = mBatteryDisplayPct;
+        float end   = Math.max(0f, Math.min(100f, targetPct));
+        if (Math.abs(end - start) < 0.5f) {
+            mBatteryDisplayPct = end;
+            invalidate();
+            return;
+        }
+        long dur = (long)(Math.abs(end - start) * 12f);
+        dur = Math.max(200L, Math.min(dur, 1200L));
+        mBatteryLevelAnim = ValueAnimator.ofFloat(start, end);
+        mBatteryLevelAnim.setDuration(dur);
+        mBatteryLevelAnim.setInterpolator(new android.view.animation.DecelerateInterpolator());
+        mBatteryLevelAnim.addUpdateListener(a -> {
+            mBatteryDisplayPct = (float) a.getAnimatedValue();
+            invalidate();
+        });
+        mBatteryLevelAnim.start();
+    }
+
+    private void stopBatteryIndicatorAnim() {
+        if (mBatteryLevelAnim != null) {
+            mBatteryLevelAnim.cancel();
+            mBatteryLevelAnim = null;
+        }
+        mBatteryDisplayPct = 0f;
+    }
+
+    public void setProgress(int value) {
+        int pct = Math.max(0, Math.min(100, value));
+        if (mProgress == pct) return;
+
+        int prev = mProgress;
+        mProgress = pct;
+        mLastProgressMs = System.currentTimeMillis();
+
+        removeCallbacks(mBurnInHide);
+        if (pct > 0 && pct < 100) {
+            postDelayed(mBurnInHide, BURN_IN_HIDE_MS);
+        }
+
+        if (prev == 0 && pct > 0) {
+            mDownloadStartMs = System.currentTimeMillis();
+            cancelPendingFinish();
+        }
+
+        if (pct == 100 && !mAnim.isFinishAnimating) {
+            long elapsed = System.currentTimeMillis() - mDownloadStartMs;
+            long remaining = (sCfgMinVis ? sCfgMinVisMs : 0) - elapsed;
+            if (remaining > 0 && mDownloadStartMs > 0) {
+                mPendingFinish = () -> { mPendingFinish = null; beginFinishAnim(); };
+                postDelayed(mPendingFinish, remaining);
+            } else {
+                beginFinishAnim();
+            }
+        } else if (pct > 0 && pct < 100 && mAnim.isFinishAnimating) {
+            mAnim.cancelFinish();
+        } else if (pct == 0) {
+            mDownloadStartMs = 0L;
+            cancelPendingFinish();
+        }
+
+        invalidate();
+    }
+
+    public void setDownloadCount(int count) {
+        if (mDownloadCount != count) { mDownloadCount = count; invalidate(); }
+    }
+
+    public void setFilenameHint(String hint) {
+        if (!Objects.equals(mFilenameHint, hint)) { mFilenameHint = hint; invalidate(); }
+    }
+
+    public void showError() {
+        mAnim.startError(() -> setProgress(0));
+    }
+
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        mCutoutPath.reset();
+        mHasCutout = false;
+
+        DisplayCutout cutout = insets.getDisplayCutout();
+        if (cutout != null) {
+            Path native31 = null;
+            try { native31 = cutout.getCutoutPath(); } catch (NoSuchMethodError ignored) {}
+
+            if (native31 != null && !native31.isEmpty()) {
+                mCutoutPath.set(native31);
+                mHasCutout = true;
+            } else if (!cutout.getBoundingRects().isEmpty()) {
+                android.graphics.Rect r = cutout.getBoundingRects().get(0);
+                float cx = r.exactCenterX();
+                float cy = r.exactCenterY();
+                float radius = Math.min(r.width(), r.height()) / 2f;
+                mCutoutPath.addCircle(cx, cy, radius, Path.Direction.CW);
+                mHasCutout = true;
+            }
+        }
+
+        if (!mHasCutout) {
+            float cx = getResources().getDisplayMetrics().widthPixels / 2f;
+            float radius = 15f * mDp;
+            mCutoutPath.addCircle(cx, radius * 2f, radius, Path.Direction.CW);
+            mHasCutout = true;
+        }
+
+        mRainbowShader = null;
+        mRainbowCx = Float.NaN;
+
+        recalcScaledPath();
+        invalidate();
+        return super.onApplyWindowInsets(insets);
+    }
+
+    private void recalcScaledPath() {
+        mCutoutPath.computeBounds(mPathBounds, true);
+        mScaleMatrix.setScale(sCfgRingGap, sCfgRingGap,
+                mPathBounds.centerX(), mPathBounds.centerY());
+        mScaledPath.reset();
+        mCutoutPath.transform(mScaleMatrix, mScaledPath);
+    }
+
+    private final Runnable mBurnInHide = this::invalidate;
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (!mHasCutout) return;
+
+        if (mAnim.isErrorAnimating) {
+            computeArcBounds();
+            mRenderer.updateBounds(mArcBounds);
+            mErrorPaint.setAlpha((int)(mAnim.errorAlpha * 255));
+            mRenderer.drawFullRing(canvas, mErrorPaint);
+            return;
+        }
+
+        int effectivePct = mAnim.isGeometryPreviewActive() ? 100
+                : mAnim.isDynamicPreviewActive() ? mAnim.previewProgress
+                : mProgress;
+
+        boolean burnedOut = effectivePct > 0 && effectivePct < 100
+                && mLastProgressMs > 0
+                && System.currentTimeMillis() - mLastProgressMs >= BURN_IN_HIDE_MS;
+
+        boolean shouldDraw = mAnim.isFinishAnimating
+                || mAnim.isGeometryPreviewActive()
+                || mAnim.isDynamicPreviewActive()
+                || (effectivePct > 0 && effectivePct < 100 && !burnedOut)
+                || mPendingFinish != null;
+
+        boolean showCharging = mIsCharging && sCfgChargingRing && !mAnim.isFinishAnimating
+                && !mAnim.isErrorAnimating && effectivePct == 0 && mProgress == 0;
+
+        boolean showBatteryIndicator = mIsBatteryIndicatorActive && !mIsCharging
+                && !mAnim.isFinishAnimating && !mAnim.isErrorAnimating
+                && effectivePct == 0 && mProgress == 0;
+
+        if (!shouldDraw && !showCharging && !showBatteryIndicator) return;
+        if (shouldDraw) { /* fall through to download drawing below */ }
+        else if (showCharging) {
+            drawChargingRing(canvas);
+            return;
+        } else if (showBatteryIndicator) {
+            drawBatteryIndicatorRing(canvas);
+            return;
+        }
+
+        if (mAnim.displayScale != 1f) {
+            mScaledPath.computeBounds(mArcBounds, true);
+            canvas.save();
+            canvas.scale(mAnim.displayScale, mAnim.displayScale,
+                    mArcBounds.centerX(), mArcBounds.centerY());
+        }
+
+        int activeRingColor = resolveRingColor();
+
+        mAnimPaint.set(mRingPaint);
+        mAnimPaint.setColor(activeRingColor);
+        mAnimPaint.setStrokeWidth(sCfgStrokeDp * mDp);
+        int alpha = (int)(sCfgOpacity * 255f / 100f
+                * mAnim.displayAlpha * mAnim.completionPulseAlpha);
+        mAnimPaint.setAlpha(alpha);
+
+        computeArcBounds();
+        if (sCfgRingColorMode == CutoutProgressSettings.RING_COLOR_MODE_RAINBOW) {
+            applyRainbowShader(mAnimPaint, mArcBounds.centerX(), mArcBounds.centerY());
+        } else {
+            clearShader(mAnimPaint);
+        }
+
+        if (mAnim.successColorBlend > 0f) {
+            int flashColor = sCfgFinishFlash ? sCfgFlashColor
+                    : brighten(activeRingColor, mAnim.successColorBlend);
+            mAnimPaint.setColor(blendColors(activeRingColor, flashColor,
+                    mAnim.successColorBlend));
+            clearShader(mAnimPaint);
+        }
+
+        boolean isActive = effectivePct > 0 && effectivePct < 100
+                || mAnim.isGeometryPreviewActive()
+                || mAnim.isDynamicPreviewActive();
+
+        if (sCfgBgRing && !mAnim.isFinishAnimating && isActive) {
+            mRenderer.updateBounds(mArcBounds);
+            mBgPaint.setAlpha((int)(sCfgBgOpacity * 255 / 100 * mAnim.displayAlpha));
+            mRenderer.drawFullRing(canvas, mBgPaint);
+        }
+
+        mRenderer.updateBounds(mArcBounds);
+        if (mAnim.isFinishAnimating) {
+            drawFinish(canvas, mAnimPaint);
+        } else {
+            float sweep = eased(effectivePct, sCfgEasing);
+            mRenderer.drawProgress(canvas, sweep, sCfgClockwise, mAnimPaint);
+
+            if (isActive) drawLabels(canvas, effectivePct, activeRingColor);
+        }
+
+        boolean showBadge = !mAnim.isDynamicPreviewActive() && sCfgShowBadge
+                && (mDownloadCount > 1 || mAnim.isGeometryPreviewActive());
+        if (showBadge) {
+            mScaledPath.computeBounds(mArcBounds, true);
+            float badgeCx = mArcBounds.centerX() + sCfgBadgeOffXDp * mDp;
+            float badgeTop = mArcBounds.bottom + 4f * mDp + sCfgBadgeOffYDp * mDp;
+            int badgeN = mAnim.isGeometryPreviewActive() ? 3 : mDownloadCount;
+            mBadge.draw(canvas, badgeCx, badgeTop, badgeN, sCfgOpacity);
+        }
+
+        if (mAnim.displayScale != 1f) canvas.restore();
+    }
+
+    private void drawChargingRing(Canvas canvas) {
+        computeArcBounds();
+        mRenderer.updateBounds(mArcBounds);
+
+        int baseAlpha = sCfgOpacity * 255 / 100;
+
+        if (sCfgBgRing) {
+            mBgPaint.setAlpha(sCfgBgOpacity * 255 / 100);
+            mRenderer.drawFullRing(canvas, mBgPaint);
+        }
+
+        int levelColor = chargingColor(mChargingDisplayPct);
+        applyStroke(mChargingPaint, levelColor, sCfgStrokeDp * mDp, baseAlpha);
+
+        if (mChargingPulseEnabled && sCfgChargingPulse && mChargingPulseAnim != null) {
+            float drawFraction = mChargingPulsePhase * (mChargingDisplayPct / 100f);
+            drawSymmetricArc(canvas, drawFraction, mChargingPaint);
+        } else {
+            drawSymmetricArc(canvas, mChargingDisplayPct / 100f, mChargingPaint);
+        }
+    }
+
+    private void drawBatteryIndicatorRing(Canvas canvas) {
+        computeArcBounds();
+        mRenderer.updateBounds(mArcBounds);
+
+        int baseAlpha = sCfgOpacity * 255 / 100;
+
+        if (sCfgBgRing) {
+            mBgPaint.setAlpha(sCfgBgOpacity * 255 / 100);
+            mRenderer.drawFullRing(canvas, mBgPaint);
+        }
+
+        int levelColor = chargingColor(mBatteryDisplayPct);
+        applyStroke(mChargingPaint, levelColor, sCfgStrokeDp * mDp, baseAlpha);
+
+        float fraction = mBatteryDisplayPct / 100f;
+        mRenderer.drawProgress(canvas, fraction, true /* clockwise */, mChargingPaint);
+    }
+
+    private void drawSymmetricArc(Canvas canvas, float fraction, Paint paint) {
+        if (fraction <= 0f) return;
+        fraction = Math.min(fraction, 1f);
+        float sweep = fraction * 180f;
+
+        canvas.drawArc(mArcBounds, 90f - sweep, sweep, false, paint);
+        canvas.drawArc(mArcBounds, 90f, sweep, false, paint);
+    }
+
+    private static int chargingColor(float pct) {
+        if (pct < 30f) return 0xFFF44336;
+        if (pct < 60f) return 0xFFFF9800;
+        return 0xFF4CAF50;
+    }
+
+    private void drawFinish(Canvas canvas, Paint paint) {
+        if ("segmented".equals(sCfgFinishStyle)) {
+            mRenderer.drawSegmented(canvas,
+                    OverlayAnimationHelper.SEGMENT_COUNT,
+                    OverlayAnimationHelper.SEGMENT_GAP_DEG,
+                    OverlayAnimationHelper.SEGMENT_ARC_DEG,
+                    mAnim.segmentHighlight,
+                    paint, mShinePaint, mAnim.displayAlpha);
+        } else {
+            mRenderer.drawFullRing(canvas, paint);
+        }
+    }
+
+    private void drawLabels(Canvas canvas, int pct, int ringColor) {
+        float pad = 4f * mDp;
+        int alpha = sCfgOpacity * 255 / 100;
+
+        if (sCfgPct) {
+            String text = pct + "%";
+            float tw = mPercentPaint.measureText(text);
+            float[] pos = labelXY(sCfgPctPos, pad, mPercentPaint.getTextSize(), tw);
+            mPercentPaint.setColor(ringColor);
+            mPercentPaint.setAlpha(alpha);
+            canvas.drawText(text, pos[0] + sCfgPctOffXDp * mDp,
+                    pos[1] + sCfgPctOffYDp * mDp, mPercentPaint);
+        }
+
+        boolean geoPreview = mAnim.isGeometryPreviewActive();
+        String fname = mFilenameHint != null ? mFilenameHint
+                : geoPreview ? "EvolutionX-16.0-arm64.zip" : null;
+
+        if (sCfgFname && fname != null && (mDownloadCount <= 1 || geoPreview)) {
+            String display = truncate(fname, sCfgFnameMaxChars, sCfgFnameTruncate);
+            float[] pos = labelXY(sCfgFnamePos, pad, mFilenamePaint.getTextSize(), null);
+            mFilenamePaint.setColor(ringColor);
+            mFilenamePaint.setAlpha(alpha);
+            canvas.drawText(display, pos[0] + sCfgFnameOffXDp * mDp,
+                    pos[1] + sCfgFnameOffYDp * mDp, mFilenamePaint);
+        }
+    }
+
+    private float[] labelXY(String position, float pad, float textHeight, Float textW) {
+        switch (position) {
+            case "left":
+                return new float[]{
+                        textW != null ? mArcBounds.left - textW / 2f - pad
+                                      : mArcBounds.left - pad,
+                        mArcBounds.centerY() + textHeight / 3f};
+            case "top":
+                return new float[]{mArcBounds.centerX(), mArcBounds.top - pad};
+            case "bottom":
+                return new float[]{mArcBounds.centerX(),
+                        mArcBounds.bottom + textHeight + pad};
+            case "top_left":
+                return new float[]{mArcBounds.left - pad, mArcBounds.top - pad};
+            case "top_right":
+                return new float[]{mArcBounds.right + pad, mArcBounds.top - pad};
+            case "bottom_left":
+                return new float[]{mArcBounds.left - pad,
+                        mArcBounds.bottom + textHeight + pad};
+            case "bottom_right":
+                return new float[]{mArcBounds.right + pad,
+                        mArcBounds.bottom + textHeight + pad};
+            default:
+                return new float[]{
+                        textW != null ? mArcBounds.right + textW / 2f + pad
+                                      : mArcBounds.right + pad,
+                        mArcBounds.centerY() + textHeight / 3f};
+        }
+    }
+
+    private void computeArcBounds() {
+        mScaledPath.computeBounds(mArcBounds, true);
+        float[] offRotated = rotateOffset(sCfgOffsetXDp, sCfgOffsetYDp);
+        float cx = mArcBounds.centerX() + offRotated[0];
+        float cy = mArcBounds.centerY() + offRotated[1];
+
+        float halfW, halfH;
+        if (sCfgPathMode) {
+            halfW = mArcBounds.width() / 2f * sCfgScaleX;
+            halfH = mArcBounds.height() / 2f * sCfgScaleY;
+        } else {
+            float halfBase = Math.max(mArcBounds.width(), mArcBounds.height()) / 2f;
+            halfW = halfBase * sCfgScaleX;
+            halfH = halfBase * sCfgScaleY;
+        }
+        mArcBounds.set(cx - halfW, cy - halfH, cx + halfW, cy + halfH);
+    }
+
+    private float[] rotateOffset(float dx, float dy) {
+        int rot = getDisplay() != null ? getDisplay().getRotation() : Surface.ROTATION_0;
+        switch (rot) {
+            case Surface.ROTATION_90: return new float[]{ dy * mDp, -dx * mDp};
+            case Surface.ROTATION_180: return new float[]{-dx * mDp, -dy * mDp};
+            case Surface.ROTATION_270: return new float[]{-dy * mDp,  dx * mDp};
+            default: return new float[]{ dx * mDp, dy * mDp};
+        }
+    }
+
+    private void initPaints() {
+        sCfgRingColorMode = CutoutProgressSettings.RING_COLOR_MODE_ACCENT;
+        sCfgRingColor = 0xFF2196F3;
+        sCfgErrorColor = 0xFFF44336;
+        sCfgFlashColor = Color.WHITE;
+        sCfgStrokeDp = 2f;
+        sCfgRingGap = 1.155f;
+        sCfgOpacity = 90;
+        sCfgBgColor = 0xFF808080;
+        sCfgBgOpacity = 30;
+        sCfgPctSp = 8f;
+        sCfgPctBold = true;
+        sCfgFnameSp = 7f;
+        sCfgBadgeSp = 10f;
+        sCfgPctPos = "right";
+        sCfgFnamePos = "top_right";
+        sCfgFnameTruncate = "middle";
+        sCfgFnameMaxChars = 20;
+        sCfgEasing = "linear";
+        sCfgClockwise = true;
+        sCfgFinishStyle= "pop";
+        sCfgScaleX = sCfgScaleY = 1f;
+        sCfgBgRing = sCfgMinVis = true;
+        sCfgMinVisMs = 500;
+        sCfgChargingRing = true;
+        sCfgChargingPulse = true;
+        refreshPaints();
+    }
+
+    private void refreshPaints() {
+        float stroke = sCfgStrokeDp * mDp;
+        int baseColor = (sCfgRingColorMode == CutoutProgressSettings.RING_COLOR_MODE_CUSTOM)
+                ? sCfgRingColor : resolveRingColor();
+        applyStroke(mRingPaint, baseColor, stroke, sCfgOpacity * 255 / 100);
+        applyStroke(mShinePaint, sCfgFlashColor, stroke * 1.2f, 255);
+        applyStroke(mErrorPaint, sCfgErrorColor, stroke * 1.5f, 255);
+        applyStroke(mBgPaint, sCfgBgColor, stroke, sCfgBgOpacity * 255 / 100);
+        applyStroke(mChargingPaint, baseColor, stroke, sCfgOpacity * 255 / 100);
+
+        mRainbowPaint.setStyle(Paint.Style.STROKE);
+        mRainbowPaint.setAntiAlias(true);
+        mRainbowPaint.setStrokeWidth(stroke);
+        mRainbowPaint.setStrokeCap(Paint.Cap.BUTT);
+        mRainbowPaint.setAlpha(sCfgOpacity * 255 / 100);
+
+        mPercentPaint.setTypeface(sCfgPctBold
+                ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
+        mPercentPaint.setTextSize(spToPx(sCfgPctSp));
+        mPercentPaint.setTextAlign(Paint.Align.CENTER);
+
+        mFilenamePaint.setTypeface(sCfgFnameBold
+                ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
+        mFilenamePaint.setTextSize(spToPx(sCfgFnameSp));
+        mFilenamePaint.setTextAlign(Paint.Align.LEFT);
+
+        mBadge.applyConfig(baseColor, sCfgBadgeSp, mDp);
+    }
+
+    private static void applyStroke(Paint p, int color, float width, int alpha) {
+        p.setStyle(Paint.Style.STROKE);
+        p.setAntiAlias(true);
+        p.setColor(color);
+        p.setAlpha(alpha);
+        p.setStrokeWidth(width);
+        p.setStrokeCap(Paint.Cap.BUTT);
+    }
+
+    private void beginFinishAnim() {
+        mAnim.startFinish(sCfgFinishStyle, sCfgFinishHoldMs, sCfgFinishExitMs,
+                sCfgPulse, () -> setProgress(0));
+    }
+
+    private void cancelPendingFinish() {
+        if (mPendingFinish != null) {
+            removeCallbacks(mPendingFinish);
+            mPendingFinish = null;
+        }
+    }
+
+    private static float eased(int pct, String mode) {
+        float v = pct / 100f;
+        switch (mode) {
+            case "accelerate": return v * v;
+            case "decelerate": return 1f - (1f - v) * (1f - v);
+            case "ease_in_out": return v < .5f ? 2*v*v : 1f - (float)Math.pow(-2*v+2,2)/2f;
+            default: return v;
+        }
+    }
+
+    private static int brighten(int c, float f) {
+        return Color.argb(Color.alpha(c),
+                Math.min(255, (int)(Color.red(c) + (255 - Color.red(c)) * f)),
+                Math.min(255, (int)(Color.green(c) + (255 - Color.green(c)) * f)),
+                Math.min(255, (int)(Color.blue(c) + (255 - Color.blue(c)) * f)));
+    }
+
+    private static int blendColors(int c1, int c2, float ratio) {
+        float inv = 1f - ratio;
+        return Color.argb(Color.alpha(c1),
+                (int)(Color.red(c1)*inv + Color.red(c2)*ratio),
+                (int)(Color.green(c1)*inv + Color.green(c2)*ratio),
+                (int)(Color.blue(c1)*inv + Color.blue(c2)*ratio));
+    }
+
+    private static String truncate(String s, int max, String mode) {
+        if (s.length() <= max) return s;
+        String e = "\u2026";
+        int avail = max - 1;
+        if (avail <= 0) return e;
+        switch (mode) {
+            case "start": return e + s.substring(s.length() - avail);
+            case "end": return s.substring(0, avail) + e;
+            default: {
+                int head = (avail + 1) / 2;
+                int tail = avail - head;
+                return s.substring(0, head) + e + s.substring(s.length() - tail);
+            }
+        }
+    }
+
+    private float spToPx(float sp) {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp,
+                getResources().getDisplayMetrics());
+    }
+
+    private static Paint makePaint() {
+        Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
+        p.setStyle(Paint.Style.STROKE);
+        return p;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/OverlayAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/OverlayAnimationHelper.java
new file mode 100644
index 0000000000000..f20b562ba6f4e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/OverlayAnimationHelper.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.OvershootInterpolator;
+
+public final class OverlayAnimationHelper {
+
+    public static final int SEGMENT_COUNT = 12;
+    public static final float SEGMENT_GAP_DEG = 6f;
+    public static final float SEGMENT_ARC_DEG =
+            (360f - SEGMENT_COUNT * SEGMENT_GAP_DEG) / SEGMENT_COUNT;
+
+    public boolean isFinishAnimating = false;
+    public boolean isErrorAnimating = false;
+
+    public float displayAlpha = 1f;
+    public float displayScale = 1f;
+    public int segmentHighlight = -1;
+    public float successColorBlend = 0f;
+    public float completionPulseAlpha = 1f;
+    public float errorAlpha = 0f;
+
+    public enum PreviewMode { NONE, DYNAMIC, GEOMETRY }
+    public PreviewMode previewMode = PreviewMode.NONE;
+    public int previewProgress = 0;
+
+    public boolean isDynamicPreviewActive() { return previewMode == PreviewMode.DYNAMIC; }
+    public boolean isGeometryPreviewActive() { return previewMode == PreviewMode.GEOMETRY; }
+
+    private static final int MAX_ANIM_MS = 800;
+    private static final float INTENSITY_POP = 1.5f;
+    private static final float POP_SCALE_FACTOR = 0.08f;
+    private static final float SEGMENT_SHINE_BLEND = 0.4f;
+    private static final float PULSE_MIN_ALPHA = 0.7f;
+    private static final long PULSE_DURATION_MS = 400L;
+    private static final long PREVIEW_DEBOUNCE_MS = 300L;
+    private static final long GEOMETRY_HOLD_MS = 3000L;
+
+    private final View mHost;
+
+    private ValueAnimator mFinishAnim;
+    private ValueAnimator mPulseAnim;
+    private ValueAnimator mErrorAnim;
+    private ValueAnimator mPreviewAnim;
+    private Runnable mPreviewDebounce;
+    private Runnable mGeometryHideTask;
+
+    public OverlayAnimationHelper(View host) {
+        mHost = host;
+    }
+
+    public void startFinish(String style, int holdMs, int exitMs,
+                            boolean pulse, Runnable onComplete) {
+        cancelFinish();
+        isFinishAnimating = true;
+        displayAlpha = 1f;
+        displayScale = 1f;
+        segmentHighlight = -1;
+        successColorBlend = 1f;
+        completionPulseAlpha = 1f;
+
+        Runnable runStyle = () -> {
+            switch (style) {
+                case "snap":
+                    isFinishAnimating = false;
+                    resetFinishState();
+                    onComplete.run();
+                    break;
+                case "segmented":
+                    animateSegmented(holdMs, exitMs, INTENSITY_POP, onComplete);
+                    break;
+                default:
+                    animatePop(holdMs, exitMs, INTENSITY_POP, onComplete);
+            }
+        };
+
+        if (pulse && !"snap".equals(style)) {
+            animatePulse(runStyle);
+        } else {
+            runStyle.run();
+        }
+    }
+
+    private void animatePop(int holdMs, int exitMs, float intensity, Runnable onComplete) {
+        int total = Math.min(holdMs + exitMs, MAX_ANIM_MS);
+        long scaleDuration = (long)(total * 0.4f);
+        long fadeDuration = total - scaleDuration;
+
+        mFinishAnim = animate(0f, 1f, scaleDuration, new OvershootInterpolator(2f * intensity),
+                f -> displayScale = 1f + POP_SCALE_FACTOR * intensity * f,
+                () -> mFinishAnim = animate(0f, 1f, fadeDuration,
+                        new AccelerateDecelerateInterpolator(),
+                        f -> {
+                            displayScale = 1f + POP_SCALE_FACTOR * intensity * (1f - f * 0.5f);
+                            displayAlpha = 1f - f;
+                        },
+                        () -> endFinish(onComplete)));
+    }
+
+    private void animateSegmented(int holdMs, int exitMs, float intensity, Runnable onComplete) {
+        int total = Math.min(holdMs + exitMs, MAX_ANIM_MS);
+        long cascadeDuration = (long)(total * 0.6f);
+        long fadeDuration = total - cascadeDuration;
+
+        mFinishAnim = animateInt(0, SEGMENT_COUNT + 2, cascadeDuration,
+                new LinearInterpolator(),
+                seg -> {
+                    segmentHighlight  = seg;
+                    successColorBlend = intensity * SEGMENT_SHINE_BLEND;
+                },
+                () -> {
+                    segmentHighlight = -1;
+                    mFinishAnim = animate(1f, 0f, fadeDuration,
+                            new AccelerateDecelerateInterpolator(),
+                            f -> displayAlpha = f,
+                            () -> endFinish(onComplete));
+                });
+    }
+
+    private void animatePulse(Runnable then) {
+        if (mPulseAnim != null) mPulseAnim.cancel();
+        mPulseAnim = animate(1f, PULSE_MIN_ALPHA, PULSE_DURATION_MS,
+                new AccelerateDecelerateInterpolator(),
+                f -> completionPulseAlpha = f, null);
+        ValueAnimator second = animate(PULSE_MIN_ALPHA, 1f, PULSE_DURATION_MS,
+                new AccelerateDecelerateInterpolator(),
+                f -> completionPulseAlpha = f, then);
+        mPulseAnim.addListener(new AnimatorListenerAdapter() {
+            @Override public void onAnimationEnd(Animator a) { second.start(); }
+        });
+        mPulseAnim.start();
+    }
+
+    private void endFinish(Runnable onComplete) {
+        isFinishAnimating = false;
+        resetFinishState();
+        onComplete.run();
+        mHost.invalidate();
+    }
+
+    public void cancelFinish() {
+        cancel(mFinishAnim); mFinishAnim = null;
+        cancel(mPulseAnim);  mPulseAnim  = null;
+        isFinishAnimating = false;
+        resetFinishState();
+    }
+
+    private void resetFinishState() {
+        displayAlpha = 1f;
+        displayScale = 1f;
+        segmentHighlight = -1;
+        successColorBlend = 0f;
+        completionPulseAlpha = 1f;
+    }
+
+    public void startError(Runnable onComplete) {
+        if (isFinishAnimating || isErrorAnimating) return;
+        isErrorAnimating = true;
+        cancel(mErrorAnim);
+
+        mErrorAnim = ValueAnimator.ofFloat(0f, 1f, 0f, 1f, 0f);
+        mErrorAnim.setDuration(600);
+        mErrorAnim.setInterpolator(new LinearInterpolator());
+        mErrorAnim.addUpdateListener(a -> {
+            errorAlpha = (float) a.getAnimatedValue();
+            mHost.invalidate();
+        });
+        mErrorAnim.addListener(new AnimatorListenerAdapter() {
+            @Override public void onAnimationEnd(Animator a) {
+                isErrorAnimating = false;
+                errorAlpha = 0f;
+                if (onComplete != null) onComplete.run();
+                mHost.invalidate();
+            }
+        });
+        mErrorAnim.start();
+    }
+
+    public void cancelError() {
+        cancel(mErrorAnim); mErrorAnim = null;
+        isErrorAnimating = false;
+        errorAlpha = 0f;
+    }
+
+    public void startDynamicPreview(String finishStyle, int holdMs,
+                                    int exitMs, boolean pulse) {
+        mHost.removeCallbacks(mPreviewDebounce);
+        mPreviewDebounce = () -> runDynamicPreview(finishStyle, holdMs, exitMs, pulse);
+        mHost.postDelayed(mPreviewDebounce, PREVIEW_DEBOUNCE_MS);
+    }
+
+    private void runDynamicPreview(String finishStyle, int holdMs,
+                                   int exitMs, boolean pulse) {
+        cancelDynamicPreview();
+        previewMode = PreviewMode.DYNAMIC;
+        previewProgress = 0;
+
+        mPreviewAnim = animateInt(0, 100, 800,
+                new AccelerateDecelerateInterpolator(),
+                p -> previewProgress = p,
+                () -> {
+                    previewProgress = 100;
+                    startFinish(finishStyle, holdMs, exitMs, pulse, () ->
+                            mHost.postDelayed(() -> {
+                                previewMode     = PreviewMode.NONE;
+                                previewProgress = 0;
+                                mHost.invalidate();
+                            }, 200));
+                });
+    }
+
+    public void cancelDynamicPreview() {
+        mHost.removeCallbacks(mPreviewDebounce);
+        mPreviewDebounce = null;
+        cancel(mPreviewAnim); mPreviewAnim = null;
+        previewMode = PreviewMode.NONE;
+        previewProgress = 0;
+    }
+
+    public void showGeometryPreview(boolean autoHide) {
+        mHost.removeCallbacks(mGeometryHideTask);
+        mGeometryHideTask = null;
+        previewMode = PreviewMode.GEOMETRY;
+        mHost.invalidate();
+        if (autoHide) {
+            mGeometryHideTask = () -> {
+                previewMode = PreviewMode.NONE;
+                mGeometryHideTask = null;
+                mHost.invalidate();
+            };
+            mHost.postDelayed(mGeometryHideTask, GEOMETRY_HOLD_MS);
+        }
+    }
+
+    public void cancelGeometryPreview() {
+        mHost.removeCallbacks(mGeometryHideTask);
+        mGeometryHideTask = null;
+        if (previewMode == PreviewMode.GEOMETRY) {
+            previewMode = PreviewMode.NONE;
+            mHost.invalidate();
+        }
+    }
+
+    public void cancelAll() {
+        cancelFinish();
+        cancelError();
+        cancelDynamicPreview();
+        cancelGeometryPreview();
+    }
+
+    private interface FloatConsumer { void accept(float v); }
+    private interface IntConsumer { void accept(int v);   }
+
+    private ValueAnimator animate(float from, float to, long durationMs,
+                                  TimeInterpolator interp,
+                                  FloatConsumer onUpdate, Runnable onEnd) {
+        if (durationMs <= 0) {
+            onUpdate.accept(to);
+            mHost.invalidate();
+            if (onEnd != null) onEnd.run();
+            return new ValueAnimator();
+        }
+        ValueAnimator va = ValueAnimator.ofFloat(from, to);
+        va.setDuration(durationMs);
+        va.setInterpolator(interp);
+        va.addUpdateListener(a -> {
+            onUpdate.accept((float) a.getAnimatedValue());
+            mHost.invalidate();
+        });
+        if (onEnd != null) va.addListener(new AnimatorListenerAdapter() {
+            @Override public void onAnimationEnd(Animator a) { onEnd.run(); }
+        });
+        va.start();
+        return va;
+    }
+
+    private ValueAnimator animateInt(int from, int to, long durationMs,
+                                     TimeInterpolator interp,
+                                     IntConsumer onUpdate, Runnable onEnd) {
+        if (durationMs <= 0) {
+            onUpdate.accept(to);
+            mHost.invalidate();
+            if (onEnd != null) onEnd.run();
+            return new ValueAnimator();
+        }
+        ValueAnimator va = ValueAnimator.ofInt(from, to);
+        va.setDuration(durationMs);
+        va.setInterpolator(interp);
+        va.addUpdateListener(a -> {
+            onUpdate.accept((int) a.getAnimatedValue());
+            mHost.invalidate();
+        });
+        if (onEnd != null) va.addListener(new AnimatorListenerAdapter() {
+            @Override public void onAnimationEnd(Animator a) { onEnd.run(); }
+        });
+        va.start();
+        return va;
+    }
+
+    private static void cancel(ValueAnimator va) {
+        if (va != null) va.cancel();
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/RingViewRenderer.java b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/RingViewRenderer.java
new file mode 100644
index 0000000000000..26ef233598b08
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/cutoutprogress/ring/RingViewRenderer.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.cutoutprogress.ring;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+
+public interface RingViewRenderer {
+
+    void updateBounds(RectF bounds);
+
+    void drawFullRing(Canvas canvas, Paint paint);
+
+    void drawProgress(Canvas canvas, float sweepFraction, boolean clockwise, Paint paint);
+
+    void drawSegmented(Canvas canvas,
+                       int segments, float gapDeg, float arcDeg,
+                       int highlight,
+                       Paint basePaint, Paint shinePaint, float alpha);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
index c2e1e33f53182..001f62e89d2aa 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java
@@ -34,6 +34,7 @@
 import com.android.systemui.usb.UsbConfirmActivity;
 import com.android.systemui.usb.UsbDebuggingActivity;
 import com.android.systemui.usb.UsbDebuggingSecondaryUserActivity;
+import com.android.systemui.usb.UsbFunctionActivity;
 import com.android.systemui.usb.UsbPermissionActivity;
 import com.android.systemui.user.CreateUserActivity;
 
@@ -102,6 +103,12 @@ public abstract Activity bindUsbDebuggingSecondaryUserActivity(
     @ClassKey(UsbAccessoryUriActivity.class)
     public abstract Activity bindUsbAccessoryUriActivity(UsbAccessoryUriActivity activity);
 
+    /** Inject into UsbFunctionActivity. */
+    @Binds
+    @IntoMap
+    @ClassKey(UsbFunctionActivity.class)
+    public abstract Activity bindUsbFunctionActivity(UsbFunctionActivity activity);
+
     /** Inject into CreateUserActivity. */
     @Binds
     @IntoMap
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java
index 2459541b91b37..57ac23dceab1c 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultBroadcastReceiverBinder.java
@@ -25,6 +25,7 @@
 import com.android.systemui.people.widget.PeopleSpaceWidgetPinnedReceiver;
 import com.android.systemui.people.widget.PeopleSpaceWidgetProvider;
 import com.android.systemui.screenshot.DeleteScreenshotReceiver;
+import com.android.systemui.screenshot.LensScreenshotReceiver;
 import com.android.systemui.screenshot.SmartActionsReceiver;
 import com.android.systemui.user.UserDialogReceiver;
 
@@ -47,6 +48,15 @@ public abstract class DefaultBroadcastReceiverBinder {
     public abstract BroadcastReceiver bindDeleteScreenshotReceiver(
             DeleteScreenshotReceiver broadcastReceiver);
 
+    /**
+     *
+     */
+    @Binds
+    @IntoMap
+    @ClassKey(LensScreenshotReceiver.class)
+    public abstract BroadcastReceiver bindLensScreenshotReceiver(
+            LensScreenshotReceiver broadcastReceiver);
+
     /**
      *
      */
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java
index 8f01775bc9695..807ec4a008b06 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java
@@ -18,6 +18,8 @@
 
 import android.app.Service;
 
+import com.android.systemui.CPUInfoService;
+import com.android.systemui.FPSInfoService;
 import com.android.systemui.SystemUIService;
 import com.android.systemui.communal.widgets.GlanceableHubWidgetManagerService;
 import com.android.systemui.doze.DozeService;
@@ -100,4 +102,16 @@ public abstract Service bindNotificationListenerWithPlugins(
     @ClassKey(GlanceableHubWidgetManagerService.class)
     public abstract Service bindGlanceableHubWidgetManagerService(
             GlanceableHubWidgetManagerService service);
+
+    /** Inject into FPSInfoService */
+    @Binds
+    @IntoMap
+    @ClassKey(FPSInfoService.class)
+    public abstract Service bindFPSInfoService(FPSInfoService service);
+
+    /** Inject into FPSInfoService */
+    @Binds
+    @IntoMap
+    @ClassKey(CPUInfoService.class)
+    public abstract Service bindCPUInfoService(CPUInfoService service);
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
index 0c9dc172727e3..1b8a722db16bf 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
@@ -22,6 +22,7 @@
 import android.app.ActivityTaskManager;
 import android.app.AlarmManager;
 import android.app.AppOpsManager;
+import android.app.AxSandboxManager;
 import android.app.IActivityManager;
 import android.app.IActivityTaskManager;
 import android.app.INotificationManager;
@@ -101,6 +102,7 @@
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.ims.ImsManager;
 import android.telephony.satellite.SatelliteManager;
 import android.view.CrossWindowBlurListeners;
 import android.view.IWindowManager;
@@ -853,4 +855,17 @@ static SupervisionManager provideSupervisionManager(Context context) {
     static AutofillManager provideAutofillManager(Context context) {
         return context.getSystemService(AutofillManager.class);
     }
+
+    @Provides
+    @Singleton
+    static ImsManager provideImsManager(Context context) {
+        return context.getSystemService(ImsManager.class);
+    }
+
+    @Provides
+    @Singleton
+    @Nullable
+    static AxSandboxManager provideAxSandboxManager(Context context) {
+        return context.getSystemService(AxSandboxManager.class);
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
index f65e8488b98c1..074b79c1d518d 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
@@ -25,11 +25,16 @@
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dagger.qualifiers.PerUser;
 import com.android.systemui.dump.DumpManager;
+import com.android.systemui.edgelight.EdgeLightViewController;
+import com.android.systemui.nowplaying.NowPlayingViewController;
 import com.android.systemui.keyguard.KeyguardSliceProvider;
+import com.android.systemui.media.MediaViewController;
 import com.android.systemui.people.PeopleProvider;
+import com.android.systemui.pulse.PulseViewController;
 import com.android.systemui.settings.MultiUserUtilsModule;
 import com.android.systemui.startable.Dependencies;
 import com.android.systemui.statusbar.NotificationInsetsModule;
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController;
 import com.android.systemui.statusbar.QsFrameTranslateModule;
 import com.android.systemui.statusbar.phone.ConfigurationForwarder;
 import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -208,4 +213,19 @@ interface Builder {
      * Member injection into the supplied argument.
      */
     void inject(PeopleProvider peopleProvider);
+
+    @SysUISingleton
+    NTForbiddenSwipeDownQSController forbiddenSwipeDownQSController();
+
+    @SysUISingleton
+    MediaViewController mediaViewController();
+
+    @SysUISingleton
+    PulseViewController pulseViewController();
+
+    @SysUISingleton
+    EdgeLightViewController edgeLightViewController();
+
+    @SysUISingleton
+    NowPlayingViewController nowPlayingViewController();
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
index 6463529a89013..482cf797f3e9c 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt
@@ -21,6 +21,10 @@ import com.android.systemui.CoreStartable
 import com.android.systemui.LatencyTester
 import com.android.systemui.SliceBroadcastRelayHandler
 import com.android.systemui.accessibility.Magnification
+import com.android.systemui.applocker.AxAppLockerHelper
+import com.android.systemui.ax.AxPlatformServiceImpl
+import com.android.systemui.axdynamicbar.domain.AxDynamicBarChipsRefiner
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarManager
 import com.android.systemui.back.domain.interactor.BackActionInteractor
 import com.android.systemui.biometrics.BiometricNotificationService
 import com.android.systemui.bouncer.domain.startable.BouncerStartable
@@ -50,7 +54,9 @@ import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerR
 import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator
 import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherCoreStartable
 import com.android.systemui.shortcut.ShortcutKeyDispatcher
+import com.android.systemui.smartpixel.ui.SmartPixelManager
 import com.android.systemui.statusbar.ImmersiveModeConfirmation
+import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsRefiner
 import com.android.systemui.statusbar.gesture.GesturePointerEventListener
 import com.android.systemui.statusbar.notification.InstantAppNotifier
 import com.android.systemui.statusbar.notification.headsup.StatusBarHeadsUpChangeListener
@@ -58,11 +64,13 @@ import com.android.systemui.stylus.StylusUsiPowerStartable
 import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator
 import com.android.systemui.usb.StorageNotification
 import com.android.systemui.util.NotificationChannels
+import com.android.systemui.usb.UsbModePickerDialogDelegate
 import com.android.systemui.wmshell.WMShell
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.ClassKey
 import dagger.multibindings.IntoMap
+import dagger.multibindings.IntoSet
 
 /**
  * DEPRECATED: DO NOT ADD THINGS TO THIS FILE. b/427499553
@@ -329,4 +337,35 @@ abstract class SystemUICoreStartableModule {
     abstract fun bindSysUIKeyGestureEventInitializer(
         keyGestureEventInitializer: SysUIKeyGestureEventInitializer
     ): CoreStartable
+
+    @Binds
+    @IntoMap
+    @ClassKey(UsbModePickerDialogDelegate::class)
+    abstract fun bindUsbModePickerDialogDelegate(impl: UsbModePickerDialogDelegate): CoreStartable
+
+    @Binds
+    @IntoMap
+    @ClassKey(AxPlatformServiceImpl::class)
+    abstract fun bindAxPlatformService(impl: AxPlatformServiceImpl): CoreStartable
+
+    @Binds
+    @IntoMap
+    @ClassKey(AxDynamicBarManager::class)
+    abstract fun bindAxDynamicBarManager(impl: AxDynamicBarManager): CoreStartable
+
+    @Binds
+    @IntoSet
+    abstract fun bindDynamicBarChipsRefiner(impl: AxDynamicBarChipsRefiner): OngoingActivityChipsRefiner
+
+    @Binds
+    @IntoMap
+    @ClassKey(AxAppLockerHelper::class)
+    abstract fun bindAxAppLockerHelper(impl: AxAppLockerHelper): CoreStartable
+    
+    @Binds
+    @IntoMap
+    @ClassKey(SmartPixelManager::class)
+    abstract fun bindSmartPixelManager(
+        impl: SmartPixelManager
+    ): CoreStartable
 }
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
index 48a8119b8430f..db21ba592045d 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
@@ -16,10 +16,13 @@
 
 package com.android.systemui.dagger;
 
+import android.app.AlarmManager;
 import android.app.INotificationManager;
 import android.app.Service;
 import android.app.backup.BackupManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.os.Handler;
 import android.service.dreams.IDreamManager;
 import android.view.Display;
 
@@ -40,6 +43,7 @@
 import com.android.systemui.appops.dagger.AppOpsModule;
 import com.android.systemui.assist.AssistModule;
 import com.android.systemui.authentication.AuthenticationModule;
+import com.android.systemui.res.R;
 import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider;
 import com.android.systemui.biometrics.FingerprintReEnrollNotification;
 import com.android.systemui.biometrics.UdfpsDisplayModeProvider;
@@ -49,6 +53,7 @@
 import com.android.systemui.bouncer.domain.interactor.BouncerInteractorModule;
 import com.android.systemui.bouncer.ui.BouncerViewModule;
 import com.android.systemui.brightness.dagger.ScreenBrightnessModule;
+import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.classifier.FalsingModule;
 import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule;
 import com.android.systemui.common.data.CommonDataLayerModule;
@@ -60,6 +65,7 @@
 import com.android.systemui.compose.ComposeModule;
 import com.android.systemui.controls.dagger.ControlsModule;
 import com.android.systemui.dagger.qualifiers.Application;
+import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dagger.qualifiers.SystemUser;
 import com.android.systemui.dagger.qualifiers.UiBackground;
@@ -90,6 +96,7 @@
 import com.android.systemui.log.table.impl.TableLogBufferModule;
 import com.android.systemui.lowlight.dagger.LowLightModule;
 import com.android.systemui.lowlightclock.dagger.LowLightClockModule;
+import com.android.systemui.media.NotificationMediaManager;
 import com.android.systemui.mediaprojection.MediaProjectionModule;
 import com.android.systemui.mediaprojection.appselector.MediaProjectionActivitiesModule;
 import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherModule;
@@ -100,6 +107,7 @@
 import com.android.systemui.navigationbar.gestural.dagger.GestureModule;
 import com.android.systemui.notetask.NoteTaskModule;
 import com.android.systemui.people.PeopleModule;
+import com.android.systemui.cutoutprogress.dagger.CutoutProgressModule;
 import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
 import com.android.systemui.plugins.BcSmartspaceDataPlugin;
 import com.android.systemui.privacy.PrivacyModule;
@@ -128,6 +136,7 @@
 import com.android.systemui.shade.transition.LargeScreenShadeInterpolator;
 import com.android.systemui.shade.transition.LargeScreenShadeInterpolatorImpl;
 import com.android.systemui.shared.condition.Monitor;
+import com.android.systemui.smartspace.config.BcSmartspaceConfigProvider;
 import com.android.systemui.smartspace.dagger.SmartspaceModule;
 import com.android.systemui.startable.Dependencies;
 import com.android.systemui.statusbar.CommandQueue;
@@ -161,11 +170,14 @@
 import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;
 import com.android.systemui.statusbar.policy.DeviceStateRotationLockSettingController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
+import com.android.systemui.statusbar.policy.NextAlarmController;
+import com.android.systemui.statusbar.policy.NextAlarmControllerImpl;
 import com.android.systemui.statusbar.policy.PolicyModule;
 import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController;
 import com.android.systemui.statusbar.policy.ZenModeController;
 import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule;
 import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;
+import com.android.systemui.statusbar.policy.domain.interactor.ZenModeInteractor;
 import com.android.systemui.statusbar.systemstatusicons.SystemStatusIconsModule;
 import com.android.systemui.statusbar.ui.binder.StatusBarViewBinderModule;
 import com.android.systemui.statusbar.window.StatusBarWindowModule;
@@ -179,6 +191,7 @@
 import com.android.systemui.user.UserModule;
 import com.android.systemui.user.domain.UserDomainLayerModule;
 import com.android.systemui.util.EventLogModule;
+import com.android.systemui.util.concurrency.DelayableExecutor;
 import com.android.systemui.util.concurrency.SysUIConcurrencyModule;
 import com.android.systemui.util.dagger.UtilModule;
 import com.android.systemui.util.kotlin.SysUICoroutinesModule;
@@ -190,6 +203,13 @@
 import com.android.systemui.wmshell.BubblesManager;
 import com.android.wm.shell.bubbles.Bubbles;
 
+import com.google.android.systemui.smartspace.BcSmartspaceDataProvider;
+import com.google.android.systemui.smartspace.DateSmartspaceDataProvider;
+import com.google.android.systemui.smartspace.KeyguardMediaViewController;
+import com.google.android.systemui.smartspace.KeyguardZenAlarmViewController;
+import com.google.android.systemui.smartspace.WeatherSmartspaceDataProvider;
+import com.google.android.systemui.smartspace.dagger.SmartspaceStartableModule;
+
 import dagger.Binds;
 import dagger.BindsOptionalOf;
 import dagger.Module;
@@ -198,8 +218,6 @@
 import dagger.multibindings.IntoMap;
 import dagger.multibindings.Multibinds;
 
-import kotlinx.coroutines.CoroutineScope;
-
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
@@ -208,6 +226,9 @@
 
 import javax.inject.Named;
 
+import kotlinx.coroutines.CoroutineDispatcher;
+import kotlinx.coroutines.CoroutineScope;
+
 /**
  * A dagger module for injecting components of System UI that are required by System UI.
  *
@@ -292,6 +313,7 @@
         SettingsUtilModule.class,
         SmartRepliesInflationModule.class,
         SmartspaceModule.class,
+            SmartspaceStartableModule.class,
         StatusBarEventsModule.class,
         StatusBarModule.class,
         StatusBarChipsModule.class,
@@ -322,6 +344,7 @@
         LowLightClockModule.class,
         PerDisplayRepositoriesModule.class,
         InputDeviceModule.class,
+        CutoutProgressModule.class,
 },
         subcomponents = {
                 ComplicationComponent.class,
@@ -396,11 +419,15 @@ static BackupManager provideBackupManager(@Application Context context) {
 
     @BindsOptionalOf
     @Named(SmartspaceModule.DATE_SMARTSPACE_DATA_PLUGIN)
-    abstract BcSmartspaceDataPlugin optionalDateSmartspaceConfigPlugin();
+    abstract BcSmartspaceDataPlugin optionalDateSmartspaceDataPlugin();
+
+    @BindsOptionalOf
+    @Named(SmartspaceModule.GLANCEABLE_HUB_SMARTSPACE_DATA_PLUGIN)
+    abstract BcSmartspaceDataPlugin optionalGlanceableHubBcSmartspaceDataPlugin();
 
     @BindsOptionalOf
     @Named(SmartspaceModule.WEATHER_SMARTSPACE_DATA_PLUGIN)
-    abstract BcSmartspaceDataPlugin optionalWeatherSmartspaceConfigPlugin();
+    abstract BcSmartspaceDataPlugin optionalWeatherSmartspaceDataPlugin();
 
     @BindsOptionalOf
     abstract Recents optionalRecents();
@@ -518,4 +545,80 @@ static SceneDataSourceDelegator providesSceneDataSourceDelegator(
     static SettingsProxy.CurrentUserIdProvider provideCurrentUserId(UserTracker userTracker) {
         return userTracker::getUserId;
     }
+
+    @Provides
+    @SysUISingleton
+    static KeyguardZenAlarmViewController provideKeyguardZenAlarmViewController(
+            Context context,
+            @Named(SmartspaceModule.DATE_SMARTSPACE_DATA_PLUGIN) BcSmartspaceDataPlugin datePlugin,
+            ZenModeController zenModeController,
+            ZenModeInteractor zenModeInteractor,
+            AlarmManager alarmManager,
+            NextAlarmControllerImpl nextAlarmController,
+            @Main Handler handler,
+            @Application CoroutineScope applicationScope,
+            @Background CoroutineDispatcher bgDispatcher) {
+        KeyguardZenAlarmViewController controller = new KeyguardZenAlarmViewController(
+                context,
+                datePlugin,
+                zenModeController,
+                zenModeInteractor,
+                alarmManager,
+                nextAlarmController,
+                handler,
+                applicationScope,
+                bgDispatcher
+        );
+        controller.alarmImage = context.getResources().getDrawable(R.drawable.ic_access_alarms_big, null);
+        return controller;
+    }
+
+    @Provides
+    @SysUISingleton
+    static KeyguardMediaViewController provideKeyguardMediaViewController(
+            Context context,
+            NotificationMediaManager mediaManager,
+            BcSmartspaceDataPlugin plugin,
+            UserTracker userTracker,
+            @Main DelayableExecutor uiExecutor) {
+        KeyguardMediaViewController controller = new KeyguardMediaViewController(
+                context, mediaManager, plugin, userTracker, uiExecutor);
+        controller.mediaComponent = new ComponentName(context, KeyguardMediaViewController.class);
+        return controller;
+    }
+
+
+    @Provides
+    @SysUISingleton
+    static BcSmartspaceConfigProvider provideBcSmartspaceConfigPlugin(
+            FeatureFlags featureFlags) {
+        return new BcSmartspaceConfigProvider(featureFlags);
+    }
+
+    @Provides
+    @SysUISingleton
+    static BcSmartspaceDataPlugin provideBcSmartspaceDataPlugin() {
+        return new BcSmartspaceDataProvider();
+    }
+
+    @Provides
+    @SysUISingleton
+    @Named(SmartspaceModule.DATE_SMARTSPACE_DATA_PLUGIN)
+    static BcSmartspaceDataPlugin provideDateSmartspaceDataPlugin() {
+        return new DateSmartspaceDataProvider();
+    }
+
+    @Provides
+    @SysUISingleton
+    @Named(SmartspaceModule.GLANCEABLE_HUB_SMARTSPACE_DATA_PLUGIN)
+    static BcSmartspaceDataPlugin provideGlanceableHubSmartspaceDataPlugin() {
+        return new BcSmartspaceDataProvider();
+    }
+
+    @Provides
+    @SysUISingleton
+    @Named(SmartspaceModule.WEATHER_SMARTSPACE_DATA_PLUGIN)
+    static BcSmartspaceDataPlugin provideWeatherSmartspaceDataPlugin() {
+        return new WeatherSmartspaceDataProvider();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/development/ui/compose/BuildNumber.kt b/packages/SystemUI/src/com/android/systemui/development/ui/compose/BuildNumber.kt
index e5213fa6a52fa..d898606bae4e9 100644
--- a/packages/SystemUI/src/com/android/systemui/development/ui/compose/BuildNumber.kt
+++ b/packages/SystemUI/src/com/android/systemui/development/ui/compose/BuildNumber.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 The Android Open Source Project
+ * Copyright (C) 2025-2026 crDroid Android Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,84 +16,400 @@
 
 package com.android.systemui.development.ui.compose
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.database.ContentObserver
+import android.net.ConnectivityManager
+import android.net.ConnectivityManager.NetworkCallback
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiManager
+import android.os.UserHandle
+import android.provider.Settings
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener
+import android.text.format.Formatter
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.onLongClick
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
-import com.android.systemui.communal.ui.compose.extensions.detectLongPressGesture
+import androidx.compose.ui.text.AnnotatedString
+import com.android.settingslib.net.DataUsageController
 import com.android.systemui.development.ui.viewmodel.BuildNumberViewModel
-import com.android.systemui.lifecycle.rememberViewModel
 import com.android.systemui.qs.ui.compose.borderOnFocus
 import com.android.systemui.res.R
 
+private const val WINDOW_DAILY = 0
+private const val WINDOW_WEEKLY = 1
+
+/**
+ * BuildNumber composable replaced with a data usage readout
+ */
 @Composable
 fun BuildNumber(
-    viewModelFactory: BuildNumberViewModel.Factory,
+    @Suppress("UNUSED_PARAMETER") viewModelFactory: BuildNumberViewModel.Factory? = null,
+    @Suppress("UNUSED_PARAMETER") viewModel: BuildNumberViewModel? = null,
     modifier: Modifier = Modifier,
     textColor: Color = MaterialTheme.colorScheme.onSurface,
 ) {
-    val viewModel = rememberViewModel(traceName = "BuildNumber") { viewModelFactory.create() }
+    val context = LocalContext.current
+    val haptics = LocalHapticFeedback.current
 
-    BuildNumber(viewModel, modifier, textColor)
-}
+    var usageText by remember { mutableStateOf<String?>(null) }
+    val subMgr = remember { SubscriptionManager.from(context) }
+    val duc = remember { DataUsageController(context) }
+    val cr = context.contentResolver
 
-@Composable
-fun BuildNumber(
-    viewModel: BuildNumberViewModel,
-    modifier: Modifier,
-    textColor: Color = MaterialTheme.colorScheme.onSurface,
-) {
-    val buildNumber = viewModel.buildNumber
-
-    if (buildNumber != null) {
-        val haptics = LocalHapticFeedback.current
-        val copyToClipboardActionLabel = stringResource(id = R.string.copy_to_clipboard_a11y_action)
-
-        Text(
-            text = buildNumber.value,
-            style = MaterialTheme.typography.bodySmall,
-            modifier =
-                modifier
-                    .borderOnFocus(
-                        color = MaterialTheme.colorScheme.secondary,
-                        cornerSize = CornerSize(1.dp),
-                    )
-                    .focusable()
-                    .wrapContentWidth()
-                    // Using this instead of combinedClickable because this node should not support
-                    // single click
-                    .pointerInput(Unit) {
-                        detectLongPressGesture {
-                            haptics.performHapticFeedback(HapticFeedbackType.LongPress)
-                            viewModel.onBuildNumberLongPress()
-                        }
+    var showDataUsage by remember {
+        mutableStateOf(
+            try {
+                Settings.System.getIntForUser(
+                    cr,
+                    Settings.System.QS_SHOW_DATA_USAGE,
+                    0,
+                    UserHandle.USER_CURRENT
+                ) != 0
+            } catch (_: Throwable) {
+                false
+            }
+        )
+    }
+
+    DisposableEffect(Unit) {
+        val usageToggleObserver = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    showDataUsage = try {
+                        Settings.System.getIntForUser(
+                            cr,
+                            Settings.System.QS_SHOW_DATA_USAGE,
+                            0,
+                            UserHandle.USER_CURRENT
+                        ) != 0
+                    } catch (_: Throwable) {
+                        false
                     }
-                    .semantics {
-                        onLongClick(copyToClipboardActionLabel) {
-                            viewModel.onBuildNumberLongPress()
-                            true
-                        }
+                }
+            }
+        }
+
+        val toggleUri = Settings.System.getUriFor(Settings.System.QS_SHOW_DATA_USAGE)
+        cr.registerContentObserver(toggleUri, false, usageToggleObserver, UserHandle.USER_ALL)
+
+        onDispose {
+            cr.unregisterContentObserver(usageToggleObserver)
+        }
+    }
+
+    var usageWindow by rememberSaveable {
+        mutableIntStateOf(
+            Settings.System.getIntForUser(
+                cr, Settings.System.QS_SHOW_DATA_USAGE_WINDOW, WINDOW_DAILY, UserHandle.USER_CURRENT
+            )
+        )
+    }
+
+    fun setUsageWindow(newVal: Int) {
+        usageWindow = newVal
+        Settings.System.putIntForUser(
+            cr, Settings.System.QS_SHOW_DATA_USAGE_WINDOW, newVal, UserHandle.USER_CURRENT
+        )
+    }
+
+    var displaySubId by remember { mutableIntStateOf(currentDataSubId(context, subMgr)) }
+
+    fun wifiSsidOrNull(wm: WifiManager): String? {
+        val raw = wm.connectionInfo?.ssid ?: return null
+        val ssid = raw.replace("\"", "")
+        return when {
+            ssid.isEmpty() -> null
+            ssid.equals("<unknown ssid>", ignoreCase = true) -> null
+            ssid.equals("<unknown>", ignoreCase = true) -> null
+            else -> ssid
+        }
+    }
+
+    fun ssidWithTruncation(wm: WifiManager): String {
+        val ssid = wifiSsidOrNull(wm) ?: return context.getString(R.string.usage_wifi_default_suffix)
+        return if (ssid.length > 10) ssid.substring(0, 7) + "..." else ssid
+    }
+
+    fun isWifiConnected(cm: ConnectivityManager, wm: WifiManager): Boolean {
+        val net = cm.activeNetwork ?: return false
+        val caps = cm.getNetworkCapabilities(net) ?: return false
+        val validatedWifi = caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+            caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+        return validatedWifi && wifiSsidOrNull(wm) != null
+    }
+
+    fun fallbackCarrierName(subMgr: SubscriptionManager, subId: Int): String {
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            val subInfo: SubscriptionInfo? = subMgr.getActiveSubscriptionInfo(subId)
+            if (subInfo != null) {
+                val name = subInfo.displayName?.toString()
+                if (!name.isNullOrBlank()) return name
+            }
+        }
+        val list = subMgr.activeSubscriptionInfoList
+        if (!list.isNullOrEmpty()) {
+            val name = list[0].displayName?.toString()
+            if (!name.isNullOrBlank()) return name
+        }
+        return context.getString(R.string.usage_data_default_suffix)
+    }
+
+    fun formatDataUsage(bytes: Long, suffix: String, weekly: Boolean): String {
+        // Example: "1.23 GB used today (airtel)"
+        val labelId = if (weekly) R.string.usage_data_weekly else R.string.usage_data
+        return StringBuilder(Formatter.formatFileSize(context, bytes, Formatter.FLAG_IEC_UNITS))
+            .append(" ")
+            .append(context.getString(labelId))
+            .append(" (")
+            .append(suffix)
+            .append(")")
+            .toString()
+    }
+
+    fun updateUsage() {
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val wm = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        val wifi = isWifiConnected(cm, wm)
+        val hasSims = subMgr.activeSubscriptionInfoCount > 0
+        val weekly = (usageWindow == WINDOW_WEEKLY)
+
+        if (wifi) {
+            val info = if (weekly)
+                duc.getWifiWeeklyDataUsageInfo(true) ?: duc.getWifiWeeklyDataUsageInfo(false)
+            else
+                duc.getWifiDailyDataUsageInfo(true) ?: duc.getWifiDailyDataUsageInfo(false)
+
+            val suffix = ssidWithTruncation(wm)
+            if (info != null) {
+                usageText = formatDataUsage(info.usageLevel, suffix, weekly)
+            }
+        } else if (hasSims) {
+            val subId = displaySubId.takeIf { SubscriptionManager.isValidSubscriptionId(it) }
+                ?: currentDataSubId(context, subMgr)
+            displaySubId = subId
+            duc.setSubscriptionId(subId)
+            val info = if (weekly) duc.getWeeklyDataUsageInfo() else duc.getDailyDataUsageInfo()
+            val suffix = (info?.carrier?.takeIf { !it.isNullOrBlank() })
+                ?: fallbackCarrierName(subMgr, subId)
+            if (info != null) {
+                usageText = formatDataUsage(info.usageLevel, suffix, weekly)
+            }
+        } else {
+            // Radios off / no SIM: keep last known text
+        }
+    }
+
+    LaunchedEffect(showDataUsage, usageWindow) {
+        if (showDataUsage) updateUsage() else usageText = ""   // keep stable Text node
+    }
+
+    val latestUpdate by rememberUpdatedState(newValue = { updateUsage() })
+
+    DisposableEffect(showDataUsage) {
+        if (!showDataUsage) {
+            onDispose { }
+        } else {
+            val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val wm = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+            val wifiFilter = IntentFilter().apply {
+                addAction(WifiManager.WIFI_STATE_CHANGED_ACTION)
+                addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION)
+                addAction(WifiManager.RSSI_CHANGED_ACTION)
+            }
+
+            val receiver = object : BroadcastReceiver() {
+                override fun onReceive(context: Context?, intent: Intent?) { updateUsage() }
+            }
+            context.registerReceiver(receiver, wifiFilter, Context.RECEIVER_NOT_EXPORTED)
+
+            val netCb = object : NetworkCallback() {
+                override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {
+                    latestUpdate()
+                }
+                override fun onLost(network: Network) {
+                    latestUpdate()
+                }
+            }
+            cm.registerDefaultNetworkCallback(netCb)
+
+            val settingsObserver = object : ContentObserver(null) {
+                override fun onChange(selfChange: Boolean) {
+                    context.mainExecutor.execute {
+                        displaySubId = currentDataSubId(context, subMgr)
+                        latestUpdate()
+                    }
+                }
+            }
+
+            val uri = Settings.Global.getUriFor(Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION)
+            context.contentResolver.registerContentObserver(uri, false, settingsObserver, UserHandle.USER_ALL)
+
+            val subListener = object : OnSubscriptionsChangedListener() {
+                override fun onSubscriptionsChanged() {
+                    if (!SubscriptionManager.isValidSubscriptionId(displaySubId) ||
+                        subMgr.getActiveSubscriptionInfo(displaySubId) == null
+                    ) {
+                        displaySubId = currentDataSubId(context, subMgr)
                     }
-                    .basicMarquee(iterations = 1, initialDelayMillis = 2000)
-                    .minimumInteractiveComponentSize(),
-            color = textColor,
-            maxLines = 1,
+                    updateUsage()
+                }
+            }
+            subMgr.addOnSubscriptionsChangedListener(context.mainExecutor, subListener)
+
+            val windowObserver = object : ContentObserver(null) {
+                override fun onChange(selfChange: Boolean) {
+                    context.mainExecutor.execute {
+                        usageWindow = Settings.System.getIntForUser(
+                            cr,
+                            Settings.System.QS_SHOW_DATA_USAGE_WINDOW,
+                            WINDOW_DAILY,
+                            UserHandle.USER_CURRENT
+                        )
+                        latestUpdate()
+                    }
+                }
+            }
+
+            val windowUri = Settings.System.getUriFor(Settings.System.QS_SHOW_DATA_USAGE_WINDOW)
+            context.contentResolver.registerContentObserver(windowUri, false, windowObserver, UserHandle.USER_ALL)
+
+            onDispose {
+                context.unregisterReceiver(receiver)
+                cm.unregisterNetworkCallback(netCb)
+                context.contentResolver.unregisterContentObserver(settingsObserver)
+                context.contentResolver.unregisterContentObserver(windowObserver)
+                subMgr.removeOnSubscriptionsChangedListener(subListener)
+            }
+        }
+    }
+
+    val textToShow = if (showDataUsage) usageText.orEmpty() else ""
+
+    val base = modifier
+        .borderOnFocus(
+            color = MaterialTheme.colorScheme.secondary,
+            cornerSize = CornerSize(1.dp),
         )
+        .focusable()
+        .wrapContentWidth()
+        .minimumInteractiveComponentSize()
+        .pointerInput(Unit) {
+            detectTapGestures(
+                onTap = {
+                    if (!textToShow.isNullOrEmpty()) {
+                        val next = if (usageWindow == WINDOW_DAILY) WINDOW_WEEKLY else WINDOW_DAILY
+                        setUsageWindow(next)
+                        updateUsage()
+                    }
+                },
+                onDoubleTap = {
+                    if (!textToShow.isNullOrEmpty()) {
+                        val list = subMgr.activeSubscriptionInfoList
+                        if (!list.isNullOrEmpty() && list.size > 1) {
+                            val ids = list.sortedBy { it.simSlotIndex }.map { it.subscriptionId }
+                            val idx = ids.indexOf(displaySubId).let { if (it < 0) 0 else it }
+                            displaySubId = ids[(idx + 1) % ids.size]
+                            updateUsage()
+                        }
+                    }
+                },
+                onLongPress = {
+                    if (textToShow.isNotEmpty()) {
+                        haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                        openDataUsageSettings(context)
+                    }
+                }
+            )
+        }
+        .semantics {
+            onLongClick("Open data usage settings") {
+                if (textToShow.isNotEmpty()) {
+                    openDataUsageSettings(context)
+                    true
+                } else false
+            }
+        }
+
+    val marquee = if (textToShow.isNotEmpty()) {
+        base.basicMarquee(iterations = 1, initialDelayMillis = 2000)
     } else {
-        Spacer(modifier)
+        base
+    }
+
+    Text(
+        text = textToShow,
+        style = MaterialTheme.typography.bodySmall,
+        modifier = marquee.alpha(if (textToShow.isNotEmpty()) 1f else 0f),
+        color = textColor,
+        maxLines = 1,
+    )
+}
+
+fun openDataUsageSettings(context: Context) {
+    val intent = Intent(Settings.ACTION_DATA_USAGE_SETTINGS).apply {
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+    try {
+        context.startActivityAsUser(intent, UserHandle.CURRENT)
+    } catch (_: Throwable) {
+        val fallback = Intent(Intent.ACTION_MAIN).apply {
+            setClassName(
+                "com.android.settings",
+                "com.android.settings.Settings\$DataUsageSummaryActivity"
+            )
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivityAsUser(fallback, UserHandle.CURRENT)
+    }
+}
+
+private fun currentDataSubId(context: Context, subMgr: SubscriptionManager): Int {
+    val fromSettings = Settings.Global.getInt(
+        context.contentResolver,
+        Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION,
+        SubscriptionManager.INVALID_SUBSCRIPTION_ID
+    )
+    if (SubscriptionManager.isValidSubscriptionId(fromSettings)) {
+        return fromSettings
+    }
+    val fallback = SubscriptionManager.getDefaultDataSubscriptionId()
+    if (SubscriptionManager.isValidSubscriptionId(fallback)) {
+        return fallback
     }
+    val active = subMgr.activeSubscriptionInfoList
+    return if (!active.isNullOrEmpty()) active[0].subscriptionId
+    else SubscriptionManager.INVALID_SUBSCRIPTION_ID
 }
diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt
index 48a062c8c228b..477916dffa086 100644
--- a/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt
@@ -237,7 +237,7 @@ constructor(
             )
 
     override fun setLockedOut(isLockedOut: Boolean) {
-        _isLockedOut.value = isLockedOut
+        _isLockedOut.value = false
     }
 
     private val faceLockoutResetCallback =
@@ -507,7 +507,7 @@ constructor(
             override fun onAuthenticationError(errorCode: Int, errString: CharSequence?) {
                 val errorStatus = ErrorFaceAuthenticationStatus(errorCode, errString.toString())
                 if (errorStatus.isLockoutError()) {
-                    _isLockedOut.value = true
+                    _isLockedOut.value = false
                 }
                 _isAuthenticated.value = false
                 _authenticationStatus.value = errorStatus
diff --git a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt
index c87b3aaab6f81..9e959472f328c 100644
--- a/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt
@@ -20,6 +20,8 @@ import android.app.trust.TrustManager
 import android.content.Context
 import android.hardware.biometrics.BiometricFaceConstants
 import android.hardware.biometrics.BiometricSourceType
+import android.pocket.IPocketCallback
+import android.pocket.PocketManager
 import android.security.Flags.secureLockDevice
 import android.service.dreams.Flags.dreamsV2
 import com.android.keyguard.KeyguardUpdateMonitor
@@ -119,7 +121,22 @@ constructor(
 
     private val listeners: MutableList<FaceAuthenticationListener> = mutableListOf()
 
+    private var isDeviceInPocket: Boolean = false
+    private var pocketManager: PocketManager? = context.getSystemService(Context.POCKET_SERVICE) as? PocketManager
+    private val pocketCallback = object : IPocketCallback.Stub() {
+        override fun onStateChanged(state: Boolean, reason: Int) {
+            if (reason == PocketManager.REASON_SENSOR) {
+                isDeviceInPocket = state
+            } else {
+                isDeviceInPocket = false
+            }
+        }
+    }
+
     override fun start() {
+        // Register pocket callback to detect pocket state changes
+        pocketManager?.addCallback(pocketCallback)
+
         // Todo(b/310594096): there is a dependency cycle introduced by the repository depending on
         //  KeyguardBypassController, which in turn depends on KeyguardUpdateMonitor through
         //  its other dependencies. Once bypassEnabled state is available through a repository, we
@@ -378,7 +395,7 @@ constructor(
 
     fun isAuthOrDetectRunning(): Boolean = isAuthRunning() || isDetectRunning()
 
-    override fun canFaceAuthRun(): Boolean = repository.canRunFaceAuth.value
+    override fun canFaceAuthRun(): Boolean = repository.canRunFaceAuth.value && !isDeviceInPocket
 
     override fun isFaceAuthStrong(): Boolean =
         facePropertyRepository.sensorInfo.value?.strength == SensorStrength.STRONG
@@ -437,6 +454,7 @@ constructor(
         authenticationStatus.filterIsInstance<SuccessFaceAuthenticationStatus>()
 
     private fun runFaceAuth(uiEvent: FaceAuthUiEvent, fallbackToDetect: Boolean) {
+        if (isDeviceInPocket) return
         if (
             secureLockDevice() &&
                 (_pendingFaceAuthConfirmationInSecureLockDevice.value ||
@@ -445,17 +463,9 @@ constructor(
             return
         }
 
-        if (repository.isLockedOut.value && !isBypassEnabled.value) {
-            faceAuthenticationStatusOverride.value =
-                ErrorFaceAuthenticationStatus(
-                    BiometricFaceConstants.FACE_ERROR_LOCKOUT_PERMANENT,
-                    context.resources.getString(R.string.keyguard_face_unlock_unavailable),
-                )
-        } else {
-            faceAuthenticationStatusOverride.value = null
-            faceAuthenticationLogger.authRequested(uiEvent)
-            repository.requestAuthenticate(uiEvent, fallbackToDetection = fallbackToDetect)
-        }
+        faceAuthenticationStatusOverride.value = null
+        faceAuthenticationLogger.authRequested(uiEvent)
+        repository.requestAuthenticate(uiEvent, fallbackToDetection = fallbackToDetect)
     }
 
     override fun isFaceAuthEnabledAndEnrolled(): Boolean =
diff --git a/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java b/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java
index 78b742892aac3..a7ea719fdb404 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java
@@ -44,7 +44,7 @@
 public class AlwaysOnDisplayPolicy {
     public static final String TAG = "AlwaysOnDisplayPolicy";
 
-    private static final long DEFAULT_PROX_SCREEN_OFF_DELAY_MS = 10 * DateUtils.SECOND_IN_MILLIS;
+    private static final long DEFAULT_PROX_SCREEN_OFF_DELAY_MS = 3 * DateUtils.SECOND_IN_MILLIS;
     private static final long DEFAULT_PROX_COOLDOWN_TRIGGER_MS = 2 * DateUtils.SECOND_IN_MILLIS;
     private static final long DEFAULT_PROX_COOLDOWN_PERIOD_MS = 5 * DateUtils.SECOND_IN_MILLIS;
     private static final long DEFAULT_WALLPAPER_VISIBILITY_MS = 60 * DateUtils.SECOND_IN_MILLIS;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
index 537cacd13a960..b589be8db797c 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java
@@ -107,8 +107,8 @@ public void onEvent(int dockState) {
                     nextState = State.DOZE_AOD_DOCKED;
                     break;
                 case DockManager.STATE_NONE:
-                    nextState = mConfig.alwaysOnEnabled(mUserTracker.getUserId()) ? State.DOZE_AOD
-                            : State.DOZE;
+                    nextState = mConfig.screenOffAodEnabled(mUserTracker.getUserId())
+                            ? State.DOZE_AOD : State.DOZE;
                     break;
                 case DockManager.STATE_DOCKED_HIDE:
                     nextState = State.DOZE;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
index 7cd141813c5e0..8d16b3c549084 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
@@ -458,7 +458,7 @@ private void resolveIntermediateState(State state) {
                     nextState = State.FINISH;
                 } else if (mDockManager.isDocked()) {
                     nextState = mDockManager.isHidden() ? State.DOZE : State.DOZE_AOD_DOCKED;
-                } else if (mAmbientDisplayConfig.alwaysOnEnabled(mUserTracker.getUserId())) {
+                } else if (mAmbientDisplayConfig.screenOffAodEnabled(mUserTracker.getUserId())) {
                     nextState = State.DOZE_AOD;
                 } else {
                     nextState = State.DOZE;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMinMode.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMinMode.java
index a23b9c5ddaf61..f72127a40871d 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeMinMode.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMinMode.java
@@ -110,7 +110,7 @@ public void onEvent(int minModeState) {
                     break;
                 case MinModeManager.STATE_NONE:
                     nextState =
-                            mConfig.alwaysOnEnabled(mUserTracker.getUserId())
+                            mConfig.screenOffAodEnabled(mUserTracker.getUserId())
                                     ? State.DOZE_AOD
                                     : State.DOZE;
                     break;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenOffPeekController.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenOffPeekController.java
new file mode 100644
index 0000000000000..c8927e311fb56
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenOffPeekController.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2026 VoltageOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.doze;
+
+import android.app.AlarmManager;
+import android.content.Context;
+import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.Handler;
+import android.pocket.PocketManager;
+import android.provider.Settings;
+
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.doze.dagger.DozeScope;
+import com.android.systemui.settings.UserTracker;
+import com.android.systemui.statusbar.phone.DozeParameters;
+import com.android.systemui.util.AlarmTimeout;
+
+import java.io.PrintWriter;
+
+import javax.inject.Inject;
+
+/**
+ * Limits screen-off AOD peek sessions to a short timeout when full AOD is not active.
+ */
+@DozeScope
+public class DozeScreenOffPeekController implements DozeMachine.Part {
+    private static final String TAG = "DozeScreenOffPeek";
+
+    private final Context mContext;
+    private final AmbientDisplayConfiguration mConfig;
+    private final UserTracker mUserTracker;
+    private final AlarmTimeout mPeekTimeout;
+    private final PocketManager mPocketManager;
+    private final DozeParameters mDozeParameters;
+
+    private DozeMachine mMachine;
+
+    @Inject
+    DozeScreenOffPeekController(
+            Context context,
+            AmbientDisplayConfiguration config,
+            UserTracker userTracker,
+            DozeParameters dozeParameters,
+            @Main Handler handler,
+            AlarmManager alarmManager) {
+        mContext = context;
+        mConfig = config;
+        mUserTracker = userTracker;
+        mDozeParameters = dozeParameters;
+        mPeekTimeout = new AlarmTimeout(alarmManager, this::onTimeout, TAG, handler);
+        mPocketManager = (PocketManager) context.getSystemService(Context.POCKET_SERVICE);
+    }
+
+    @Override
+    public void setDozeMachine(DozeMachine dozeMachine) {
+        mMachine = dozeMachine;
+    }
+
+    @Override
+    public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) {
+        final boolean peekActive = newState == DozeMachine.State.DOZE_AOD && shouldRunPeek();
+        mDozeParameters.setScreenOffPeekActive(peekActive);
+
+        if (peekActive) {
+            if (shouldSkipForPocket()) {
+                mMachine.requestState(DozeMachine.State.DOZE);
+                return;
+            }
+            mPeekTimeout.schedule(getPeekDurationMillis(),
+                    AlarmTimeout.MODE_RESCHEDULE_IF_SCHEDULED);
+            return;
+        }
+        mPeekTimeout.cancel();
+    }
+
+    @Override
+    public void dump(PrintWriter pw) {
+        pw.println("DozeScreenOffPeekController:");
+        pw.println(" enabled=" + shouldRunPeek());
+        pw.println(" durationMs=" + getPeekDurationMillis());
+    }
+
+    private boolean shouldRunPeek() {
+        return mConfig.screenOffPeekEnabled(mUserTracker.getUserId());
+    }
+
+    private boolean shouldSkipForPocket() {
+        final int userId = mUserTracker.getUserId();
+        final boolean pocketJudgeEnabled = Settings.System.getIntForUser(
+                mContext.getContentResolver(), Settings.System.POCKET_JUDGE, 0, userId) == 1;
+        return pocketJudgeEnabled && mPocketManager != null && mPocketManager.isDeviceInPocket();
+    }
+
+    private long getPeekDurationMillis() {
+        return mConfig.getScreenOffPeekDurationMillis(mUserTracker.getUserId());
+    }
+
+    private void onTimeout() {
+        mMachine.requestState(DozeMachine.State.DOZE);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 35e53ecfa3b44..e887bf42e3de3 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -74,7 +74,9 @@ public void onDestroy() {
             mPluginManager.removePluginListener(this);
         }
         super.onDestroy();
-        mDozeMachine.destroy();
+        if (mDozeMachine != null) {
+            mDozeMachine.destroy();
+        }
         mDozeMachine = null;
     }
 
@@ -95,7 +97,9 @@ public void onPluginDisconnected(DozeServicePlugin plugin) {
     @Override
     public void onDreamingStarted() {
         super.onDreamingStarted();
-        mDozeMachine.requestState(DozeMachine.State.INITIALIZED);
+        if (mDozeMachine != null) {
+            mDozeMachine.requestState(DozeMachine.State.INITIALIZED);
+        }
         startDozing();
         if (mDozePlugin != null) {
             mDozePlugin.onDreamingStarted();
@@ -105,7 +109,9 @@ public void onDreamingStarted() {
     @Override
     public void onDreamingStopped() {
         super.onDreamingStopped();
-        mDozeMachine.requestState(DozeMachine.State.FINISH);
+        if (mDozeMachine != null) {
+            mDozeMachine.requestState(DozeMachine.State.FINISH);
+        }
         if (mDozePlugin != null) {
             mDozePlugin.onDreamingStopped();
         }
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSuppressor.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSuppressor.java
index 8d612d1689f7b..ce5f8871288fa 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeSuppressor.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSuppressor.java
@@ -124,7 +124,7 @@ public void onPowerSaveChanged(boolean active) {
             if (mDozeHost.isPowerSaveActive()) {
                 nextState = DozeMachine.State.DOZE;
             } else if (mMachine.getState() == DozeMachine.State.DOZE
-                    && mConfig.alwaysOnEnabled(mUserTracker.getUserId())) {
+                    && mConfig.screenOffAodEnabled(mUserTracker.getUserId())) {
                 nextState = DozeMachine.State.DOZE_AOD;
             }
 
@@ -139,7 +139,7 @@ public void onAlwaysOnSuppressedChanged(boolean suppressed) {
             // handles suppression changes, while DozeMachine#transitionPolicy handles gating
             // transitions to DOZE_AOD
             final DozeMachine.State nextState;
-            if (mConfig.alwaysOnEnabled(mUserTracker.getUserId()) && !suppressed) {
+            if (mConfig.screenOffAodEnabled(mUserTracker.getUserId()) && !suppressed) {
                 nextState = DozeMachine.State.DOZE_AOD;
             } else {
                 nextState = DozeMachine.State.DOZE;
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 58b2b23a39f57..a5d96d9b9283d 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -30,6 +30,10 @@
 import android.content.IntentFilter;
 import android.hardware.display.AmbientDisplayConfiguration;
 import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.VibrationAttributes;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.text.format.Formatter;
 import android.util.IndentingPrintWriter;
 import android.util.Log;
@@ -107,6 +111,7 @@ public class DozeTriggers implements DozeMachine.Part {
     private final UserTracker mUserTracker;
     private final SelectedUserInteractor mSelectedUserInteractor;
     private final UiEventLogger mUiEventLogger;
+    private final Vibrator mVibrator;
 
     private long mNotificationPulseTime;
     private Runnable mAodInterruptRunnable;
@@ -232,6 +237,7 @@ public DozeTriggers(Context context, DozeHost dozeHost,
         mKeyguardStateController = keyguardStateController;
         mUserTracker = userTracker;
         mSelectedUserInteractor = selectedUserInteractor;
+        mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
     }
 
     @Override
@@ -379,7 +385,36 @@ private boolean shouldDropPickupEvent() {
         return mKeyguardStateController.isOccluded();
     }
 
+    private boolean dozeInsteadOfWake(@DozeLog.Reason int reason) {
+        switch (reason) {
+            case DozeLog.REASON_SENSOR_PICKUP:
+                return mConfig.pickupGestureAmbient(UserHandle.USER_CURRENT);
+            case DozeLog.REASON_SENSOR_TAP:
+                return mConfig.tapGestureAmbient(UserHandle.USER_CURRENT);
+        }
+        return false;
+    }
+
+    private boolean shouldVibrate(@DozeLog.Reason int reason) {
+        if (mVibrator == null || !mVibrator.hasVibrator())
+            return false;
+        switch (reason) {
+            case DozeLog.REASON_SENSOR_PICKUP:
+                return mConfig.pickupGestureVibrate(mUserTracker.getUserId());
+            case DozeLog.REASON_SENSOR_DOUBLE_TAP:
+                return mConfig.doubleTapGestureVibrate(mUserTracker.getUserId());
+            case DozeLog.REASON_SENSOR_TAP:
+                return mConfig.tapGestureVibrate(mUserTracker.getUserId());
+        }
+        return false;
+    }
+
     private void gentleWakeUp(@DozeLog.Reason int reason) {
+        if (shouldVibrate(reason)) wakeVibrate();
+        if (dozeInsteadOfWake(reason)) {
+            requestPulse(reason, true, null);
+            return;
+        }
         // Log screen wake up reason (lift/pickup, tap, double-tap)
         Optional.ofNullable(DozingUpdateUiEvent.fromReason(reason))
                 .ifPresent(uiEventEnum -> mUiEventLogger.log(uiEventEnum, getKeyguardSessionId()));
@@ -392,6 +427,16 @@ private void gentleWakeUp(@DozeLog.Reason int reason) {
         mMachine.wakeUp(reason);
     }
 
+    private void wakeVibrate() {
+        VibrationEffect effect = VibrationEffect.createWaveform(new long[] { 0, 100 }, -1);
+        if (mVibrator.areAllEffectsSupported(VibrationEffect.EFFECT_CLICK) ==
+                Vibrator.VIBRATION_EFFECT_SUPPORT_YES) {
+            effect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK);
+        }
+        mVibrator.vibrate(effect,
+                VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK));
+    }
+
     private void onProximityFar(boolean far) {
         // Proximity checks are asynchronous and the user might have interacted with the phone
         // when a new event is arriving. This means that a state transition might have happened
diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
index 3c518eec00648..d3009ad5ac1ec 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
@@ -25,6 +25,7 @@
 import com.android.systemui.doze.DozeMachine;
 import com.android.systemui.doze.DozeMinMode;
 import com.android.systemui.doze.DozePauser;
+import com.android.systemui.doze.DozeScreenOffPeekController;
 import com.android.systemui.doze.DozeScreenBrightness;
 import com.android.systemui.doze.DozeScreenState;
 import com.android.systemui.doze.DozeScreenStatePreventingAdapter;
@@ -71,13 +72,15 @@ static WakeLock providesDozeWakeLock(DelayedWakeLock.Factory delayedWakeLockFact
     @Provides
     static DozeMachine.Part[] providesDozeMachineParts(DozePauser dozePauser,
             DozeFalsingManagerAdapter dozeFalsingManagerAdapter, DozeTriggers dozeTriggers,
-            DozeUi dozeUi, DozeScreenState dozeScreenState,
+            DozeUi dozeUi, DozeScreenOffPeekController dozeScreenOffPeekController,
+            DozeScreenState dozeScreenState,
             DozeScreenBrightness dozeScreenBrightness, DozeWallpaperState dozeWallpaperState,
             DozeDockHandler dozeDockHandler, DozeMinMode dozeMinMode,
             DozeAuthRemover dozeAuthRemover,
             DozeSuppressor dozeSuppressor, DozeTransitionListener dozeTransitionListener) {
         List<DozeMachine.Part> parts = new ArrayList<>();
         parts.add(dozePauser);
+        parts.add(dozeScreenOffPeekController);
         parts.add(dozeFalsingManagerAdapter);
         parts.add(dozeTriggers);
         parts.add(dozeUi);
diff --git a/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt b/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt
index 888785510c1e6..3796af8a8b3ab 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt
@@ -32,13 +32,18 @@ private const val BURN_IN_PREVENTION_PERIOD_PROGRESS = 89f
  * @param amplitude Maximum translation that will be interpolated.
  * @param xAxis If we're moving on X or Y.
  */
-fun getBurnInOffset(amplitude: Int, xAxis: Boolean): Int {
+@JvmOverloads
+fun getBurnInOffset(
+    amplitude: Int,
+    xAxis: Boolean,
+    periodX: Float = BURN_IN_PREVENTION_PERIOD_X,
+    periodY: Float = BURN_IN_PREVENTION_PERIOD_Y
+): Int {
     return zigzag(
-            System.currentTimeMillis() / MILLIS_PER_MINUTES,
-            amplitude.toFloat(),
-            if (xAxis) BURN_IN_PREVENTION_PERIOD_X else BURN_IN_PREVENTION_PERIOD_Y,
-        )
-        .toInt()
+        System.currentTimeMillis() / MILLIS_PER_MINUTES,
+        amplitude.toFloat(),
+        if (xAxis) periodX else periodY
+    ).toInt()
 }
 
 /**
diff --git a/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightSettingsRepository.kt b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightSettingsRepository.kt
new file mode 100644
index 0000000000000..3463462c720a0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightSettingsRepository.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.edgelight
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.ContentObserver
+import android.graphics.Color
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.provider.Settings
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.combine
+
+data class EdgeLightSettings(
+    val isEnabled: Boolean,
+    val colorMode: String,
+    val customColor: Int,
+    val pulseCount: Int,
+    val strokeWidth: Int,
+    val edgeStyle: String,
+    val animationEffect: String
+)
+
+class EdgeLightSettingsRepository(context: Context) {
+
+    private val resolver: ContentResolver = context.contentResolver
+
+    private val DEFAULT_CUSTOM_COLOR = Color.WHITE
+
+    val settingsFlow: Flow<EdgeLightSettings> = combine(
+        observeSettingInt(SETTING_ENABLED, 0),
+        observeSettingString(SETTING_COLOR_MODE, "accent"),
+        observeSettingInt(SETTING_CUSTOM_COLOR, DEFAULT_CUSTOM_COLOR),
+        observeSettingInt(SETTING_PULSE_COUNT, 3),
+        observeSettingInt(SETTING_STROKE_WIDTH, 8),
+        observeSettingString(SETTING_EDGE_STYLE, "default"),
+        observeSettingString(SETTING_ANIMATION_EFFECT, "none")
+    ) { flows: Array<Any?> ->
+        val enabled = flows[0] as Int
+        val mode = flows[1] as String
+        val color = flows[2] as Int
+        val pulses = flows[3] as Int
+        val width = flows[4] as Int
+        val style = flows[5] as String
+        val effect = flows[6] as String
+
+        val pulsesClamped = pulses.coerceIn(1, 5)
+        val widthClamped = width.coerceIn(2, 32)
+        EdgeLightSettings(enabled == 1, mode, color, pulsesClamped, widthClamped, style, effect)
+    }.distinctUntilChanged()
+
+    fun currentSettings(): EdgeLightSettings = EdgeLightSettings(
+        isEnabled = Settings.System.getIntForUser(resolver, SETTING_ENABLED, 0, UserHandle.USER_CURRENT) == 1,
+        colorMode = Settings.System.getStringForUser(resolver, SETTING_COLOR_MODE, UserHandle.USER_CURRENT) ?: "accent",
+        customColor = Settings.System.getIntForUser(resolver, SETTING_CUSTOM_COLOR, DEFAULT_CUSTOM_COLOR, UserHandle.USER_CURRENT),
+        pulseCount = Settings.System.getIntForUser(resolver, SETTING_PULSE_COUNT, 3, UserHandle.USER_CURRENT),
+        strokeWidth = Settings.System.getIntForUser(resolver, SETTING_STROKE_WIDTH, 8, UserHandle.USER_CURRENT),
+        edgeStyle = Settings.System.getStringForUser(resolver, SETTING_EDGE_STYLE, UserHandle.USER_CURRENT) ?: "default",
+        animationEffect = Settings.System.getStringForUser(resolver, SETTING_ANIMATION_EFFECT, UserHandle.USER_CURRENT) ?: "none"
+    )
+
+    private fun observeSettingInt(key: String, default: Int): Flow<Int> = callbackFlow {
+        val uri = Settings.System.getUriFor(key)
+        val observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Settings.System.getIntForUser(resolver, key, default, UserHandle.USER_CURRENT))
+            }
+        }
+        resolver.registerContentObserver(uri, false, observer)
+        trySend(Settings.System.getIntForUser(resolver, key, default, UserHandle.USER_CURRENT))
+        awaitClose { resolver.unregisterContentObserver(observer) }
+    }.distinctUntilChanged()
+
+    private fun observeSettingString(key: String, default: String): Flow<String> = callbackFlow {
+        val uri = Settings.System.getUriFor(key)
+        val observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Settings.System.getStringForUser(resolver, key, UserHandle.USER_CURRENT) ?: default)
+            }
+        }
+        resolver.registerContentObserver(uri, false, observer)
+        trySend(Settings.System.getStringForUser(resolver, key, UserHandle.USER_CURRENT) ?: default)
+        awaitClose { resolver.unregisterContentObserver(observer) }
+    }.distinctUntilChanged()
+
+    companion object {
+        private const val SETTING_ENABLED = Settings.System.EDGE_LIGHT_ENABLED
+        private const val SETTING_COLOR_MODE = Settings.System.EDGE_LIGHT_COLOR_MODE
+        private const val SETTING_CUSTOM_COLOR = Settings.System.EDGE_LIGHT_CUSTOM_COLOR
+        private const val SETTING_PULSE_COUNT = Settings.System.EDGE_LIGHT_PULSE_COUNT
+        private const val SETTING_STROKE_WIDTH = Settings.System.EDGE_LIGHT_STROKE_WIDTH
+        private const val SETTING_EDGE_STYLE = Settings.System.EDGE_LIGHT_STYLE
+        private const val SETTING_ANIMATION_EFFECT = Settings.System.EDGE_LIGHT_ANIMATION_EFFECT
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightView.kt b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightView.kt
new file mode 100644
index 0000000000000..faca15dcc2274
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightView.kt
@@ -0,0 +1,675 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.edgelight
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.LinearGradient
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.PathMeasure
+import android.graphics.RectF
+import android.graphics.Shader
+import android.graphics.SweepGradient
+import android.widget.FrameLayout
+import androidx.core.view.isVisible
+import com.android.systemui.res.R
+import kotlin.math.sin
+import kotlin.math.cos
+import kotlin.math.PI
+import kotlin.random.Random
+
+class EdgeLightView(context: Context) : FrameLayout(context) {
+
+    var userStrokeWidth: Int = 8
+        set(value) {
+            field = value.coerceIn(2, 32)
+            edgePaint.strokeWidth = field * resources.displayMetrics.density
+            invalidate()
+        }
+
+    var edgeStyle: String = STYLE_DEFAULT
+        set(value) {
+            field = value
+            if (useRainbowGradient) updateRainbowGradient()
+            invalidate()
+        }
+
+    var animationEffect: String = EFFECT_NONE
+
+    private val edgePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.BUTT
+    }
+
+    private val totalPulseDuration =
+        resources.getInteger(R.integer.doze_pulse_duration_visible).toLong()
+
+    var userPulseCount: Int = 3
+        set(value) {
+            field = value.coerceIn(1, 5)
+        }
+
+    private val fadeFraction = 0.2f
+    private val MIN_SEGMENTS = 3
+
+    private var pulseAnimator: ValueAnimator? = null
+    private var rainbowAnimator: ValueAnimator? = null
+    private var effectAnimator: ValueAnimator? = null
+    private var rainbowRotation: Float = 0f
+    private var effectProgress: Float = 0f
+
+    private val sparkles = mutableListOf<Sparkle>()
+
+    private val roundedPath = Path()
+    private val roundedRect = RectF()
+    private var cornerRadius: Float = 0f
+    private var pathLength: Float = 0f
+
+    private var useRainbowGradient = false
+
+    var visible: Boolean
+        get() = isVisible
+        set(value) { isVisible = value }
+
+    var paintColor: Int
+        get() = edgePaint.color
+        set(value) {
+            if (value != COLOR_RAINBOW) {
+                useRainbowGradient = false
+                edgePaint.shader = null
+                edgePaint.color = value
+                edgePaint.alpha = 255
+            } else {
+                useRainbowGradient = true
+                updateRainbowGradient()
+            }
+            invalidate()
+        }
+
+    var pulseRunning: Boolean
+        get() = pulseAnimator?.isRunning == true
+        set(value) {
+            if (value && !pulseRunning) {
+                startPulse()
+                startEffectAnimation()
+                startRainbowAnimation()
+            } else if (!value) {
+                stopRainbowAnimation()
+                stopEffectAnimation()
+                stopPulse()
+                visible = false
+            }
+        }
+
+    init {
+        layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
+        setWillNotDraw(false)
+        visible = false
+
+        cornerRadius = try {
+            resources.getDimension(
+                resources.getIdentifier("rounded_corner_radius", "dimen", "android")
+            )
+        } catch (e: Exception) {
+            32f * resources.displayMetrics.density
+        }
+
+        edgePaint.strokeWidth = userStrokeWidth * resources.displayMetrics.density
+    }
+
+    private fun startPulse() {
+        visible = true
+        alpha = 0f
+
+        val totalSegments = maxOf(userPulseCount, MIN_SEGMENTS)
+        val active = BooleanArray(totalSegments)
+
+        for (i in 0 until userPulseCount) {
+            val idx = (((i + 0.5f) * totalSegments) / userPulseCount).toInt()
+                .coerceIn(0, totalSegments - 1)
+            active[idx] = true
+        }
+
+        pulseAnimator = ValueAnimator.ofFloat(0f, totalSegments.toFloat()).apply {
+            duration = totalPulseDuration
+            addUpdateListener { animator ->
+                val progress = animator.animatedValue as Float
+                val segmentIndex = progress.toInt().coerceIn(0, totalSegments - 1)
+                val fraction = progress - segmentIndex
+
+                if (active[segmentIndex]) {
+                    alpha = when {
+                        fraction < fadeFraction -> fraction / fadeFraction
+                        fraction > 1f - fadeFraction -> (1f - fraction) / fadeFraction
+                        else -> 1f
+                    }
+                } else {
+                    alpha = 0f
+                }
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    visible = false
+                    pulseAnimator = null
+                }
+
+                override fun onAnimationCancel(animation: Animator) {
+                    visible = false
+                    pulseAnimator = null
+                }
+            })
+            repeatCount = 0
+            start()
+        }
+    }
+
+    private fun stopPulse() {
+        pulseAnimator?.cancel()
+        pulseAnimator = null
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        stopRainbowAnimation()
+        stopEffectAnimation()
+        stopPulse()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        when (edgeStyle) {
+            STYLE_ROUNDED -> drawRoundedEdges(canvas)
+            else -> drawDefaultEdges(canvas)
+        }
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (useRainbowGradient) {
+            updateRainbowGradient()
+            invalidate()
+        }
+    }
+
+    private fun drawDefaultEdges(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        edgePaint.strokeCap = Paint.Cap.BUTT
+
+        when (animationEffect) {
+            EFFECT_BREATHING -> applyBreathingEffect()
+            EFFECT_WAVE -> drawWaveEffect(canvas)
+            EFFECT_SPARKLE -> drawSparkleEffect(canvas)
+            EFFECT_CHASE -> drawChaseEffect(canvas)
+            EFFECT_COMET -> drawCometEffect(canvas)
+            else -> {
+                edgePaint.alpha = 255
+                edgePaint.maskFilter = null
+                canvas.drawLine(halfStroke, 0f, halfStroke, height.toFloat(), edgePaint)
+                canvas.drawLine(width - halfStroke, 0f, width - halfStroke, height.toFloat(), edgePaint)
+            }
+        }
+    }
+
+    private fun drawRoundedEdges(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        edgePaint.strokeCap = Paint.Cap.ROUND
+
+        roundedRect.set(
+            halfStroke,
+            halfStroke,
+            width.toFloat() - halfStroke,
+            height.toFloat() - halfStroke
+        )
+
+        roundedPath.reset()
+        roundedPath.addRoundRect(
+            roundedRect,
+            cornerRadius,
+            cornerRadius,
+            Path.Direction.CW
+        )
+
+        when (animationEffect) {
+            EFFECT_BREATHING -> {
+                applyBreathingEffect()
+                canvas.drawPath(roundedPath, edgePaint)
+            }
+            EFFECT_WAVE -> drawWaveEffectRounded(canvas)
+            EFFECT_SPARKLE -> drawSparkleEffectRounded(canvas)
+            EFFECT_CHASE -> drawChaseEffectRounded(canvas)
+            EFFECT_COMET -> drawCometEffectRounded(canvas)
+            else -> {
+                edgePaint.alpha = 255
+                edgePaint.maskFilter = null
+                canvas.drawPath(roundedPath, edgePaint)
+            }
+        }
+    }
+
+    private fun applyBreathingEffect() {
+        val cycle = sin(effectProgress * 2 * PI).toFloat()
+        val normalizedCycle = (cycle + 1f) / 2f
+
+        edgePaint.alpha = (155 + (normalizedCycle * 100)).toInt().coerceIn(0, 255)
+        edgePaint.strokeWidth = (userStrokeWidth * resources.displayMetrics.density) * (0.7f + normalizedCycle * 0.6f)
+        edgePaint.maskFilter = null
+    }
+
+    private fun drawWaveEffect(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        val segments = 50
+        val waveHeight = width * 0.05f
+
+        edgePaint.alpha = 255
+        edgePaint.maskFilter = null
+
+        for (i in 0 until segments) {
+            val y1 = (i.toFloat() / segments) * height
+            val y2 = ((i + 1).toFloat() / segments) * height
+            val offset1 = sin((effectProgress * 2 * PI + (i.toFloat() / segments) * 2 * PI)).toFloat() * waveHeight
+            val offset2 = sin((effectProgress * 2 * PI + ((i + 1).toFloat() / segments) * 2 * PI)).toFloat() * waveHeight
+
+            canvas.drawLine(halfStroke + offset1, y1, halfStroke + offset2, y2, edgePaint)
+        }
+
+        for (i in 0 until segments) {
+            val y1 = (i.toFloat() / segments) * height
+            val y2 = ((i + 1).toFloat() / segments) * height
+            val offset1 = sin((effectProgress * 2 * PI + (i.toFloat() / segments) * 2 * PI)).toFloat() * waveHeight
+            val offset2 = sin((effectProgress * 2 * PI + ((i + 1).toFloat() / segments) * 2 * PI)).toFloat() * waveHeight
+
+            canvas.drawLine(width - halfStroke + offset1, y1, width - halfStroke + offset2, y2, edgePaint)
+        }
+    }
+
+    private fun drawWaveEffectRounded(canvas: Canvas) {
+        edgePaint.alpha = 255
+        edgePaint.maskFilter = null
+
+        val measure = PathMeasure(roundedPath, false)
+        pathLength = measure.length
+        val segments = 100
+        val waveAmplitude = edgePaint.strokeWidth * 0.5f
+
+        val wavePath = Path()
+        for (i in 0..segments) {
+            val distance = (i.toFloat() / segments) * pathLength
+            val pos = FloatArray(2)
+            val tan = FloatArray(2)
+            measure.getPosTan(distance, pos, tan)
+
+            val waveOffset = sin((effectProgress * 2 * PI + (i.toFloat() / segments) * 4 * PI)).toFloat() * waveAmplitude
+            val normalX = -tan[1]
+            val normalY = tan[0]
+
+            val x = pos[0] + normalX * waveOffset
+            val y = pos[1] + normalY * waveOffset
+
+            if (i == 0) wavePath.moveTo(x, y) else wavePath.lineTo(x, y)
+        }
+
+        canvas.drawPath(wavePath, edgePaint)
+    }
+
+    private fun drawSparkleEffect(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        edgePaint.alpha = 100
+        edgePaint.maskFilter = null
+
+        canvas.drawLine(halfStroke, 0f, halfStroke, height.toFloat(), edgePaint)
+        canvas.drawLine(width - halfStroke, 0f, width - halfStroke, height.toFloat(), edgePaint)
+
+        sparkles.removeAll { it.lifetime <= 0f }
+
+        if (sparkles.size < 15 && Random.nextFloat() < 0.3f) {
+            val isLeft = Random.nextBoolean()
+            sparkles.add(
+                Sparkle(
+                    x = if (isLeft) halfStroke else width - halfStroke,
+                    y = Random.nextFloat() * height,
+                    lifetime = 1f,
+                    maxSize = edgePaint.strokeWidth * (2f + Random.nextFloat() * 2f)
+                )
+            )
+        }
+
+        val sparklePaint = Paint(edgePaint).apply { strokeCap = Paint.Cap.ROUND }
+        sparkles.forEach { sparkle ->
+            sparkle.lifetime -= 0.03f
+            val alpha = (sparkle.lifetime * 255).toInt().coerceIn(0, 255)
+            val size = sparkle.maxSize * sin(sparkle.lifetime * PI).toFloat()
+
+            sparklePaint.alpha = alpha
+            sparklePaint.strokeWidth = size
+            canvas.drawPoint(sparkle.x, sparkle.y, sparklePaint)
+        }
+    }
+
+    private fun drawSparkleEffectRounded(canvas: Canvas) {
+        edgePaint.alpha = 100
+        edgePaint.maskFilter = null
+        canvas.drawPath(roundedPath, edgePaint)
+
+        val measure = PathMeasure(roundedPath, false)
+        pathLength = measure.length
+
+        sparkles.removeAll { it.lifetime <= 0f }
+
+        if (sparkles.size < 20 && Random.nextFloat() < 0.3f) {
+            val distance = Random.nextFloat() * pathLength
+            val pos = FloatArray(2)
+            measure.getPosTan(distance, pos, null)
+
+            sparkles.add(
+                Sparkle(
+                    x = pos[0],
+                    y = pos[1],
+                    lifetime = 1f,
+                    maxSize = edgePaint.strokeWidth * (2f + Random.nextFloat() * 2f)
+                )
+            )
+        }
+
+        val sparklePaint = Paint(edgePaint).apply { strokeCap = Paint.Cap.ROUND }
+        sparkles.forEach { sparkle ->
+            sparkle.lifetime -= 0.03f
+            val alpha = (sparkle.lifetime * 255).toInt().coerceIn(0, 255)
+            val size = sparkle.maxSize * sin(sparkle.lifetime * PI).toFloat()
+
+            sparklePaint.alpha = alpha
+            sparklePaint.strokeWidth = size
+            canvas.drawPoint(sparkle.x, sparkle.y, sparklePaint)
+        }
+    }
+
+    private fun drawChaseEffect(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        val segmentLength = height * 0.15f
+        val numChasers = 3
+
+        edgePaint.alpha = 50
+        edgePaint.maskFilter = null
+        canvas.drawLine(halfStroke, 0f, halfStroke, height.toFloat(), edgePaint)
+        canvas.drawLine(width - halfStroke, 0f, width - halfStroke, height.toFloat(), edgePaint)
+
+        for (i in 0 until numChasers) {
+            val offset = (effectProgress + i.toFloat() / numChasers) % 1f
+            val centerY = offset * height
+
+            val gradient = LinearGradient(
+                0f, centerY - segmentLength,
+                0f, centerY + segmentLength,
+                intArrayOf(
+                    0x00000000 or (edgePaint.color and 0x00FFFFFF),
+                    edgePaint.color,
+                    0x00000000 or (edgePaint.color and 0x00FFFFFF)
+                ),
+                floatArrayOf(0f, 0.5f, 1f),
+                Shader.TileMode.CLAMP
+            )
+
+            val chaserPaint = Paint(edgePaint).apply {
+                shader = gradient
+                alpha = 255
+            }
+
+            canvas.drawLine(
+                halfStroke,
+                (centerY - segmentLength).coerceAtLeast(0f),
+                halfStroke,
+                (centerY + segmentLength).coerceAtMost(height.toFloat()),
+                chaserPaint
+            )
+            canvas.drawLine(
+                width - halfStroke,
+                (centerY - segmentLength).coerceAtLeast(0f),
+                width - halfStroke,
+                (centerY + segmentLength).coerceAtMost(height.toFloat()),
+                chaserPaint
+            )
+        }
+    }
+
+    private fun drawChaseEffectRounded(canvas: Canvas) {
+        edgePaint.alpha = 50
+        edgePaint.maskFilter = null
+        canvas.drawPath(roundedPath, edgePaint)
+
+        val measure = PathMeasure(roundedPath, false)
+        pathLength = measure.length
+        val segmentLength = pathLength * 0.15f
+        val numChasers = 3
+
+        for (i in 0 until numChasers) {
+            val offset = (effectProgress + i.toFloat() / numChasers) % 1f
+            val centerDistance = offset * pathLength
+
+            val chaserPath = Path()
+            val startDist = (centerDistance - segmentLength).coerceAtLeast(0f)
+            val endDist = (centerDistance + segmentLength).coerceAtMost(pathLength)
+
+            measure.getSegment(startDist, endDist, chaserPath, true)
+
+            val chaserPaint = Paint(edgePaint).apply { alpha = 255 }
+            canvas.drawPath(chaserPath, chaserPaint)
+        }
+    }
+
+    private fun drawCometEffect(canvas: Canvas) {
+        val halfStroke = edgePaint.strokeWidth / 2
+        val tailLength = height * 0.25f
+
+        edgePaint.alpha = 30
+        edgePaint.maskFilter = null
+        canvas.drawLine(halfStroke, 0f, halfStroke, height.toFloat(), edgePaint)
+        canvas.drawLine(width - halfStroke, 0f, width - halfStroke, height.toFloat(), edgePaint)
+
+        val cometY = effectProgress * height
+
+        val gradient = LinearGradient(
+            0f,
+            (cometY - tailLength).coerceAtLeast(0f),
+            0f,
+            cometY,
+            intArrayOf(0x00000000 or (edgePaint.color and 0x00FFFFFF), edgePaint.color),
+            null,
+            Shader.TileMode.CLAMP
+        )
+
+        val cometPaint = Paint(edgePaint).apply {
+            shader = gradient
+            alpha = 255
+            strokeWidth = edgePaint.strokeWidth * 1.5f
+        }
+
+        canvas.drawLine(
+            halfStroke,
+            (cometY - tailLength).coerceAtLeast(0f),
+            halfStroke,
+            cometY,
+            cometPaint
+        )
+        canvas.drawLine(
+            width - halfStroke,
+            (cometY - tailLength).coerceAtLeast(0f),
+            width - halfStroke,
+            cometY,
+            cometPaint
+        )
+    }
+
+    private fun drawCometEffectRounded(canvas: Canvas) {
+        edgePaint.alpha = 30
+        edgePaint.maskFilter = null
+        canvas.drawPath(roundedPath, edgePaint)
+
+        val measure = PathMeasure(roundedPath, false)
+        pathLength = measure.length
+        val tailLength = pathLength * 0.2f
+        val cometDistance = effectProgress * pathLength
+
+        val cometPath = Path()
+        val startDist = (cometDistance - tailLength).coerceAtLeast(0f)
+        measure.getSegment(startDist, cometDistance, cometPath, true)
+
+        val cometPaint = Paint(edgePaint).apply {
+            alpha = 255
+            strokeWidth = edgePaint.strokeWidth * 1.5f
+        }
+        canvas.drawPath(cometPath, cometPaint)
+    }
+
+    private fun updateRainbowGradient() {
+        if (width == 0 || height == 0) {
+            post { _updateRainbowGradient() }
+        } else {
+            _updateRainbowGradient()
+        }
+    }
+
+    private fun _updateRainbowGradient() {
+        edgePaint.shader = when (edgeStyle) {
+            STYLE_ROUNDED -> {
+                val matrix = Matrix()
+                matrix.postRotate(rainbowRotation, width / 2f, height / 2f)
+                SweepGradient(width / 2f, height / 2f, RAINBOW, null).also {
+                    it.setLocalMatrix(matrix)
+                }
+            }
+            else -> {
+                val offset = (rainbowRotation / 360f) * height
+                LinearGradient(
+                    0f, -offset, 0f, height.toFloat() - offset,
+                    RAINBOW, null, Shader.TileMode.REPEAT
+                )
+            }
+        }
+    }
+
+    private fun startRainbowAnimation() {
+        if (!useRainbowGradient || edgePaint.shader == null) return
+        if (animationEffect in MOVING_EFFECT) return
+        if (rainbowAnimator?.isRunning == true) return
+
+        rainbowAnimator = ValueAnimator.ofFloat(0f, 360f).apply {
+            duration = totalPulseDuration
+            repeatCount = ValueAnimator.INFINITE
+            repeatMode = ValueAnimator.RESTART
+            interpolator = android.view.animation.LinearInterpolator()
+            addUpdateListener { animator ->
+                rainbowRotation = animator.animatedValue as Float
+                _updateRainbowGradient()
+                invalidate()
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    rainbowAnimator = null
+                    rainbowRotation = 0f
+                }
+
+                override fun onAnimationCancel(animation: Animator) {
+                    rainbowAnimator = null
+                    rainbowRotation = 0f
+                }
+            })
+            start()
+        }
+    }
+
+    private fun stopRainbowAnimation() {
+        rainbowAnimator?.cancel()
+        rainbowAnimator = null
+        rainbowRotation = 0f
+    }
+
+    private fun startEffectAnimation() {
+        if (animationEffect == EFFECT_NONE) return
+        if (effectAnimator?.isRunning == true) return
+
+        val duration = when (animationEffect) {
+            EFFECT_BREATHING -> 3000L
+            EFFECT_WAVE -> 2000L
+            EFFECT_SPARKLE -> 100L
+            EFFECT_CHASE -> 2500L
+            EFFECT_COMET -> 2000L
+            else -> 2000L
+        }
+
+        effectAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
+            this.duration = duration
+            repeatCount = ValueAnimator.INFINITE
+            repeatMode = ValueAnimator.RESTART
+            interpolator = android.view.animation.LinearInterpolator()
+            addUpdateListener { animator ->
+                effectProgress = animator.animatedValue as Float
+                invalidate()
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    effectAnimator = null
+                    effectProgress = 0f
+                    sparkles.clear()
+                }
+
+                override fun onAnimationCancel(animation: Animator) {
+                    effectAnimator = null
+                    effectProgress = 0f
+                    sparkles.clear()
+                }
+            })
+            start()
+        }
+    }
+
+    private fun stopEffectAnimation() {
+        effectAnimator?.cancel()
+        effectAnimator = null
+        effectProgress = 0f
+        sparkles.clear()
+    }
+
+    private data class Sparkle(
+        var x: Float,
+        var y: Float,
+        var lifetime: Float,
+        val maxSize: Float
+    )
+
+    companion object {
+        const val STYLE_DEFAULT = "default"
+        const val STYLE_ROUNDED = "rounded"
+        const val COLOR_RAINBOW = -1
+        const val EFFECT_NONE = "none"
+        const val EFFECT_BREATHING = "breathing"
+        const val EFFECT_WAVE = "wave"
+        const val EFFECT_SPARKLE = "sparkle"
+        const val EFFECT_CHASE = "chase"
+        const val EFFECT_COMET = "comet"
+        private val MOVING_EFFECT = arrayOf(EFFECT_WAVE, EFFECT_SPARKLE, EFFECT_CHASE, EFFECT_COMET)
+        private val RAINBOW = intArrayOf(
+            0xFFFF0000.toInt(), 0xFFFF7F00.toInt(), 0xFFFFFF00.toInt(),
+            0xFF00FF00.toInt(), 0xFF0000FF.toInt(), 0xFF4B0082.toInt(),
+            0xFF9400D3.toInt(), 0xFFFF0000.toInt()
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightViewController.kt b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightViewController.kt
new file mode 100644
index 0000000000000..824ccb80500c8
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/edgelight/EdgeLightViewController.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.edgelight
+
+import android.app.Notification
+import android.app.WallpaperManager
+import android.content.Context
+import android.graphics.Color
+import android.service.notification.NotificationListenerService.RankingMap
+import android.service.notification.StatusBarNotification
+import android.widget.FrameLayout
+
+import com.android.settingslib.Utils
+
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.NotificationListener
+import com.android.systemui.util.ScrimUtils
+import com.android.internal.util.ContrastColorUtil
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+@SysUISingleton
+class EdgeLightViewController 
+@Inject 
+constructor(
+    private val context: Context,
+    private val listener: NotificationListener,
+) : NotificationListener.NotificationHandler,
+    ScrimUtils.ScrimEventListener {
+
+    private val edgeLightView = EdgeLightView(context)
+    private val settingsRepo = EdgeLightSettingsRepository(context)
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+
+    private val wallpaperManager = context.getSystemService(WallpaperManager::class.java)!!
+
+    private var currentSettings = settingsRepo.currentSettings()
+
+    private var job: Job? = null
+
+    private var isDozing = false
+
+    private var lastNotificationKey: String? = null
+    private var lastNotificationText: CharSequence? = null
+    private var lastNotificationTime: Long = 0L
+    private val deduplicationWindowMs = 3000L
+    private var lastNotifColor: Int = Color.TRANSPARENT
+
+    init {
+        INSTANCE = this
+
+        ScrimUtils.get().addListener(this)
+        updateView()
+    }
+
+    fun getEdgeLightView(): FrameLayout = edgeLightView
+
+    private fun getColor(): Int =
+        when (currentSettings.colorMode) {
+            COLOR_MODE_ACCENT -> Utils.getColorAccentDefaultColor(context)
+            COLOR_MODE_CUSTOM -> currentSettings.customColor
+            COLOR_MODE_WALLPAPER -> wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM)
+                    ?.primaryColor?.toArgb() ?: Utils.getColorAccentDefaultColor(context)
+            COLOR_MODE_NOTIFICATION -> lastNotifColor
+            COLOR_MODE_RAINBOW -> EdgeLightView.COLOR_RAINBOW
+            else -> Utils.getColorAccentDefaultColor(context)
+        }
+
+    private fun updateView() {
+        job?.cancel()
+        job = scope.launch {
+            currentSettings = settingsRepo.settingsFlow.first()
+            if (!currentSettings.isEnabled) {
+                edgeLightView.pulseRunning = false
+                edgeLightView.visible = false
+            } else {
+                edgeLightView.paintColor = getColor()
+                edgeLightView.userPulseCount = currentSettings.pulseCount
+                edgeLightView.userStrokeWidth = currentSettings.strokeWidth
+                edgeLightView.edgeStyle = currentSettings.edgeStyle
+                edgeLightView.animationEffect = currentSettings.animationEffect
+            }
+        }
+    }
+
+    override fun onNotificationPosted(sbn: StatusBarNotification, rankingMap: RankingMap) {
+        if (!currentSettings.isEnabled || !isDozing
+                || currentSettings.colorMode != COLOR_MODE_NOTIFICATION) return
+
+        val currentKey = sbn.key
+        val currentText = sbn.notification.extras.getCharSequence(Notification.EXTRA_TEXT)
+        val now = System.currentTimeMillis()
+
+        if (currentKey == lastNotificationKey &&
+            currentText == lastNotificationText &&
+            (now - lastNotificationTime <= deduplicationWindowMs)) {
+            return
+        }
+
+        lastNotificationKey = currentKey
+        lastNotificationText = currentText
+        lastNotificationTime = now
+
+        val notifColor = sbn?.notification?.color ?: Color.TRANSPARENT
+        val accent = Utils.getColorAccentDefaultColor(context)
+
+        lastNotifColor = when {
+            notifColor == Color.TRANSPARENT || notifColor == 0 -> accent
+            ContrastColorUtil.isColorDark(notifColor) -> accent
+            else -> notifColor
+        }
+        edgeLightView.paintColor = lastNotifColor
+    }
+
+    override fun onDozingChanged(dozing: Boolean) {
+        if (!currentSettings.isEnabled) return
+        isDozing = dozing
+        if (!isDozing) {
+            edgeLightView.pulseRunning = false
+            edgeLightView.visible = false
+        }
+    }
+
+    override fun onKeyguardShowingChanged(showing: Boolean) {
+        if (!currentSettings.isEnabled) return
+        if (!showing) {
+            edgeLightView.pulseRunning = false
+            edgeLightView.visible = false
+            listener.removeNotificationHandler(this)
+        } else {
+            listener.addNotificationHandler(this)
+            updateView()
+        }
+    }
+
+    override fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        if (!currentSettings.isEnabled) return
+        if (fadingAway) {
+            edgeLightView.pulseRunning = false
+            edgeLightView.visible = false
+        }
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        if (!currentSettings.isEnabled) return
+        if (goingAway) {
+            edgeLightView.pulseRunning = false
+            edgeLightView.visible = false
+        }
+    }
+
+    override fun setPulsing(pulsing: Boolean) {
+        if (!currentSettings.isEnabled || !pulsing || !isDozing) return
+        edgeLightView.apply {
+            visible = true
+            pulseRunning = true
+        }
+    }
+
+    override fun onNotificationRemoved(sbn: StatusBarNotification, rankingMap: RankingMap) {}
+    override fun onNotificationRemoved(sbn: StatusBarNotification, rankingMap: RankingMap, reason: Int) {}
+    override fun onNotificationsInitialized() {}
+    override fun onNotificationRankingUpdate(rankingMap: RankingMap) {}
+
+    companion object {
+        private const val COLOR_MODE_ACCENT = "accent"
+        private const val COLOR_MODE_NOTIFICATION = "notification"
+        private const val COLOR_MODE_WALLPAPER = "wallpaper"
+        private const val COLOR_MODE_CUSTOM = "custom"
+        private const val COLOR_MODE_RAINBOW = "rainbow"
+
+        @Volatile
+        private var INSTANCE: EdgeLightViewController? = null
+
+        @JvmStatic
+        fun get(context: Context): EdgeLightViewController {
+            return INSTANCE ?: throw IllegalStateException(
+                "EdgeLightViewController not initialized"
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
index 643f3bb917d13..f8b45bdd047fc 100644
--- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
+++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
@@ -62,7 +62,7 @@ public class FragmentHostManager {
     private final LeakDetector mLeakDetector;
     private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(
             ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE
-                    | ActivityInfo.CONFIG_ASSETS_PATHS);
+                    | ActivityInfo.CONFIG_ASSETS_PATHS | ActivityInfo.CONFIG_ORIENTATION);
     private final FragmentService mManager;
     private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager();
 
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
index 528e7d871ac5a..19303bcf4e8b4 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -18,7 +18,6 @@
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL;
 import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_GLOBAL_ACTIONS;
@@ -43,6 +42,7 @@
 import android.app.WallpaperManager;
 import android.app.trust.TrustManager;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -72,6 +72,7 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
@@ -155,6 +156,7 @@
 import com.android.systemui.shade.ShadeController;
 import com.android.systemui.shade.ShadeDisplayAware;
 import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;
+import com.android.systemui.statusbar.BlurUtils;
 import com.android.systemui.statusbar.VibratorHelper;
 import com.android.systemui.statusbar.phone.LightBarController;
 import com.android.systemui.statusbar.phone.SystemUIDialog;
@@ -178,8 +180,10 @@
 import org.lineageos.internal.util.PowerMenuUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -212,6 +216,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
     private static final String RESTART_ACTION_KEY_RESTART_BOOTLOADER = "restart_bootloader";
     private static final String RESTART_ACTION_KEY_RESTART_DOWNLOAD = "restart_download";
     private static final String RESTART_ACTION_KEY_RESTART_FASTBOOT = "restart_fastboot";
+    private static final String RESTART_ACTION_KEY_RESTART_SYSTEMUI = "restart_systemui";
 
     // See NotificationManagerService#scheduleDurationReachedLocked
     private static final long TOAST_FADE_TIME = 333;
@@ -302,6 +307,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
     private final PowerManager mPowerManager;
     private int mGlobalActionDialogTimeout;
     private final Handler mHandler;
+    private final BlurUtils mBlurUtils;
 
     private final UserTracker.Callback mOnUserSwitched = new UserTracker.Callback() {
         @Override
@@ -437,7 +443,8 @@ public GlobalActionsDialogLite(
             GlobalActionsInteractor interactor,
             ControlsComponent controlsComponent,
             Lazy<DisplayWindowPropertiesRepository> displayWindowPropertiesRepository,
-            PowerManager powerManager) {
+            PowerManager powerManager,
+            BlurUtils blurUtils) {
         mContext = context;
         mWindowManagerFuncs = windowManagerFuncs;
         mAudioManager = audioManager;
@@ -477,6 +484,7 @@ public GlobalActionsDialogLite(
         mInteractor = interactor;
         mDisplayWindowPropertiesRepositoryLazy = displayWindowPropertiesRepository;
         mPowerManager = powerManager;
+        mBlurUtils = blurUtils;
 
         mHandler = new Handler(mMainHandler.getLooper()) {
             public void handleMessage(Message msg) {
@@ -621,13 +629,6 @@ protected void handleShow(@Nullable Expandable expandable, int displayId) {
         mDialog = createDialog(displayId);
         prepareDialog();
 
-        WindowManager.LayoutParams attrs = mDialog.getWindow().getAttributes();
-        attrs.setTitle("GlobalActionsDialogLite");
-        attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-        mDialog.getWindow().setAttributes(attrs);
-        // Don't acquire soft keyboard focus, to avoid destroying state when capturing bugreports
-        mDialog.getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM);
-
         DialogTransitionAnimator.Controller controller =
                 expandable != null ? expandable.dialogTransitionController(
                         new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
@@ -723,13 +724,17 @@ protected void createActionItems() {
         RestartBootloaderAction blAction = new RestartBootloaderAction();
         RestartDownloadAction dlAction = new RestartDownloadAction();
         RestartFastbootAction fbAction = new RestartFastbootAction();
+        RestartSystemUIAction sysuiAction = new RestartSystemUIAction();
         ArraySet<String> addedKeys = new ArraySet<>();
         ArraySet<String> addedRestartKeys = new ArraySet<String>();
         List<Action> tempActions = new ArrayList<>();
         CurrentUserProvider currentUser = new CurrentUserProvider();
 
         // make sure emergency affordance action is first, if needed
-        if (mEmergencyAffordanceManager.needsEmergencyAffordance()) {
+        boolean showEmergencyAffordance = Arrays.stream(mActions)
+                .anyMatch(GLOBAL_ACTION_KEY_EMERGENCY::equals);
+        if (showEmergencyAffordance &&
+                mEmergencyAffordanceManager.needsEmergencyAffordance()) {
             addIfShouldShowAction(tempActions, new EmergencyAffordanceAction());
             addedKeys.add(GLOBAL_ACTION_KEY_EMERGENCY);
         }
@@ -752,9 +757,12 @@ protected void createActionItems() {
                 if (mShowSilentToggle) {
                     addIfShouldShowAction(tempActions, mSilentModeAction);
                 }
-            } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)) {
-                List<UserInfo> users = mUserManager.getUsers();
-                if (users.size() > 1) {
+            } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)
+                    && mUserManager.isUserSwitcherEnabled()) {
+                Stream<UserInfo> users = mUserManager.getUsers()
+                        .stream()
+                        .filter(u -> u.supportsSwitchToByUser());
+                if (users.count() > 1) {
                     addUserActions(mUsersItems, currentUser.get());
                     addIfShouldShowAction(tempActions, new UsersAction());
                 }
@@ -778,6 +786,12 @@ protected void createActionItems() {
                 if (uiModeManager.getCurrentModeType() != Configuration.UI_MODE_TYPE_TELEVISION) {
                     addIfShouldShowAction(tempActions, new ScreenshotAction());
                 }
+            } else if (GLOBAL_ACTION_KEY_ONTHEGO.equals(actionKey)) {
+                UiModeManager uiModeManager =
+                        (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
+                if (uiModeManager.getCurrentModeType() != Configuration.UI_MODE_TYPE_TELEVISION) {
+                    addIfShouldShowAction(tempActions, new getOnTheGoAction());
+                }
             } else if (GLOBAL_ACTION_KEY_LOGOUT.equals(actionKey)) {
                 if (mLogoutInteractor.isLogoutEnabled().getValue()) {
                     addIfShouldShowAction(tempActions, new LogoutAction());
@@ -815,6 +829,8 @@ protected void createActionItems() {
                 addIfShouldShowAction(mRestartItems, dlAction);
             } else if (RESTART_ACTION_KEY_RESTART_FASTBOOT.equals(actionKey)) {
                 addIfShouldShowAction(mRestartItems, fbAction);
+            } else if (RESTART_ACTION_KEY_RESTART_SYSTEMUI.equals(actionKey)) {
+                addIfShouldShowAction(mRestartItems, sysuiAction);
             }
             // Add here so we don't add more than one.
             addedRestartKeys.add(actionKey);
@@ -914,7 +930,8 @@ protected ActionsDialogLite createDialog(int displayId) {
                 mShadeController,
                 mKeyguardUpdateMonitor,
                 mLockPatternUtils,
-                mSelectedUserInteractor) {
+                mSelectedUserInteractor,
+                mBlurUtils) {
             @Override
             public boolean dispatchTouchEvent(MotionEvent event) {
                 rescheduleBurninTimeout(mGlobalActionDialogTimeout);
@@ -968,6 +985,11 @@ boolean shouldDisplayBugReport(@Nullable UserInfo user) {
                 user.id) != 0;
     }
 
+    @Override
+    public void onUiModeChanged() {
+        onRefresh();
+    }
+
     @Override
     public void onConfigChanged(Configuration newConfig) {
         if (mDialog != null && mDialog.isShowing()
@@ -979,6 +1001,25 @@ public void onConfigChanged(Configuration newConfig) {
         }
     }
 
+    private boolean rebootAction(boolean safeMode) {
+        return rebootAction(safeMode, null);
+    }
+
+    private boolean rebootAction(boolean safeMode, String reason) {
+        final int userId = Binder.getCallingUserHandle().getIdentifier();
+        final boolean powerOffVerify = mSecureSettings.getIntForUser("power_off_verify", 0,
+                userId) != 0;
+        if (mKeyguardStateController.isMethodSecure() && mKeyguardStateController.isShowing() && powerOffVerify) {
+            mActivityStarter.postQSRunnableDismissingKeyguard(() -> {
+                mWindowManagerFuncs.reboot(safeMode, reason);
+            });
+            return true;
+        } else {
+            mWindowManagerFuncs.reboot(safeMode, reason);
+            return true;
+        }
+    }
+
     /**
      * Implements {@link GlobalActionsPanelPlugin.Callbacks#dismissGlobalActionsMenu()}, which is
      * called when the quick access wallet requests dismissal.
@@ -1035,7 +1076,7 @@ public boolean onLongPress() {
             mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_LONG_PRESS);
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
                     getCurrentUser().getUserHandle())) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1060,7 +1101,13 @@ public void onPress() {
             }
             mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_PRESS);
             // shutdown by making sure radio and power are handled accordingly.
-            mWindowManagerFuncs.shutdown();
+            if (mKeyguardStateController.isMethodSecure() && mKeyguardStateController.isShowing()) {
+                  mActivityStarter.postQSRunnableDismissingKeyguard(() -> {
+                    mWindowManagerFuncs.shutdown();
+                });
+            } else {
+                mWindowManagerFuncs.shutdown();
+            }
         }
     }
 
@@ -1187,7 +1234,7 @@ public boolean onLongPress() {
             mUiEventLogger.log(GlobalActionsEvent.GA_REBOOT_LONG_PRESS);
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
                     getCurrentUser().getUserHandle())) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1214,7 +1261,7 @@ public void onPress() {
             if (mDialog != null && shouldShowRestartSubmenu()) {
                 mDialog.showRestartOptionsMenu();
             } else {
-                mWindowManagerFuncs.reboot(false, null);
+                rebootAction(false);
             }
         }
     }
@@ -1228,7 +1275,7 @@ public RestartSystemAction() {
         @Override
         public boolean onLongPress() {
             if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
-                mWindowManagerFuncs.reboot(true, null);
+                rebootAction(true);
                 return true;
             }
             return false;
@@ -1246,7 +1293,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, null);
+            rebootAction(false);
         }
     }
 
@@ -1268,7 +1315,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_RECOVERY);
+            rebootAction(false, PowerManager.REBOOT_RECOVERY);
         }
     }
 
@@ -1290,7 +1337,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_BOOTLOADER);
+            rebootAction(false, PowerManager.REBOOT_BOOTLOADER);
         }
     }
 
@@ -1312,7 +1359,7 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_FASTBOOT);
+            rebootAction(false, PowerManager.REBOOT_FASTBOOT);
         }
     }
 
@@ -1334,7 +1381,32 @@ public boolean showBeforeProvisioning() {
 
         @Override
         public void onPress() {
-            mWindowManagerFuncs.reboot(false, PowerManager.REBOOT_DOWNLOAD);
+            rebootAction(false, PowerManager.REBOOT_DOWNLOAD);
+        }
+    }
+
+    private final class RestartSystemUIAction extends SinglePressAction {
+        private RestartSystemUIAction() {
+            super(com.android.systemui.res.R.drawable.ic_restart_systemui, com.android.systemui.res.R.string.global_action_restart_systemui);
+        }
+
+        @Override
+        public boolean showDuringKeyguard() {
+            return true;
+        }
+
+        @Override
+        public boolean showBeforeProvisioning() {
+            return true;
+        }
+
+        @Override
+        public void onPress() {
+            // No time and need to dismiss the dialog here, just kill systemui straight after telling to
+            // policy/GlobalActions that we hid the dialog within the kill action itself so its onStatusBarConnectedChanged
+            // won't show the LegacyGlobalActions after systemui restart
+            mWindowManagerFuncs.onGlobalActionsHidden();
+            Process.killProcess(Process.myPid());
         }
     }
 
@@ -1624,6 +1696,34 @@ public boolean showBeforeProvisioning() {
         };
     }
 
+    class getOnTheGoAction extends SinglePressAction {
+
+        public getOnTheGoAction() {
+            super(com.android.systemui.res.R.drawable.ic_lock_onthego,
+                    com.android.systemui.res.R.string.global_action_onthego);
+        }
+
+        @Override
+        public void onPress() {
+            ComponentName cn = new ComponentName("com.android.systemui",
+                    "com.android.systemui.crdroid.onthego.OnTheGoService");
+            Intent onTheGoIntent = new Intent();
+            onTheGoIntent.setComponent(cn);
+            onTheGoIntent.setAction("start");
+            mContext.startService(onTheGoIntent);
+        }
+
+        @Override
+        public boolean showDuringKeyguard() {
+            return true;
+        }
+
+        @Override
+        public boolean showBeforeProvisioning() {
+            return false;
+        }
+    }
+
     @VisibleForTesting
     class LockDownAction extends SinglePressAction {
         LockDownAction() {
@@ -2889,7 +2989,6 @@ static class ActionsDialogLite extends SystemUIDialog implements DialogInterface
         protected Drawable mBackgroundDrawable;
         protected final SysuiColorExtractor mColorExtractor;
         private boolean mKeyguardShowing;
-        protected float mScrimAlpha;
         protected final LightBarController mLightBarController;
         private final KeyguardStateController mKeyguardStateController;
         protected final TopUiController mTopUiController;
@@ -2906,6 +3005,7 @@ static class ActionsDialogLite extends SystemUIDialog implements DialogInterface
         private SelectedUserInteractor mSelectedUserInteractor;
         private LockPatternUtils mLockPatternUtils;
         private float mWindowDimAmount;
+        private BlurUtils mBlurUtils;
 
         protected ViewGroup mContainer;
 
@@ -2989,7 +3089,8 @@ void setBackDispatcherOverride(OnBackInvokedDispatcher mockDispatcher) {
                 ShadeController shadeController,
                 KeyguardUpdateMonitor keyguardUpdateMonitor,
                 LockPatternUtils lockPatternUtils,
-                SelectedUserInteractor selectedUserInteractor) {
+                SelectedUserInteractor selectedUserInteractor,
+                BlurUtils blurUtils) {
             // We set dismissOnDeviceLock to false because we have a custom broadcast receiver to
             // dismiss this dialog when the device is locked.
             super(context, themeRes, false /* dismissOnDeviceLock */);
@@ -3013,13 +3114,12 @@ void setBackDispatcherOverride(OnBackInvokedDispatcher mockDispatcher) {
             mLockPatternUtils = lockPatternUtils;
             mGestureDetector = new GestureDetector(mContext, mGestureListener);
             mSelectedUserInteractor = selectedUserInteractor;
+            mBlurUtils = blurUtils;
         }
 
         @Override
         protected void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            getWindow().setTitle(getContext().getString(
-                    com.android.systemui.res.R.string.accessibility_quick_settings_power_menu));
             initializeLayout();
             mWindowDimAmount = getWindow().getAttributes().dimAmount;
             getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
@@ -3085,13 +3185,14 @@ private ListPopupWindow createPowerOverflowPopup() {
         }
 
         public void showPowerOptionsMenu() {
-            mPowerOptionsDialog = GlobalActionsPowerDialog.create(mContext, mPowerOptionsAdapter);
+            mPowerOptionsDialog = GlobalActionsPowerDialog.create(mContext,
+                    mPowerOptionsAdapter, mBlurUtils);
             mPowerOptionsDialog.show();
         }
 
         public void showRestartOptionsMenu() {
             mRestartOptionsDialog = GlobalActionsPowerDialog.create(mContext,
-                    mRestartOptionsAdapter);
+                    mRestartOptionsAdapter, mBlurUtils);
             mRestartOptionsDialog.show();
         }
 
@@ -3101,7 +3202,8 @@ protected void showPowerOverflowMenu() {
         }
 
         public void showUsersMenu() {
-            mUsersDialog = GlobalActionsPowerDialog.create(mContext, mUsersAdapter);
+            mUsersDialog = GlobalActionsPowerDialog.create(mContext,
+                    mUsersAdapter, mBlurUtils);
             mUsersDialog.show();
         }
 
@@ -3153,7 +3255,24 @@ public boolean dispatchPopulateAccessibilityEvent(
 
             if (mBackgroundDrawable == null) {
                 mBackgroundDrawable = new ScrimDrawable();
-                mScrimAlpha = 1.0f;
+            }
+
+            Window window = getWindow();
+            window.setType(WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY);
+            window.setTitle(""); // prevent Talkback from speaking first item name twice
+            window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+            if (mBlurUtils.supportsBlursOnWindows()) {
+                // Enable blur behind
+                // Enable dim behind since we are setting some amount dim for the blur.
+                window.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+                // Set blur behind radius
+                int blurBehindRadius = mContext.getResources()
+                        .getDimensionPixelSize(com.android.systemui.res.R.dimen.max_window_blur_radius);
+                window.getAttributes().setBlurBehindRadius(blurBehindRadius);
+                window.setDimAmount(0.54f);
+            } else {
+                window.setDimAmount(0.88f);
             }
             if (QsInCompose.isEnabled()) {
                 View v = findViewById(R.id.list);
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java
index 6d0b6c68feb1f..f66a2120b65a5 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java
@@ -19,6 +19,7 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.Resources;
+import android.view.CrossWindowBlurListeners;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +27,8 @@
 import android.view.WindowManager;
 import android.widget.ListAdapter;
 
+import com.android.systemui.statusbar.BlurUtils;
+
 import androidx.constraintlayout.helper.widget.Flow;
 
 /**
@@ -36,7 +39,7 @@ public class GlobalActionsPowerDialog {
     /**
      * Create a dialog for displaying Shut Down and Restart actions.
      */
-    public static Dialog create(@NonNull Context context, ListAdapter adapter) {
+    public static Dialog create(@NonNull Context context, ListAdapter adapter, BlurUtils blurUtils) {
         ViewGroup listView = (ViewGroup) LayoutInflater.from(context).inflate(
                 com.android.systemui.res.R.layout.global_actions_power_dialog_flow, null);
 
@@ -62,7 +65,8 @@ public static Dialog create(@NonNull Context context, ListAdapter adapter) {
         }
         flow.setMaxElementsWrap(nElementsWrap);
 
-        Dialog dialog = new Dialog(context);
+        Dialog dialog = new Dialog(context,
+                com.android.systemui.res.R.style.Theme_SystemUI_Dialog_GlobalActionsLite);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(listView);
 
@@ -73,6 +77,19 @@ public static Dialog create(@NonNull Context context, ListAdapter adapter) {
                 com.android.systemui.res.R.drawable.global_actions_lite_background,
                 context.getTheme()));
         window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+        if (blurUtils.supportsBlursOnWindows()) {
+            // Enable blur behind
+            // Enable dim behind since we are setting some amount dim for the blur.
+            window.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+            // Set blur behind radius
+            int blurBehindRadius = context.getResources()
+                    .getDimensionPixelSize(com.android.systemui.res.R.dimen.max_window_blur_radius);
+            window.getAttributes().setBlurBehindRadius(blurBehindRadius);
+            window.setDimAmount(0.54f);
+        } else {
+            window.setDimAmount(0.88f);
+        }
 
         return dialog;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt
index 7b97bbc0fd286..966c2a112e65e 100644
--- a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt
@@ -26,11 +26,11 @@ data class SliderHapticFeedbackConfig(
     /** Interpolator factor for progress-based vibration scale interpolations. Must be positive */
     val progressInterpolatorFactor: Float = 1f,
     /** Minimum vibration scale for vibrations based on slider progress */
-    @FloatRange(from = 0.0, to = 1.0) val progressBasedDragMinScale: Float = 0f,
+    @FloatRange(from = 0.0, to = 1.0) val progressBasedDragMinScale: Float = 0.10f,
     /** Maximum vibration scale for vibrations based on slider progress */
-    @FloatRange(from = 0.0, to = 1.0) val progressBasedDragMaxScale: Float = 0.2f,
+    @FloatRange(from = 0.0, to = 1.0) val progressBasedDragMaxScale: Float = 0.85f,
     /** Additional vibration scaling due to velocity */
-    @FloatRange(from = 0.0, to = 1.0) val additionalVelocityMaxBump: Float = 0.15f,
+    @FloatRange(from = 0.0, to = 1.0) val additionalVelocityMaxBump: Float = 0.25f,
     /** Additional time delta to wait between drag texture vibrations */
     @FloatRange(from = 0.0) val deltaMillisForDragInterval: Float = 0f,
     /** Progress threshold beyond which a new drag texture is delivered */
@@ -46,7 +46,7 @@ data class SliderHapticFeedbackConfig(
     /** Vibration scale at the lower bookend of the slider */
     @FloatRange(from = 0.0, to = 1.0) val lowerBookendScale: Float = 0.05f,
     /** Exponent for power function compensation */
-    @FloatRange(from = 0.0, fromInclusive = false) val exponent: Float = 1f / 0.89f,
+    @FloatRange(from = 0.0, fromInclusive = false) val exponent: Float = 0.80f,
     /** The step-size that defines the slider quantization. Zero represents a continuous slider */
     @FloatRange(from = 0.0) val sliderStepSize: Float = 0f,
     /** A filter that determines values for which haptics are triggered */
diff --git a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt
index 82c284a57954d..3d091c6c84a1b 100644
--- a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt
@@ -27,6 +27,7 @@ import com.android.systemui.statusbar.VibratorHelper
 import com.google.android.msdl.data.model.MSDLToken
 import com.google.android.msdl.domain.InteractionProperties
 import com.google.android.msdl.domain.MSDLPlayer
+import kotlinx.coroutines.*
 import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.pow
@@ -49,6 +50,8 @@ class SliderHapticFeedbackProvider(
     private val clock: com.android.systemui.util.time.SystemClock,
 ) : SliderStateListener {
 
+    private var dragVibrationJob: Job? = null
+
     private val velocityAccelerateInterpolator =
         AccelerateInterpolator(config.velocityInterpolatorFactor)
     private val positionAccelerateInterpolator =
@@ -62,10 +65,33 @@ class SliderHapticFeedbackProvider(
     private var hasVibratedAtLowerBookend = false
     private var hasVibratedAtUpperBookend = false
 
+    private val doubleClickEffect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_DOUBLE_CLICK)
+    private val textureClickEffect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_TEXTURE_TICK)
+
     /** Time threshold to wait before making new API call. */
     private val thresholdUntilNextDragCallMillis =
         lowTickDurationMs * config.numberOfLowTicks + config.deltaMillisForDragInterval
 
+    private val areAllPrimitivesSupported by lazy {
+        vibratorHelper.areAllPrimitivesSupported(
+            VibrationEffect.Composition.PRIMITIVE_TICK,
+            VibrationEffect.Composition.PRIMITIVE_LOW_TICK,
+            VibrationEffect.Composition.PRIMITIVE_CLICK
+        ) ?: false
+    }
+
+    private val composedTick by lazy {
+        VibrationEffect.startComposition()
+            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK)
+            .compose()
+    }
+
+    private val composedClick by lazy {
+        VibrationEffect.startComposition()
+            .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK)
+            .compose()
+    }
+
     /**
      * Vibrate when the handle reaches either bookend with a certain velocity.
      *
@@ -81,11 +107,11 @@ class SliderHapticFeedbackProvider(
                 )
             msdlPlayer.playToken(MSDLToken.DRAG_THRESHOLD_INDICATOR_LIMIT, properties)
         } else {
-            val vibration =
-                VibrationEffect.startComposition()
-                    .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, powerScale)
-                    .compose()
-            vibratorHelper.vibrate(vibration, VIBRATION_ATTRIBUTES_PIPELINING)
+            if (areAllPrimitivesSupported) {
+                vibratorHelper.vibrate(composedClick, VIBRATION_ATTRIBUTES_PIPELINING)
+            } else {
+                vibratorHelper.vibrate(doubleClickEffect, VIBRATION_ATTRIBUTES_PIPELINING)
+            }
         }
     }
 
@@ -156,11 +182,11 @@ class SliderHapticFeedbackProvider(
                 InteractionProperties.DynamicVibrationScale(scale, VIBRATION_ATTRIBUTES_PIPELINING)
             msdlPlayer.playToken(MSDLToken.DRAG_INDICATOR_DISCRETE, properties)
         } else {
-            val effect =
-                VibrationEffect.startComposition()
-                    .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, scale)
-                    .compose()
-            vibratorHelper.vibrate(effect, VIBRATION_ATTRIBUTES_PIPELINING)
+            if (areAllPrimitivesSupported) {
+                vibratorHelper.vibrate(composedTick, VIBRATION_ATTRIBUTES_PIPELINING)
+            } else {
+                vibratorHelper.vibrate(textureClickEffect, VIBRATION_ATTRIBUTES_PIPELINING)
+            }
         }
     }
 
@@ -170,11 +196,21 @@ class SliderHapticFeedbackProvider(
                 InteractionProperties.DynamicVibrationScale(scale, VIBRATION_ATTRIBUTES_PIPELINING)
             msdlPlayer.playToken(MSDLToken.DRAG_INDICATOR_CONTINUOUS, properties)
         } else {
-            val composition = VibrationEffect.startComposition()
-            repeat(config.numberOfLowTicks) {
-                composition.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, scale)
+            if (areAllPrimitivesSupported) {
+                val composition = VibrationEffect.startComposition()
+                repeat(config.numberOfLowTicks) {
+                    composition.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, scale)
+                }
+                vibratorHelper.vibrate(composition.compose(), VIBRATION_ATTRIBUTES_PIPELINING)
+            } else {
+                dragVibrationJob?.cancel()
+                dragVibrationJob = CoroutineScope(Dispatchers.Default).launch {
+                    repeat(config.numberOfLowTicks) {
+                        vibratorHelper.vibrate(textureClickEffect, VIBRATION_ATTRIBUTES_PIPELINING)
+                        delay(80)
+                    }
+                }
             }
-            vibratorHelper.vibrate(composition.compose(), VIBRATION_ATTRIBUTES_PIPELINING)
         }
     }
 
@@ -207,7 +243,7 @@ class SliderHapticFeedbackProvider(
         val velocityBasedScale = velocityInterpolated * config.additionalVelocityMaxBump
 
         // Total scale
-        val scale = positionBasedScale + velocityBasedScale
+        val scale = (positionBasedScale + velocityBasedScale).coerceIn(0f, 1f)
         return scale.pow(config.exponent)
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
index 61b661f8bb6d9..a677ca206229b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
@@ -157,10 +157,10 @@ public void updateIndication(@IndicationType int type, KeyguardIndication newInd
         boolean currMsgShownForMinTime = timeSinceLastIndicationSwitch >= minShowDuration;
         if (hasNewIndication) {
             if (mCurrIndicationType == INDICATION_TYPE_NONE || mCurrIndicationType == type) {
-                showIndication(type);
+                showIndication(type, showAsap);
             } else if (showAsap) {
                 if (currMsgShownForMinTime) {
-                    showIndication(type);
+                    showIndication(type, showAsap);
                 } else {
                     mIndicationQueue.removeIf(x -> x == type);
                     mIndicationQueue.add(0 /* index */, type /* type */);
@@ -171,7 +171,7 @@ public void updateIndication(@IndicationType int type, KeyguardIndication newInd
                         getMinVisibilityMillis(mIndicationMessages.get(type)),
                         DEFAULT_INDICATION_SHOW_LENGTH);
                 if (timeSinceLastIndicationSwitch >= nextShowTime) {
-                    showIndication(type);
+                    showIndication(type, showAsap);
                 } else {
                     scheduleShowNextIndication(
                             nextShowTime - timeSinceLastIndicationSwitch);
@@ -188,7 +188,7 @@ public void updateIndication(@IndicationType int type, KeyguardIndication newInd
             if (mShowNextIndicationRunnable != null) {
                 mShowNextIndicationRunnable.runImmediately();
             } else {
-                showIndication(INDICATION_TYPE_NONE);
+                showIndication(INDICATION_TYPE_NONE, true);
             }
         }
     }
@@ -251,7 +251,7 @@ public void clearMessages() {
      * Will re-add this indication to be re-shown after all other indications have been
      * rotated through.
      */
-    private void showIndication(@IndicationType int type) {
+    private void showIndication(@IndicationType int type, boolean showAsap) {
         cancelScheduledIndication();
 
         final CharSequence previousMessage = mCurrMessage;
@@ -271,7 +271,7 @@ private void showIndication(@IndicationType int type) {
                 || previousIndicationType != mCurrIndicationType) {
             mLogger.logKeyguardSwitchIndication(type,
                     mCurrMessage != null ? mCurrMessage.toString() : null);
-            mView.switchIndication(mIndicationMessages.get(type));
+            mView.switchIndication(mIndicationMessages.get(type), showAsap);
         }
 
         // only schedule next indication if there's more than just this indication in the queue
@@ -323,9 +323,9 @@ public void onDozingChanged(boolean isDozing) {
                     if (isDozing == mIsDozing) return;
                     mIsDozing = isDozing;
                     if (mIsDozing) {
-                        showIndication(INDICATION_TYPE_NONE);
+                        showIndication(INDICATION_TYPE_NONE, true);
                     } else if (mIndicationQueue.size() > 0) {
-                        showIndication(mIndicationQueue.get(0));
+                        showIndication(mIndicationQueue.remove(0), true);
                     }
                 }
             };
@@ -343,7 +343,7 @@ class ShowNextIndication {
             mShowIndicationRunnable = () -> {
                 int type = mIndicationQueue.size() == 0
                         ? INDICATION_TYPE_NONE : mIndicationQueue.get(0);
-                showIndication(type);
+                showIndication(type, true);
             };
             mCancelDelayedRunnable = mExecutor.executeDelayed(mShowIndicationRunnable, delay);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
index 8e04eee6c212f..800b1fd4a5705 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
@@ -32,7 +32,9 @@
 import android.media.session.PlaybackState;
 import android.net.Uri;
 import android.os.Handler;
+import android.os.SystemClock;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 import android.text.TextUtils;
@@ -97,6 +99,7 @@ public class KeyguardSliceProvider extends SliceProvider implements
             "content://com.android.systemui.keyguard/media";
     public static final String KEYGUARD_ACTION_URI =
             "content://com.android.systemui.keyguard/action";
+    private static final String PULSE_ACTION = "com.android.systemui.doze.pulse";
 
     /**
      * Only show alarms that will ring within N hours.
@@ -107,6 +110,8 @@ public class KeyguardSliceProvider extends SliceProvider implements
     private static final Object sInstanceLock = new Object();
     private static KeyguardSliceProvider sInstance;
 
+    private static final long MIN_PULSE_INTERVAL_MS = 3000;
+
     protected final Uri mSliceUri;
     protected final Uri mHeaderUri;
     protected final Uri mDateUri;
@@ -151,6 +156,9 @@ public class KeyguardSliceProvider extends SliceProvider implements
     protected boolean mDozing;
     private int mStatusBarState;
     private boolean mMediaIsVisible;
+    private boolean mPulseOnNewTracks;
+    private long mLastPulseUptimeMs = 0L;
+
     private ContentProviderContextAvailableCallback mContextAvailableCallback;
     @Inject
     WakeLockLogger mWakeLockLogger;
@@ -220,14 +228,13 @@ public Slice onBindSlice(Uri sliceUri) {
             synchronized (this) {
                 ListBuilder builder = new ListBuilder(getContext(), mSliceUri,
                         ListBuilder.INFINITY);
-                if (needsMediaLocked()) {
-                    addMediaLocked(builder);
-                } else {
-                    builder.addRow(new RowBuilder(mDateUri).setTitle(mLastText));
-                }
+                addDateLocked(builder);
                 addNextAlarmLocked(builder);
                 addZenModeLocked(builder);
                 addPrimaryActionLocked(builder);
+                if (needsMediaLocked()) {
+                    addMediaLocked(builder);
+                }
                 slice = builder.build();
             }
         } catch (IllegalStateException e) {
@@ -238,6 +245,10 @@ public Slice onBindSlice(Uri sliceUri) {
         return slice;
     }
 
+    protected void addDateLocked(ListBuilder builder) {
+        builder.setHeader(new ListBuilder.HeaderBuilder(mDateUri).setTitle(mLastText));
+    }
+
     protected boolean needsMediaLocked() {
         boolean keepWhenAwake = mKeyguardBypassController != null
                 && mKeyguardBypassController.getBypassEnabled() && mDozeParameters.getAlwaysOn();
@@ -252,8 +263,11 @@ protected void addMediaLocked(ListBuilder listBuilder) {
         if (TextUtils.isEmpty(mMediaTitle)) {
             return;
         }
-        listBuilder.setHeader(new ListBuilder.HeaderBuilder(mHeaderUri).setTitle(mMediaTitle));
-
+        {
+            var titleBuilder = new RowBuilder(mHeaderUri);
+            titleBuilder.setTitle(mMediaTitle);
+            listBuilder.addRow(titleBuilder);
+        }
         if (!TextUtils.isEmpty(mMediaArtist)) {
             RowBuilder albumBuilder = new RowBuilder(mMediaUri);
             albumBuilder.setTitle(mMediaArtist);
@@ -264,6 +278,7 @@ protected void addMediaLocked(ListBuilder listBuilder) {
             if (mediaIconCompat != null) {
                 albumBuilder.addEndItem(mediaIconCompat, ListBuilder.ICON_IMAGE);
             }
+            albumBuilder.setEndOfSection(true);
 
             listBuilder.addRow(albumBuilder);
         }
@@ -289,7 +304,8 @@ protected void addNextAlarmLocked(ListBuilder builder) {
                 R.drawable.ic_access_alarms_big);
         RowBuilder alarmRowBuilder = new RowBuilder(mAlarmUri)
                 .setTitle(mNextAlarm)
-                .addEndItem(alarmIcon, ListBuilder.ICON_IMAGE);
+                .addEndItem(alarmIcon, ListBuilder.ICON_IMAGE)
+                .setEndOfSection(true);
         builder.addRow(alarmRowBuilder);
     }
 
@@ -306,7 +322,8 @@ protected void addZenModeLocked(ListBuilder builder) {
                         .getString(R.string.accessibility_quick_settings_dnd))
                 .addEndItem(
                     IconCompat.createWithResource(getContext(), R.drawable.stat_sys_dnd),
-                    ListBuilder.ICON_IMAGE);
+                    ListBuilder.ICON_IMAGE)
+                .setEndOfSection(true);
         builder.addRow(dndBuilder);
     }
 
@@ -319,7 +336,9 @@ protected boolean isDndOn() {
 
     @Override
     public boolean onCreateSliceProvider() {
-        mContextAvailableCallback.onContextAvailable(getContext());
+        if (mContextAvailableCallback != null) {
+            mContextAvailableCallback.onContextAvailable(getContext());
+        }
         if (mMediaManager == null) {
             Log.e(TAG, "Dagger injection failed, cannot start. See any above warnings with string: "
                     + "\"No injector for class\"");
@@ -328,21 +347,25 @@ public boolean onCreateSliceProvider() {
         mMediaWakeLock = new SettableWakeLock(
                 WakeLock.createPartial(getContext(), mWakeLockLogger, "media"), "media");
         synchronized (KeyguardSliceProvider.sInstanceLock) {
-            KeyguardSliceProvider oldInstance = KeyguardSliceProvider.sInstance;
-            if (oldInstance != null) {
-                oldInstance.onDestroy();
+            try {
+                KeyguardSliceProvider oldInstance = KeyguardSliceProvider.sInstance;
+                if (oldInstance != null) {
+                    oldInstance.onDestroy();
+                }
+                mDatePattern = getContext().getString(R.string.system_ui_aod_date_pattern);
+                mPendingIntent = PendingIntent.getActivity(getContext(), 0,
+                        new Intent(getContext(), KeyguardSliceProvider.class),
+                        PendingIntent.FLAG_IMMUTABLE);
+                mMediaManager.addCallback(this);
+                mStatusBarStateController.addCallback(this);
+                mNextAlarmController.addCallback(this);
+                mZenModeController.addCallback(this);
+                KeyguardSliceProvider.sInstance = this;
+                registerClockUpdate();
+                updateClockLocked();
+            } catch (Exception e) {
+                return false;
             }
-            mDatePattern = getContext().getString(R.string.system_ui_aod_date_pattern);
-            mPendingIntent = PendingIntent.getActivity(getContext(), 0,
-                    new Intent(getContext(), KeyguardSliceProvider.class),
-                    PendingIntent.FLAG_IMMUTABLE);
-            mMediaManager.addCallback(this);
-            mStatusBarStateController.addCallback(this);
-            mNextAlarmController.addCallback(this);
-            mZenModeController.addCallback(this);
-            KeyguardSliceProvider.sInstance = this;
-            registerClockUpdate();
-            updateClockLocked();
         }
         return true;
     }
@@ -393,7 +416,7 @@ private boolean withinNHoursLocked(AlarmManager.AlarmClockInfo alarmClockInfo, i
         }
 
         long limit = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(hours);
-        return mNextAlarmInfo.getTriggerTime() <= limit;
+        return alarmClockInfo.getTriggerTime() <= limit;
     }
 
     /**
@@ -518,6 +541,27 @@ private void updateMediaStateLocked(MediaMetadata metadata, @PlaybackState.State
         mMediaArtist = artist;
         mMediaIsVisible = nextVisible;
         notifyChange();
+        if (mPulseOnNewTracks && mMediaIsVisible
+                && !mDozeParameters.getAlwaysOn() && mDozing
+                && !TextUtils.isEmpty(mMediaTitle)) {
+            final long now = SystemClock.uptimeMillis();
+            if (now - mLastPulseUptimeMs >= MIN_PULSE_INTERVAL_MS) {
+                mLastPulseUptimeMs = now;
+                mBgHandler.post(() -> {
+                    try {
+                        Intent intent = new Intent(PULSE_ACTION)
+                                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+                        getContext().sendBroadcastAsUser(intent, UserHandle.CURRENT);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error on sendBroadcastAsUser()", e);
+                    }
+                });
+            }
+        }
+    }
+
+    public void setPulseOnNewTracks(boolean enabled) {
+        mPulseOnNewTracks = enabled;
     }
 
     protected void notifyChange() {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
index cd890a684d848..2072ec1b7fe86 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
@@ -31,6 +31,7 @@ import com.android.systemui.keyguard.ui.binder.KeyguardJankBinder
 import com.android.systemui.keyguard.ui.binder.KeyguardRootViewBinder
 import com.android.systemui.keyguard.ui.binder.LightRevealScrimViewBinder
 import com.android.systemui.keyguard.ui.view.KeyguardIndicationArea
+import com.android.systemui.keyguard.ui.view.KeyguardIndicationAreaTop
 import com.android.systemui.keyguard.ui.view.KeyguardRootView
 import com.android.systemui.keyguard.ui.viewmodel.KeyguardBlueprintViewModel
 import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel
@@ -127,6 +128,9 @@ constructor(
     private fun initializeViews() {
         val indicationArea = KeyguardIndicationArea(context, null)
         keyguardIndicationController.setIndicationArea(indicationArea)
+
+        val indicationAreaTop = KeyguardIndicationAreaTop(context, null)
+        keyguardIndicationController.setIndicationAreaTop(indicationAreaTop)
     }
 
     private fun bindKeyguardRootView() {
@@ -141,6 +145,7 @@ constructor(
                 keyguardRootViewModel,
                 keyguardBlueprintViewModel,
                 configuration,
+                context,
                 occludingAppDeviceEntryMessageViewModel,
                 chipbarCoordinator,
                 shadeInteractor,
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 62c41395da575..0d5a22ada6432 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -88,6 +88,7 @@
 import android.provider.Settings;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.util.DisplayUtils;
 import android.util.Log;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
@@ -124,6 +125,7 @@
 import com.android.internal.policy.IKeyguardStateCallback;
 import com.android.internal.policy.ScreenDecorationsUtils;
 import com.android.internal.statusbar.IStatusBarService;
+import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.LatencyTracker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.keyguard.KeyguardConstants;
@@ -169,6 +171,7 @@
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.NotificationShadeDepthController;
 import com.android.systemui.statusbar.NotificationShadeWindowController;
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController;
 import com.android.systemui.statusbar.SysuiStatusBarStateController;
 import com.android.systemui.statusbar.phone.BiometricUnlockController;
 import com.android.systemui.statusbar.phone.CentralSurfaces;
@@ -1687,8 +1690,11 @@ public KeyguardViewMediator(
         mScrimControllerLazy = scrimControllerLazy;
         mActivityTaskManagerService = activityTaskManagerService;
 
-        mPowerButtonY = context.getResources().getDimensionPixelSize(
-                R.dimen.physical_power_button_center_screen_location_y);
+        final float scaleFactor = DisplayUtils.getScaleFactor(mContext);
+        int positionY = (int) (scaleFactor * mContext.getResources().getDimensionPixelSize(
+                R.dimen.physical_power_button_center_screen_location_y));
+
+        mPowerButtonY = positionY;
         mWindowCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context);
 
         mDreamOpenAnimationDuration = (int) DREAMING_ANIMATION_DURATION_MS;
@@ -1905,16 +1911,26 @@ public void onStartedGoingToSleep(@WindowManagerPolicyConstants.OffReason int of
 
         mUpdateMonitor.dispatchStartedGoingToSleep(offReason);
 
-        // Reset keyguard going away state, so we can start listening for fingerprint. We
-        // explicitly DO NOT want to call
-        // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
-        // here, since that will mess with the device lock state.
-        mKeyguardStateController.notifyKeyguardGoingAway(false);
-        mUpdateMonitor.dispatchKeyguardGoingAway(false);
+        // Prevent keyguard going away conflicts during lock operations
+        boolean isLockingOperation = mShowing || mKeyguardStateController.isKeyguardGoingAway() || mPendingLock;
+
+        // Only dispatch keyguard going away if:
+        // 1. UDFPS is not configured (original logic)
+        // 2. Not currently in a locking operation
+        if (!isUdfpsConfigured() || (!mUpdateMonitor.isUdfpsEnrolled() && !isLockingOperation)) {
+            mKeyguardStateController.notifyKeyguardGoingAway(false);
+            mUpdateMonitor.dispatchKeyguardGoingAway(false);
+        }
 
         notifyStartedGoingToSleep();
     }
 
+    private boolean isUdfpsConfigured() {
+        int[] udfpsProps = mContext.getResources().getIntArray(
+            com.android.internal.R.array.config_udfps_sensor_props);
+        return !ArrayUtils.isEmpty(udfpsProps);
+    }
+
     /**
      * Called to let us know the screen finished turning off.
      * @param offReason either {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_USER} or
@@ -2687,7 +2703,8 @@ private void showKeyguard(Bundle options) {
         Trace.beginSection("KeyguardViewMediator#showKeyguard acquiring mShowKeyguardWakeLock");
         if (DEBUG) Log.d(TAG, "showKeyguard");
         // ensure we stay awake until we are finished displaying the keyguard
-        mShowKeyguardWakeLock.acquire();
+        if (mShowKeyguardWakeLock != null)
+            mShowKeyguardWakeLock.acquire();
         mLastShowRequest++;
         Message msg = mHandler.obtainMessage(SHOW, options);
         // Treat these messages with priority - This call can originate from #doKeyguardTimeout,
@@ -3167,7 +3184,8 @@ private void handleShowInner(Bundle options) {
             userActivity();
             mUpdateMonitor.setKeyguardGoingAway(false);
             mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
-            mShowKeyguardWakeLock.release();
+            if (mShowKeyguardWakeLock != null)
+                mShowKeyguardWakeLock.release();
         }
         mKeyguardDisplayManager.show();
 
@@ -3917,6 +3935,10 @@ private void adjustStatusBarLocked(boolean forceHideHomeRecentsButtons,
                 flags |= StatusBarManager.DISABLE_RECENT;
             }
 
+            if (NTForbiddenSwipeDownQSController.get(mContext).getForbiddenSwipeDownQS() && this.mOccluded) {
+                flags |= StatusBarManager.DISABLE_EXPAND;
+            }
+
             if (DEBUG) {
                 Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded
                         + " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
index c261cfefb2b85..7f3803912e402 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
@@ -25,6 +25,7 @@
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.util.DisplayMetrics;
+import android.util.DisplayUtils;
 
 import androidx.annotation.Nullable;
 
@@ -230,19 +231,17 @@ private void updateLastSleepOriginLocation() {
      * Returns the point on the screen closest to the physical power button.
      */
     private Point getPowerButtonOrigin() {
+        final float scaleFactor = DisplayUtils.getScaleFactor(mContext);
+        int positionY = (int) (scaleFactor * mContext.getResources().getDimensionPixelSize(
+                R.dimen.physical_power_button_center_screen_location_y));
+
         final boolean isPortrait = mContext.getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_PORTRAIT;
 
         if (isPortrait) {
-            return new Point(
-                    mDisplayMetrics.widthPixels,
-                    mContext.getResources().getDimensionPixelSize(
-                            R.dimen.physical_power_button_center_screen_location_y));
+            return new Point(mDisplayMetrics.widthPixels, positionY);
         } else {
-            return new Point(
-                    mContext.getResources().getDimensionPixelSize(
-                            R.dimen.physical_power_button_center_screen_location_y),
-                    mDisplayMetrics.heightPixels);
+            return new Point(positionY, mDisplayMetrics.heightPixels);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/AssistantKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/AssistantKeyguardQuickAffordanceConfig.kt
new file mode 100644
index 0000000000000..c6a7e9d5fe130
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/AssistantKeyguardQuickAffordanceConfig.kt
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (C) 2023 The risingOS Android Project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.android.systemui.keyguard.data.quickaffordance
+
+import android.app.StatusBarManager
+import android.content.Context
+import android.content.Intent
+import com.android.systemui.animation.Expandable
+import com.android.systemui.common.shared.model.ContentDescription
+import com.android.systemui.common.shared.model.Icon
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.res.R
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+
+import com.android.internal.util.matrixx.Utils
+
+@SysUISingleton
+class AssistantKeyguardQuickAffordanceConfig
+@Inject
+constructor(
+    @Application private val context: Context
+) : KeyguardQuickAffordanceConfig {
+
+    override val key: String
+        get() = BuiltInKeyguardQuickAffordanceKeys.ASSISTANT
+
+    override fun pickerName(): String = context.getString(R.string.accessibility_assistant_button)
+
+    override val pickerIconResourceId: Int
+        get() = R.drawable.ic_assistant
+
+    override val lockScreenState: Flow<KeyguardQuickAffordanceConfig.LockScreenState>
+        get() =
+            flowOf(
+                KeyguardQuickAffordanceConfig.LockScreenState.Visible(
+                    icon =
+                        Icon.Resource(
+                            R.drawable.ic_assistant,
+                            ContentDescription.Resource(R.string.accessibility_assistant_button)
+                        )
+                )
+            )
+
+    override suspend fun getPickerScreenState(): KeyguardQuickAffordanceConfig.PickerScreenState {
+        return if (Utils.isPackageInstalled(context, "com.openai.chatgpt")) {
+            super.getPickerScreenState()
+        } else {
+            KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice
+        }
+    }
+
+    override fun onTriggered(
+        expandable: Expandable?,
+    ): KeyguardQuickAffordanceConfig.OnTriggeredResult {
+        val intent = Intent().setClassName("com.openai.chatgpt", "com.openai.voice.assistant.AssistantActivity")
+        return KeyguardQuickAffordanceConfig.OnTriggeredResult.StartActivity(
+            intent = intent,
+            canShowWhileLocked = true,
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt
index 80675d373b8eb..01bc7cc90e7e3 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt
@@ -24,6 +24,7 @@ package com.android.systemui.keyguard.data.quickaffordance
  */
 object BuiltInKeyguardQuickAffordanceKeys {
     // Please keep alphabetical order of const names to simplify future maintenance.
+    const val ASSISTANT = "assistant"
     const val CAMERA = "camera"
     const val CREATE_NOTE = "create_note"
     const val DO_NOT_DISTURB = "do_not_disturb"
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt
index 683c11a88b892..bfcc47c1dbb63 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfig.kt
@@ -116,6 +116,8 @@ constructor(
                             TAG,
                         )
                     }
+
+                    override fun onFlashlightStrengthChanged(level: Int) {}
                 }
 
             flashlightController.addCallback(flashlightCallback)
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt
index 787a9837b8603..8b6ef0af02d94 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt
@@ -33,6 +33,7 @@ interface KeyguardDataQuickAffordanceModule {
         @Provides
         @ElementsIntoSet
         fun quickAffordanceConfigs(
+            assistant: AssistantKeyguardQuickAffordanceConfig,
             camera: CameraQuickAffordanceConfig,
             doNotDisturb: DoNotDisturbQuickAffordanceConfig,
             flashlight: FlashlightQuickAffordanceConfig,
@@ -43,6 +44,7 @@ interface KeyguardDataQuickAffordanceModule {
             videoCamera: VideoCameraQuickAffordanceConfig,
         ): Set<KeyguardQuickAffordanceConfig> {
             return setOf(
+                assistant,
                 camera,
                 doNotDisturb,
                 flashlight,
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt
index afeb7f45e5551..14b0f07af871c 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepository.kt
@@ -36,6 +36,7 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.shared.clocks.ClockRegistry
 import com.android.systemui.util.settings.SecureSettings
+import com.android.systemui.util.settings.SystemSettings
 import com.android.systemui.util.settings.SettingsProxyExt.observerFlow
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -84,6 +85,7 @@ class KeyguardClockRepositoryImpl
 @Inject
 constructor(
     private val secureSettings: SecureSettings,
+    private val systemSettings: SystemSettings,
     private val clockRegistry: ClockRegistry,
     override val clockEventController: ClockEventController,
     @Background private val backgroundDispatcher: CoroutineDispatcher,
@@ -98,7 +100,19 @@ constructor(
     override val forcedClockSize: Flow<ClockSize?> =
         if (featureFlags.isEnabled(Flags.LOCKSCREEN_ENABLE_LANDSCAPE)) {
             configurationRepository.onAnyConfigurationChange.map {
-                if (context.resources.getBoolean(R.bool.force_small_clock_on_lockscreen)) {
+                if (
+                    context.resources.getBoolean(R.bool.force_small_clock_on_lockscreen) ||
+                    secureSettings.getIntForUser(
+                        "clock_style",
+                        0, // Default value
+                        UserHandle.USER_CURRENT
+                    ) != 0 ||
+                    systemSettings.getIntForUser(
+                        "lockscreen_widgets_enabled",
+                        0, // Default value
+                        UserHandle.USER_CURRENT
+                    ) != 0
+                ) {
                     ClockSize.SMALL
                 } else {
                     null
@@ -161,14 +175,28 @@ constructor(
             )
 
     private fun getClockSize(): ClockSizeSetting {
-        return ClockSizeSetting.fromSettingValue(
-            secureSettings.getIntForUser(
-                Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,
-                context.resources.getInteger(
-                    com.android.internal.R.integer.config_doublelineClockDefault
-                ),
-                UserHandle.USER_CURRENT,
-            )
+        val isDoubleLineClock = secureSettings.getIntForUser(
+            Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK,
+            context.resources.getInteger(
+                com.android.internal.R.integer.config_doublelineClockDefault
+            ),
+            UserHandle.USER_CURRENT
         )
+        val clockStyleEnabled = secureSettings.getIntForUser(
+            Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_STYLE,
+            0, // Default value
+            UserHandle.USER_CURRENT
+        ) != 0
+        val lockscreenWidgetsEnabled = systemSettings.getIntForUser(
+            "lockscreen_widgets_enabled",
+            0, // Default value
+            UserHandle.USER_CURRENT
+        ) != 0
+        val clockSettingValue = if (clockStyleEnabled || lockscreenWidgetsEnabled) {
+            0 
+        } else {
+            isDoubleLineClock
+        }
+        return ClockSizeSetting.fromSettingValue(clockSettingValue)
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt
index 4f45d44e9c0c3..c96084d5a05e4 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt
@@ -189,6 +189,10 @@ interface KeyguardRepository {
 
     val lastDozeTapToWakePosition: StateFlow<Point?>
 
+    val lastTouchToSleepPosition: StateFlow<Point?>
+
+    fun setLastTouchToSleepPosition(position: Point)
+
     /** Last point that [KeyguardRootView] was tapped */
     val lastRootViewTapPosition: MutableStateFlow<Point?>
 
@@ -284,6 +288,8 @@ interface KeyguardRepository {
 
     fun setLastDozeTapToWakePosition(position: Point)
 
+    fun clearLastTouchToSleepPosition()
+
     fun setIsDozing(isDozing: Boolean)
 
     fun dozeTimeTick()
@@ -437,6 +443,17 @@ constructor(
         _lastDozeTapToWakePosition.value = position
     }
 
+    private val _lastTouchToSleepPosition = MutableStateFlow<Point?>(null)
+    override val lastTouchToSleepPosition = _lastTouchToSleepPosition.asStateFlow()
+
+    override fun setLastTouchToSleepPosition(position: Point) {
+        _lastTouchToSleepPosition.value = position
+    }
+
+    override fun clearLastTouchToSleepPosition() {
+        _lastTouchToSleepPosition.value = null
+    }
+
     override val lastRootViewTapPosition: MutableStateFlow<Point?> = MutableStateFlow(null)
 
     override val ambientIndicationVisible: MutableStateFlow<Boolean> = MutableStateFlow(false)
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepository.kt
index 549a5081cc435..e193fd13c58d6 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepository.kt
@@ -54,7 +54,7 @@ constructor(
     override val isWeatherEnabled: StateFlow<Boolean> =
         secureSettings
             .observerFlow(
-                names = arrayOf(Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED),
+                names = arrayOf(Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED),
                 userId = UserHandle.USER_ALL,
             )
             .onStart { emit(Unit) }
@@ -71,7 +71,7 @@ constructor(
 
     private fun getLockscreenWeatherEnabled(): Boolean {
         return secureSettings.getIntForUser(
-            Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,
+            Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED,
             1,
             userTracker.userId
         ) == 1
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepository.kt
index ad7c25e67b459..bd930f90eba31 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepository.kt
@@ -32,6 +32,7 @@ import com.android.systemui.keyguard.shared.model.BiometricUnlockSource
 import com.android.systemui.power.data.repository.PowerRepository
 import com.android.systemui.power.shared.model.WakeSleepReason
 import com.android.systemui.power.shared.model.WakeSleepReason.TAP
+import com.android.systemui.power.shared.model.WakeSleepReason.TOUCH_TO_SLEEP
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.statusbar.CircleReveal
@@ -46,7 +47,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
@@ -134,17 +137,34 @@ constructor(
 
     /** The reveal effect we'll use for the next non-biometric unlock (tap, power button, etc). */
     private val nonBiometricRevealEffect: Flow<LightRevealEffect> =
-        powerRepository.wakefulness.flatMapLatest { wakefulnessModel ->
+        combine(
+            powerRepository.wakefulness,
+            keyguardRepository.lastTouchToSleepPosition,
+        ) { wakefulnessModel, touchSleepPos ->
+            Pair(wakefulnessModel, touchSleepPos)
+        }.flatMapLatest { (wakefulnessModel, touchSleepPos) ->
             when {
                 wakefulnessModel.isAwakeOrAsleepFrom(WakeSleepReason.POWER_BUTTON) ->
                     powerButtonRevealEffect
                 wakefulnessModel.isAwakeFrom(TAP) -> tapRevealEffect
+                wakefulnessModel.isAwakeOrAsleepFrom(TOUCH_TO_SLEEP) && touchSleepPos != null ->
+                    flowOf(constructCircleRevealFromPoint(touchSleepPos))
                 else -> flowOf(LiftReveal)
             }
         }
 
     private val revealAmountAnimator = ValueAnimator.ofFloat(0f, 1f)
 
+    init {
+        backgroundScope.launch {
+            powerRepository.wakefulness.collect { model ->
+                if (model.isAwake()) {
+                    keyguardRepository.clearLastTouchToSleepPosition()
+                }
+            }
+        }
+    }
+
     override val wallpaperSupportsAmbientMode: MutableStateFlow<Boolean> = MutableStateFlow(false)
 
     override val useDarkWallpaperScrim: StateFlow<Boolean> =
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt
index b3e939a4c44f4..babf7de0f6583 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt
@@ -217,9 +217,6 @@ constructor(
         }
 
     fun handleFidgetTap(x: Float, y: Float) {
-        if (!com.android.systemui.Flags.clockFidgetAnimation()) {
-            return
-        }
 
         if (wallpaperFocalAreaInteractor.hasFocalArea.value) {
             wallpaperFocalAreaInteractor.sendTapPosition(x, y)
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardSmartspaceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardSmartspaceInteractor.kt
index 45a4b70a2535c..a4ea5b9b5a154 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardSmartspaceInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardSmartspaceInteractor.kt
@@ -27,8 +27,11 @@ class KeyguardSmartspaceInteractor
 constructor(
     private val keyguardSmartspaceRepository: KeyguardSmartspaceRepository,
 ) {
-    val bcSmartspaceVisibility: StateFlow<Int> = keyguardSmartspaceRepository.bcSmartspaceVisibility
-    val isWeatherEnabled: StateFlow<Boolean> = keyguardSmartspaceRepository.isWeatherEnabled
+    val bcSmartspaceVisibility: StateFlow<Int>
+        get() = keyguardSmartspaceRepository.bcSmartspaceVisibility
+
+    val isWeatherEnabled: StateFlow<Boolean>
+        get() = keyguardSmartspaceRepository.isWeatherEnabled
 
     fun setBcSmartspaceVisibility(visibility: Int) {
         keyguardSmartspaceRepository.setBcSmartspaceVisibility(visibility)
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerUdfpsViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerUdfpsViewBinder.kt
index c031b53ab87db..4431130343595 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerUdfpsViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerUdfpsViewBinder.kt
@@ -18,23 +18,60 @@
 package com.android.systemui.keyguard.ui.binder
 
 import android.content.res.ColorStateList
+import android.provider.Settings
+import android.os.UserHandle
 import android.view.View
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.app.tracing.coroutines.launchTraced as launch
+import com.android.systemui.Dependency
+import com.android.systemui.biometrics.UdfpsIconDrawable
 import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
 import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewModel
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
+import com.android.systemui.tuner.TunerService
+import com.android.internal.util.matrixx.Utils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.launch
 
 object AlternateBouncerUdfpsViewBinder {
 
+    private final val UDFPS_ICON: String =
+            "system:" + Settings.System.UDFPS_ICON
+
     /** Updates UI for the UDFPS icon on the alternate bouncer. */
     @JvmStatic
-    fun bind(view: DeviceEntryIconView, viewModel: AlternateBouncerUdfpsIconViewModel) {
+    fun bind(applicationScope: CoroutineScope, view: DeviceEntryIconView, viewModel: AlternateBouncerUdfpsIconViewModel) {
         val fgIconView = view.iconView
         val bgView = view.bgView
 
+        val packageInstalled = Utils.isPackageInstalled(
+            view.context, "com.matrixx.udfps.icons"
+        )
+
+        val shouldUseCustomUdfpsIcon: StateFlow<Boolean> = callbackFlow {
+            val callback = object : TunerService.Tunable {
+                override fun onTuningChanged(key: String, newValue: String?) {
+                    if (key == UDFPS_ICON) {
+                        trySend(TunerService.parseIntegerSwitch(newValue, false)).isSuccess
+                    }
+                }
+            }
+            Dependency.get(TunerService::class.java).addTunable(callback, UDFPS_ICON)
+
+            awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+        }.stateIn(
+            scope = applicationScope,
+            started = SharingStarted.Eagerly,
+            initialValue = false
+        )
+
         view.repeatWhenAttached {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 view.alpha = 0f
@@ -66,12 +103,16 @@ object AlternateBouncerUdfpsViewBinder {
                         /* merge */ false,
                     )
                     fgIconView.imageTintList = ColorStateList.valueOf(fgViewModel.tint)
-                    fgIconView.setPadding(
-                        fgViewModel.padding,
-                        fgViewModel.padding,
-                        fgViewModel.padding,
-                        fgViewModel.padding,
-                    )
+                    if (fgIconView.drawable.current !is UdfpsIconDrawable) {
+                        fgIconView.setPadding(
+                            fgViewModel.padding,
+                            fgViewModel.padding,
+                            fgViewModel.padding,
+                            fgViewModel.padding
+                        )
+                    } else {
+                        fgIconView.setPadding(0, 0, 0, 0)
+                    }
                 }
             }
         }
@@ -81,7 +122,7 @@ object AlternateBouncerUdfpsViewBinder {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch("$TAG#viewModel.bgColor") {
                     viewModel.bgColor.collect { color ->
-                        bgView.imageTintList = ColorStateList.valueOf(color)
+                        bgView.imageTintList = null
                     }
                 }
                 launch("$TAG#viewModel.bgAlpha") {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt
index 15477bf85b15b..e7fa77b18dcb2 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt
@@ -46,6 +46,7 @@ import com.android.systemui.log.TouchHandlingViewLogger
 import com.android.systemui.res.R
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.scrim.ScrimView
+import com.android.systemui.tuner.TunerService
 import dagger.Lazy
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
@@ -66,6 +67,7 @@ constructor(
     private val alternateBouncerDependencies: Lazy<AlternateBouncerDependencies>,
     private val windowManager: Lazy<WindowManager>,
     private val layoutInflater: Lazy<LayoutInflater>,
+    private val tunerService: TunerService,
 ) : CoreStartable {
 
     private var alternateBouncerView: ConstraintLayout? = null
@@ -260,7 +262,7 @@ constructor(
                         var udfpsView = view.getViewById(udfpsViewId)
                         if (udfpsView == null) {
                             udfpsView =
-                                DeviceEntryIconView(view.context, null, logger = logger).apply {
+                                DeviceEntryIconView(view.context, null, 0, logger, tunerService).apply {
                                     id = udfpsViewId
                                     contentDescription =
                                         context.resources.getString(
@@ -268,7 +270,7 @@ constructor(
                                         )
                                 }
                             view.addView(udfpsView)
-                            AlternateBouncerUdfpsViewBinder.bind(udfpsView, udfpsIconViewModel)
+                            AlternateBouncerUdfpsViewBinder.bind(applicationScope, udfpsView, udfpsIconViewModel)
                         }
 
                         val constraintSet = ConstraintSet().apply { clone(view) }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
index 0dd7821b49298..506f6304cbb24 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
@@ -29,7 +29,9 @@ import androidx.core.view.isInvisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.app.tracing.coroutines.launchTraced as launch
+import com.android.systemui.Dependency
 import com.android.systemui.Flags
+import com.android.systemui.biometrics.UdfpsIconDrawable
 import com.android.systemui.common.ui.view.TouchHandlingView
 import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
 import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryBackgroundViewModel
@@ -39,16 +41,28 @@ import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.res.R
 import com.android.systemui.statusbar.VibratorHelper
+import com.android.systemui.tuner.TunerService
 import com.android.systemui.util.kotlin.DisposableHandles
 import com.google.android.msdl.data.model.MSDLToken
 import com.google.android.msdl.domain.MSDLPlayer
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DisposableHandle
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.SharingStarted
+import android.provider.Settings
+import android.os.UserHandle
+import com.android.internal.util.matrixx.Utils
 
 object DeviceEntryIconViewBinder {
     private const val TAG = "DeviceEntryIconViewBinder"
 
+    private final val UDFPS_ICON: String =
+            "system:" + Settings.System.UDFPS_ICON
+
     /**
      * Updates UI for:
      * - device entry containing view (parent view for the below views)
@@ -70,6 +84,27 @@ object DeviceEntryIconViewBinder {
         msdlPlayer: MSDLPlayer,
         overrideColor: Color? = null,
     ): DisposableHandle {
+        val packageInstalled = Utils.isPackageInstalled(
+            view.context, "com.matrixx.udfps.icons"
+        )
+
+        val shouldUseCustomUdfpsIcon: StateFlow<Boolean> = callbackFlow {
+            val callback = object : TunerService.Tunable {
+                override fun onTuningChanged(key: String, newValue: String?) {
+                    if (key == UDFPS_ICON) {
+                        trySend(TunerService.parseIntegerSwitch(newValue, false)).isSuccess
+                    }
+                }
+            }
+            Dependency.get(TunerService::class.java).addTunable(callback, UDFPS_ICON)
+
+            awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+        }.stateIn(
+            scope = applicationScope,
+            started = SharingStarted.Eagerly,
+            initialValue = false
+        )
+
         val disposables = DisposableHandles()
         val touchHandlingView = view.touchHandlingView
         val fgIconView = view.iconView
@@ -108,11 +143,7 @@ object DeviceEntryIconViewBinder {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     launch("$TAG#viewModel.useBackgroundProtection") {
                         viewModel.useBackgroundProtection.collect { useBackgroundProtection ->
-                            if (useBackgroundProtection) {
-                                bgView.visibility = View.VISIBLE
-                            } else {
-                                bgView.visibility = View.GONE
-                            }
+                            bgView.visibility = View.GONE
                         }
                     }
                     launch("$TAG#viewModel.burnInOffsets") {
@@ -221,6 +252,10 @@ object DeviceEntryIconViewBinder {
                     launch("$TAG#fpIconView.viewModel") {
                         fgViewModel.viewModel.collect { viewModel ->
                             Log.d(TAG, "Updating device entry icon image state $viewModel")
+                            fgIconView.setImageState(
+                                view.getIconState(viewModel.type, viewModel.useAodVariant),
+                                /* merge */ false,
+                            )
                             if (viewModel.type.contentDescriptionResId != -1) {
                                 fgIconView.contentDescription =
                                     fgIconView.resources.getString(
@@ -229,18 +264,16 @@ object DeviceEntryIconViewBinder {
                             }
                             fgIconView.imageTintList =
                                 ColorStateList.valueOf(overrideColor?.toArgb() ?: viewModel.tint)
-                            fgIconView.setPadding(
-                                viewModel.padding,
-                                viewModel.padding,
-                                viewModel.padding,
-                                viewModel.padding,
-                            )
-                            // Set image state at the end after updating other view state. This
-                            // method forces the ImageView to recompute the bounds of the drawable.
-                            fgIconView.setImageState(
-                                view.getIconState(viewModel.type, viewModel.useAodVariant),
-                                /* merge */ false,
-                            )
+                            if (fgIconView.drawable.current !is UdfpsIconDrawable) {
+                                fgIconView.setPadding(
+                                    viewModel.padding,
+                                    viewModel.padding,
+                                    viewModel.padding,
+                                    viewModel.padding
+                                )
+                            } else {
+                                fgIconView.setPadding(0, 0, 0, 0)
+                            }
                             // Invalidate, just in case the padding changes just after icon changes
                             fgIconView.invalidate()
                         }
@@ -256,7 +289,7 @@ object DeviceEntryIconViewBinder {
                     }
                     launch("$TAG#bgViewModel.color") {
                         bgViewModel.color.collect { color ->
-                            bgView.imageTintList = ColorStateList.valueOf(color)
+                            bgView.imageTintList = null
                         }
                     }
                 }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt
index 1a8bf001e0c17..a6e470eab41b8 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt
@@ -94,7 +94,12 @@ object KeyguardIndicationAreaBinder {
 
                     launch("$TAG#viewModel.indicationAreaTranslationY") {
                         configurationBasedDimensions
-                            .map { it.defaultBurnInPreventionYOffsetPx }
+                            .map {
+                                minOf(
+                                    it.indicationAreaBottomMarginPx,
+                                    it.defaultBurnInPreventionYOffsetPx
+                                )
+                            }
                             .flatMapLatest { defaultBurnInOffsetY ->
                                 viewModel.indicationAreaTranslationY(defaultBurnInOffsetY)
                             }
@@ -143,12 +148,15 @@ object KeyguardIndicationAreaBinder {
                 view.resources.getDimensionPixelSize(
                     com.android.internal.R.dimen.text_size_small_material
                 ),
+            indicationAreaBottomMarginPx =
+                view.resources.getDimensionPixelSize(R.dimen.keyguard_indication_margin_bottom),
         )
     }
 
     private data class ConfigurationBasedDimensions(
         val defaultBurnInPreventionYOffsetPx: Int,
         val indicationAreaPaddingPx: Int,
+        val indicationAreaBottomMarginPx: Int,
         val indicationTextSizePx: Int,
     )
 
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt
index b47f28a87daa6..6d086031397db 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceOnTouchListener.kt
@@ -51,7 +51,7 @@ class KeyguardQuickAffordanceOnTouchListener(
             MotionEvent.ACTION_DOWN -> {
                 if (viewModel.configKey != null) {
                     downDisplayCoords.set(event.rawX, event.rawY)
-                    if (isUsingAccurateTool(event)) {
+                    if (isUsingAccurateTool(event) || viewModel.singleTap) {
                         // For accurate tool types (stylus, mouse, etc.), we don't require a
                         // long-press.
                     } else {
@@ -82,7 +82,7 @@ class KeyguardQuickAffordanceOnTouchListener(
                 false
             }
             MotionEvent.ACTION_UP -> {
-                if (isUsingAccurateTool(event)) {
+                if (isUsingAccurateTool(event) || viewModel.singleTap) {
                     // When using an accurate tool type (stylus, mouse, etc.), we don't require
                     // a long-press gesture to activate the quick affordance. Therefore, lifting
                     // the pointer performs a click.
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceViewBinder.kt
index 777c703deb5b8..826880864faca 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardQuickAffordanceViewBinder.kt
@@ -20,6 +20,7 @@ package com.android.systemui.keyguard.ui.binder
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.drawable.Animatable2
+import android.os.VibrationEffect
 import android.util.Size
 import android.view.View
 import android.view.ViewGroup
@@ -206,7 +207,10 @@ constructor(
 
         view.isClickable = viewModel.isClickable
         if (viewModel.isClickable) {
-            if (viewModel.useLongPress) {
+            if (viewModel.singleTap || !viewModel.useLongPress) {
+                view.setOnClickListener(OnClickListener(viewModel, checkNotNull(falsingManager), vibratorHelper))
+                view.updateLongClickListener(null)
+            } else if (viewModel.useLongPress) {
                 val onTouchListener =
                     KeyguardQuickAffordanceOnTouchListener(
                         view,
@@ -241,9 +245,6 @@ constructor(
                         hapticsViewModel,
                         onTouchListener,
                     )
-            } else {
-                view.setOnClickListener(OnClickListener(viewModel, checkNotNull(falsingManager)))
-                view.updateLongClickListener(null)
             }
         } else {
             view.onLongClickListener = null
@@ -278,6 +279,7 @@ constructor(
     private class OnClickListener(
         private val viewModel: KeyguardQuickAffordanceViewModel,
         private val falsingManager: FalsingManager,
+        private val vibratorHelper: VibratorHelper?,
     ) : View.OnClickListener {
         override fun onClick(view: View) {
             if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
@@ -292,6 +294,29 @@ constructor(
                         slotId = viewModel.slotId,
                     )
                 )
+                vibratorHelper?.vibrate(
+                    if (viewModel.isActivated) {
+                        if (vibratorHelper?.areAllPrimitivesSupported(
+                                VibrationEffect.Composition.PRIMITIVE_TICK,
+                                VibrationEffect.Composition.PRIMITIVE_QUICK_RISE,
+                                VibrationEffect.Composition.PRIMITIVE_QUICK_FALL
+                            ) == true) {
+                            KeyguardBottomAreaVibrations.Activated
+                        } else {
+                            KeyguardBottomAreaVibrations.ActivatedAlt
+                        }
+                    } else {
+                        if (vibratorHelper?.areAllPrimitivesSupported(
+                                VibrationEffect.Composition.PRIMITIVE_TICK,
+                                VibrationEffect.Composition.PRIMITIVE_QUICK_RISE,
+                                VibrationEffect.Composition.PRIMITIVE_QUICK_FALL
+                            ) == true) {
+                            KeyguardBottomAreaVibrations.Deactivated
+                        } else {
+                            KeyguardBottomAreaVibrations.DeactivatedAlt
+                        }
+                    }
+                )
             }
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
index fb68164580db0..50c4ec3b8a49d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
@@ -20,8 +20,11 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.DrawableRes
 import android.annotation.SuppressLint
+import android.content.Context;
 import android.graphics.Point
 import android.graphics.Rect
+import android.os.UserHandle;
+import android.provider.Settings
 import android.view.HapticFeedbackConstants
 import android.view.InputDevice
 import android.view.MotionEvent
@@ -96,6 +99,7 @@ object KeyguardRootViewBinder {
         viewModel: KeyguardRootViewModel,
         blueprintViewModel: KeyguardBlueprintViewModel,
         configuration: ConfigurationState,
+        context: Context,
         occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel?,
         chipbarCoordinator: ChipbarCoordinator?,
         shadeInteractor: ShadeInteractor,
@@ -146,17 +150,20 @@ object KeyguardRootViewBinder {
             view.repeatWhenAttached(mainImmediateDispatcher) {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     if (deviceEntryHapticsInteractor != null && vibratorHelper != null) {
+
                         launch {
                             deviceEntryHapticsInteractor.playSuccessHapticOnDeviceEntry.collect {
-                                if (msdlFeedback()) {
-                                    msdlPlayer?.playToken(
-                                        MSDLToken.UNLOCK,
-                                        authInteractionProperties,
-                                    )
-                                } else {
+                                if (!isFpHapticEnabled(context, Settings.System.FP_SUCCESS_VIBRATE)) return@collect
+
+                                val playedMsdl = msdlFeedback() && (msdlPlayer?.let {
+                                    it.playToken(MSDLToken.UNLOCK, authInteractionProperties)
+                                    true
+                                } == true)
+
+                                if (!playedMsdl) {
                                     vibratorHelper.performHapticFeedback(
                                         view,
-                                        HapticFeedbackConstants.BIOMETRIC_CONFIRM,
+                                        HapticFeedbackConstants.BIOMETRIC_CONFIRM
                                     )
                                 }
                             }
@@ -164,15 +171,17 @@ object KeyguardRootViewBinder {
 
                         launch {
                             deviceEntryHapticsInteractor.playErrorHaptic.collect {
-                                if (msdlFeedback()) {
-                                    msdlPlayer?.playToken(
-                                        MSDLToken.FAILURE,
-                                        authInteractionProperties,
-                                    )
-                                } else {
+                                if (!isFpHapticEnabled(context, Settings.System.FP_ERROR_VIBRATE)) return@collect
+
+                                val playedMsdl = msdlFeedback() && (msdlPlayer?.let {
+                                    it.playToken(MSDLToken.FAILURE, authInteractionProperties)
+                                    true
+                                } == true)
+
+                                if (!playedMsdl) {
                                     vibratorHelper.performHapticFeedback(
                                         view,
-                                        HapticFeedbackConstants.BIOMETRIC_REJECT,
+                                        HapticFeedbackConstants.BIOMETRIC_REJECT
                                     )
                                 }
                             }
@@ -201,6 +210,7 @@ object KeyguardRootViewBinder {
                             view.alpha = alpha
                             childViews[burnInLayerId]?.alpha = alpha
                             childViews[sliceViewId]?.alpha = alpha
+                            childViews[weatherAreaId]?.alpha = alpha
                         }
                     }
 
@@ -230,6 +240,7 @@ object KeyguardRootViewBinder {
                         viewModel.translationY.collect { y ->
                             childViews[burnInLayerId]?.translationY = y
                             childViews[sliceViewId]?.translationY = y
+                            childViews[weatherAreaId]?.translationY = y
                             childViews[largeClockId]?.translationY = y
                             if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
                                 childViews[largeClockDateId]?.translationY = y
@@ -247,6 +258,7 @@ object KeyguardRootViewBinder {
                                     // Large Clock is not translated in the x direction
                                     childViews[burnInLayerId]?.translationX = px
                                     childViews[sliceViewId]?.translationX = px
+                                    childViews[weatherAreaId]?.translationX = px
                                     childViews[aodPromotedNotificationId]?.translationX = px
                                     childViews[aodNotificationIconContainerId]?.translationX = px
                                 }
@@ -296,6 +308,7 @@ object KeyguardRootViewBinder {
                         viewModel.burnInLayerVisibility.collect { visibility ->
                             childViews[burnInLayerId]?.visibility = visibility
                             childViews[sliceViewId]?.visibility = visibility
+                            childViews[weatherAreaId]?.visibility = visibility
                         }
                     }
 
@@ -430,6 +443,11 @@ object KeyguardRootViewBinder {
         return disposables
     }
 
+    private fun isFpHapticEnabled(context: Context, key: String): Boolean {
+        return Settings.System.getIntForUser(
+            context.contentResolver, key, 1, UserHandle.USER_CURRENT) == 1
+    }
+
     /**
      * Creates an instance of [ChipbarInfo] that can be sent to [ChipbarCoordinator] for display.
      */
@@ -583,6 +601,7 @@ object KeyguardRootViewBinder {
 
     private val burnInLayerId = R.id.burn_in_layer
     private val sliceViewId = R.id.keyguard_slice_view
+    private val weatherAreaId = R.id.keyguard_weather_area
     private val aodPromotedNotificationId = AodPromotedNotificationSection.viewId
     private val aodNotificationIconContainerId = R.id.aod_notification_icon_container
     private val largeClockId = ClockViewIds.LOCKSCREEN_CLOCK_VIEW_LARGE
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt
index d3bc79eb89e2a..d821531c91417 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt
@@ -74,6 +74,7 @@ constructor(
             ComposeView(context).apply {
                 setContent {
                     AlternateBouncer(
+                        applicationScope,
                         alternateBouncerDependencies = dependencies,
                         onHideAnimationFinished = {
                             if (root.isAttachedToWindow) {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
index d4f2d7c43ef53..4a0a13fe3c746 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
@@ -20,6 +20,8 @@ import android.companion.virtualdevice.flags.Flags
 import android.content.Context
 import android.graphics.drawable.AnimatedStateListDrawable
 import android.graphics.drawable.AnimatedVectorDrawable
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.AttributeSet
 import android.util.StateSet
 import android.view.Gravity
@@ -32,9 +34,13 @@ import android.widget.ImageView
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import com.airbnb.lottie.LottieCompositionFactory
 import com.airbnb.lottie.LottieDrawable
+import com.android.systemui.Dependency
+import com.android.systemui.biometrics.UdfpsFpIconDrawable
+import com.android.systemui.biometrics.UdfpsIconDrawable
 import com.android.systemui.common.ui.view.TouchHandlingView
 import com.android.systemui.log.TouchHandlingViewLogger
 import com.android.systemui.res.R
+import com.android.systemui.tuner.TunerService
 
 class DeviceEntryIconView
 @JvmOverloads
@@ -43,7 +49,8 @@ constructor(
     attrs: AttributeSet?,
     defStyleAttrs: Int = 0,
     logger: TouchHandlingViewLogger? = null,
-) : FrameLayout(context, attrs, defStyleAttrs) {
+    tunerService: TunerService,
+) : FrameLayout(context, attrs, defStyleAttrs), TunerService.Tunable {
 
     val touchHandlingView: TouchHandlingView =
         TouchHandlingView(
@@ -60,10 +67,23 @@ constructor(
     val iconView: ImageView = ImageView(context, attrs).apply { id = R.id.device_entry_icon_fg }
     val bgView: ImageView = ImageView(context, attrs).apply { id = R.id.device_entry_icon_bg }
     val aodFpDrawable: LottieDrawable = LottieDrawable()
+    val aodstockFpDrawable: LottieDrawable = LottieDrawable()
     var accessibilityHintType: AccessibilityHintType = AccessibilityHintType.NONE
 
     private var animatedIconDrawable: AnimatedStateListDrawable = AnimatedStateListDrawable()
 
+    private final val UDFPS_ICON: String =
+            "system:" + Settings.System.UDFPS_ICON
+
+    private final val UDFPS_ICON_AOD: String =
+            "system:" + Settings.System.UDFPS_ICON_AOD
+
+    private val fingerprintDrawable: UdfpsIconDrawable = UdfpsFpIconDrawable(context)
+
+    private val packageInstalled = com.android.internal.util.matrixx.Utils.isPackageInstalled(
+        context, "com.matrixx.udfps.icons"
+    )
+
     init {
         setupIconStates()
         setupIconTransitions()
@@ -74,6 +94,21 @@ constructor(
         addBgImageView()
         addIconImageView()
         addTouchHandlingView()
+
+        tunerService.addTunable(this, UDFPS_ICON, UDFPS_ICON_AOD)
+    }
+
+    override fun onTuningChanged(key: String?, value: String?) {
+        when (key) {
+            UDFPS_ICON, UDFPS_ICON_AOD -> {
+                iconView.setImageDrawable(null)
+                animatedIconDrawable = AnimatedStateListDrawable()
+                setupIconStates()
+                setupIconTransitions()
+                iconView.setImageDrawable(animatedIconDrawable) 
+            }
+            else -> return
+        }
     }
 
     private fun setupAccessibilityDelegate() {
@@ -111,6 +146,14 @@ constructor(
      * - Drawable properties can be updated using ImageView properties like imageTintList.
      */
     private fun setupIconStates() {
+        val customUdfpsIcon = packageInstalled && (Settings.System.getIntForUser(
+            mContext.contentResolver, Settings.System.UDFPS_ICON, 0, UserHandle.USER_CURRENT
+        ) != 0)
+
+        val customAodUdfpsIcon = Settings.System.getIntForUser(
+            mContext.contentResolver, Settings.System.UDFPS_ICON_AOD, 0, UserHandle.USER_CURRENT
+        ) != 0
+
         // Lockscreen States
         // LOCK
         animatedIconDrawable.addState(
@@ -125,11 +168,23 @@ constructor(
             R.id.unlocked,
         )
         // FINGERPRINT
-        animatedIconDrawable.addState(
-            getIconState(IconType.FINGERPRINT, false),
-            context.getDrawable(R.drawable.ic_fingerprint)!!,
-            R.id.locked_fp,
-        )
+        LottieCompositionFactory.fromRawRes(mContext, R.raw.udfps_lockscreen_fp).addListener { result ->
+            aodFpDrawable.setComposition(result)
+        }
+        if (customUdfpsIcon) {
+            fingerprintDrawable.setBounds(0, 0, bgView.width, bgView.height)
+            animatedIconDrawable.addState(
+                getIconState(IconType.FINGERPRINT, false),
+                fingerprintDrawable,
+                R.id.locked_fp
+            )
+        } else {
+            animatedIconDrawable.addState(
+                getIconState(IconType.FINGERPRINT, false),
+                aodFpDrawable,
+                R.id.locked_fp,
+            )
+        }
 
         // AOD states
         // LOCK
@@ -144,15 +199,26 @@ constructor(
             context.getDrawable(R.drawable.ic_unlocked_aod)!!,
             R.id.unlocked_aod,
         )
-        // FINGERPRINT
+        // FINGERPRINT - AOD
         LottieCompositionFactory.fromRawRes(mContext, R.raw.udfps_aod_fp).addListener { result ->
-            aodFpDrawable.setComposition(result)
+            aodstockFpDrawable.setComposition(result)
+        }
+        
+        // Use custom icon for AOD if switch is enabled AND custom icon is available
+        if (customAodUdfpsIcon && customUdfpsIcon) {
+            fingerprintDrawable.setBounds(0, 0, bgView.width, bgView.height)
+            animatedIconDrawable.addState(
+                getIconState(IconType.FINGERPRINT, true),
+                fingerprintDrawable,
+                R.id.udfps_aod_fp,
+            )
+        } else {
+            animatedIconDrawable.addState(
+                getIconState(IconType.FINGERPRINT, true),
+                aodstockFpDrawable,
+                R.id.udfps_aod_fp,
+            )
         }
-        animatedIconDrawable.addState(
-            getIconState(IconType.FINGERPRINT, true),
-            aodFpDrawable,
-            R.id.udfps_aod_fp,
-        )
 
         // WILDCARD: should always be the last state added since any states will match with this
         // and therefore won't get matched with subsequent states.
@@ -294,4 +360,4 @@ constructor(
         BOUNCER,
         ENTER,
     }
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationAreaTop.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationAreaTop.kt
new file mode 100644
index 0000000000000..99e9c796ddc72
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/KeyguardIndicationAreaTop.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.systemui.keyguard.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.LinearLayout
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.phone.FaceUnlockImageView
+
+class KeyguardIndicationAreaTop(
+    context: Context,
+    private val attrs: AttributeSet?,
+) :
+    LinearLayout(
+        context,
+        attrs,
+    ) {
+
+    init {
+        setId(R.id.keyguard_indication_area_top)
+        orientation = LinearLayout.VERTICAL
+
+        addView(
+            faceUnlockIcon(),
+            LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
+                gravity = Gravity.CENTER_HORIZONTAL
+                topMargin = R.dimen.face_unlock_icon_margin_top.dp()
+            }
+        )
+    }
+
+    private fun faceUnlockIcon(): FaceUnlockImageView {
+        return FaceUnlockImageView(context, attrs).apply {
+            id = R.id.face_unlock_icon
+            gravity = Gravity.CENTER
+            setAlpha(0.8f)
+            setVisibility(View.GONE)
+        }
+    }
+
+    private fun Int.dp(): Int {
+        return context.resources.getDimensionPixelSize(this)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt
index af323390073be..5959b30bd7191 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/DefaultKeyguardBlueprint.kt
@@ -27,13 +27,20 @@ import com.android.systemui.keyguard.ui.view.layout.sections.AodPromotedNotifica
 import com.android.systemui.keyguard.ui.view.layout.sections.ClockSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultDeviceEntrySection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultIndicationAreaSection
+import com.android.systemui.keyguard.ui.view.layout.sections.DefaultIndicationAreaTopSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultNotificationStackScrollLayoutSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultSettingsPopupMenuSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultShortcutsSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultUdfpsAccessibilityOverlaySection
+import com.android.systemui.keyguard.ui.view.layout.sections.AxDynamicBarKeyguardChipSection
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule.Companion.KEYGUARD_AMBIENT_INDICATION_AREA_SECTION
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection
+import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardWidgetViewSection
+import com.android.systemui.keyguard.ui.view.layout.sections.InfoWidgetsSection
+import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardClockStyleSection
+import com.android.systemui.keyguard.ui.view.layout.sections.AODStyleSection
+import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardWeatherViewSection
 import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection
 import java.util.Optional
 import javax.inject.Inject
@@ -52,6 +59,7 @@ class DefaultKeyguardBlueprint
 constructor(
     accessibilityActionsSection: AccessibilityActionsSection,
     defaultIndicationAreaSection: DefaultIndicationAreaSection,
+    defaultIndicationAreaTopSection: DefaultIndicationAreaTopSection,
     defaultDeviceEntrySection: DefaultDeviceEntrySection,
     defaultShortcutsSection: DefaultShortcutsSection,
     @Named(KEYGUARD_AMBIENT_INDICATION_AREA_SECTION)
@@ -64,7 +72,13 @@ constructor(
     aodBurnInSection: AodBurnInSection,
     clockSection: ClockSection,
     smartspaceSection: SmartspaceSection,
+    keyguardWeatherViewSection: KeyguardWeatherViewSection,
     keyguardSliceViewSection: KeyguardSliceViewSection,
+    keyguardWidgetViewSection: KeyguardWidgetViewSection,
+    infoWidgetsSection: InfoWidgetsSection,
+    keyguardClockStyleSection: KeyguardClockStyleSection,
+    aodStyleSection: AODStyleSection,
+    axDynamicBarKeyguardChipSection: AxDynamicBarKeyguardChipSection,
     udfpsAccessibilityOverlaySection: DefaultUdfpsAccessibilityOverlaySection,
 ) : KeyguardBlueprint {
     override val id: String = DEFAULT
@@ -73,6 +87,8 @@ constructor(
         listOfNotNull(
             accessibilityActionsSection,
             defaultIndicationAreaSection,
+            defaultIndicationAreaTopSection,
+            axDynamicBarKeyguardChipSection,
             defaultShortcutsSection,
             defaultAmbientIndicationAreaSection.getOrNull(),
             defaultSettingsPopupMenuSection,
@@ -83,7 +99,13 @@ constructor(
             smartspaceSection,
             aodBurnInSection,
             clockSection,
+            keyguardWeatherViewSection,
             keyguardSliceViewSection,
+            keyguardWidgetViewSection,
+            infoWidgetsSection,
+            keyguardClockStyleSection,
+	        aodStyleSection,
+            keyguardWeatherViewSection,
             defaultDeviceEntrySection,
             udfpsAccessibilityOverlaySection, // Add LAST: Intentionally has z-order above others
         )
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/SplitShadeKeyguardBlueprint.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/SplitShadeKeyguardBlueprint.kt
index ec7c15380b3f4..575f6844587ae 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/SplitShadeKeyguardBlueprint.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/SplitShadeKeyguardBlueprint.kt
@@ -30,8 +30,13 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultIndicationAr
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultSettingsPopupMenuSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultShortcutsSection
 import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSection
+import com.android.systemui.keyguard.ui.view.layout.sections.AxDynamicBarKeyguardChipSection
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule
+import com.android.systemui.keyguard.ui.view.layout.sections.InfoWidgetsSection
+import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardClockStyleSection
+import com.android.systemui.keyguard.ui.view.layout.sections.AODStyleSection
 import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection
+import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardWeatherViewSection
 import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection
 import com.android.systemui.keyguard.ui.view.layout.sections.SplitShadeGuidelines
 import com.android.systemui.keyguard.ui.view.layout.sections.SplitShadeMediaSection
@@ -66,8 +71,13 @@ constructor(
     aodBurnInSection: AodBurnInSection,
     clockSection: ClockSection,
     smartspaceSection: SmartspaceSection,
+    infoWidgetsSection: InfoWidgetsSection,
+    keyguardClockStyleSection: KeyguardClockStyleSection,
+    aodStyleSection: AODStyleSection,
     mediaSection: SplitShadeMediaSection,
+    keyguardWeatherViewSection: KeyguardWeatherViewSection,
     keyguardSliceViewSection: KeyguardSliceViewSection,
+    axDynamicBarKeyguardChipSection: AxDynamicBarKeyguardChipSection,
 ) : KeyguardBlueprint {
     override val id: String = ID
 
@@ -76,6 +86,7 @@ constructor(
         listOfNotNull(
             accessibilityActionsSection,
             defaultIndicationAreaSection,
+            axDynamicBarKeyguardChipSection,
             defaultShortcutsSection,
             defaultAmbientIndicationAreaSection.getOrNull(),
             defaultSettingsPopupMenuSection,
@@ -87,7 +98,11 @@ constructor(
             smartspaceSection,
             aodBurnInSection,
             clockSection,
+            keyguardWeatherViewSection,
             keyguardSliceViewSection,
+            infoWidgetsSection,
+            keyguardClockStyleSection,
+            aodStyleSection,
             mediaSection,
             defaultDeviceEntrySection, // Add LAST: Intentionally has z-order above other views.
         )
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AODStyleSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AODStyleSection.kt
new file mode 100644
index 0000000000000..c44fd2beaee0a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AODStyleSection.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2025 the RisingOS Revived Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.res.R
+import javax.inject.Inject
+
+class AODStyleSection
+@Inject
+constructor(
+    private val context: Context,
+) : KeyguardSection() {
+    
+    private var aodStyleView: View? = null
+    
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        // Remove existing view with the same ID if it exists
+        constraintLayout.findViewById<View?>(R.id.aod_ls)?.let { existingView ->
+            (existingView.parent as? ViewGroup)?.removeView(existingView)
+        }
+        
+        // Inflate the AOD style layout
+        aodStyleView = LayoutInflater.from(context).inflate(
+            R.layout.keyguard_aod_style,
+            constraintLayout,
+            false
+        ).apply {
+            id = R.id.aod_ls
+            layoutParams = ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+            )
+        }
+        
+        constraintLayout.addView(aodStyleView)
+    }
+    
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        // The AODStyle component handles its own data binding
+        // through its TunerService integration and StatusBarStateController callbacks
+    }
+    
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        constraintSet.apply {
+            // Position AOD style within the keyguard_status_area
+            connect(
+                R.id.aod_ls,
+                ConstraintSet.START,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.START
+            )
+            connect(
+                R.id.aod_ls,
+                ConstraintSet.END,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.END
+            )
+            
+            // Position at the top of status area with proper margin to avoid status bar overlap
+            val topMargin = (context.resources.getDimensionPixelSize(R.dimen.status_bar_height) * 1.25f).toInt()
+            connect(
+                R.id.aod_ls,
+                ConstraintSet.TOP,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.TOP,
+                topMargin
+            )
+            
+            // Set dimensions
+            constrainHeight(R.id.aod_ls, ConstraintSet.WRAP_CONTENT)
+            constrainWidth(R.id.aod_ls, ConstraintSet.MATCH_CONSTRAINT)
+            
+            // Set appropriate margins matching the original XML structure
+            setMargin(R.id.aod_ls, ConstraintSet.START, 
+                context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start))
+            setMargin(R.id.aod_ls, ConstraintSet.END, 
+                context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start))
+            
+            // Ensure proper layering within the status area
+            setElevation(R.id.aod_ls, 2f) // Higher elevation than info widgets
+            
+            // Update other elements to position below AOD style when it's visible
+            if (constraintSet.getConstraint(R.id.lockscreen_clock_view) != null) {
+                connect(
+                    R.id.lockscreen_clock_view,
+                    ConstraintSet.TOP,
+                    R.id.aod_ls,
+                    ConstraintSet.BOTTOM,
+                    8
+                )
+            }
+            
+            if (constraintSet.getConstraint(R.id.clock_ls) != null) {
+                connect(
+                    R.id.clock_ls,
+                    ConstraintSet.TOP,
+                    R.id.aod_ls,
+                    ConstraintSet.BOTTOM,
+                    8
+                )
+            }
+            
+            // Update the barrier to include AOD style for proper notification positioning
+            // This ensures notifications appear below all status area content including AOD
+            createBarrier(
+                R.id.smart_space_barrier_bottom,
+                Barrier.BOTTOM,
+                0,
+                *intArrayOf(
+                    R.id.aod_ls,
+                    R.id.keyguard_slice_view,
+                    R.id.keyguard_weather,
+                    R.id.clock_ls,
+                    R.id.keyguard_info_widgets
+                )
+            )
+            
+            // Ensure notification icons are positioned below the barrier
+            if (constraintSet.getConstraint(R.id.left_aligned_notification_icon_container) != null) {
+                connect(
+                    R.id.left_aligned_notification_icon_container,
+                    ConstraintSet.TOP,
+                    R.id.smart_space_barrier_bottom,
+                    ConstraintSet.BOTTOM,
+                    context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons)
+                )
+            }
+        }
+    }
+    
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        aodStyleView?.let { view ->
+            (view.parent as? ViewGroup)?.removeView(view)
+        }
+        aodStyleView = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AxDynamicBarKeyguardChipSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AxDynamicBarKeyguardChipSection.kt
new file mode 100644
index 0000000000000..91195b5b8718e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AxDynamicBarKeyguardChipSection.kt
@@ -0,0 +1,261 @@
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.transition.TransitionManager
+import android.view.View
+import android.view.ViewGroup
+import com.android.axion.compose.host.AxComposeView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.repeatOnLifecycle
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel
+import com.android.systemui.axdynamicbar.ui.compose.AxDynamicBarKeyguardChip
+import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
+import com.android.systemui.keyguard.shared.model.ClockSize
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.lifecycle.repeatWhenAttached
+import com.android.systemui.plugins.keyguard.ui.clocks.ClockViewIds
+import com.android.systemui.res.R
+import com.android.systemui.shade.ShadeDisplayAware
+import com.android.systemui.statusbar.KeyguardIndicationController
+import com.android.systemui.util.ScrimUtils
+import com.android.systemui.util.WallpaperDepthUtils
+import javax.inject.Inject
+import kotlinx.coroutines.DisposableHandle
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+
+private const val CHIP_ABOVE_LOCK_MARGIN_DP = 12f
+private const val EXPANDED_BOTTOM_PROTECTION_DP = 16f
+private const val UNSET = -1
+
+private val HIDDEN_VIEW_IDS = listOf(
+    R.id.keyguard_weather,
+    R.id.default_weather_image,
+    R.id.default_weather_text,
+    R.id.clock_ls,
+    R.id.keyguard_info_widgets,
+    R.id.keyguard_widgets,
+    R.id.shared_notification_container,
+    R.id.notificationShelf,
+    R.id.bc_smartspace_view,
+    R.id.smartspace_card_pager,
+    R.id.smartspace_page_indicator,
+    R.id.keyguard_slice_view,
+    R.id.keyguard_weather_area,
+)
+
+private fun Float.dpToPx(context: Context): Int =
+    (this * context.resources.displayMetrics.density + 0.5f).toInt()
+
+class AxDynamicBarKeyguardChipSection
+@Inject
+constructor(
+    @ShadeDisplayAware private val context: Context,
+    private val viewModel: AxDynamicBarChipViewModel,
+    private val indicationController: KeyguardIndicationController,
+    private val clockInteractor: KeyguardClockInteractor,
+) : KeyguardSection() {
+
+    private val chipViewId = R.id.ax_dynamic_bar_keyguard_chip
+    private var bindHandle: DisposableHandle? = null
+    private var expansionHandle: DisposableHandle? = null
+    private var enforceAction: Runnable? = null
+
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        val composeView = AxComposeView(context).apply { id = chipViewId }
+        constraintLayout.addView(composeView)
+    }
+
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        val composeView: AxComposeView = constraintLayout.requireViewById(chipViewId)
+
+        if (viewModel.isEnabled.value && viewModel.isKeyguardEnabled.value && viewModel.isOnKeyguard.value) {
+            indicationController.setSuppressIndication(true)
+        }
+
+        composeView.setContent {
+            PlatformTheme {
+                AxDynamicBarKeyguardChip(viewModel = viewModel)
+            }
+        }
+
+        bindHandle = composeView.repeatWhenAttached {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                combine(viewModel.isOnKeyguard, viewModel.isEnabled, viewModel.isKeyguardEnabled) { onKg, enabled, kgEnabled ->
+                    onKg && enabled && kgEnabled
+                }.collect { indicationController.setSuppressIndication(it) }
+            }
+        }
+
+        expansionHandle = composeView.repeatWhenAttached {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                val scope = this
+                scope.launch {
+                    viewModel.keyguardExpansion.collapseSettled.collect {
+                        if (!viewModel.keyguardExpansion.isExpanded.value) {
+                            applyCollapsedLp(composeView, viewModel.isLowUdfps.value)
+                            setHiddenViewsVisibility(constraintLayout, View.VISIBLE)
+                        }
+                    }
+                }
+                scope.launch {
+                    viewModel.isKeyguardExpanded.collectLatest { expanded ->
+                        if (expanded) {
+                            clockInteractor.clockSize.collect { size ->
+                                if (size != ClockSize.SMALL) {
+                                    clockInteractor.setClockSize(ClockSize.SMALL)
+                                }
+                            }
+                        }
+                    }
+                }
+                combine(viewModel.isKeyguardExpanded, viewModel.isLowUdfps) { expanded, lowUdfps ->
+                    expanded to lowUdfps
+                }.collect { (expanded, lowUdfps) ->
+                    onExpandedStateChanged(constraintLayout, composeView, expanded, lowUdfps)
+                }
+            }
+        }
+    }
+
+    private fun onExpandedStateChanged(
+        constraintLayout: ConstraintLayout,
+        composeView: View,
+        expanded: Boolean,
+        lowUdfps: Boolean,
+    ) {
+        WallpaperDepthUtils.get()?.setDynamicBarExpanded(expanded)
+        rebindPreDrawAction(constraintLayout, expanded)
+        TransitionManager.endTransitions(constraintLayout)
+        if (expanded) {
+            setHiddenViewsVisibility(constraintLayout, View.INVISIBLE)
+            applyExpandedLp(composeView)
+        }
+    }
+
+    private fun rebindPreDrawAction(constraintLayout: ConstraintLayout, expanded: Boolean) {
+        enforceAction?.let { ScrimUtils.get().removeKeyguardPreDrawAction(it) }
+        enforceAction = if (expanded) {
+            Runnable { enforceHidden(constraintLayout) }.also {
+                ScrimUtils.get().addKeyguardPreDrawAction(it)
+            }
+        } else null
+    }
+
+    private fun hiddenTargets(constraintLayout: ConstraintLayout): List<View> =
+        HIDDEN_VIEW_IDS.mapNotNull { constraintLayout.rootView.findViewById<View>(it) }
+
+    private fun setHiddenViewsVisibility(constraintLayout: ConstraintLayout, visibility: Int) {
+        hiddenTargets(constraintLayout).forEach { v ->
+            v.alpha = 1f
+            if (v.visibility != visibility) v.visibility = visibility
+        }
+         WallpaperDepthUtils.get()?.let {
+            if (visibility == View.INVISIBLE) it.hideDepthWallpaper()
+            else it.updateDepthWallpaperVisibility()
+        }
+    }
+
+    private fun enforceHidden(constraintLayout: ConstraintLayout) {
+        hiddenTargets(constraintLayout).forEach { v ->
+            if (v.visibility != View.INVISIBLE) v.visibility = View.INVISIBLE
+        }
+        WallpaperDepthUtils.get()?.hideDepthWallpaper()
+    }
+
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        val expanded = viewModel.isKeyguardExpanded.value
+        val lowUdfps = viewModel.isLowUdfps.value
+        val bottomProtectionPx = EXPANDED_BOTTOM_PROTECTION_DP.dpToPx(context)
+        val chipAboveLockPx = CHIP_ABOVE_LOCK_MARGIN_DP.dpToPx(context)
+        val wrap = ViewGroup.LayoutParams.WRAP_CONTENT
+        constraintSet.apply {
+            when {
+                expanded -> {
+                    constrainWidth(chipViewId, ConstraintSet.MATCH_CONSTRAINT)
+                    constrainHeight(chipViewId, ConstraintSet.MATCH_CONSTRAINT)
+                    connect(chipViewId, ConstraintSet.TOP, ClockViewIds.LOCKSCREEN_CLOCK_VIEW_SMALL, ConstraintSet.BOTTOM)
+                    connect(chipViewId, ConstraintSet.BOTTOM, R.id.device_entry_icon_view, ConstraintSet.TOP, bottomProtectionPx)
+                    connect(chipViewId, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+                    connect(chipViewId, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+                }
+                lowUdfps -> {
+                    constrainWidth(chipViewId, wrap)
+                    constrainHeight(chipViewId, wrap)
+                    connect(chipViewId, ConstraintSet.BOTTOM, R.id.device_entry_icon_view, ConstraintSet.TOP, chipAboveLockPx)
+                    connect(chipViewId, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+                    connect(chipViewId, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+                }
+                else -> {
+                    constrainWidth(chipViewId, wrap)
+                    constrainHeight(chipViewId, wrap)
+                    connect(chipViewId, ConstraintSet.BOTTOM, R.id.start_button, ConstraintSet.BOTTOM)
+                    connect(chipViewId, ConstraintSet.START, R.id.start_button, ConstraintSet.END)
+                    connect(chipViewId, ConstraintSet.END, R.id.end_button, ConstraintSet.START)
+                }
+            }
+        }
+    }
+
+    private fun applyExpandedLp(composeView: View) {
+        val lp = composeView.layoutParams as ConstraintLayout.LayoutParams
+        val bottomProtectionPx = EXPANDED_BOTTOM_PROTECTION_DP.dpToPx(context)
+        lp.width = ConstraintLayout.LayoutParams.MATCH_PARENT
+        lp.height = 0
+        lp.topToBottom = ClockViewIds.LOCKSCREEN_CLOCK_VIEW_SMALL
+        lp.bottomToTop = R.id.device_entry_icon_view
+        lp.startToStart = ConstraintLayout.LayoutParams.PARENT_ID
+        lp.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID
+        lp.topMargin = 0
+        lp.bottomMargin = bottomProtectionPx
+        lp.topToTop = UNSET
+        lp.bottomToBottom = UNSET
+        lp.startToEnd = UNSET
+        lp.endToStart = UNSET
+        composeView.layoutParams = lp
+    }
+
+    private fun applyCollapsedLp(composeView: View, lowUdfps: Boolean) {
+        val lp = composeView.layoutParams as ConstraintLayout.LayoutParams
+        lp.width = ViewGroup.LayoutParams.WRAP_CONTENT
+        lp.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        lp.topMargin = 0
+        lp.topToTop = UNSET
+        lp.topToBottom = UNSET
+        if (lowUdfps) {
+            lp.bottomToTop = R.id.device_entry_icon_view
+            lp.bottomToBottom = UNSET
+            lp.bottomMargin = CHIP_ABOVE_LOCK_MARGIN_DP.dpToPx(context)
+            lp.startToStart = ConstraintLayout.LayoutParams.PARENT_ID
+            lp.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID
+            lp.startToEnd = UNSET
+            lp.endToStart = UNSET
+        } else {
+            lp.bottomToBottom = R.id.start_button
+            lp.bottomToTop = UNSET
+            lp.bottomMargin = 0
+            lp.startToEnd = R.id.start_button
+            lp.endToStart = R.id.end_button
+            lp.startToStart = UNSET
+            lp.endToEnd = UNSET
+        }
+        composeView.layoutParams = lp
+    }
+
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        TransitionManager.endTransitions(constraintLayout)
+        enforceAction?.let { ScrimUtils.get().removeKeyguardPreDrawAction(it) }
+        enforceAction = null
+        WallpaperDepthUtils.get()?.setDynamicBarExpanded(false)
+        expansionHandle?.dispose()
+        expansionHandle = null
+        bindHandle?.dispose()
+        bindHandle = null
+        indicationController.setSuppressIndication(false)
+        constraintLayout.removeView(chipViewId)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt
index 7baddb8700a69..0c2d5a2f975ba 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt
@@ -18,6 +18,8 @@
 package com.android.systemui.keyguard.ui.view.layout.sections
 
 import android.content.Context
+import android.os.UserHandle
+import android.provider.Settings
 import android.view.View
 import androidx.constraintlayout.widget.Barrier
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -121,6 +123,19 @@ constructor(
             setAlpha(getTargetClockFace(clock).views, 1F)
             setAlpha(getNonTargetClockFace(clock).views, 0F)
 
+            // Hide small clock when custom clock is enabled by setting alpha to 0
+            val isCustomClockEnabled = Settings.Secure.getIntForUser(
+                    context.contentResolver,
+                    Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_STYLE,
+                    0,
+                    UserHandle.USER_CURRENT
+            ) != 0
+            
+            if (isCustomClockEnabled) {
+                setAlpha(ClockViewIds.LOCKSCREEN_CLOCK_VIEW_SMALL, 0F)
+                setAlpha(ClockViewIds.LOCKSCREEN_CLOCK_VIEW_LARGE, 0F)
+            }
+
             if (!keyguardClockViewModel.isLargeClockVisible.value) {
                 if (keyguardClockViewModel.shouldDateWeatherBeBelowSmallClock.value) {
                     connect(
@@ -264,6 +279,7 @@ constructor(
                     ),
             )
             val smallClockTopMargin = keyguardClockViewModel.getSmallClockTopMargin()
+                    + context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin)
             create(R.id.small_clock_guideline_top, ConstraintSet.HORIZONTAL_GUIDELINE)
             setGuidelineBegin(R.id.small_clock_guideline_top, smallClockTopMargin)
             connect(
@@ -279,6 +295,7 @@ constructor(
             val smallClockBottom =
                 keyguardClockViewModel.getSmallClockTopMargin() +
                     context.resources.getDimensionPixelSize(clocksR.dimen.small_clock_height)
+                    - context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin)
             val marginBetweenSmartspaceAndNotification =
                 context.resources.getDimensionPixelSize(
                     R.dimen.keyguard_status_view_bottom_margin
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySection.kt
index 223006e14e458..632ef21f7b5d8 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySection.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySection.kt
@@ -47,6 +47,7 @@ import com.android.systemui.res.R
 import com.android.systemui.shade.NotificationPanelView
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.statusbar.VibratorHelper
+import com.android.systemui.tuner.TunerService
 import com.google.android.msdl.domain.MSDLPlayer
 import dagger.Lazy
 import javax.inject.Inject
@@ -73,6 +74,7 @@ constructor(
     private val msdlPlayer: Lazy<MSDLPlayer>,
     @LongPressTouchLog private val logBuffer: LogBuffer,
     @KeyguardBlueprintLog blueprintLogBuffer: LogBuffer,
+    private val tunerService: TunerService,
 ) : KeyguardSection() {
     private val blueprintLogger = Logger(blueprintLogBuffer, TAG)
     private val deviceEntryIconViewId = R.id.device_entry_icon_view
@@ -83,7 +85,9 @@ constructor(
             DeviceEntryIconView(
                     context,
                     null,
-                    logger = TouchHandlingViewLogger(logBuffer = logBuffer, TAG),
+                    0,
+                    TouchHandlingViewLogger(logBuffer = logBuffer, TAG),
+                    tunerService,
                 )
                 .apply { id = deviceEntryIconViewId }
 
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultIndicationAreaTopSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultIndicationAreaTopSection.kt
new file mode 100644
index 0000000000000..d67edcd054e1c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultIndicationAreaTopSection.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.keyguard.ui.view.KeyguardIndicationAreaTop
+import com.android.systemui.res.R
+import javax.inject.Inject
+
+class DefaultIndicationAreaTopSection
+@Inject
+constructor(
+    private val context: Context,
+) : KeyguardSection() {
+    private val indicationAreaViewId = R.id.keyguard_indication_area_top
+
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        val view = KeyguardIndicationAreaTop(context, null)
+        constraintLayout.addView(view)
+    }
+
+    override fun bindData(constraintLayout: ConstraintLayout) {
+    }
+
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        constraintSet.apply {
+            constrainWidth(indicationAreaViewId, ViewGroup.LayoutParams.WRAP_CONTENT)
+            constrainHeight(indicationAreaViewId, ViewGroup.LayoutParams.WRAP_CONTENT)
+            connect(
+                indicationAreaViewId,
+                ConstraintSet.TOP,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.TOP,
+                context.resources.getDimensionPixelSize(R.dimen.status_bar_height)
+            )
+            connect(
+                indicationAreaViewId,
+                ConstraintSet.START,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.START
+            )
+            connect(
+                indicationAreaViewId,
+                ConstraintSet.END,
+                ConstraintSet.PARENT_ID,
+                ConstraintSet.END
+            )
+        }
+    }
+
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        constraintLayout.removeView(indicationAreaViewId)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/InfoWidgetsSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/InfoWidgetsSection.kt
new file mode 100644
index 0000000000000..ef20ce8897a9a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/InfoWidgetsSection.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2025 the RisingOS Revived Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.res.R
+import javax.inject.Inject
+
+class InfoWidgetsSection
+@Inject
+constructor(
+    private val context: Context,
+) : KeyguardSection() {
+    
+    private var infoWidgetsView: View? = null
+    
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        
+        constraintLayout.findViewById<View?>(R.id.keyguard_info_widgets)?.let { existingView ->
+            (existingView.parent as? ViewGroup)?.removeView(existingView)
+        }
+        
+        infoWidgetsView = LayoutInflater.from(context).inflate(
+            R.layout.keyguard_info_widgets,
+            constraintLayout,
+            false
+        ).apply {
+            id = R.id.keyguard_info_widgets
+            layoutParams = ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+            )
+        }
+        
+        constraintLayout.addView(infoWidgetsView)
+    }
+    
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        // ProgressImageView components handle their own data binding
+    }
+    
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        
+        constraintSet.apply {
+            // Info widgets positioning - below WEATHER (3rd in hierarchy)
+            connect(R.id.keyguard_info_widgets, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+            connect(R.id.keyguard_info_widgets, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+            
+            // Chain to weather (primary) or fallback hierarchy
+            when {
+                constraintSet.getConstraint(R.id.keyguard_weather) != null -> {
+                    connect(R.id.keyguard_info_widgets, ConstraintSet.TOP, R.id.keyguard_weather, ConstraintSet.BOTTOM, 12)
+                }
+                constraintSet.getConstraint(R.id.default_weather_image) != null -> {
+                    connect(R.id.keyguard_info_widgets, ConstraintSet.TOP, R.id.default_weather_image, ConstraintSet.BOTTOM, 12)
+                }
+                constraintSet.getConstraint(R.id.clock_ls) != null -> {
+                    connect(R.id.keyguard_info_widgets, ConstraintSet.TOP, R.id.clock_ls, ConstraintSet.BOTTOM, 12)
+                }
+                constraintSet.getConstraint(R.id.keyguard_slice_view) != null -> {
+                    connect(R.id.keyguard_info_widgets, ConstraintSet.TOP, R.id.keyguard_slice_view, ConstraintSet.BOTTOM, 12)
+                }
+                else -> {
+                    connect(R.id.keyguard_info_widgets, ConstraintSet.TOP, R.id.lockscreen_clock_view, ConstraintSet.BOTTOM, 12)
+                }
+            }
+            
+            constrainHeight(R.id.keyguard_info_widgets, ConstraintSet.WRAP_CONTENT)
+            constrainWidth(R.id.keyguard_info_widgets, ConstraintSet.MATCH_CONSTRAINT)
+            setMargin(R.id.keyguard_info_widgets, ConstraintSet.START, 0)
+            setMargin(R.id.keyguard_info_widgets, ConstraintSet.END, 0)
+            // Add small bottom margin for AOD to prevent notification overlap
+            setMargin(R.id.keyguard_info_widgets, ConstraintSet.BOTTOM, 6) // 6dp bottom margin for AOD
+            setElevation(R.id.keyguard_info_widgets, 1f)
+            
+            // UNIFIED BARRIER - Create barrier in every section that could be last
+            createUnifiedBarrierAndNotificationConstraints(constraintSet)
+        }
+    }
+    
+    private fun createUnifiedBarrierAndNotificationConstraints(constraintSet: ConstraintSet) {
+        constraintSet.apply {
+            // UNIFIED BARRIER - Include ALL status area elements
+            createBarrier(
+                R.id.smart_space_barrier_bottom,
+                Barrier.BOTTOM,
+                0,
+                *intArrayOf(
+                    R.id.keyguard_slice_view,
+                    R.id.keyguard_weather,
+                    R.id.default_weather_image,
+                    R.id.default_weather_text,
+                    R.id.clock_ls,
+                    R.id.keyguard_info_widgets,
+                    R.id.keyguard_widgets,
+                    R.id.lockscreen_clock_view // Include fallback clock
+                )
+            )
+            
+            // Position notifications below ALL status area content
+            if (constraintSet.getConstraint(R.id.left_aligned_notification_icon_container) != null) {
+                connect(
+                    R.id.left_aligned_notification_icon_container,
+                    ConstraintSet.TOP,
+                    R.id.smart_space_barrier_bottom,
+                    ConstraintSet.BOTTOM,
+                    context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons)
+                )
+            }
+        }
+    }
+    
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        infoWidgetsView?.let { view ->
+            (view.parent as? ViewGroup)?.removeView(view)
+        }
+        infoWidgetsView = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardClockStyleSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardClockStyleSection.kt
new file mode 100644
index 0000000000000..bb22a03672962
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardClockStyleSection.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2025 the RisingOS Revived Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.os.UserHandle
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.clocks.ClockStyle
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.res.R
+import com.android.systemui.util.settings.SecureSettings
+import javax.inject.Inject
+
+class KeyguardClockStyleSection
+@Inject
+constructor(
+    private val context: Context,
+    private val secureSettings: SecureSettings,
+) : KeyguardSection() {
+    
+    private var clockStyleView: ClockStyle? = null
+    private var isCustomClockEnabled: Boolean = false
+
+    private val TAG = "KeyguardClockStyleSection"
+    
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        isCustomClockEnabled = try {
+            val clockStyle = secureSettings.getIntForUser(
+                ClockStyle.CLOCK_STYLE_KEY, 0, UserHandle.USER_CURRENT
+            )
+            clockStyle != 0
+        } catch (e: Exception) {
+            false
+        }
+        
+        if (!isCustomClockEnabled) return
+        
+        constraintLayout.findViewById<View?>(R.id.clock_ls)?.let { existingView ->
+            (existingView.parent as? ViewGroup)?.removeView(existingView)
+        }
+        
+        val inflater = android.view.LayoutInflater.from(context)
+        clockStyleView = inflater.inflate(R.layout.keyguard_clock_style, null) as ClockStyle
+        clockStyleView?.apply {
+            id = R.id.clock_ls
+            layoutParams = ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+            )
+            visibility = View.VISIBLE
+        }
+        
+        clockStyleView?.let { constraintLayout.addView(it) }
+    }
+    
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        clockStyleView?.let { clockView ->
+            clockView.onTimeChanged()
+            clockView.requestLayout()
+        }
+    }
+    
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        val currentlyEnabled = try {
+            secureSettings.getIntForUser(
+                ClockStyle.CLOCK_STYLE_KEY, 0, UserHandle.USER_CURRENT
+            ) != 0
+        } catch (e: Exception) {
+            isCustomClockEnabled
+        }
+
+        if (!currentlyEnabled) return
+        
+        constraintSet.apply {
+            // Clock positioning - TOP of hierarchy
+            connect(R.id.clock_ls, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+            connect(R.id.clock_ls, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+            
+            val topMargin = (context.resources.getDimensionPixelSize(R.dimen.status_bar_height) * 1.25f).toInt()
+            connect(R.id.clock_ls, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, topMargin)
+            
+            constrainHeight(R.id.clock_ls, ConstraintSet.WRAP_CONTENT)
+            constrainWidth(R.id.clock_ls, ConstraintSet.MATCH_CONSTRAINT)
+            setMargin(R.id.clock_ls, ConstraintSet.START, 0)
+            setMargin(R.id.clock_ls, ConstraintSet.END, 0)
+            setElevation(R.id.clock_ls, 1f)
+            
+            // UNIFIED BARRIER - Create barrier in every section that could be last
+            createUnifiedBarrierAndNotificationConstraints(constraintSet)
+        }
+    }
+    
+    private fun createUnifiedBarrierAndNotificationConstraints(constraintSet: ConstraintSet) {
+        constraintSet.apply {
+            // UNIFIED BARRIER - Include ALL status area elements
+            createBarrier(
+                R.id.smart_space_barrier_bottom,
+                Barrier.BOTTOM,
+                0,
+                *intArrayOf(
+                    R.id.keyguard_slice_view,
+                    R.id.keyguard_weather,
+                    R.id.default_weather_image,
+                    R.id.default_weather_text,
+                    R.id.clock_ls,
+                    R.id.keyguard_info_widgets,
+                    R.id.keyguard_widgets,
+                    R.id.lockscreen_clock_view // Include fallback clock
+                )
+            )
+            
+            // Position notifications below ALL status area content
+            if (constraintSet.getConstraint(R.id.left_aligned_notification_icon_container) != null) {
+                connect(
+                    R.id.left_aligned_notification_icon_container,
+                    ConstraintSet.TOP,
+                    R.id.smart_space_barrier_bottom,
+                    ConstraintSet.BOTTOM,
+                    context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons)
+                )
+            }
+        }
+    }
+    
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        clockStyleView?.let { clockView ->
+            (clockView.parent as? ViewGroup)?.removeView(clockView)
+        }
+        clockStyleView = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardSliceViewSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardSliceViewSection.kt
index d3c0e9e25cc7c..4362032e13536 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardSliceViewSection.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardSliceViewSection.kt
@@ -124,14 +124,27 @@ constructor(
                 ConstraintSet.BOTTOM,
             )
 
-            createBarrier(
-                R.id.smart_space_barrier_bottom,
-                Barrier.BOTTOM,
-                0,
-                *intArrayOf(R.id.keyguard_slice_view),
-            )
+            if (!smartspaceController.isOmniWeatherEnabled) {
+                createBarrier(
+                    R.id.smart_space_barrier_bottom,
+                    Barrier.BOTTOM,
+                    0,
+                    *intArrayOf(R.id.keyguard_slice_view),
+                )
+            } else {
+                createBarrier(
+                    R.id.keyguard_weather_area,
+                    Barrier.BOTTOM,
+                    0,
+                    *intArrayOf(R.id.keyguard_slice_view),
+                )
+            }
         }
     }
 
-    override fun removeViews(constraintLayout: ConstraintLayout) {}
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        if (smartspaceController.isEnabled) return
+
+        constraintLayout.removeView(R.id.keyguard_slice_view)
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWeatherViewSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWeatherViewSection.kt
new file mode 100644
index 0000000000000..bd855c3009217
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWeatherViewSection.kt
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2025 the RisingOS Revived Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.customization.clocks.R as custR
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.plugins.keyguard.ui.clocks.ClockViewIds
+import com.android.systemui.res.R
+import com.android.systemui.shared.R as sharedR
+import com.android.systemui.weather.WeatherImageView
+import com.android.systemui.weather.WeatherTextView
+import javax.inject.Inject
+
+class KeyguardWeatherViewSection @Inject constructor(
+    private val context: Context,
+) : KeyguardSection() {
+
+    private var weatherImageView: WeatherImageView? = null
+    private var weatherTextView: WeatherTextView? = null
+
+    override fun addViews(constraintLayout: ConstraintLayout) {
+
+        val weatherContainer = constraintLayout.findViewById<ViewGroup?>(R.id.keyguard_weather)
+        
+        if (weatherContainer != null) {
+            weatherImageView = weatherContainer.findViewById(R.id.default_weather_image)
+            weatherTextView = weatherContainer.findViewById(R.id.default_weather_text)
+
+            if (weatherContainer.parent !== constraintLayout) {
+                (weatherContainer.parent as? ViewGroup)?.removeView(weatherContainer)
+                constraintLayout.addView(weatherContainer)
+            }
+        } else {
+            createWeatherViews(constraintLayout)
+        }
+
+        initializeWeatherViews()
+    }
+
+    private fun createWeatherViews(constraintLayout: ConstraintLayout) {
+        weatherImageView = WeatherImageView(context, isCustomClock = false).apply {
+            id = R.id.default_weather_image
+            layoutParams = ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+            )
+            visibility = View.GONE
+        }
+
+        weatherTextView = WeatherTextView(context, isCustomClock = false).apply {
+            id = R.id.default_weather_text
+            layoutParams = ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT
+            )
+            setTextColor(context.getColor(android.R.color.white))
+            textSize = 16f
+            visibility = View.GONE
+        }
+
+        weatherImageView?.let { constraintLayout.addView(it) }
+        weatherTextView?.let { constraintLayout.addView(it) }
+    }
+
+    private fun initializeWeatherViews() {
+        // Weather views initialize automatically when attached to window
+    }
+
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        // Weather data binding handled by individual weather views
+    }
+
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+
+        constraintSet.apply {
+            val startMargin = context.resources.getDimensionPixelSize(custR.dimen.clock_padding_start) +
+                context.resources.getDimensionPixelSize(custR.dimen.status_view_margin_horizontal)
+
+            // Weather positioning - below CLOCK (2nd in hierarchy)
+            if (constraintSet.getConstraint(R.id.keyguard_weather) != null) {
+                connect(R.id.keyguard_weather, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START, startMargin)
+                connect(R.id.keyguard_weather, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+                
+                // Chain to clock (primary) or fallback to slice_view
+                if (constraintSet.getConstraint(R.id.clock_ls) != null) {
+                    connect(R.id.keyguard_weather, ConstraintSet.TOP, R.id.clock_ls, ConstraintSet.BOTTOM, 8)
+                } else if (constraintSet.getConstraint(R.id.keyguard_slice_view) != null) {
+                    connect(R.id.keyguard_weather, ConstraintSet.TOP, R.id.keyguard_slice_view, ConstraintSet.BOTTOM, 8)
+                } else {
+                    connect(R.id.keyguard_weather, ConstraintSet.TOP, R.id.lockscreen_clock_view, ConstraintSet.BOTTOM, 8)
+                }
+                
+                constrainHeight(R.id.keyguard_weather, ConstraintSet.WRAP_CONTENT)
+                constrainWidth(R.id.keyguard_weather, ConstraintSet.MATCH_CONSTRAINT)
+            } else {
+                applyWeatherImageConstraints(constraintSet, startMargin)
+                applyWeatherTextConstraints(constraintSet)
+            }
+            
+            // UNIFIED BARRIER - Create barrier in every section that could be last
+            createUnifiedBarrierAndNotificationConstraints(constraintSet)
+        }
+    }
+
+    private fun applyWeatherImageConstraints(constraintSet: ConstraintSet, startMargin: Int) {
+        if (constraintSet.getConstraint(R.id.default_weather_image) != null) {
+            constraintSet.apply {
+                connect(R.id.default_weather_image, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START, startMargin)
+                
+                if (constraintSet.getConstraint(R.id.clock_ls) != null) {
+                    connect(R.id.default_weather_image, ConstraintSet.TOP, R.id.clock_ls, ConstraintSet.BOTTOM, 8)
+                } else if (constraintSet.getConstraint(R.id.keyguard_slice_view) != null) {
+                    connect(R.id.default_weather_image, ConstraintSet.TOP, R.id.keyguard_slice_view, ConstraintSet.BOTTOM, 8)
+                } else {
+                    connect(R.id.default_weather_image, ConstraintSet.TOP, R.id.lockscreen_clock_view, ConstraintSet.BOTTOM, 8)
+                }
+                
+                constrainHeight(R.id.default_weather_image, ConstraintSet.WRAP_CONTENT)
+                constrainWidth(R.id.default_weather_image, ConstraintSet.WRAP_CONTENT)
+            }
+        }
+    }
+
+    private fun applyWeatherTextConstraints(constraintSet: ConstraintSet) {
+        if (constraintSet.getConstraint(R.id.default_weather_text) != null) {
+            constraintSet.apply {
+                connect(R.id.default_weather_text, ConstraintSet.START, R.id.default_weather_image, ConstraintSet.END, 12)
+                connect(R.id.default_weather_text, ConstraintSet.TOP, R.id.default_weather_image, ConstraintSet.TOP)
+                connect(R.id.default_weather_text, ConstraintSet.BOTTOM, R.id.default_weather_image, ConstraintSet.BOTTOM)
+                constrainHeight(R.id.default_weather_text, ConstraintSet.WRAP_CONTENT)
+                constrainWidth(R.id.default_weather_text, ConstraintSet.WRAP_CONTENT)
+            }
+        }
+    }
+    
+    private fun createUnifiedBarrierAndNotificationConstraints(constraintSet: ConstraintSet) {
+        constraintSet.apply {
+            // UNIFIED BARRIER - Include ALL status area elements
+            createBarrier(
+                R.id.smart_space_barrier_bottom,
+                Barrier.BOTTOM,
+                0,
+                *intArrayOf(
+                    R.id.keyguard_slice_view,
+                    R.id.keyguard_weather,
+                    R.id.default_weather_image,
+                    R.id.default_weather_text,
+                    R.id.clock_ls,
+                    R.id.keyguard_info_widgets,
+                    R.id.keyguard_widgets,
+                    R.id.lockscreen_clock_view,
+                    ClockViewIds.LOCKSCREEN_CLOCK_VIEW_SMALL,
+                    sharedR.id.bc_smartspace_view,
+                    sharedR.id.date_smartspace_view,
+                )
+            )
+            
+            // Position notifications below ALL status area content
+            if (constraintSet.getConstraint(R.id.left_aligned_notification_icon_container) != null) {
+                connect(
+                    R.id.left_aligned_notification_icon_container,
+                    ConstraintSet.TOP,
+                    R.id.smart_space_barrier_bottom,
+                    ConstraintSet.BOTTOM,
+                    context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons)
+                )
+            }
+        }
+    }
+
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        constraintLayout.findViewById<ViewGroup?>(R.id.keyguard_weather)?.let { weatherContainer ->
+            constraintLayout.removeView(weatherContainer)
+        }
+        
+        weatherImageView?.let { constraintLayout.removeView(it) }
+        weatherTextView?.let { constraintLayout.removeView(it) }
+        
+        weatherImageView = null
+        weatherTextView = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWidgetViewSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWidgetViewSection.kt
new file mode 100644
index 0000000000000..4a46d9e1e65b9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/KeyguardWidgetViewSection.kt
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2025 the RisingOS Revived Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.android.systemui.keyguard.ui.view.layout.sections
+
+import android.content.Context
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import com.android.systemui.keyguard.shared.model.KeyguardSection
+import com.android.systemui.res.R
+import javax.inject.Inject
+import com.android.systemui.lockscreen.LockScreenWidgets
+
+class KeyguardWidgetViewSection
+@Inject
+constructor(
+    private val context: Context,
+) : KeyguardSection() {
+
+    private var widgetView: LockScreenWidgets? = null
+    private val TAG = "KeyguardWidgetViewSection"
+
+    private fun createWidgetView(): LockScreenWidgets? {
+        Log.d(TAG, "Creating LockScreenWidgets view")
+        return try {
+            val layoutInflater = android.view.LayoutInflater.from(context)
+            // Try to inflate from your actual layout file
+            val view = layoutInflater.inflate(R.layout.keyguard_clock_widgets, null) as LockScreenWidgets
+            
+            view.apply {
+                // Override the ID to match what the keyguard system expects
+                id = R.id.keyguard_widgets
+                layoutParams = ConstraintLayout.LayoutParams(
+                    ConstraintLayout.LayoutParams.MATCH_PARENT,
+                    ConstraintLayout.LayoutParams.WRAP_CONTENT
+                )
+                visibility = View.VISIBLE
+            }
+            
+            Log.d(TAG, "Successfully inflated LockScreenWidgets from keyguard_clock_widgets layout")
+            view
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to inflate from keyguard_clock_widgets, trying direct instantiation", e)
+            try {
+                // Create a dummy AttributeSet for direct instantiation
+                val parser = context.resources.getLayout(android.R.layout.simple_list_item_1)
+                val attrs = android.util.Xml.asAttributeSet(parser)
+                
+                LockScreenWidgets(context, attrs).apply {
+                    id = R.id.keyguard_widgets
+                    layoutParams = ConstraintLayout.LayoutParams(
+                        ConstraintLayout.LayoutParams.MATCH_PARENT,
+                        ConstraintLayout.LayoutParams.WRAP_CONTENT
+                    )
+                    visibility = View.VISIBLE
+                }
+            } catch (e2: Exception) {
+                Log.e(TAG, "Failed to create LockScreenWidgets directly", e2)
+                null
+            }
+        }
+    }
+
+    override fun addViews(constraintLayout: ConstraintLayout) {
+        Log.d(TAG, "addViews called")
+        
+        // Check if the widget view already exists in the layout
+        val existingView = constraintLayout.findViewById<View?>(R.id.keyguard_widgets)
+        
+        if (existingView != null) {
+            Log.d(TAG, "Found existing widget view")
+            widgetView = existingView as? LockScreenWidgets
+            return
+        }
+        
+        // Check if we already have a widget view instance
+        if (widgetView != null) {
+            Log.d(TAG, "Reusing existing widget view instance")
+            // Remove from any previous parent
+            (widgetView?.parent as? ViewGroup)?.removeView(widgetView)
+        } else {
+            Log.d(TAG, "Creating new widget view")
+            widgetView = createWidgetView()
+        }
+        
+        widgetView?.let { view ->
+            try {
+                constraintLayout.addView(view)
+                Log.d(TAG, "Successfully added widget view to constraint layout")
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to add widget view", e)
+            }
+        }
+    }
+
+    override fun bindData(constraintLayout: ConstraintLayout) {
+        Log.d(TAG, "bindData called")
+        // Ensure the widget view is properly initialized and visible
+        widgetView?.let { view ->
+            if (view.visibility != View.VISIBLE) {
+                view.visibility = View.VISIBLE
+                Log.d(TAG, "Set widget view visibility to VISIBLE")
+            }
+            
+            // Force a layout pass to ensure the view is measured and laid out
+            view.requestLayout()
+        }
+    }
+
+    override fun applyConstraints(constraintSet: ConstraintSet) {
+        Log.d(TAG, "applyConstraints called")
+        
+        // Only apply constraints if the widget view exists
+        widgetView ?: run {
+            Log.w(TAG, "Widget view is null, skipping constraints")
+            return
+        }
+        
+        try {
+            constraintSet.apply {
+                // Position widgets within the keyguard layout
+                connect(
+                    R.id.keyguard_widgets,
+                    ConstraintSet.START,
+                    ConstraintSet.PARENT_ID,
+                    ConstraintSet.START
+                )
+                connect(
+                    R.id.keyguard_widgets,
+                    ConstraintSet.END,
+                    ConstraintSet.PARENT_ID,
+                    ConstraintSet.END
+                )
+                
+                // Try to position below other status content with priority order
+                val anchorViews = listOf(
+                    R.id.keyguard_info_widgets,
+                    R.id.clock_ls,  
+                    R.id.keyguard_weather,
+                    R.id.keyguard_slice_view,
+                    R.id.lockscreen_clock_view
+                )
+                
+                var positioned = false
+                for (anchorId in anchorViews) {
+                    if (constraintSet.getConstraint(anchorId) != null) {
+                        connect(
+                            R.id.keyguard_widgets,
+                            ConstraintSet.TOP,
+                            anchorId,
+                            ConstraintSet.BOTTOM,
+                            8 // 8dp margin
+                        )
+                        positioned = true
+                        Log.d(TAG, "Positioned widgets below anchor: ${context.resources.getResourceEntryName(anchorId)}")
+                        break
+                    }
+                }
+                
+                // If no anchor found, position at top with margin
+                if (!positioned) {
+                    connect(
+                        R.id.keyguard_widgets,
+                        ConstraintSet.TOP,
+                        ConstraintSet.PARENT_ID,
+                        ConstraintSet.TOP,
+                        16 // 16dp margin from top
+                    )
+                    Log.d(TAG, "No anchor found, positioned at top")
+                }
+                
+                // Set dimensions
+                constrainHeight(R.id.keyguard_widgets, ConstraintSet.WRAP_CONTENT)
+                constrainWidth(R.id.keyguard_widgets, ConstraintSet.MATCH_CONSTRAINT)
+                
+                // Set margins
+                setMargin(R.id.keyguard_widgets, ConstraintSet.START, 0)
+                setMargin(R.id.keyguard_widgets, ConstraintSet.END, 0)
+                
+                // Set elevation for proper layering
+                setElevation(R.id.keyguard_widgets, 2f)
+                
+                // Update barrier to include widgets
+                try {
+                    val potentialBarrierViews = listOf(
+                        R.id.keyguard_slice_view,
+                        R.id.keyguard_weather,
+                        R.id.clock_ls,
+                        R.id.keyguard_info_widgets,
+                        R.id.keyguard_widgets
+                    )
+                    val barrierViews = potentialBarrierViews
+                        .filter { constraintSet.getConstraint(it) != null }
+                        .toIntArray()
+                    
+                    if (barrierViews.isNotEmpty()) {
+                        createBarrier(
+                            R.id.smart_space_barrier_bottom,
+                            Barrier.BOTTOM,
+                            0,
+                            *barrierViews
+                        )
+                        Log.d(TAG, "Created barrier with ${barrierViews.size} views")
+                    }
+                    
+                    // Position notification icons below barrier
+                    if (constraintSet.getConstraint(R.id.left_aligned_notification_icon_container) != null) {
+                        connect(
+                            R.id.left_aligned_notification_icon_container,
+                            ConstraintSet.TOP,
+                            R.id.smart_space_barrier_bottom,
+                            ConstraintSet.BOTTOM,
+                            try {
+                                context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons)
+                            } catch (e: Exception) {
+                                8 // fallback margin
+                            }
+                        )
+                    }
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to create barrier", e)
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to apply constraints", e)
+        }
+    }
+
+    override fun removeViews(constraintLayout: ConstraintLayout) {
+        Log.d(TAG, "removeViews called")
+        widgetView?.let { view ->
+            try {
+                constraintLayout.removeView(view)
+                Log.d(TAG, "Successfully removed widget view")
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to remove widget view", e)
+            }
+        }
+        widgetView = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt
index 1799d0a384ff3..82c2980dd66cf 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt
@@ -29,6 +29,7 @@ import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.scene.shared.model.Overlays
 import com.android.systemui.scene.ui.composable.transitions.TO_BOUNCER_FADE_FRACTION
+import com.android.systemui.util.settings.SecureSettings
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.flow.Flow
@@ -41,8 +42,11 @@ import kotlinx.coroutines.flow.emptyFlow
 @SysUISingleton
 class AlternateBouncerToPrimaryBouncerTransitionViewModel
 @Inject
-constructor(animationFlow: KeyguardTransitionAnimationFlow, blurConfig: BlurConfig) :
-    DeviceEntryIconTransition, PrimaryBouncerTransition {
+constructor(
+    animationFlow: KeyguardTransitionAnimationFlow,
+    blurConfig: BlurConfig,
+    private val secureSettings: SecureSettings,
+) : DeviceEntryIconTransition, PrimaryBouncerTransition {
     private val transitionAnimation =
         animationFlow
             .setup(
@@ -88,12 +92,15 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow, blurConfig: BlurConf
             alphaFlow
         }
 
+    val maxBlurRadius: Float 
+        get() = secureSettings.getFloat("system_blur_radius", 34f)
+
     override val notificationBlurRadius: Flow<Float> =
         if (Flags.bouncerUiRevamp()) {
             transitionAnimation.sharedFlowWithShade(
                 duration = 1.milliseconds,
                 onStep = { _, isShadeExpanded ->
-                    if (isShadeExpanded) blurConfig.maxBlurRadiusPx else null
+                    if (isShadeExpanded) maxBlurRadius else null
                 },
             )
         } else {
@@ -109,14 +116,14 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow, blurConfig: BlurConf
             onStep = { step, isShadeExpanded ->
                 if (isShadeExpanded) {
                     if (Flags.notificationShadeBlur()) {
-                        blurConfig.maxBlurRadiusPx
+                        maxBlurRadius
                     } else {
                         blurConfig.minBlurRadiusPx
                     }
                 } else {
                     transitionProgressToBlurRadius(
                         starBlurRadius = blurConfig.minBlurRadiusPx,
-                        endBlurRadius = blurConfig.maxBlurRadiusPx,
+                        endBlurRadius = maxBlurRadius,
                         transitionProgress = step,
                     )
                 }
@@ -125,7 +132,7 @@ constructor(animationFlow: KeyguardTransitionAnimationFlow, blurConfig: BlurConf
                 if (isShadeExpanded && !Flags.notificationShadeBlur()) {
                     blurConfig.minBlurRadiusPx
                 } else {
-                    blurConfig.maxBlurRadiusPx
+                    maxBlurRadius
                 }
             },
         )
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt
index 5121b2ec822d5..d749e445bc41d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryForegroundViewModel.kt
@@ -62,11 +62,7 @@ constructor(
         }
 
     private fun getColor(usingBackgroundProtection: Boolean): Int {
-        return if (usingBackgroundProtection) {
-            Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary)
-        } else {
-            Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColorAccent)
-        }
+        return android.graphics.Color.WHITE
     }
 
     // While dozing, the display can show the AOD UI; show the AOD udfps when dozing
@@ -98,7 +94,7 @@ constructor(
     private val padding: Flow<Int> =
         deviceEntryUdfpsInteractor.isUdfpsSupported.flatMapLatest { udfpsSupported ->
             if (udfpsSupported) {
-                udfpsOverlayInteractor.iconPadding.debounce(udfpsPaddingDebounceDuration.toLong())
+                flowOf(0)
             } else {
                 configurationInteractor.scaleForResolution.map { scale ->
                     (context.resources.getDimensionPixelSize(R.dimen.lock_icon_padding) * scale)
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordanceViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordanceViewModel.kt
index 9d2f1a3811aa5..7524021c2af2c 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordanceViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordanceViewModel.kt
@@ -33,6 +33,7 @@ data class KeyguardQuickAffordanceViewModel(
     val useLongPress: Boolean = false,
     val isDimmed: Boolean = false,
     val slotId: String,
+    var singleTap: Boolean = false,
 ) {
     data class OnClickedParameters(
         val configKey: String,
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt
index 3c16b04e47306..c1b6fb28feaa1 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt
@@ -17,6 +17,9 @@
 
 package com.android.systemui.keyguard.ui.viewmodel
 
+import android.content.Context
+import android.provider.Settings
+
 import androidx.annotation.VisibleForTesting
 import com.android.app.tracing.FlowTracing.traceEmissionCount
 import com.android.app.tracing.coroutines.flow.flowName
@@ -51,6 +54,7 @@ class KeyguardQuickAffordancesCombinedViewModel
 constructor(
     @Application private val applicationScope: CoroutineScope,
     private val quickAffordanceInteractor: KeyguardQuickAffordanceInteractor,
+    private var context: Context,
     private val keyguardInteractor: KeyguardInteractor,
     shadeInteractor: ShadeInteractor,
     aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,
@@ -277,6 +281,7 @@ constructor(
                             forceInactive = previewMode.isInPreviewMode,
                             slotId = slotId,
                             useLongPress = useLongPress,
+                            singleTap = useSingleTap(),
                         )
                     }
                     .distinctUntilChanged()
@@ -292,6 +297,7 @@ constructor(
         forceInactive: Boolean,
         slotId: String,
         useLongPress: Boolean,
+        singleTap: Boolean,
     ): KeyguardQuickAffordanceViewModel {
         return when (this) {
             is KeyguardQuickAffordanceModel.Visible ->
@@ -313,12 +319,22 @@ constructor(
                     useLongPress = useLongPress,
                     isDimmed = isDimmed,
                     slotId = slotId,
+                    singleTap = useSingleTap(),
                 )
             is KeyguardQuickAffordanceModel.Hidden ->
                 KeyguardQuickAffordanceViewModel(slotId = slotId)
         }
     }
 
+    fun useSingleTap(): Boolean {
+	if (Settings.Secure.getString(
+                context.contentResolver, Settings.Secure.KEYGUARD_AFFORDANCE_SINGLE_TAP) == "1") {
+            return true
+        } else {
+            return false
+        }
+    }
+
     @VisibleForTesting
     fun nonTintedIcon(icon: Icon): Icon =
         if (Flags.clearShortcutIconTint() && icon is Icon.Loaded) {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt
index d0ec1be1889b4..6e2477a038ac9 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt
@@ -37,19 +37,22 @@ class KeyguardSmartspaceViewModel
 @Inject
 constructor(
     @Application applicationScope: CoroutineScope,
-    smartspaceController: LockscreenSmartspaceController,
+    private val smartspaceController: LockscreenSmartspaceController,
     keyguardClockViewModel: KeyguardClockViewModel,
-    smartspaceInteractor: KeyguardSmartspaceInteractor,
+    private val smartspaceInteractor: KeyguardSmartspaceInteractor,
     shadeModeInteractor: ShadeModeInteractor,
 ) {
     /** Whether the smartspace section is available in the build. */
-    val isSmartspaceEnabled: Boolean = smartspaceController.isEnabled
+    val isSmartspaceEnabled: Boolean
+        get() = smartspaceController.isEnabled
 
     /** Whether the weather area is available and enabled. */
-    val isWeatherEnabled: Flow<Boolean> = smartspaceInteractor.isWeatherEnabled
+    val isWeatherEnabled: Flow<Boolean>
+        get() = smartspaceInteractor.isWeatherEnabled
 
     /** Whether the data and weather areas are decoupled in the build. */
-    val isDateWeatherDecoupled: Boolean = smartspaceController.isDateWeatherDecoupled
+    val isDateWeatherDecoupled: Boolean
+        get() = smartspaceController.isDateWeatherDecoupled
 
     @Deprecated("Remove after flexiglass ships")
     /** Whether the date area should be visible. */
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/util/WallpaperPickerIntentUtils.kt b/packages/SystemUI/src/com/android/systemui/keyguard/util/WallpaperPickerIntentUtils.kt
index 84e05661d05a5..984c74752f321 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/util/WallpaperPickerIntentUtils.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/util/WallpaperPickerIntentUtils.kt
@@ -18,22 +18,24 @@ package com.android.systemui.keyguard.util
 
 import android.content.Context
 import android.content.Intent
-import com.android.systemui.res.R
+
+import com.android.internal.util.matrixx.Utils
 
 /** Provides function(s) to get intent for launching the Wallpaper Picker app. */
 object WallpaperPickerIntentUtils {
 
     fun getIntent(context: Context, launchSource: String): Intent {
+        val isGoogleWpInstalled = Utils.isPackageInstalled(context, GOOGLE_WP_PKG)
+        val wpPkg = if (isGoogleWpInstalled) GOOGLE_WP_PKG else DEFAULT_WP_PKG
         return Intent(Intent.ACTION_SET_WALLPAPER).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            context
-                .getString(R.string.config_wallpaperPickerPackage)
-                .takeIf { it.isNotEmpty() }
-                ?.let { packageName -> setPackage(packageName) }
+            setPackage(wpPkg)
             putExtra(WALLPAPER_LAUNCH_SOURCE, launchSource)
         }
     }
 
     private const val WALLPAPER_LAUNCH_SOURCE = "com.android.wallpaper.LAUNCH_SOURCE"
     const val LAUNCH_SOURCE_KEYGUARD = "app_launched_keyguard"
+    private const val DEFAULT_WP_PKG = "com.android.wallpaper"
+    private const val GOOGLE_WP_PKG = "com.google.android.apps.wallpaper"
 }
diff --git a/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt b/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
index 5a0cb1013d88e..1de8bc24d15be 100644
--- a/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/lineage/LineageModule.kt
@@ -22,17 +22,34 @@ import com.android.systemui.qs.shared.model.TileCategory
 import com.android.systemui.qs.tileimpl.QSTileImpl
 import com.android.systemui.qs.tiles.AmbientDisplayTile
 import com.android.systemui.qs.tiles.AODTile
+import com.android.systemui.qs.tiles.CPUInfoTile
 import com.android.systemui.qs.tiles.CaffeineTile
+import com.android.systemui.qs.tiles.CompassTile
+import com.android.systemui.qs.tiles.DataSwitchTile
+import com.android.systemui.qs.tiles.DnsTile
+import com.android.systemui.qs.tiles.FPSInfoTile
 import com.android.systemui.qs.tiles.HeadsUpTile
+import com.android.systemui.qs.tiles.LocaleTile
+import com.android.systemui.qs.tiles.OnTheGoTile
 import com.android.systemui.qs.tiles.PowerShareTile
+import com.android.systemui.qs.tiles.PreferredNetworkTile
 import com.android.systemui.qs.tiles.ProfilesTile
 import com.android.systemui.qs.tiles.ReadingModeTile
+import com.android.systemui.qs.tiles.RefreshRateTile
+import com.android.systemui.qs.tiles.ScreenshotTile
+import com.android.systemui.qs.tiles.SleepModeTile
+import com.android.systemui.qs.tiles.SoundTile
 import com.android.systemui.qs.tiles.SyncTile
 import com.android.systemui.qs.tiles.UsbTetherTile
+import com.android.systemui.qs.tiles.VolumeQSTile
+import com.android.systemui.qs.tiles.VPNTetheringTile
+import com.android.systemui.qs.tiles.VolumeTile
 import com.android.systemui.qs.tiles.VpnTile
+import com.android.systemui.qs.tiles.WeatherTile
 import com.android.systemui.qs.tiles.base.shared.model.QSTileConfig
 import com.android.systemui.qs.tiles.base.shared.model.QSTileUIConfig
 import com.android.systemui.res.R
+import com.android.systemui.smartpixel.ui.SmartPixelTile
 
 import dagger.Binds
 import dagger.Module
@@ -54,24 +71,72 @@ interface LineageModule {
     @StringKey(AODTile.TILE_SPEC)
     fun bindAODTile(aodTile: AODTile): QSTileImpl<*>
 
+    /** Inject CPUInfoTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(CPUInfoTile.TILE_SPEC)
+    fun CPUInfoTile(cpuInfoTile: CPUInfoTile): QSTileImpl<*>
+
     /** Inject CaffeineTile into tileMap in QSModule */
     @Binds
     @IntoMap
     @StringKey(CaffeineTile.TILE_SPEC)
     fun bindCaffeineTile(caffeineTile: CaffeineTile): QSTileImpl<*>
 
+    /** Inject CompassTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(CompassTile.TILE_SPEC)
+    fun bindCompassTile(compassTile: CompassTile): QSTileImpl<*>
+
+    /** Inject DataSwitchTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(DataSwitchTile.TILE_SPEC)
+    fun bindDataSwitchTile(dataSwitchTile: DataSwitchTile): QSTileImpl<*>
+
+    /** Inject DnsTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(DnsTile.TILE_SPEC)
+    fun bindDnsTile(dnsTile: DnsTile): QSTileImpl<*>
+
+    /** Inject FPSInfoTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(FPSInfoTile.TILE_SPEC)
+    fun FPSInfoTile(fpsInfoTile: FPSInfoTile): QSTileImpl<*>
+
     /** Inject HeadsUpTile into tileMap in QSModule */
     @Binds
     @IntoMap
     @StringKey(HeadsUpTile.TILE_SPEC)
     fun bindHeadsUpTile(headsUpTile: HeadsUpTile): QSTileImpl<*>
 
+    /** Inject LocaleTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(LocaleTile.TILE_SPEC)
+    fun bindLocaleTile(localeTile: LocaleTile): QSTileImpl<*>
+
+    /** Inject OnTheGoTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(OnTheGoTile.TILE_SPEC)
+    fun bindOnTheGoTile(onTheGoTile: OnTheGoTile): QSTileImpl<*>
+
     /** Inject PowerShareTile into tileMap in QSModule */
     @Binds
     @IntoMap
     @StringKey(PowerShareTile.TILE_SPEC)
     fun bindPowerShareTile(powerShareTile: PowerShareTile): QSTileImpl<*>
 
+    /** Inject PreferredNetworkTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(PreferredNetworkTile.TILE_SPEC)
+    fun bindPreferredNetworkTile(preferredNetworkTile: PreferredNetworkTile): QSTileImpl<*>
+
     /** Inject ProfilesTile into tileMap in QSModule */
     @Binds
     @IntoMap
@@ -84,6 +149,36 @@ interface LineageModule {
     @StringKey(ReadingModeTile.TILE_SPEC)
     fun bindReadingModeTile(readingModeTile: ReadingModeTile): QSTileImpl<*>
 
+    /** Inject RefreshRateTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(RefreshRateTile.TILE_SPEC)
+    fun bindRefreshRateTile(refreshRateTile: RefreshRateTile): QSTileImpl<*>
+
+    /** Inject ScreenshotTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(ScreenshotTile.TILE_SPEC)
+    fun bindScreenshotTile(screenshotTile: ScreenshotTile): QSTileImpl<*>
+
+    /** Inject SleepModeTile into tileMap in QSModule */
+    @Binds  
+    @IntoMap
+    @StringKey(SleepModeTile.TILE_SPEC)
+    fun bindSleepModeTile(sleepModeTile: SleepModeTile): QSTileImpl<*>
+
+    /** Inject SmartPixelTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(SmartPixelTile.TILE_SPEC)
+    abstract fun bindSmartPixelTile(tile: SmartPixelTile): QSTileImpl<*>
+
+    /** Inject SoundTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(SoundTile.TILE_SPEC)
+    fun bindSoundTile(soundTile: SoundTile): QSTileImpl<*>
+
     /** Inject SyncTile into tileMap in QSModule */
     @Binds
     @IntoMap
@@ -96,12 +191,36 @@ interface LineageModule {
     @StringKey(UsbTetherTile.TILE_SPEC)
     fun bindUsbTetherTile(usbTetherTile: UsbTetherTile): QSTileImpl<*>
 
+    /** Inject VolumeQSTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(VolumeQSTile.TILE_SPEC)
+    fun bindVolumeQSTile(volumeQSTile: VolumeQSTile): QSTileImpl<*>
+    
+    /** Inject VPNTetheringTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(VPNTetheringTile.TILE_SPEC)
+    fun bindVPNTetheringTile(vpnTetheringTile: VPNTetheringTile): QSTileImpl<*>
+
+    /** Inject VolumeTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(VolumeTile.TILE_SPEC)
+    fun bindVolumeTile(volumeTile: VolumeTile): QSTileImpl<*>
+
     /** Inject VpnTile into tileMap in QSModule */
     @Binds
     @IntoMap
     @StringKey(VpnTile.TILE_SPEC)
     fun bindVpnTile(vpnTile: VpnTile): QSTileImpl<*>
 
+    /** Inject WeatherTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(WeatherTile.TILE_SPEC)
+    fun bindWeatherTile(weatherTile: WeatherTile): QSTileImpl<*>
+
     companion object {
         const val AMBIENT_DISPLAY_TILE_SPEC = "ambient_display"
         const val AOD_TILE_SPEC = "aod"
@@ -110,8 +229,10 @@ interface LineageModule {
         const val POWERSHARE_TILE_SPEC = "powershare"
         const val PROFILES_TILE_SPEC = "profiles"
         const val READING_MODE_TILE_SPEC = "reading_mode"
+        const val REFRESH_RATE_TILE_SPEC = "refresh_rate"
         const val SYNC_TILE_SPEC = "sync"
         const val USB_TETHER_TILE_SPEC = "usb_tether"
+        const val VOLUME_TILE_SPEC = "volume"
         const val VPN_TILE_SPEC = "vpn"
 
         @Provides
@@ -144,6 +265,21 @@ interface LineageModule {
                 category = TileCategory.DISPLAY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(CPUInfoTile.TILE_SPEC)
+        fun provideCPUInfoConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(CPUInfoTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_cpu_info,
+                        labelRes = R.string.quick_settings_cpuinfo_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
         @Provides
         @IntoMap
         @StringKey(CAFFEINE_TILE_SPEC)
@@ -159,6 +295,66 @@ interface LineageModule {
                 category = TileCategory.DISPLAY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(CompassTile.TILE_SPEC)
+        fun provideCompassTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(CompassTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_compass,
+                        labelRes = R.string.quick_settings_compass_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(DataSwitchTile.TILE_SPEC)
+        fun provideDataSwitchTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(DataSwitchTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_data_switch_0,
+                        labelRes = R.string.qs_data_switch_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.CONNECTIVITY,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(DnsTile.TILE_SPEC)
+        fun provideDnsTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(DnsTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_settings_dns,
+                        labelRes = com.android.settingslib.R.string.select_private_dns_configuration_title
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.CONNECTIVITY,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(FPSInfoTile.TILE_SPEC)
+        fun provideFPSInfoConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(FPSInfoTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_fps_info,
+                        labelRes = R.string.quick_settings_fpsinfo_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
         @Provides
         @IntoMap
         @StringKey(HEADS_UP_TILE_SPEC)
@@ -174,6 +370,36 @@ interface LineageModule {
                 category = TileCategory.ACCESSIBILITY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(LocaleTile.TILE_SPEC)
+        fun provideLocaleTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(LocaleTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_locale,
+                        labelRes = R.string.quick_settings_locale_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.ACCESSIBILITY,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(OnTheGoTile.TILE_SPEC)
+        fun provideOnTheGoTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(OnTheGoTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_onthego,
+                        labelRes = R.string.global_action_onthego
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.ACCESSIBILITY,
+            )
+
         @Provides
         @IntoMap
         @StringKey(POWERSHARE_TILE_SPEC)
@@ -189,6 +415,21 @@ interface LineageModule {
                 category = TileCategory.UTILITIES,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(PreferredNetworkTile.TILE_SPEC)
+        fun providePreferredNetworkTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(PreferredNetworkTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_preferred_network,
+                        labelRes = R.string.qs_preferred_network_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.CONNECTIVITY,
+            )
+
         @Provides
         @IntoMap
         @StringKey(PROFILES_TILE_SPEC)
@@ -219,6 +460,81 @@ interface LineageModule {
                 category = TileCategory.DISPLAY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(RefreshRateTile.TILE_SPEC)
+        fun provideRefreshRateTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(RefreshRateTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_refresh_rate,
+                        labelRes = R.string.refresh_rate_tile_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.DISPLAY,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(ScreenshotTile.TILE_SPEC)
+        fun provideScreenshotTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(ScreenshotTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = com.android.internal.R.drawable.ic_screenshot,
+                        labelRes = com.android.internal.R.string.global_action_screenshot
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(SleepModeTile.TILE_SPEC)
+        fun provideSleepModeTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(SleepModeTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_sleep,
+                        labelRes = R.string.quick_settings_sleep_mode_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(SmartPixelTile.TILE_SPEC)
+        fun provideSmartPixelsTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(SmartPixelTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.qs_smart_pixels_icon_off,
+                        labelRes = R.string.quick_settings_smart_pixels_label,
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.DISPLAY,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(SoundTile.TILE_SPEC)
+        fun provideSoundConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(SoundTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_ringer_audible,
+                        labelRes = R.string.quick_settings_sound_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
         @Provides
         @IntoMap
         @StringKey(SYNC_TILE_SPEC)
@@ -249,6 +565,21 @@ interface LineageModule {
                 category = TileCategory.CONNECTIVITY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(VolumeTile.TILE_SPEC)
+        fun provideVolumeTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(VolumeTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_volume_panel,
+                        labelRes = R.string.quick_settings_volume_panel_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
         @Provides
         @IntoMap
         @StringKey(VPN_TILE_SPEC)
@@ -263,5 +594,50 @@ interface LineageModule {
                 instanceId = uiEventLogger.getNewInstanceId(),
                 category = TileCategory.CONNECTIVITY,
             )
+
+        @Provides
+        @IntoMap
+        @StringKey(WeatherTile.TILE_SPEC)
+        fun provideWeatherTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(WeatherTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_qs_weather,
+                        labelRes = R.string.omnijaws_label_default
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES,
+            )
+
+        @Provides
+        @IntoMap
+        @StringKey(VOLUME_TILE_SPEC)
+        fun provideVolumeQSTile(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(VOLUME_TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_volume_media,
+                        labelRes = R.string.quick_settings_volume_label
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.UTILITIES
+            )
+       
+        @Provides
+        @IntoMap
+        @StringKey(VPNTetheringTile.TILE_SPEC)
+        fun provideVPNTetheringTileConfig(uiEventLogger: QsEventLogger): QSTileConfig {
+            return QSTileConfig(
+                tileSpec = TileSpec.create(VPNTetheringTile.TILE_SPEC),
+                uiConfig = QSTileUIConfig.Resource(
+                    iconRes = R.drawable.ic_qs_vpn_tethering,
+                    labelRes = R.string.vpn_tethering_label
+                ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.CONNECTIVITY
+            )
+        }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsBootReceiver.java b/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsBootReceiver.java
new file mode 100644
index 0000000000000..e6069ac85cad8
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsBootReceiver.java
@@ -0,0 +1,36 @@
+package com.android.systemui.lockglymps;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * Boot receiver to start LockGlympsService on device boot
+ * Place in: frameworks/base/packages/SystemUI/src/com/android/systemui/lockglymps/
+ */
+public class LockGlympsBootReceiver extends BroadcastReceiver {
+    private static final String TAG = "LockGlympsBootReceiver";
+    
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction()) ||
+            Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(intent.getAction())) {
+            
+            Log.d(TAG, "Boot completed, checking if should start LockGlympsService");
+            
+            // Check if feature is enabled
+            int enabled = Settings.System.getInt(context.getContentResolver(),
+                    Settings.System.LOCK_GLYMPS_ENABLED, 0);
+            
+            if (enabled == 1) {
+                Intent serviceIntent = new Intent(context, LockGlympsService.class);
+                context.startService(serviceIntent);
+                Log.d(TAG, "LockGlympsService started");
+            } else {
+                Log.d(TAG, "LockGlymps disabled, not starting service");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsService.java b/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsService.java
new file mode 100644
index 0000000000000..77fea8ebba3c5
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/lockglymps/LockGlympsService.java
@@ -0,0 +1,644 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.lockglymps;
+
+import android.app.Service;
+import android.app.WallpaperManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class LockGlympsService extends Service {
+    private static final String TAG = "LockGlympsService";
+    private static final int MAX_CACHE_SIZE = 10;
+    private static final int CONNECTION_TIMEOUT = 15000;
+    private static final int READ_TIMEOUT = 15000;
+    private static final int SCREEN_ON_DELAY = 800;
+    private static final int SCREEN_OFF_DELAY = 450;
+    
+    private static final String LOCK_GLYMPS_ENABLED = "lock_glymps_enabled";
+    private static final String LOCK_GLYMPS_SOURCE = "lock_glymps_source";
+    private static final String LOCK_GLYMPS_WIFI_ONLY = "lock_glymps_wifi_only";
+    private static final String LOCK_GLYMPS_CACHE_SIZE = "lock_glymps_cache_size";
+    private static final String LOCK_GLYMPS_CUSTOM_URLS = "lock_glymps_custom_urls";
+    private static final String LOCK_GLYMPS_CHANGE_ON = "lock_glymps_change_on";
+    private static final String LOCK_GLYMPS_TIMER_INTERVAL = "lock_glymps_timer_interval";
+    private static final String LOCK_GLYMPS_WALLPAPER_TARGET = "lock_glymps_wallpaper_target";
+    
+    private static final String STORAGE_FOLDER = "LunarisGlymps";
+    
+    private static final int TARGET_LOCK_SCREEN = 0;
+    private static final int TARGET_HOME_SCREEN = 1;
+    private static final int TARGET_BOTH = 2;
+    
+    private WallpaperManager mWallpaperManager;
+    private ExecutorService mExecutor;
+    private Handler mHandler;
+    private File mCacheDir;
+    private Random mRandom;
+    private ScreenStateReceiver mScreenReceiver;
+    private PowerManager.WakeLock mWakeLock;
+    private Runnable mTimerRunnable;
+    
+    private boolean mEnabled = false;
+    private int mWallpaperSource = 0;
+    private boolean mWifiOnly = true;
+    private int mCacheSize = 5;
+    private int mChangeOn = 1;
+    private long mTimerInterval = 1800000; // 30 minutes default
+    private int mWallpaperTarget = TARGET_LOCK_SCREEN;
+    private List<String> mCustomUrls = new ArrayList<>();
+    
+    private int mCurrentIndex = 0;
+    private Runnable mPendingWallpaperChange = null;
+    
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        
+        mWallpaperManager = WallpaperManager.getInstance(this);
+        mExecutor = Executors.newSingleThreadExecutor();
+        mHandler = new Handler(Looper.getMainLooper());
+        mRandom = new Random();
+        
+        mCacheDir = new File(getCacheDir(), "lock_glymps");
+        if (!mCacheDir.exists()) {
+            mCacheDir.mkdirs();
+        }
+        
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        if (pm != null) {
+            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG + ":WallpaperChange");
+        }
+        
+        loadSettings();
+        registerScreenReceiver();
+        
+        if (mEnabled) {
+            mExecutor.execute(this::preFetchWallpapers);
+            
+            if (mChangeOn == 2) {
+                startTimer();
+            }
+        }
+    }
+    
+    private void registerScreenReceiver() {
+        if (mScreenReceiver != null) {
+            try {
+                unregisterReceiver(mScreenReceiver);
+            } catch (Exception e) {
+            }
+            mScreenReceiver = null;
+        }
+        
+        if (mChangeOn == 0 || mChangeOn == 1) {
+            mScreenReceiver = new ScreenStateReceiver();
+            IntentFilter filter = new IntentFilter();
+            
+            if (mChangeOn == 0) {
+                filter.addAction(Intent.ACTION_SCREEN_ON);
+                filter.addAction(Intent.ACTION_USER_PRESENT);
+            } else {
+                filter.addAction(Intent.ACTION_SCREEN_OFF);
+            }
+            
+            registerReceiver(mScreenReceiver, filter);
+            Log.d(TAG, "Screen receiver registered for: " + (mChangeOn == 0 ? "SCREEN_ON" : "SCREEN_OFF"));
+        }
+    }
+    
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null) {
+            String action = intent.getAction();
+            if ("REFRESH_SETTINGS".equals(action)) {
+                int oldChangeOn = mChangeOn;
+                loadSettings();
+                
+                if (oldChangeOn != mChangeOn) {
+                    registerScreenReceiver();
+                    
+                    if (oldChangeOn == 2 && mChangeOn != 2) {
+                        stopTimer();
+                    }
+                    else if (oldChangeOn != 2 && mChangeOn == 2) {
+                        startTimer();
+                    }
+                }
+                
+                if (mChangeOn == 2) {
+                    stopTimer();
+                    startTimer();
+                }
+                
+                if (mEnabled) {
+                    mExecutor.execute(this::preFetchWallpapers);
+                }
+            } else if ("CLEAR_CACHE".equals(action)) {
+                mExecutor.execute(this::clearCache);
+            } else if ("APPLY_NOW".equals(action)) {
+                Log.d(TAG, "Manual wallpaper change requested");
+                if (mEnabled && mExecutor != null && !mExecutor.isShutdown()) {
+                    mExecutor.execute(this::changeWallpaper);
+                } else {
+                    Log.w(TAG, "Cannot apply wallpaper: feature disabled or executor unavailable");
+                }
+            }
+        }
+        return START_STICKY;
+    }
+    
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        stopTimer();
+        
+        if (mScreenReceiver != null) {
+            try {
+                unregisterReceiver(mScreenReceiver);
+            } catch (Exception e) {
+                Log.e(TAG, "Error unregistering receiver", e);
+            }
+            mScreenReceiver = null;
+        }
+        
+        if (mPendingWallpaperChange != null) {
+            mHandler.removeCallbacks(mPendingWallpaperChange);
+            mPendingWallpaperChange = null;
+        }
+        
+        if (mExecutor != null) {
+            mExecutor.shutdownNow();
+            mExecutor = null;
+        }
+        
+        if (mWakeLock != null) {
+            if (mWakeLock.isHeld()) {
+                mWakeLock.release();
+            }
+            mWakeLock = null;
+        }
+        
+        mWallpaperManager = null;
+        mHandler = null;
+        mCacheDir = null;
+        mRandom = null;
+        mCustomUrls.clear();
+        mCustomUrls = null;
+    }
+    
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+    
+    private void loadSettings() {
+        try {
+            mEnabled = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_ENABLED, 0) == 1;
+            mWallpaperSource = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_SOURCE, 0);
+            mWifiOnly = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_WIFI_ONLY, 1) == 1;
+            mCacheSize = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_CACHE_SIZE, 5);
+            mChangeOn = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_CHANGE_ON, 1);
+            mTimerInterval = Settings.System.getLong(getContentResolver(), LOCK_GLYMPS_TIMER_INTERVAL, 1800000L);
+            mWallpaperTarget = Settings.System.getInt(getContentResolver(), LOCK_GLYMPS_WALLPAPER_TARGET, TARGET_LOCK_SCREEN);
+            
+            String urls = Settings.System.getString(getContentResolver(), LOCK_GLYMPS_CUSTOM_URLS);
+            mCustomUrls.clear();
+            if (urls != null && !urls.isEmpty()) {
+                String[] urlArray = urls.split(",");
+                for (String url : urlArray) {
+                    String trimmed = url.trim();
+                    if (!trimmed.isEmpty()) {
+                        mCustomUrls.add(trimmed);
+                    }
+                }
+            }
+            
+            String targetStr = mWallpaperTarget == TARGET_LOCK_SCREEN ? "lock screen" : 
+                              mWallpaperTarget == TARGET_HOME_SCREEN ? "home screen" : "both";
+            
+            Log.d(TAG, "Settings loaded - Enabled: " + mEnabled + ", Source: " + mWallpaperSource + 
+                ", ChangeOn: " + (mChangeOn == 0 ? "screen-on" : mChangeOn == 1 ? "screen-off" : "timer") +
+                ", TimerInterval: " + mTimerInterval + "ms" + ", Target: " + targetStr);
+        } catch (Exception e) {
+            Log.e(TAG, "Error loading settings", e);
+        }
+    }
+    
+    private void startTimer() {
+        if (mHandler == null || mTimerInterval <= 0) return;
+        
+        stopTimer();
+        
+        mTimerRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mExecutor != null && !mExecutor.isShutdown()) {
+                    mExecutor.execute(() -> changeWallpaper());
+                }
+                
+                if (mHandler != null && mTimerRunnable != null) {
+                    mHandler.postDelayed(mTimerRunnable, mTimerInterval);
+                }
+            }
+        };
+        
+        mHandler.postDelayed(mTimerRunnable, mTimerInterval);
+        Log.d(TAG, "Timer started with interval: " + mTimerInterval + "ms");
+    }
+    
+    private void stopTimer() {
+        if (mHandler != null && mTimerRunnable != null) {
+            mHandler.removeCallbacks(mTimerRunnable);
+            mTimerRunnable = null;
+            Log.d(TAG, "Timer stopped");
+        }
+    }
+    
+    private boolean shouldDownload() {
+        if (!mWifiOnly) return true;
+        
+        ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (cm == null) return false;
+        
+        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+        return activeNetwork != null && 
+               activeNetwork.isConnected() && 
+               activeNetwork.getType() == ConnectivityManager.TYPE_WIFI;
+    }
+    
+    private void preFetchWallpapers() {
+        if (mWallpaperSource == 2) {
+            Log.d(TAG, "Using local folder source, skipping cache");
+            return;
+        }
+        
+        if (!shouldDownload()) {
+            Log.d(TAG, "WiFi not available, skipping pre-fetch");
+            return;
+        }
+        
+        File[] cachedFiles = mCacheDir.listFiles();
+        int currentCacheCount = cachedFiles != null ? cachedFiles.length : 0;
+        
+        Log.d(TAG, "Current cache: " + currentCacheCount + ", Target: " + mCacheSize);
+        
+        while (currentCacheCount < mCacheSize) {
+            Bitmap wallpaper = downloadWallpaper();
+            if (wallpaper != null) {
+                File cacheFile = new File(mCacheDir, "wallpaper_" + System.currentTimeMillis() + ".png");
+                if (saveBitmapToFile(wallpaper, cacheFile)) {
+                    currentCacheCount++;
+                    Log.d(TAG, "Cached wallpaper: " + cacheFile.getName());
+                }
+                wallpaper.recycle();
+            } else {
+                break;
+            }
+        }
+        
+        cleanOldCache();
+    }
+    
+    private Bitmap downloadWallpaper() {
+        String url = getWallpaperUrl();
+        if (url == null) {
+            Log.w(TAG, "No URL available");
+            return null;
+        }
+        
+        HttpURLConnection connection = null;
+        InputStream input = null;
+        
+        try {
+            connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setDoInput(true);
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setRequestProperty("User-Agent", "LockGlymps/1.0");
+            connection.connect();
+            
+            int responseCode = connection.getResponseCode();
+            if (responseCode != HttpURLConnection.HTTP_OK) {
+                Log.e(TAG, "HTTP error code: " + responseCode);
+                return null;
+            }
+            
+            input = connection.getInputStream();
+            Bitmap bitmap = BitmapFactory.decodeStream(input);
+            
+            if (bitmap != null) {
+                Log.d(TAG, "Downloaded bitmap: " + bitmap.getWidth() + "x" + bitmap.getHeight());
+            }
+            
+            return bitmap;
+        } catch (Exception e) {
+            Log.e(TAG, "Error downloading wallpaper", e);
+            return null;
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Error closing input stream", e);
+                }
+            }
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+    
+    private String getWallpaperUrl() {
+        switch (mWallpaperSource) {
+            case 0:
+                return "https://picsum.photos/1080/1920";
+                
+            case 1:
+                if (mCustomUrls.isEmpty()) {
+                    Log.w(TAG, "Custom URLs list is empty");
+                    return null;
+                }
+                return mCustomUrls.get(mRandom.nextInt(mCustomUrls.size()));
+                
+            case 2:
+                return null;
+                
+            default:
+                return "https://picsum.photos/1080/1920";
+        }
+    }
+    
+    private File getLocalWallpaper() {
+        File storageDir = new File(Environment.getExternalStorageDirectory(), STORAGE_FOLDER);
+        
+        if (!storageDir.exists() || !storageDir.isDirectory()) {
+            Log.w(TAG, "Local folder doesn't exist: " + storageDir.getPath());
+            return null;
+        }
+        
+        File[] files = storageDir.listFiles((dir, name) -> {
+            String lower = name.toLowerCase();
+            return lower.endsWith(".jpg") || lower.endsWith(".jpeg") || 
+                   lower.endsWith(".png") || lower.endsWith(".webp");
+        });
+        
+        if (files == null || files.length == 0) {
+            Log.w(TAG, "No wallpapers found in: " + storageDir.getPath());
+            return null;
+        }
+        
+        return files[mRandom.nextInt(files.length)];
+    }
+    
+    private boolean saveBitmapToFile(Bitmap bitmap, File file) {
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(file);
+            bitmap.compress(Bitmap.CompressFormat.PNG, 90, fos);
+            fos.flush();
+            return true;
+        } catch (IOException e) {
+            Log.e(TAG, "Error saving bitmap to file", e);
+            return false;
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Error closing file output stream", e);
+                }
+            }
+        }
+    }
+    
+    private void scheduleWallpaperChange() {
+        if (!mEnabled) {
+            Log.d(TAG, "Feature disabled");
+            return;
+        }
+        
+        if (mPendingWallpaperChange != null) {
+            mHandler.removeCallbacks(mPendingWallpaperChange);
+        }
+        
+        final int delay = mChangeOn == 0 ? SCREEN_ON_DELAY : SCREEN_OFF_DELAY;
+        
+        mPendingWallpaperChange = () -> {
+            if (mExecutor != null && !mExecutor.isShutdown()) {
+                mExecutor.execute(this::changeWallpaper);
+            }
+            mPendingWallpaperChange = null;
+        };
+        
+        mHandler.postDelayed(mPendingWallpaperChange, delay);
+        Log.d(TAG, "Wallpaper change scheduled in " + delay + "ms");
+    }
+    
+    private void changeWallpaper() {
+        if (!mEnabled) {
+            Log.d(TAG, "Feature disabled");
+            return;
+        }
+        
+        if (mWakeLock != null && !mWakeLock.isHeld()) {
+            try {
+                mWakeLock.acquire(10000);
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to acquire wake lock", e);
+            }
+        }
+        
+        Bitmap bitmap = null;
+        
+        try {
+            if (mWallpaperSource == 2) {
+                File localFile = getLocalWallpaper();
+                if (localFile != null) {
+                    bitmap = BitmapFactory.decodeFile(localFile.getPath());
+                    if (bitmap != null) {
+                        Log.d(TAG, "Loaded wallpaper from local folder: " + localFile.getName());
+                    }
+                }
+            } 
+            else {
+                File[] cachedFiles = mCacheDir != null ? mCacheDir.listFiles() : null;
+                if (cachedFiles == null || cachedFiles.length == 0) {
+                    Log.w(TAG, "No cached wallpapers available");
+                    if (shouldDownload()) {
+                        bitmap = downloadWallpaper();
+                    }
+                } else {
+                    if (mCurrentIndex >= cachedFiles.length) {
+                        mCurrentIndex = 0;
+                    }
+                    File wallpaperFile = cachedFiles[mCurrentIndex];
+                    mCurrentIndex++;
+                    
+                    bitmap = BitmapFactory.decodeFile(wallpaperFile.getPath());
+                    if (bitmap != null) {
+                        wallpaperFile.delete();
+                        if (mExecutor != null && !mExecutor.isShutdown()) {
+                            mExecutor.execute(this::preFetchWallpapers);
+                        }
+                    } else {
+                        Log.e(TAG, "Failed to decode cached wallpaper");
+                    }
+                }
+            }
+            
+            if (bitmap != null) {
+                setWallpaperFromBitmap(bitmap);
+            } else {
+                Log.w(TAG, "No bitmap available to set");
+            }
+            
+        } catch (Exception e) {
+            Log.e(TAG, "Error changing wallpaper", e);
+        } finally {
+            if (bitmap != null) {
+                bitmap.recycle();
+            }
+            
+            if (mWakeLock != null && mWakeLock.isHeld()) {
+                try {
+                    mWakeLock.release();
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to release wake lock", e);
+                }
+            }
+        }
+    }
+    
+    private void setWallpaperFromBitmap(Bitmap bitmap) {
+        if (mWallpaperManager == null) {
+            Log.e(TAG, "WallpaperManager is null");
+            return;
+        }
+        
+        try {
+            int flags = getWallpaperFlags();
+            
+            int wallpaperId = mWallpaperManager.setBitmap(
+                bitmap,
+                null,
+                false,
+                flags
+            );
+            
+            String targetStr = mWallpaperTarget == TARGET_LOCK_SCREEN ? "lock screen" : 
+                              mWallpaperTarget == TARGET_HOME_SCREEN ? "home screen" : "both";
+            
+            Log.d(TAG, "Wallpaper changed successfully for " + targetStr + ", ID: " + wallpaperId);
+            
+        } catch (IOException e) {
+            Log.e(TAG, "Error setting wallpaper", e);
+        }
+    }
+    
+    private int getWallpaperFlags() {
+        switch (mWallpaperTarget) {
+            case TARGET_LOCK_SCREEN:
+                return WallpaperManager.FLAG_LOCK;
+            case TARGET_HOME_SCREEN:
+                return WallpaperManager.FLAG_SYSTEM;
+            case TARGET_BOTH:
+                return WallpaperManager.FLAG_LOCK | WallpaperManager.FLAG_SYSTEM;
+            default:
+                return WallpaperManager.FLAG_LOCK;
+        }
+    }
+    
+    private void cleanOldCache() {
+        if (mCacheDir == null) return;
+        
+        File[] cachedFiles = mCacheDir.listFiles();
+        if (cachedFiles == null || cachedFiles.length <= MAX_CACHE_SIZE) {
+            return;
+        }
+        
+        java.util.Arrays.sort(cachedFiles, (f1, f2) -> 
+            Long.compare(f1.lastModified(), f2.lastModified()));
+        
+        int toDelete = cachedFiles.length - MAX_CACHE_SIZE;
+        for (int i = 0; i < toDelete; i++) {
+            if (cachedFiles[i].delete()) {
+                Log.d(TAG, "Deleted old cache: " + cachedFiles[i].getName());
+            }
+        }
+    }
+    
+    private void clearCache() {
+        if (mCacheDir == null) return;
+        
+        File[] cachedFiles = mCacheDir.listFiles();
+        if (cachedFiles != null) {
+            for (File file : cachedFiles) {
+                file.delete();
+            }
+        }
+        mCurrentIndex = 0;
+        Log.d(TAG, "Cache cleared");
+    }
+    
+    private class ScreenStateReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null || intent.getAction() == null) return;
+            
+            String action = intent.getAction();
+            
+            if (Intent.ACTION_SCREEN_ON.equals(action) && mChangeOn == 0) {
+                Log.d(TAG, "Screen turned on, scheduling wallpaper change");
+                scheduleWallpaperChange();
+            } else if (Intent.ACTION_SCREEN_OFF.equals(action) && mChangeOn == 1) {
+                Log.d(TAG, "Screen turned off, scheduling wallpaper change");
+                scheduleWallpaperChange();
+            } else if (Intent.ACTION_USER_PRESENT.equals(action) && mChangeOn == 0) {
+                if (mPendingWallpaperChange != null) {
+                    Log.d(TAG, "Device unlocked, cancelling pending wallpaper change");
+                    mHandler.removeCallbacks(mPendingWallpaperChange);
+                    mPendingWallpaperChange = null;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/lockscreen/ActivityLauncherUtils.kt b/packages/SystemUI/src/com/android/systemui/lockscreen/ActivityLauncherUtils.kt
new file mode 100644
index 0000000000000..1866196925ffa
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/lockscreen/ActivityLauncherUtils.kt
@@ -0,0 +1,155 @@
+/*
+     Copyright (C) 2023-2025 the risingOS Android Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+*/
+package com.android.systemui.lockscreen
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.media.AudioManager
+import android.os.DeviceIdleManager
+import android.provider.AlarmClock
+import android.provider.MediaStore
+import android.speech.RecognizerIntent
+import android.widget.Toast
+import androidx.annotation.StringRes
+import com.android.systemui.Dependency
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.res.R
+
+class ActivityLauncherUtils(private val context: Context) {
+
+    companion object {
+        private const val PERSONALIZATIONS_ACTIVITY = "com.android.settings.Settings\$mistifySettingsLayoutActivity"
+        private const val SERVICE_PACKAGE = "org.omnirom.omnijaws"
+    }
+
+    private val activityStarter: ActivityStarter? = Dependency.get(ActivityStarter::class.java)
+    private val packageManager: PackageManager = context.packageManager
+
+    fun getInstalledMusicApp(): String {
+        val intent = Intent(Intent.ACTION_MAIN).apply {
+            addCategory(Intent.CATEGORY_APP_MUSIC)
+        }
+        val musicApps = packageManager.queryIntentActivities(intent, 0)
+        return musicApps.firstOrNull()?.activityInfo?.packageName.orEmpty()
+    }
+
+    fun launchAppIfAvailable(launchIntent: Intent, @StringRes appTypeResId: Int) {
+        val apps = packageManager.queryIntentActivities(launchIntent, PackageManager.MATCH_DEFAULT_ONLY)
+        if (apps.isNotEmpty()) {
+            activityStarter?.startActivity(launchIntent, true)
+        } else {
+            showNoDefaultAppFoundToast(appTypeResId)
+        }
+    }
+
+    fun launchVoiceAssistant() {
+        val dim = context.getSystemService(DeviceIdleManager::class.java)
+        dim?.endIdle("voice-search")
+        val voiceIntent = Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE).apply {
+            putExtra(RecognizerIntent.EXTRA_SECURE, true)
+        }
+        activityStarter?.startActivity(voiceIntent, true)
+    }
+
+    fun launchCamera() {
+        val launchIntent = Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)
+        launchAppIfAvailable(launchIntent, R.string.camera)
+    }
+
+    fun launchTimer() {
+        val launchIntent = Intent(AlarmClock.ACTION_SET_TIMER)
+        launchAppIfAvailable(launchIntent, R.string.clock_timer)
+    }
+
+    fun launchCalculator() {
+        val launchIntent = Intent(Intent.ACTION_MAIN).apply {
+            addCategory(Intent.CATEGORY_APP_CALCULATOR)
+        }
+        launchAppIfAvailable(launchIntent, R.string.calculator)
+    }
+
+    fun launchSettingsComponent(className: String) {
+        val intent = if (className == PERSONALIZATIONS_ACTIVITY) {
+            Intent(Intent.ACTION_MAIN)
+        } else {
+            Intent().setComponent(ComponentName("com.android.settings", className))
+        }
+        activityStarter?.startActivity(intent, true)
+    }
+
+    fun launchWeatherApp() {
+        val launchIntent = Intent(Intent.ACTION_MAIN).apply {
+            setClassName(SERVICE_PACKAGE, "$SERVICE_PACKAGE.WeatherActivity")
+        }
+        launchAppIfAvailable(launchIntent, R.string.omnijaws_weather)
+    }
+
+    fun launchWalletApp() {
+        val launchIntent = context.packageManager.getLaunchIntentForPackage("com.google.android.apps.walletnfcrel")?.apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        }
+        launchIntent?.let {
+            launchAppIfAvailable(it, R.string.google_wallet)
+        }
+    }
+
+    fun launchMediaPlayerApp(packageName: String) {
+        if (packageName.isNotEmpty()) {
+            val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+            launchIntent?.let {
+                activityStarter?.startActivity(it, true)
+            }
+        }
+    }
+
+    fun launchQrScanner() {
+        try {
+            val qrScannerComponent = context.resources.getString(
+                com.android.internal.R.string.config_defaultQrCodeComponent
+            )
+            val intent = if (qrScannerComponent.isNotEmpty()) {
+                Intent().apply {
+                    component = ComponentName.unflattenFromString(qrScannerComponent)
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            } else {
+                Intent().apply {
+                    component = ComponentName(
+                        "com.google.android.googlequicksearchbox",
+                        "com.google.android.apps.search.lens.LensActivity"
+                    )
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            }
+            startIntent(intent)
+        } catch (e: Exception) {
+            Toast.makeText(context, "Unable to launch QR Scanner", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    fun startSettingsActivity() {
+        val settingsIntent = Intent(android.provider.Settings.ACTION_SETTINGS)
+        activityStarter?.startActivity(settingsIntent, true)
+    }
+
+    fun startIntent(intent: Intent) {
+        activityStarter?.startActivity(intent, true)
+    }
+
+    private fun showNoDefaultAppFoundToast(@StringRes appTypeResId: Int) {
+        Toast.makeText(context, context.getString(appTypeResId) + " not found", Toast.LENGTH_SHORT).show()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgets.kt b/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgets.kt
new file mode 100644
index 0000000000000..45f6b02fc47ac
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgets.kt
@@ -0,0 +1,67 @@
+/*
+     Copyright (C) 2024 the risingOS Android Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+*/
+package com.android.systemui.lockscreen
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+
+import com.android.internal.jank.InteractionJankMonitor
+
+import com.android.systemui.Dependency
+import com.android.systemui.animation.Expandable
+import com.android.systemui.animation.DialogCuj
+import com.android.systemui.animation.DialogTransitionAnimator
+import com.android.systemui.media.dialog.MediaOutputDialogManager
+
+class LockScreenWidgets(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs) {
+
+    private val mViewController: LockScreenWidgetsController? = LockScreenWidgetsController(this)
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        mViewController?.registerCallbacks()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        mViewController?.unregisterCallbacks()
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        mViewController?.initViews()
+    }
+
+    fun showMediaDialog(view: View, lastMediaPackage: String) {
+        val packageName = lastMediaPackage.takeIf { it.isNotEmpty() } ?: return
+        Dependency.get(MediaOutputDialogManager::class.java)
+            .createAndShowWithController(
+                packageName,
+                true,
+                Expandable.fromView(view).dialogController()
+            )
+    }
+
+    private fun Expandable.dialogController(): DialogTransitionAnimator.Controller? {
+        return dialogTransitionController(
+            cuj =
+                DialogCuj(
+                    InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
+                    MediaOutputDialogManager.INTERACTION_JANK_TAG
+                )
+        )
+    }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgetsController.java b/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgetsController.java
new file mode 100644
index 0000000000000..361bbbd866876
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/lockscreen/LockScreenWidgetsController.java
@@ -0,0 +1,1095 @@
+/*
+     Copyright (C) 2024 the risingOS Android Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+*/
+package com.android.systemui.lockscreen;
+
+import android.annotation.NonNull;
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.ColorStateList;
+import android.database.ContentObserver;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.hardware.camera2.CameraManager;
+import android.media.AudioManager;
+import android.media.MediaMetadata;
+import android.media.session.MediaSessionLegacyHelper;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.KeyEvent;
+import android.provider.MediaStore;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import com.android.settingslib.net.DataUsageController;
+import com.android.settingslib.Utils;
+
+import com.android.systemui.res.R;
+import com.android.systemui.Dependency;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.animation.view.LaunchableImageView;
+import com.android.systemui.animation.view.LaunchableFAB;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.statusbar.StatusBarState;
+import com.android.systemui.bluetooth.ui.viewModel.BluetoothDetailsContentViewModel;
+import com.android.systemui.qs.tiles.dialog.InternetDialogManager;
+import com.android.systemui.statusbar.policy.BluetoothController;
+import com.android.systemui.statusbar.policy.BluetoothController.Callback;
+import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
+import com.android.systemui.statusbar.policy.FlashlightController;
+import com.android.systemui.statusbar.policy.HotspotController;
+import com.android.systemui.statusbar.connectivity.AccessPointController;
+import com.android.systemui.statusbar.connectivity.IconState;
+import com.android.systemui.statusbar.connectivity.NetworkController;
+import com.android.systemui.statusbar.connectivity.SignalCallback;
+import com.android.systemui.statusbar.connectivity.MobileDataIndicators;
+import com.android.systemui.statusbar.connectivity.WifiIndicators;
+import com.android.systemui.util.MediaSessionManagerHelper;
+import com.android.internal.util.matrixx.VibrationUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.android.internal.util.matrixx.OmniJawsClient;
+
+public class LockScreenWidgetsController implements OmniJawsClient.OmniJawsObserver, MediaSessionManagerHelper.MediaMetadataListener {
+
+    private static final String LOCKSCREEN_WIDGETS_ENABLED =
+            "lockscreen_widgets_enabled";
+
+    private static final String LOCKSCREEN_WIDGETS =
+            "lockscreen_widgets";
+
+    private static final String LOCKSCREEN_WIDGETS_EXTRAS =
+            "lockscreen_widgets_extras";
+            
+    private static final String LOCKSCREEN_WIDGETS_STYLE =
+            "lockscreen_widgets_style";
+            
+    private static final String LOCKSCREEN_WIDGETS_TRANSPARENCY =
+            "lockscreen_widgets_transparency";
+
+    private static final int[] MAIN_WIDGETS_VIEW_IDS = {
+            R.id.main_kg_item_placeholder1,
+            R.id.main_kg_item_placeholder2
+    };
+
+    private static final int[] WIDGETS_VIEW_IDS = {
+            R.id.kg_item_placeholder1,
+            R.id.kg_item_placeholder2,
+            R.id.kg_item_placeholder3,
+            R.id.kg_item_placeholder4
+    };
+
+    public static final int BT_ACTIVE = R.drawable.qs_bluetooth_icon_on;
+    public static final int BT_INACTIVE = R.drawable.qs_bluetooth_icon_off;
+    public static final int DATA_ACTIVE = R.drawable.ic_signal_cellular_alt_24;
+    public static final int DATA_INACTIVE = R.drawable.ic_mobiledata_off_24;
+    public static final int RINGER_ACTIVE = R.drawable.ic_vibration_24;
+    public static final int RINGER_INACTIVE = R.drawable.ic_ring_volume_24;
+    public static final int TORCH_RES_ACTIVE = R.drawable.ic_flashlight_on;
+    public static final int TORCH_RES_INACTIVE = R.drawable.ic_flashlight_off;
+    public static final int WIFI_ACTIVE = R.drawable.ic_wifi_24;
+    public static final int WIFI_INACTIVE = R.drawable.ic_wifi_off_24;
+    public static final int HOTSPOT_ACTIVE = R.drawable.qs_hotspot_icon_on;
+    public static final int HOTSPOT_INACTIVE = R.drawable.qs_hotspot_icon_off;
+
+    public static final int BT_LABEL_INACTIVE = R.string.quick_settings_bluetooth_label;
+    public static final int DATA_LABEL_INACTIVE = R.string.quick_settings_data_label;
+    public static final int RINGER_LABEL_INACTIVE = R.string.quick_settings_ringer_label;
+    public static final int TORCH_LABEL_ACTIVE = R.string.torch_active;
+    public static final int TORCH_LABEL_INACTIVE = R.string.quick_settings_flashlight_label;
+    public static final int WIFI_LABEL_INACTIVE = R.string.quick_settings_wifi_label;
+    public static final int HOTSPOT_LABEL = R.string.accessibility_status_bar_hotspot;
+
+    private OmniJawsClient mWeatherClient;
+    private OmniJawsClient.WeatherInfo mWeatherInfo;
+
+    private final AccessPointController mAccessPointController;
+    private final BluetoothController mBluetoothController;
+    private final BluetoothDetailsContentViewModel mBluetoothDetailsContentViewModel;
+    private final ConfigurationController mConfigurationController;
+    private final DataUsageController mDataController;
+    private final FlashlightController mFlashlightController;
+    private final InternetDialogManager mInternetDialogManager;
+    private final NetworkController mNetworkController;
+    private final StatusBarStateController mStatusBarStateController;
+    private final MediaSessionManagerHelper mMediaSessionManagerHelper;
+    private final LockscreenWidgetsObserver mLockscreenWidgetsObserver;
+    private final ActivityLauncherUtils mActivityLauncherUtils;
+    private final HotspotController mHotspotController;
+
+    protected final CellSignalCallback mCellSignalCallback = new CellSignalCallback();
+    protected final WifiSignalCallback mWifiSignalCallback = new WifiSignalCallback();
+    private final HotspotCallback mHotspotCallback = new HotspotCallback();
+
+    private Context mContext;
+    private LaunchableImageView mWidget1, mWidget2, mWidget3, mWidget4, mediaButton, torchButton, weatherButton;
+    private LaunchableFAB mediaButtonFab, torchButtonFab, weatherButtonFab, hotspotButtonFab;
+    private LaunchableFAB wifiButtonFab, dataButtonFab, ringerButtonFab, btButtonFab;
+    private LaunchableImageView wifiButton, dataButton, ringerButton, btButton, hotspotButton;
+    private int mDarkColor, mDarkColorActive, mLightColor, mLightColorActive;
+
+    private CameraManager mCameraManager;
+    private String mCameraId;
+    private boolean isFlashOn = false;
+
+    private String mMainLockscreenWidgetsList;
+    private String mSecondaryLockscreenWidgetsList;
+    private LaunchableFAB[] mMainWidgetViews;
+    private LaunchableImageView[] mSecondaryWidgetViews;
+    private List<String> mMainWidgetsList = new ArrayList<>();
+    private List<String> mSecondaryWidgetsList = new ArrayList<>();
+    private String mWidgetImagePath;
+
+    private AudioManager mAudioManager;
+    private String mLastTrackTitle = null;
+
+    private boolean mDozing;
+
+    private boolean mIsInflated = false;
+    private GestureDetector mGestureDetector;
+    private boolean mIsLongPress = false;
+
+    private boolean mLockscreenWidgetsEnabled;
+    private int mThemeStyle = 0;
+    private float mTransparency = 0.3f;
+
+    final ConfigurationListener mConfigurationListener = new ConfigurationListener() {
+        @Override
+        public void onUiModeChanged() {
+            updateWidgetViews();
+        }
+        @Override
+        public void onThemeChanged() {
+            updateWidgetViews();
+        }
+    };
+
+    private final View mView;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    public LockScreenWidgetsController(View view) {
+        mView = view;
+        mContext = mView.getContext();
+        mAccessPointController = Dependency.get(AccessPointController.class);
+        mBluetoothDetailsContentViewModel = Dependency.get(BluetoothDetailsContentViewModel.class);
+        mConfigurationController = Dependency.get(ConfigurationController.class);
+        mFlashlightController = Dependency.get(FlashlightController.class);
+        mInternetDialogManager = Dependency.get(InternetDialogManager.class);
+        mStatusBarStateController = Dependency.get(StatusBarStateController.class);
+        mBluetoothController = Dependency.get(BluetoothController.class);
+        mNetworkController = Dependency.get(NetworkController.class);
+        mDataController = mNetworkController.getMobileDataController();
+        mHotspotController = Dependency.get(HotspotController.class);
+        mMediaSessionManagerHelper = MediaSessionManagerHelper.Companion.getInstance(mContext);
+
+        mActivityLauncherUtils = new ActivityLauncherUtils(mContext);
+
+        mLockscreenWidgetsObserver = new LockscreenWidgetsObserver();
+
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        mCameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
+
+        initResources();
+
+        // FIX 1: OmniJawsClient no longer takes Context in constructor; use get()
+        if (mWeatherClient == null) {
+            mWeatherClient = OmniJawsClient.get();
+        }
+
+        try {
+            String[] cameraIds = mCameraManager.getCameraIdList();
+            if (cameraIds != null && cameraIds.length > 0) {
+                mCameraId = cameraIds[0];
+            }
+        } catch (Exception e) {}
+
+        IntentFilter ringerFilter = new IntentFilter(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+        mContext.registerReceiver(mRingerModeReceiver, ringerFilter);
+    }
+
+    private final StatusBarStateController.StateListener mStatusBarStateListener =
+            new StatusBarStateController.StateListener() {
+        @Override
+        public void onStateChanged(int newState) {
+            if (newState == StatusBarState.KEYGUARD) {
+                syncAllTileStatesOnKeyguard();
+            }
+        }
+        @Override
+        public void onDozingChanged(boolean dozing) {
+            if (mDozing == dozing) return;
+            mDozing = dozing;
+            updateWidgetViews();
+            updateContainerVisibility();
+        }
+    };
+
+    private void syncAllTileStatesOnKeyguard() {
+        if (isWidgetEnabled("wifi")) {
+            mNetworkController.removeCallback(mWifiSignalCallback);
+            mNetworkController.addCallback(mWifiSignalCallback);
+        }
+        if (isWidgetEnabled("data")) {
+            mNetworkController.removeCallback(mCellSignalCallback);
+            mNetworkController.addCallback(mCellSignalCallback);
+            updateMobileDataState(isMobileDataEnabled());
+        }
+        if (isWidgetEnabled("bt")) {
+            updateBtState();
+        }
+        if (isWidgetEnabled("torch")) {
+            isFlashOn = mFlashlightController.isEnabled();
+            updateTorchButtonState();
+        }
+        if (isWidgetEnabled("ringer")) {
+            updateRingerButtonState();
+        }
+        if (isWidgetEnabled("hotspot")) {
+            updateHotspotState();
+        }
+    }
+
+    private final FlashlightController.FlashlightListener mFlashlightCallback =
+            new FlashlightController.FlashlightListener() {
+        @Override
+        public void onFlashlightChanged(boolean enabled) {
+            isFlashOn = enabled;
+            updateTorchButtonState();
+        }
+        @Override
+        public void onFlashlightError() {
+        }
+        @Override
+        public void onFlashlightAvailabilityChanged(boolean available) {
+            isFlashOn = mFlashlightController.isEnabled() && available;
+            updateTorchButtonState();
+        }
+        // Add the missing method
+        @Override
+        public void onFlashlightStrengthChanged(int level) {
+            // Handle flashlight strength changes if needed
+            updateTorchButtonState();
+        }
+    };
+
+    private void initResources() {
+        mDarkColor = mContext.getResources().getColor(R.color.lockscreen_widget_background_color_dark);
+        mLightColor = mContext.getResources().getColor(R.color.lockscreen_widget_background_color_light);
+        mDarkColorActive = mContext.getResources().getColor(R.color.lockscreen_widget_active_color_dark);
+        mLightColorActive = mContext.getResources().getColor(R.color.lockscreen_widget_active_color_light);
+    }
+
+    public void registerCallbacks() {
+        if (isWidgetEnabled("hotspot")) {
+            mHotspotController.addCallback(mHotspotCallback);
+        }
+        if (isWidgetEnabled("wifi")) {
+            mNetworkController.addCallback(mWifiSignalCallback);
+        }
+        if (isWidgetEnabled("data")) {
+            mNetworkController.addCallback(mCellSignalCallback);
+        }
+        if (isWidgetEnabled("bt")) {
+            mBluetoothController.addCallback(mBtCallback);
+        }
+        if (isWidgetEnabled("torch")) {
+            mFlashlightController.addCallback(mFlashlightCallback);
+            isFlashOn = mFlashlightController.isEnabled();
+            updateTorchButtonState();
+        }
+        mConfigurationController.addCallback(mConfigurationListener);
+        mStatusBarStateController.addCallback(mStatusBarStateListener);
+        mStatusBarStateListener.onDozingChanged(mStatusBarStateController.isDozing());
+        mMediaSessionManagerHelper.addMediaMetadataListener(this);
+        mLockscreenWidgetsObserver.observe();
+        updateWidgetViews();
+        updateMediaPlaybackState();
+    }
+
+    public void unregisterCallbacks() {
+        if (isWidgetEnabled("weather")) {
+            disableWeatherUpdates();
+        }
+        if (isWidgetEnabled("wifi")) {
+            mNetworkController.removeCallback(mWifiSignalCallback);
+        }
+        if (isWidgetEnabled("data")) {
+            mNetworkController.removeCallback(mCellSignalCallback);
+        }
+        if (isWidgetEnabled("bt")) {
+            mBluetoothController.removeCallback(mBtCallback);
+        }
+        if (isWidgetEnabled("torch")) {
+            mFlashlightController.removeCallback(mFlashlightCallback);
+        }
+        if (isWidgetEnabled("hotspot")) {
+            mHotspotController.removeCallback(mHotspotCallback);
+        }
+        mConfigurationController.removeCallback(mConfigurationListener);
+        mStatusBarStateController.removeCallback(mStatusBarStateListener);
+        try {
+            mContext.unregisterReceiver(mRingerModeReceiver);
+        } catch (IllegalArgumentException e) {
+        }
+        mLockscreenWidgetsObserver.unobserve();
+        mHandler.removeCallbacksAndMessages(null);
+        mMediaSessionManagerHelper.removeMediaMetadataListener(this);
+    }
+
+    public void initViews() {
+        mMainWidgetViews = new LaunchableFAB[MAIN_WIDGETS_VIEW_IDS.length];
+        for (int i = 0; i < mMainWidgetViews.length; i++) {
+            mMainWidgetViews[i] = mView.findViewById(MAIN_WIDGETS_VIEW_IDS[i]);
+        }
+        mSecondaryWidgetViews = new LaunchableImageView[WIDGETS_VIEW_IDS.length];
+        for (int i = 0; i < mSecondaryWidgetViews.length; i++) {
+            mSecondaryWidgetViews[i] = mView.findViewById(WIDGETS_VIEW_IDS[i]);
+        }
+        mIsInflated = true;
+        updateWidgetViews();
+    }
+
+    public void updateWidgetViews() {
+        if (!mIsInflated) return;
+        if (!mLockscreenWidgetsEnabled) {
+            if (mMainWidgetViews != null) {
+                for (LaunchableFAB v : mMainWidgetViews) { if (v != null) v.setVisibility(View.GONE); }
+            }
+            if (mSecondaryWidgetViews != null) {
+                for (LaunchableImageView v : mSecondaryWidgetViews) { if (v != null) v.setVisibility(View.GONE); }
+            }
+            final View mc = mView.findViewById(R.id.main_widgets_container);
+            if (mc != null) mc.setVisibility(View.GONE);
+            final View sc = mView.findViewById(R.id.secondary_widgets_container);
+            if (sc != null) sc.setVisibility(View.GONE);
+            mView.setVisibility(View.GONE);
+            return;
+        }
+        if (mMainWidgetViews != null && mMainWidgetsList != null) {
+            for (int i = 0; i < mMainWidgetViews.length; i++) {
+                if (mMainWidgetViews[i] != null) {
+                    mMainWidgetViews[i].setVisibility(i < mMainWidgetsList.size() ? View.VISIBLE : View.GONE);
+                }
+            }
+            for (int i = 0; i < Math.min(mMainWidgetsList.size(), mMainWidgetViews.length); i++) {
+                String widgetType = mMainWidgetsList.get(i);
+                if (widgetType != null && mMainWidgetViews[i] != null) {
+                    setUpWidgetWiews(null, mMainWidgetViews[i], widgetType);
+                    updateMainWidgetResources(mMainWidgetViews[i], false);
+                }
+            }
+        }
+        if (mSecondaryWidgetViews != null && mSecondaryWidgetsList != null) {
+            for (int i = 0; i < mSecondaryWidgetViews.length; i++) {
+                if (mSecondaryWidgetViews[i] != null) {
+                    mSecondaryWidgetViews[i].setVisibility(i < mSecondaryWidgetsList.size() ? View.VISIBLE : View.GONE);
+                }
+            }
+            for (int i = 0; i < Math.min(mSecondaryWidgetsList.size(), mSecondaryWidgetViews.length); i++) {
+                String widgetType = mSecondaryWidgetsList.get(i);
+                if (widgetType != null && mSecondaryWidgetViews[i] != null) {
+                    setUpWidgetWiews(mSecondaryWidgetViews[i], null, widgetType);
+                    updateWidgetsResources(mSecondaryWidgetViews[i]);
+                }
+            }
+        }
+        updateContainerVisibility();
+    }
+
+    private void updateMainWidgetResources(LaunchableFAB efab, boolean active) {
+        if (efab == null) return;
+        efab.setElevation(0);
+        if (mDozing) {
+            int bgRes = (mThemeStyle == 1 || mThemeStyle == 2)
+                    ? R.drawable.lockscreen_widget_background_square_aod
+                    : R.drawable.lockscreen_widget_background_circle_aod;
+            efab.setBackgroundTintList(null);
+            efab.setBackgroundDrawable(mContext.getDrawable(bgRes));
+        } else {
+            int bgRes = (mThemeStyle == 1 || mThemeStyle == 2)
+                    ? R.drawable.lockscreen_widget_background_square
+                    : R.drawable.lockscreen_widget_background_circle;
+            efab.setBackgroundDrawable(mContext.getDrawable(bgRes));
+        }
+        setButtonActiveState(null, efab, false);
+        long visibleWidgetCount = mMainWidgetsList.stream().filter(w -> !"none".equals(w)).count();
+        ViewGroup.LayoutParams params = efab.getLayoutParams();
+        if (params instanceof LinearLayout.LayoutParams) {
+            LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) params;
+            if (efab.getVisibility() == View.VISIBLE && visibleWidgetCount == 1) {
+                lp.width = mContext.getResources().getDimensionPixelSize(R.dimen.kg_widget_main_width);
+                lp.height = mContext.getResources().getDimensionPixelSize(R.dimen.kg_widget_main_height);
+            } else {
+                lp.width = 0;
+                lp.weight = 1;
+            }
+            efab.setLayoutParams(lp);
+        }
+    }
+
+    private void updateContainerVisibility() {
+        if (!mLockscreenWidgetsEnabled) {
+            final View mc = mView.findViewById(R.id.main_widgets_container);
+            if (mc != null) mc.setVisibility(View.GONE);
+            final View sc = mView.findViewById(R.id.secondary_widgets_container);
+            if (sc != null) sc.setVisibility(View.GONE);
+            mView.setVisibility(View.GONE);
+            return;
+        }
+        final boolean isMainEmpty = mMainLockscreenWidgetsList == null || TextUtils.isEmpty(mMainLockscreenWidgetsList);
+        final boolean isSecondaryEmpty = mSecondaryLockscreenWidgetsList == null || TextUtils.isEmpty(mSecondaryLockscreenWidgetsList);
+        final View mc = mView.findViewById(R.id.main_widgets_container);
+        if (mc != null) mc.setVisibility(isMainEmpty ? View.GONE : View.VISIBLE);
+        final View sc = mView.findViewById(R.id.secondary_widgets_container);
+        if (sc != null) sc.setVisibility(isSecondaryEmpty ? View.GONE : View.VISIBLE);
+        mView.setVisibility((isMainEmpty && isSecondaryEmpty) ? View.GONE : View.VISIBLE);
+    }
+
+    private void updateWidgetsResources(LaunchableImageView iv) {
+        if (iv == null) return;
+        int bgRes;
+        if (mDozing) {
+            bgRes = (mThemeStyle == 1 || mThemeStyle == 2)
+                    ? R.drawable.lockscreen_widget_background_square_aod
+                    : R.drawable.lockscreen_widget_background_circle_aod;
+        } else {
+            bgRes = (mThemeStyle == 1 || mThemeStyle == 2)
+                    ? R.drawable.lockscreen_widget_background_square
+                    : R.drawable.lockscreen_widget_background_circle;
+        }
+        iv.setBackgroundResource(bgRes);
+        setButtonActiveState(iv, null, false);
+    }
+
+    private boolean isNightMode() {
+        final Configuration config = mContext.getResources().getConfiguration();
+        return (config.uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+    }
+
+    private void setUpWidgetWiews(LaunchableImageView iv, LaunchableFAB efab, String type) {
+        View.OnClickListener clickListener = null;
+        View.OnLongClickListener longClickListener = null;
+        int drawableRes = 0;
+        int stringRes = 0;
+
+        switch (type) {
+            case "none":
+                if (iv != null) iv.setVisibility(View.GONE);
+                if (efab != null) efab.setVisibility(View.GONE);
+                return;
+            case "wifi":
+                clickListener = v -> toggleWiFi();
+                longClickListener = v -> { showInternetDialog(v); return true; };
+                drawableRes = WIFI_INACTIVE;
+                stringRes = R.string.quick_settings_wifi_label;
+                if (iv != null) wifiButton = iv;
+                if (efab != null) wifiButtonFab = efab;
+                break;
+            case "data":
+                clickListener = v -> toggleMobileData();
+                longClickListener = v -> { showInternetDialog(v); return true; };
+                drawableRes = DATA_INACTIVE;
+                stringRes = DATA_LABEL_INACTIVE;
+                if (iv != null) dataButton = iv;
+                if (efab != null) dataButtonFab = efab;
+                break;
+            case "ringer":
+                clickListener = v -> toggleRingerMode();
+                drawableRes = RINGER_INACTIVE;
+                stringRes = RINGER_LABEL_INACTIVE;
+                if (iv != null) ringerButton = iv;
+                if (efab != null) ringerButtonFab = efab;
+                break;
+            case "bt":
+                clickListener = v -> toggleBluetoothState();
+                longClickListener = v -> { showBluetoothDialog(v); return true; };
+                drawableRes = BT_INACTIVE;
+                stringRes = BT_LABEL_INACTIVE;
+                if (iv != null) btButton = iv;
+                if (efab != null) btButtonFab = efab;
+                break;
+            case "torch":
+                clickListener = v -> toggleFlashlight();
+                drawableRes = TORCH_RES_INACTIVE;
+                stringRes = TORCH_LABEL_INACTIVE;
+                if (iv != null) torchButton = iv;
+                if (efab != null) torchButtonFab = efab;
+                break;
+            case "timer":
+                clickListener = v -> mActivityLauncherUtils.launchTimer();
+                drawableRes = R.drawable.ic_alarm;
+                stringRes = R.string.clock_timer;
+                break;
+            case "calculator":
+                clickListener = v -> mActivityLauncherUtils.launchCalculator();
+                drawableRes = R.drawable.ic_calculator;
+                stringRes = R.string.calculator;
+                break;
+            case "media":
+                clickListener = v -> toggleMediaPlaybackState();
+                longClickListener = v -> { showMediaDialog(v); return true; };
+                drawableRes = R.drawable.ic_media_play;
+                stringRes = R.string.controls_media_button_play;
+                if (iv != null) mediaButton = iv;
+                if (efab != null) mediaButtonFab = efab;
+                break;
+            case "weather":
+                clickListener = v -> mActivityLauncherUtils.launchWeatherApp();
+                drawableRes = R.drawable.ic_weather;
+                stringRes = R.string.weather_data_unavailable;
+                if (iv != null) weatherButton = iv;
+                if (efab != null) weatherButtonFab = efab;
+                enableWeatherUpdates();
+                break;
+            case "hotspot":
+                clickListener = v -> toggleHotspot();
+                longClickListener = v -> { showInternetDialog(v); return true; };
+                drawableRes = HOTSPOT_INACTIVE;
+                stringRes = HOTSPOT_LABEL;
+                if (iv != null) hotspotButton = iv;
+                if (efab != null) hotspotButtonFab = efab;
+                break;
+            case "wallet":
+                clickListener = v -> mActivityLauncherUtils.launchWalletApp();
+                drawableRes = R.drawable.ic_wallet_lockscreen;
+                stringRes = R.string.google_wallet;
+                break;
+            case "qrscanner":
+                clickListener = v -> mActivityLauncherUtils.launchQrScanner();
+                drawableRes = R.drawable.ic_qr_code_scanner;
+                stringRes = R.string.qr_code_scanner_title;
+                break;
+            default:
+                return;
+        }
+
+        if (efab != null) {
+            efab.setOnClickListener(clickListener);
+            efab.setIcon(mContext.getDrawable(drawableRes));
+            efab.setText(mContext.getResources().getString(stringRes));
+            if (longClickListener != null) {
+                efab.setOnLongClickListener(longClickListener);
+            } else {
+                efab.setOnLongClickListener(null);
+            }
+            if (mediaButtonFab == efab) attachSwipeGesture(efab);
+        }
+        if (iv != null) {
+            iv.setOnClickListener(clickListener);
+            if (longClickListener != null) {
+                iv.setOnLongClickListener(longClickListener);
+            } else {
+                iv.setOnLongClickListener(null);
+            }
+            iv.setImageResource(drawableRes);
+        }
+    }
+
+    private void attachSwipeGesture(LaunchableFAB efab) {
+        final boolean[] mIsSwiping = {false};
+        final GestureDetector gestureDetector = new GestureDetector(mContext,
+                new GestureDetector.SimpleOnGestureListener() {
+            private static final int SWIPE_THRESHOLD = 100;
+            private static final int SWIPE_VELOCITY_THRESHOLD = 100;
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+                float diffX = e2.getX() - e1.getX();
+                if (Math.abs(diffX) > SWIPE_THRESHOLD && Math.abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
+                    mIsSwiping[0] = true;
+                    if (diffX > 0) {
+                        dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
+                    } else {
+                        dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_NEXT);
+                    }
+                    VibrationUtils.triggerVibration(mContext, 2);
+                    return true;
+                }
+                return false;
+            }
+            @Override
+            public void onLongPress(MotionEvent e) {
+                super.onLongPress(e);
+                mIsLongPress = true;
+                showMediaDialog(efab);
+                mHandler.postDelayed(() -> mIsLongPress = false, 2500);
+            }
+        });
+        efab.setOnTouchListener((v, event) -> {
+            gestureDetector.onTouchEvent(event);
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                mIsSwiping[0] = false;
+            }
+            if (event.getAction() == MotionEvent.ACTION_UP && !mIsSwiping[0] && !mIsLongPress) {
+                v.performClick();
+            }
+            return true;
+        });
+    }
+
+    private void setButtonActiveState(LaunchableImageView iv, LaunchableFAB efab, boolean active) {
+        if (mDozing) {
+            if (iv != null) {
+                iv.setBackgroundTintList(null);
+                iv.setImageTintList(ColorStateList.valueOf(Color.WHITE));
+            }
+            if (efab != null) {
+                efab.setBackgroundTintList(null);
+                efab.setIconTint(efab == weatherButtonFab ? null : ColorStateList.valueOf(Color.WHITE));
+                efab.setTextColor(Color.WHITE);
+            }
+            return;
+        }
+        int bgTint, tintColor;
+        if (mThemeStyle == 2 || mThemeStyle == 3) {
+            bgTint = active ? Utils.applyAlpha(mTransparency, mDarkColorActive) : Utils.applyAlpha(mTransparency, Color.WHITE);
+            tintColor = active ? mDarkColorActive : Color.WHITE;
+        } else {
+            bgTint = active ? (isNightMode() ? mDarkColorActive : mLightColorActive) : (isNightMode() ? mDarkColor : mLightColor);
+            tintColor = active ? (isNightMode() ? mDarkColor : mLightColor) : (isNightMode() ? mLightColor : mDarkColor);
+        }
+        if (iv != null) {
+            iv.setBackgroundTintList(ColorStateList.valueOf(bgTint));
+            iv.setImageTintList(iv == weatherButton ? null : ColorStateList.valueOf(tintColor));
+        }
+        if (efab != null) {
+            efab.setBackgroundTintList(ColorStateList.valueOf(bgTint));
+            efab.setIconTint(efab == weatherButtonFab ? null : ColorStateList.valueOf(tintColor));
+            efab.setTextColor(tintColor);
+        }
+    }
+
+    private void toggleMediaPlaybackState() {
+        if (mMediaSessionManagerHelper.isMediaPlaying()) {
+            dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PAUSE);
+        } else {
+            dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PLAY);
+        }
+    }
+
+    private void showMediaDialog(View view) {
+        String lastMediaPkg = getLastUsedMedia();
+        if (TextUtils.isEmpty(lastMediaPkg)) return;
+        if (!(mView instanceof LockScreenWidgets)) return;
+        mHandler.post(() -> {
+            ((LockScreenWidgets) mView).showMediaDialog(view, lastMediaPkg);
+            VibrationUtils.triggerVibration(mContext, 2);
+        });
+    }
+
+    private String getLastUsedMedia() {
+        return Settings.System.getString(mContext.getContentResolver(), "media_session_last_package_name");
+    }
+
+    private void dispatchMediaKeyWithWakeLockToMediaSession(final int keycode) {
+        final MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext);
+        if (helper == null) return;
+        KeyEvent event = new KeyEvent(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(),
+                KeyEvent.ACTION_DOWN, keycode, 0);
+        helper.sendMediaButtonEvent(event, true);
+        event = KeyEvent.changeAction(event, KeyEvent.ACTION_UP);
+        helper.sendMediaButtonEvent(event, true);
+        mHandler.postDelayed(this::updateMediaPlaybackState, 250);
+    }
+
+    private void updateMediaPlaybackState() {
+        boolean isPlaying = mMediaSessionManagerHelper.isMediaPlaying();
+        int stateIcon = isPlaying ? R.drawable.ic_media_pause : R.drawable.ic_media_play;
+        if (mediaButton != null) {
+            mediaButton.setImageResource(stateIcon);
+            setButtonActiveState(mediaButton, null, isPlaying);
+        }
+        if (mediaButtonFab != null) {
+            MediaMetadata meta = mMediaSessionManagerHelper.getCurrentMediaMetadata();
+            String trackTitle = meta != null ? meta.getString(MediaMetadata.METADATA_KEY_TITLE) : "";
+            if (!TextUtils.isEmpty(trackTitle) && !trackTitle.equals(mLastTrackTitle)) {
+                mLastTrackTitle = trackTitle;
+            }
+            final boolean canShowTitle = isPlaying || !TextUtils.isEmpty(mLastTrackTitle);
+            mediaButtonFab.setIcon(mContext.getDrawable(stateIcon));
+            mediaButtonFab.setText(canShowTitle ? mLastTrackTitle : mContext.getString(R.string.controls_media_button_play));
+            setButtonActiveState(null, mediaButtonFab, isPlaying);
+        }
+    }
+
+    private void toggleFlashlight() {
+        if (torchButton == null && torchButtonFab == null) return;
+        try {
+            final boolean newState = !isFlashOn;
+            isFlashOn = newState;
+            updateTorchButtonState();
+            mFlashlightController.setFlashlight(newState);
+        } catch (Exception e) {
+            isFlashOn = mFlashlightController.isEnabled();
+            updateTorchButtonState();
+        }
+    }
+
+    private void toggleWiFi() {
+        final WifiCallbackInfo cbi = mWifiSignalCallback.mInfo;
+        final boolean newEnabled = !cbi.enabled;
+        cbi.enabled = newEnabled;
+        mNetworkController.setWifiEnabled(newEnabled);
+        updateWiFiButtonState(newEnabled);
+    }
+
+    private boolean isMobileDataEnabled() {
+        return mDataController.isMobileDataEnabled();
+    }
+
+    private void toggleMobileData() {
+        final boolean newEnabled = !isMobileDataEnabled();
+        mDataController.setMobileDataEnabled(newEnabled);
+        updateMobileDataState(newEnabled);
+        mHandler.postDelayed(() -> updateMobileDataState(isMobileDataEnabled()), 250);
+    }
+
+    private void showInternetDialog(View view) {
+        mHandler.post(() -> mInternetDialogManager.create(true,
+                mAccessPointController.canConfigMobileData(),
+                mAccessPointController.canConfigWifi(), Expandable.fromView(view)));
+        VibrationUtils.triggerVibration(mContext, 2);
+    }
+
+    private void toggleRingerMode() {
+        if (mAudioManager == null) return;
+        int mode = mAudioManager.getRingerMode();
+        mAudioManager.setRingerMode(mode == AudioManager.RINGER_MODE_NORMAL
+                ? AudioManager.RINGER_MODE_VIBRATE : AudioManager.RINGER_MODE_NORMAL);
+        updateRingerButtonState();
+    }
+
+    private void updateTileButtonState(LaunchableImageView iv, LaunchableFAB efab,
+            boolean active, int activeResource, int inactiveResource,
+            String activeString, String inactiveString) {
+        mHandler.post(() -> {
+            if (iv != null) {
+                iv.setImageResource(active ? activeResource : inactiveResource);
+                setButtonActiveState(iv, null, active);
+            }
+            if (efab != null) {
+                efab.setIcon(mContext.getDrawable(active ? activeResource : inactiveResource));
+                efab.setText(active ? activeString : inactiveString);
+                setButtonActiveState(null, efab, active);
+            }
+        });
+    }
+
+    public void updateTorchButtonState() {
+        if (!isWidgetEnabled("torch")) return;
+        String activeString = mContext.getResources().getString(TORCH_LABEL_ACTIVE);
+        String inactiveString = mContext.getResources().getString(TORCH_LABEL_INACTIVE);
+        updateTileButtonState(torchButton, torchButtonFab, isFlashOn,
+                TORCH_RES_ACTIVE, TORCH_RES_INACTIVE, activeString, inactiveString);
+    }
+
+    private final BroadcastReceiver mRingerModeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateRingerButtonState();
+        }
+    };
+
+    private final BluetoothController.Callback mBtCallback = new BluetoothController.Callback() {
+        @Override
+        public void onBluetoothStateChange(boolean enabled) {
+            updateBtState();
+        }
+        @Override
+        public void onBluetoothDevicesChanged() {
+            updateBtState();
+        }
+    };
+
+    private void updateWiFiButtonState(boolean enabled) {
+        if (!isWidgetEnabled("wifi")) return;
+        if (wifiButton == null && wifiButtonFab == null) return;
+        final WifiCallbackInfo cbi = mWifiSignalCallback.mInfo;
+        String inactiveString = mContext.getResources().getString(WIFI_LABEL_INACTIVE);
+        updateTileButtonState(wifiButton, wifiButtonFab, enabled,
+                WIFI_ACTIVE, WIFI_INACTIVE,
+                cbi.ssid != null ? removeDoubleQuotes(cbi.ssid) : inactiveString,
+                inactiveString);
+    }
+
+    private void updateRingerButtonState() {
+        if (!isWidgetEnabled("ringer")) return;
+        if (ringerButton == null && ringerButtonFab == null) return;
+        if (mAudioManager == null) return;
+        boolean isVibrateActive = mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE;
+        String inactiveString = mContext.getResources().getString(RINGER_LABEL_INACTIVE);
+        updateTileButtonState(ringerButton, ringerButtonFab, isVibrateActive,
+                RINGER_ACTIVE, RINGER_INACTIVE, inactiveString, inactiveString);
+    }
+
+    private void updateMobileDataState(boolean enabled) {
+        if (!isWidgetEnabled("data")) return;
+        if (dataButton == null && dataButtonFab == null) return;
+        String networkName = mNetworkController == null ? "" : mNetworkController.getMobileDataNetworkName();
+        boolean hasNetwork = !TextUtils.isEmpty(networkName) && mNetworkController != null
+                && mNetworkController.hasMobileDataFeature();
+        String inactiveString = mContext.getResources().getString(DATA_LABEL_INACTIVE);
+        updateTileButtonState(dataButton, dataButtonFab, enabled,
+                DATA_ACTIVE, DATA_INACTIVE,
+                hasNetwork && enabled ? networkName : inactiveString,
+                inactiveString);
+    }
+
+    private void toggleBluetoothState() {
+        final boolean newEnabled = !mBluetoothController.isBluetoothEnabled();
+        mBluetoothController.setBluetoothEnabled(newEnabled);
+        updateBtState();
+    }
+
+    private void showBluetoothDialog(View view) {
+        mHandler.post(() -> mBluetoothDetailsContentViewModel.showDialog(Expandable.fromView(view)));
+        VibrationUtils.triggerVibration(mContext, 2);
+    }
+
+    private void updateBtState() {
+        if (!isWidgetEnabled("bt")) return;
+        if (btButton == null && btButtonFab == null) return;
+        final boolean btEnabled = mBluetoothController.isBluetoothEnabled();
+        String deviceName = btEnabled ? mBluetoothController.getConnectedDeviceName() : "";
+        boolean isConnected = !TextUtils.isEmpty(deviceName);
+        String inactiveString = mContext.getResources().getString(BT_LABEL_INACTIVE);
+        updateTileButtonState(btButton, btButtonFab, btEnabled,
+                BT_ACTIVE, BT_INACTIVE,
+                isConnected ? deviceName : inactiveString,
+                inactiveString);
+    }
+
+    @Nullable
+    private static String removeDoubleQuotes(String string) {
+        if (string == null) return null;
+        final int length = string.length();
+        if (length > 1 && string.charAt(0) == '"' && string.charAt(length - 1) == '"') {
+            return string.substring(1, length - 1);
+        }
+        return string;
+    }
+
+    protected static final class WifiCallbackInfo {
+        boolean enabled;
+        @Nullable String ssid;
+    }
+
+    protected final class WifiSignalCallback implements SignalCallback {
+        final WifiCallbackInfo mInfo = new WifiCallbackInfo();
+        @Override
+        public void setWifiIndicators(@NonNull WifiIndicators indicators) {
+            if (indicators.qsIcon == null) {
+                mInfo.enabled = false;
+                mInfo.ssid = null;
+                updateWiFiButtonState(false);
+                return;
+            }
+            mInfo.enabled = indicators.enabled;
+            mInfo.ssid = indicators.description;
+            updateWiFiButtonState(mInfo.enabled);
+        }
+    }
+
+    private final class CellSignalCallback implements SignalCallback {
+        @Override
+        public void setMobileDataIndicators(@NonNull MobileDataIndicators indicators) {
+            if (indicators.qsIcon == null) {
+                updateMobileDataState(false);
+                return;
+            }
+            updateMobileDataState(isMobileDataEnabled());
+        }
+        @Override
+        public void setNoSims(boolean show, boolean simDetected) {
+            updateMobileDataState(simDetected && isMobileDataEnabled());
+        }
+        @Override
+        public void setIsAirplaneMode(@NonNull IconState icon) {
+            updateMobileDataState(!icon.visible && isMobileDataEnabled());
+        }
+    }
+
+    // FIX 2: addObserver now requires Context as first argument
+    public void enableWeatherUpdates() {
+        if (mWeatherClient != null) {
+            mWeatherClient.addObserver(mContext, this);
+            queryAndUpdateWeather();
+        }
+    }
+
+    // FIX 3: removeObserver now requires Context as first argument
+    public void disableWeatherUpdates() {
+        if (mWeatherClient != null) {
+            mWeatherClient.removeObserver(mContext, this);
+        }
+    }
+
+    @Override
+    public void weatherError(int errorReason) {
+        if (errorReason == OmniJawsClient.EXTRA_ERROR_DISABLED) {
+            mWeatherInfo = null;
+        }
+    }
+
+    @Override
+    public void weatherUpdated() {
+        queryAndUpdateWeather();
+    }
+
+    @Override
+    public void updateSettings() {
+        queryAndUpdateWeather();
+    }
+
+    private void queryAndUpdateWeather() {
+        try {
+            // FIX 4: isOmniJawsEnabled and queryWeather now require Context argument
+            // FIX 5: getWeatherConditionImage now requires Context as first argument
+            if (mWeatherClient == null || !mWeatherClient.isOmniJawsEnabled(mContext)) return;
+            mWeatherClient.queryWeather(mContext);
+            mWeatherInfo = mWeatherClient.getWeatherInfo();
+            if (mWeatherInfo != null) {
+                String formattedCondition = mWeatherInfo.condition;
+                if (formattedCondition.toLowerCase().contains("clouds")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_clouds);
+                } else if (formattedCondition.toLowerCase().contains("rain")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_rain);
+                } else if (formattedCondition.toLowerCase().contains("clear")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_clear);
+                } else if (formattedCondition.toLowerCase().contains("storm")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_storm);
+                } else if (formattedCondition.toLowerCase().contains("snow")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_snow);
+                } else if (formattedCondition.toLowerCase().contains("wind")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_wind);
+                } else if (formattedCondition.toLowerCase().contains("mist")) {
+                    formattedCondition = mContext.getString(R.string.weather_condition_mist);
+                }
+                if (formattedCondition.contains("_")) {
+                    String[] words = formattedCondition.split("_");
+                    StringBuilder sb = new StringBuilder();
+                    for (String word : words) {
+                        sb.append(Character.toUpperCase(word.charAt(0))).append(word.substring(1)).append(" ");
+                    }
+                    formattedCondition = sb.toString().trim();
+                }
+                final Drawable d = mWeatherClient.getWeatherConditionImage(mContext, mWeatherInfo.conditionCode);
+                if (weatherButtonFab != null) {
+                    weatherButtonFab.setIcon(d);
+                    weatherButtonFab.setText(mWeatherInfo.temp + mWeatherInfo.tempUnits + " \u2022 " + formattedCondition);
+                    weatherButtonFab.setIconTint(null);
+                }
+                if (weatherButton != null) {
+                    weatherButton.setImageDrawable(d);
+                    weatherButton.setImageTintList(null);
+                }
+            }
+        } catch (Exception e) {}
+    }
+
+    private boolean isWidgetEnabled(String widget) {
+        return (mMainLockscreenWidgetsList != null && mMainLockscreenWidgetsList.contains(widget))
+                || (mSecondaryLockscreenWidgetsList != null && mSecondaryLockscreenWidgetsList.contains(widget));
+    }
+
+    @Override
+    public void onMediaMetadataChanged() { updateMediaPlaybackState(); }
+
+    @Override
+    public void onPlaybackStateChanged() { updateMediaPlaybackState(); }
+
+    private class LockscreenWidgetsObserver extends ContentObserver {
+        public LockscreenWidgetsObserver() {
+            super(new Handler(Looper.getMainLooper()));
+        }
+        @Override
+        public void onChange(boolean selfChange) {
+            super.onChange(selfChange);
+            updateSettings();
+        }
+        void observe() {
+            ContentResolver cr = mContext.getContentResolver();
+            cr.registerContentObserver(Settings.System.getUriFor(LOCKSCREEN_WIDGETS_ENABLED), false, this);
+            cr.registerContentObserver(Settings.System.getUriFor(LOCKSCREEN_WIDGETS), false, this);
+            cr.registerContentObserver(Settings.System.getUriFor(LOCKSCREEN_WIDGETS_EXTRAS), false, this);
+            cr.registerContentObserver(Settings.System.getUriFor(LOCKSCREEN_WIDGETS_STYLE), false, this);
+            cr.registerContentObserver(Settings.System.getUriFor(LOCKSCREEN_WIDGETS_TRANSPARENCY), false, this);
+            updateSettings();
+        }
+        void unobserve() {
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+        void updateSettings() {
+            ContentResolver cr = mContext.getContentResolver();
+            mLockscreenWidgetsEnabled = Settings.System.getInt(cr, LOCKSCREEN_WIDGETS_ENABLED, 0) == 1;
+            mMainLockscreenWidgetsList = Settings.System.getString(cr, LOCKSCREEN_WIDGETS);
+            mSecondaryLockscreenWidgetsList = Settings.System.getString(cr, LOCKSCREEN_WIDGETS_EXTRAS);
+            mThemeStyle = Settings.System.getInt(cr, LOCKSCREEN_WIDGETS_STYLE, 0);
+            mTransparency = Settings.System.getInt(cr, LOCKSCREEN_WIDGETS_TRANSPARENCY, 30) / 100f;
+            if (mMainLockscreenWidgetsList != null) {
+                mMainWidgetsList = Arrays.asList(mMainLockscreenWidgetsList.split(","));
+            }
+            if (mSecondaryLockscreenWidgetsList != null) {
+                mSecondaryWidgetsList = Arrays.asList(mSecondaryLockscreenWidgetsList.split(","));
+            }
+            updateWidgetViews();
+        }
+    }
+
+    private void updateHotspotState() {
+        if (!isWidgetEnabled("hotspot")) return;
+        if (hotspotButton == null && hotspotButtonFab == null) return;
+        String hotspotString = mContext.getResources().getString(HOTSPOT_LABEL);
+        updateTileButtonState(hotspotButton, hotspotButtonFab, mHotspotController.isHotspotEnabled(),
+                HOTSPOT_ACTIVE, HOTSPOT_INACTIVE, hotspotString, hotspotString);
+    }
+
+    private void toggleHotspot() {
+        mHotspotController.setHotspotEnabled(!mHotspotController.isHotspotEnabled());
+        updateHotspotState();
+        mHandler.postDelayed(this::updateHotspotState, 250);
+    }
+
+    private final class HotspotCallback implements HotspotController.Callback {
+        @Override
+        public void onHotspotChanged(boolean enabled, int numDevices) {
+            updateHotspotState();
+        }
+        @Override
+        public void onHotspotAvailabilityChanged(boolean available) {}
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/log/LogBufferHelper.kt b/packages/SystemUI/src/com/android/systemui/log/LogBufferHelper.kt
index 619eac1dbdc33..972bf15fde02d 100644
--- a/packages/SystemUI/src/com/android/systemui/log/LogBufferHelper.kt
+++ b/packages/SystemUI/src/com/android/systemui/log/LogBufferHelper.kt
@@ -22,11 +22,7 @@ class LogBufferHelper {
     companion object {
         /** If necessary, returns a limited maximum size for low ram (Go) devices */
         fun adjustMaxSize(requestedMaxSize: Int): Int {
-            return if (ActivityManager.isLowRamDeviceStatic()) {
-                minOf(requestedMaxSize, 20) /* low ram max log size*/
-            } else {
-                requestedMaxSize
-            }
+            return minOf(requestedMaxSize, 20)
         }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java b/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java
index 6dfe51340cbd9..2ecd12cc37ac5 100644
--- a/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/logcat/LogAccessDialogActivity.java
@@ -138,6 +138,12 @@ protected void onStop() {
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        mHandler.removeMessages(MSG_DISMISS_DIALOG);
+        super.onDestroy();
+    }
+
     private boolean readIntentInfo(Intent intent) {
         if (intent == null) {
             Slog.e(TAG, "Intent is null");
@@ -246,7 +252,9 @@ public void onClick(View view) {
         } catch (RemoteException ignored) {
             // Do nothing.
         } finally {
-            mAlert.dismiss();
+            if (mAlert != null && mAlert.isShowing()) {
+                mAlert.dismiss();
+            }
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/LunarisIdleManager.java b/packages/SystemUI/src/com/android/systemui/matrixx/LunarisIdleManager.java
new file mode 100644
index 0000000000000..dbce3739c959c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/LunarisIdleManager.java
@@ -0,0 +1,789 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx;
+
+import android.app.ActivityManager;
+import android.app.AlarmManager;
+import android.app.usage.UsageStats;
+import android.app.usage.UsageStatsManager;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.BatteryManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class LunarisIdleManager {
+
+    private static final String TAG = "LunarisIdleManager";
+
+    public static final long POLICY_BALANCED_MS = TimeUnit.MINUTES.toMillis(60);
+    public static final long POLICY_AGGRESSIVE_MS = TimeUnit.MINUTES.toMillis(15);
+    public static final long DEFAULT_TIMEOUT_MS = POLICY_BALANCED_MS;
+
+    private static final long ALARM_BUFFER_MS = TimeUnit.MINUTES.toMillis(15);
+    private static final long MIN_DELAY_MS = 100L;
+    private static final long SCAN_INTERVAL_HIGH_MS = TimeUnit.MINUTES.toMillis(15);
+    private static final long SCAN_INTERVAL_MS = TimeUnit.MINUTES.toMillis(5);
+    private static final long SCAN_INTERVAL_CHARGING_MS = TimeUnit.MINUTES.toMillis(20);
+    private static final long SCAN_INTERVAL_LOW_MS = TimeUnit.MINUTES.toMillis(3);
+
+    private static final int BATTERY_LOW_THRESHOLD  = 15;
+    private static final int BATTERY_HIGH_THRESHOLD = 35;
+
+    public static final int STANDBY_BUCKET_ACTIVE = 10;
+    public static final int STANDBY_BUCKET_WORKING_SET = 20;
+    public static final int STANDBY_BUCKET_FREQUENT = 30;
+    public static final int STANDBY_BUCKET_RARE = 40;
+    public static final int STANDBY_BUCKET_RESTRICTED = 45;
+
+    public enum Policy { BALANCED, AGGRESSIVE, CUSTOM }
+
+    public enum IdleAction {
+        STANDBY_BUCKET_RARE,
+        STANDBY_BUCKET_RESTRICTED,
+        KILL_BACKGROUND,
+        FULL_KILL;
+
+        public String toDisplayName() {
+            switch (this) {
+                case STANDBY_BUCKET_RARE: 
+                    return "Rare Bucket";
+                case STANDBY_BUCKET_RESTRICTED: 
+                    return "Restricted";
+                case KILL_BACKGROUND: 
+                    return "Kill BG";
+                case FULL_KILL: 
+                    return "Full Kill";
+                default: 
+                    return name();
+            }
+        }
+    }
+
+    public static final class AppConfig {
+        public final String packageName;
+        public final Policy policy;
+        public final long customTimeoutMs;
+        public final IdleAction action;
+
+        public AppConfig(
+                @NonNull String packageName,
+                @NonNull Policy policy,
+                long customTimeoutMs,
+                @NonNull IdleAction action) {
+            this.packageName = packageName;
+            this.policy = policy;
+            this.customTimeoutMs = customTimeoutMs;
+            this.action = action;
+        }
+
+        public long resolvedTimeoutMs() {
+            switch (policy) {
+                case AGGRESSIVE: 
+                    return POLICY_AGGRESSIVE_MS;
+                case CUSTOM:     
+                    return customTimeoutMs > 0 ? customTimeoutMs : DEFAULT_TIMEOUT_MS;
+                default:         
+                    return POLICY_BALANCED_MS;
+            }
+        }
+
+        public JSONObject toJson() throws Exception {
+            JSONObject o = new JSONObject();
+            o.put("package", packageName);
+            o.put("policy", policy.name());
+            o.put("timeout_minutes", TimeUnit.MILLISECONDS.toMinutes(customTimeoutMs));
+            o.put("action", action.name());
+            return o;
+        }
+
+        public static AppConfig fromJson(@NonNull JSONObject o) throws Exception {
+            String pkg = o.getString("package");
+            Policy pol = Policy.valueOf(o.optString("policy", "BALANCED"));
+            long mins = o.optLong("timeout_minutes", 60);
+            IdleAction act = parseAction(o.optString("action",
+                    IdleAction.STANDBY_BUCKET_RARE.name()));
+            return new AppConfig(pkg, pol, TimeUnit.MINUTES.toMillis(mins), act);
+        }
+
+        private static IdleAction parseAction(String s) {
+            try {
+                return IdleAction.valueOf(s);
+            }
+            catch (Exception e) {
+                return IdleAction.STANDBY_BUCKET_RARE;
+            }
+        }
+    }
+
+    public static final class AppEnforcementRecord {
+        public final String packageName;
+        public final IdleAction actionTaken;
+        public final long timestampMs;
+        public final int killCount;
+
+        public AppEnforcementRecord(String pkg, IdleAction action, long ts, int count) {
+            this.packageName = pkg;
+            this.actionTaken = action;
+            this.timestampMs = ts;
+            this.killCount = count;
+        }
+
+        public JSONObject toJson() throws Exception {
+            JSONObject o = new JSONObject();
+            o.put("package", packageName);
+            o.put("action", actionTaken.name());
+            o.put("ts", timestampMs);
+            o.put("kill_count", killCount);
+            return o;
+        }
+
+        public static AppEnforcementRecord fromJson(JSONObject o) throws Exception {
+            return new AppEnforcementRecord(
+                    o.getString("package"),
+                    IdleAction.valueOf(o.optString("action",
+                            IdleAction.STANDBY_BUCKET_RARE.name())),
+                    o.optLong("ts", 0L),
+                    o.optInt("kill_count", 0)
+            );
+        }
+    }
+
+    private static final class AppIdleState {
+        int currentBucket = STANDBY_BUCKET_ACTIVE;
+        boolean isRestricted = false;
+        long restrictedAtMs = 0L;
+    }
+
+    private static volatile LunarisIdleManager sInstance;
+    private static final Object sLock = new Object();
+
+    private final Context mContext;
+    private final Handler mMainHandler;
+    private final ActivityManager mActivityManager;
+    private final AlarmManager mAlarmManager;
+    private final AudioManager mAudioManager;
+    private final UsageStatsManager mUsageStatsManager;
+    private final Executor mIoExecutor;
+
+    private volatile boolean mEnabled = true;
+    private volatile Map<String, AppConfig> mAppConfigCache = Collections.emptyMap();
+
+    private final Map<String, AppIdleState> mAppIdleStates = new ConcurrentHashMap<>();
+    private final Map<String, Long> mLastKillTime = new ConcurrentHashMap<>();
+
+    private volatile int mBatteryLevel = 100;
+    private volatile boolean mIsCharging = false;
+
+    private BroadcastReceiver mBatteryReceiver;
+    private ContentObserver mSettingsObserver;
+    private Runnable mScanRunnable;
+    private Runnable mHaltRunnable;
+    private volatile boolean mIsRunning = false;
+
+    private LunarisIdleManager(@NonNull Context context) {
+        mContext = context.getApplicationContext();
+        mMainHandler = new Handler(Looper.getMainLooper());
+        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        mUsageStatsManager = (UsageStatsManager) mContext.getSystemService(Context.USAGE_STATS_SERVICE);
+
+        mIoExecutor = Executors.newSingleThreadExecutor(r -> {
+            Thread t = new Thread(r, "LunarisIdleManager-IO");
+            t.setDaemon(true);
+            return t;
+        });
+
+        loadConfigFromSettings();
+        registerSettingsObserver();
+        registerBatteryReceiver();
+        initRunnables();
+    }
+
+    public static void initManager(@NonNull Context context) {
+        if (sInstance == null) {
+            synchronized (sLock) {
+                if (sInstance == null) {
+                    sInstance = new LunarisIdleManager(context);
+                }
+            }
+        }
+    }
+
+    @Nullable
+    public static LunarisIdleManager getInstance() { return sInstance; }
+
+    public void executeManager() {
+        if (!mEnabled) {
+            Log.d(TAG, "LunarisIdleManager disabled — skipping");
+            return;
+        }
+        if (mIsRunning) {
+            Log.d(TAG, "Already running — ignoring duplicate start");
+            return;
+        }
+        mIsRunning = true;
+        cancelCallbacks();
+
+        Log.d(TAG, "executeManager: appCount=" + mAppConfigCache.size()
+                + " enabled=" + mEnabled);
+
+        long timeUntilAlarm = getMillisUntilNextAlarm();
+        long firstDelay;
+
+        if (timeUntilAlarm > 0 && timeUntilAlarm < getMinConfiguredTimeout()) {
+            firstDelay = MIN_DELAY_MS;
+            Log.d(TAG, "Alarm soon — scheduling immediate scan");
+        } else {
+            firstDelay = getMinConfiguredTimeout();
+            Log.d(TAG, "First scan in "
+                    + TimeUnit.MILLISECONDS.toMinutes(firstDelay) + " min");
+        }
+
+        mMainHandler.postDelayed(mScanRunnable, firstDelay);
+
+        if (timeUntilAlarm > ALARM_BUFFER_MS) {
+            mMainHandler.postDelayed(mHaltRunnable, timeUntilAlarm - ALARM_BUFFER_MS);
+        }
+    }
+
+    public void haltManager() {
+        Log.d(TAG, "Halting LunarisIdleManager");
+        cancelCallbacks();
+        mIsRunning = false;
+    }
+
+    public void cleanup() {
+        haltManager();
+        unregisterSettingsObserver();
+        unregisterBatteryReceiver();
+        synchronized (sLock) { sInstance = null; }
+    }
+
+    public boolean isEnabled() {
+        return mEnabled;
+    }
+
+    public boolean isRunning() {
+        return mIsRunning;
+    }
+
+    public Map<String, AppConfig> getAppConfigs() {
+        return Collections.unmodifiableMap(mAppConfigCache);
+    }
+
+    public void setEnabled(boolean enabled) {
+        mEnabled = enabled;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.IDLE_MANAGER, enabled ? 1 : 0);
+        if (!enabled) {
+            haltManager();
+            restoreAllBuckets();
+        }
+    }
+
+    public void saveAppConfigs(@NonNull Map<String, AppConfig> configs) {
+        mAppConfigCache = new HashMap<>(configs);
+        persistAppConfigs(configs);
+    }
+
+    public void addOrUpdateApp(@NonNull AppConfig config) {
+        Map<String, AppConfig> updated = new HashMap<>(mAppConfigCache);
+        updated.put(config.packageName, config);
+        saveAppConfigs(updated);
+    }
+
+    public void removeApp(@NonNull String packageName) {
+        Map<String, AppConfig> updated = new HashMap<>(mAppConfigCache);
+        updated.remove(packageName);
+        saveAppConfigs(updated);
+        restoreBucket(packageName);
+        mAppIdleStates.remove(packageName);
+        mLastKillTime.remove(packageName);
+    }
+
+    @NonNull
+    public List<AppEnforcementRecord> getEnforcementRecords() {
+        List<AppEnforcementRecord> records = new ArrayList<>();
+        String json = Settings.Secure.getString(
+                mContext.getContentResolver(), Settings.Secure.IDLE_MANAGER_KILL_STATS);
+        if (json == null || json.isEmpty()) return records;
+        try {
+            JSONObject root = new JSONObject(json);
+            for (java.util.Iterator<String> it = root.keys(); it.hasNext(); ) {
+                String pkg = it.next();
+                JSONObject entry = root.optJSONObject(pkg);
+                if (entry == null) continue;
+                records.add(new AppEnforcementRecord(
+                        pkg,
+                        parseAction(entry.optString("last_action",
+                                IdleAction.STANDBY_BUCKET_RARE.name())),
+                        entry.optLong("last_kill", 0L),
+                        entry.optInt("count", 0)
+                ));
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse enforcement records", e);
+        }
+        records.sort((a, b) -> Long.compare(b.timestampMs, a.timestampMs));
+        return records;
+    }
+
+    private static IdleAction parseAction(String s) {
+        try { return IdleAction.valueOf(s); }
+        catch (Exception e) { return IdleAction.STANDBY_BUCKET_RARE; }
+    }
+
+    private void initRunnables() {
+        mScanRunnable = () -> {
+            mIoExecutor.execute(this::performIdleScan);
+            if (mIsRunning) {
+                long interval = getDynamicScanIntervalMs();
+                Log.d(TAG, "Next scan in "
+                        + TimeUnit.MILLISECONDS.toMinutes(interval)
+                        + " min [battery=" + mBatteryLevel
+                        + "%, charging=" + mIsCharging + "]");
+                mMainHandler.postDelayed(mScanRunnable, interval);
+            }
+        };
+        mHaltRunnable = this::haltManager;
+    }
+
+    private void performIdleScan() {
+        if (mActivityManager == null || mUsageStatsManager == null) return;
+
+        Log.d(TAG, "performIdleScan: evaluating " + mAppConfigCache.size() + " configured apps");
+
+        List<ActivityManager.RunningAppProcessInfo> processes;
+        try {
+            processes = mActivityManager.getRunningAppProcesses();
+        } catch (Exception e) {
+            Log.e(TAG, "Error fetching processes", e);
+            return;
+        }
+        if (processes == null) processes = Collections.emptyList();
+
+        Set<String> foregroundPkgs = getForegroundPackages(processes);
+        boolean audioActive = isAudioActive();
+        long now = System.currentTimeMillis();
+        int restricted = 0;
+        int killed = 0;
+
+        for (Map.Entry<String, AppConfig> entry : mAppConfigCache.entrySet()) {
+            String pkg = entry.getKey();
+            AppConfig cfg = entry.getValue();
+
+            if (foregroundPkgs.contains(pkg)) {
+                Log.v(TAG, "Skipping foreground: " + pkg);
+                continue;
+            }
+
+            if (audioActive && isActiveMediaApp(pkg, processes)) {
+                Log.v(TAG, "Skipping active media: " + pkg);
+                continue;
+            }
+
+            long timeoutMs = cfg.resolvedTimeoutMs();
+
+            if (!isAppIdleLongEnough(pkg, timeoutMs, now)) {
+                Log.v(TAG, "Not idle long enough: " + pkg);
+                continue;
+            }
+
+            boolean didAct = false;
+
+            switch (cfg.action) {
+                case STANDBY_BUCKET_RARE:
+                    didAct = applyStandbyBucket(pkg, STANDBY_BUCKET_RARE);
+                    if (didAct) restricted++;
+                    break;
+                case STANDBY_BUCKET_RESTRICTED:
+                    didAct = applyStandbyBucket(pkg, STANDBY_BUCKET_RESTRICTED);
+                    if (didAct) restricted++;
+                    break;
+                case KILL_BACKGROUND:
+                    didAct = killBackground(pkg, now, timeoutMs);
+                    if (didAct) killed++;
+                    break;
+                case FULL_KILL:
+                    boolean r = applyStandbyBucket(pkg, STANDBY_BUCKET_RESTRICTED);
+                    boolean k = forceStop(pkg, now, timeoutMs);
+                    didAct = r || k;
+                    if (r) restricted++;
+                    if (k) killed++;
+                    break;
+            }
+
+            if (didAct) {
+                updateKillStats(pkg, now, cfg.action);
+            }
+        }
+
+        Log.i(TAG, "Scan done — restricted=" + restricted
+                + " killed=" + killed
+                + " total=" + mAppConfigCache.size());
+    }
+
+    private boolean applyStandbyBucket(String pkg, int targetBucket) {
+        if (mUsageStatsManager == null) return false;
+
+        AppIdleState state = mAppIdleStates.computeIfAbsent(pkg, k -> new AppIdleState());
+        if (state.isRestricted && state.currentBucket <= targetBucket) {
+            return false;
+        }
+
+        try {
+            mUsageStatsManager.setAppStandbyBucket(pkg, targetBucket);
+            state.isRestricted = true;
+            state.currentBucket = targetBucket;
+            state.restrictedAtMs = System.currentTimeMillis();
+
+            Log.d(TAG, "Bucket applied ["
+                    + bucketName(targetBucket) + "]: " + pkg);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to set standby bucket for "
+                    + pkg + ": " + e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean killBackground(String pkg, long now, long timeoutMs) {
+        Long lastKill = mLastKillTime.get(pkg);
+        if (lastKill != null && (now - lastKill) < timeoutMs) {
+            return false;
+        }
+        try {
+            mActivityManager.killBackgroundProcesses(pkg);
+            mLastKillTime.put(pkg, now);
+            Log.d(TAG, "Killed background: " + pkg);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to kill " + pkg + ": " + e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean forceStop(String pkg, long now, long timeoutMs) {
+        Long lastKill = mLastKillTime.get(pkg);
+        if (lastKill != null && (now - lastKill) < timeoutMs) {
+            return false;
+        }
+        try {
+            java.lang.reflect.Method method = mActivityManager.getClass()
+                    .getMethod("forceStopPackage", String.class);
+            method.invoke(mActivityManager, pkg);
+            mLastKillTime.put(pkg, now);
+            Log.d(TAG, "Force stopped: " + pkg);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "forceStop failed for " + pkg + ": " + e.getMessage());
+            return killBackground(pkg, now, timeoutMs);
+        }
+    }
+
+    private void restoreBucket(String pkg) {
+        AppIdleState state = mAppIdleStates.get(pkg);
+        if (state == null || !state.isRestricted) return;
+        try {
+            mUsageStatsManager.setAppStandbyBucket(pkg, STANDBY_BUCKET_WORKING_SET);
+            state.isRestricted  = false;
+            state.currentBucket = STANDBY_BUCKET_WORKING_SET;
+            Log.d(TAG, "Bucket restored (WORKING_SET): " + pkg);
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to restore bucket for " + pkg);
+        }
+    }
+
+    private void restoreAllBuckets() {
+        mIoExecutor.execute(() -> {
+            for (String pkg : new HashSet<>(mAppIdleStates.keySet())) {
+                restoreBucket(pkg);
+            }
+        });
+    }
+
+    private static String bucketName(int bucket) {
+        switch (bucket) {
+            case STANDBY_BUCKET_ACTIVE: 
+                return "ACTIVE";
+            case STANDBY_BUCKET_WORKING_SET: 
+                return "WORKING_SET";
+            case STANDBY_BUCKET_FREQUENT: 
+                return "FREQUENT";
+            case STANDBY_BUCKET_RARE: 
+                return "RARE";
+            case STANDBY_BUCKET_RESTRICTED: 
+                return "RESTRICTED";
+            default: 
+                return "UNKNOWN(" + bucket + ")";
+        }
+    }
+
+    private boolean isAppIdleLongEnough(String pkg, long timeoutMs, long now) {
+        try {
+            long begin = now - timeoutMs;
+            Map<String, UsageStats> stats =
+                    mUsageStatsManager.queryAndAggregateUsageStats(begin, now);
+
+            if (stats == null || stats.isEmpty()) {
+                Log.w(TAG, "UsageStats returned empty — "
+                        + "check PACKAGE_USAGE_STATS grant. Treating " + pkg + " as idle.");
+                return true;
+            }
+
+            UsageStats appStats = stats.get(pkg);
+            if (appStats == null) {
+                Log.v(TAG, pkg + ": no usage in window → idle");
+                return true;
+            }
+
+            long lastUsed = appStats.getLastTimeUsed();
+            long idleDuration = now - lastUsed;
+
+            Log.v(TAG, pkg + ": idle for "
+                    + TimeUnit.MILLISECONDS.toMinutes(idleDuration)
+                    + " min (threshold="
+                    + TimeUnit.MILLISECONDS.toMinutes(timeoutMs) + " min)");
+
+            return idleDuration >= timeoutMs;
+
+        } catch (Exception e) {
+            Log.w(TAG, "UsageStats query failed for " + pkg + ": " + e.getMessage());
+            Long lastKill = mLastKillTime.get(pkg);
+            return lastKill == null || (now - lastKill) >= timeoutMs;
+        }
+    }
+
+    private Set<String> getForegroundPackages(
+            @NonNull List<ActivityManager.RunningAppProcessInfo> processes) {
+        Set<String> fg = new HashSet<>();
+        for (ActivityManager.RunningAppProcessInfo p : processes) {
+            if (p.importance
+                    <= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE
+                    && p.pkgList != null) {
+                for (String pkg : p.pkgList) fg.add(pkg);
+            }
+        }
+        return fg;
+    }
+
+    private boolean isAudioActive() {
+        if (mAudioManager == null) return false;
+        try { return mAudioManager.isMusicActive(); }
+        catch (Exception e) { return false; }
+    }
+
+    private boolean isActiveMediaApp(@NonNull String pkg,
+            @NonNull List<ActivityManager.RunningAppProcessInfo> processes) {
+        for (ActivityManager.RunningAppProcessInfo p : processes) {
+            if (p.pkgList == null) continue;
+            for (String name : p.pkgList) {
+                if (name.equals(pkg)) {
+                    return p.importance
+                            <= ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void loadConfigFromSettings() {
+        ContentResolver cr = mContext.getContentResolver();
+        mEnabled = Settings.Secure.getInt(cr, Settings.Secure.IDLE_MANAGER, 1) == 1;
+        String appsJson = Settings.Secure.getString(cr, Settings.Secure.IDLE_MANAGER_APPS);
+        Log.d(TAG, "loadConfigFromSettings: json=" + appsJson);
+        mAppConfigCache = parseAppConfigs(appsJson);
+        Log.d(TAG, "Config loaded — enabled=" + mEnabled
+                + ", apps=" + mAppConfigCache.size());
+    }
+
+    private void registerSettingsObserver() {
+        ContentResolver cr = mContext.getContentResolver();
+        mSettingsObserver = new ContentObserver(mMainHandler) {
+            @Override
+            public void onChange(boolean selfChange, @Nullable Uri uri) {
+                Log.d(TAG, "Settings changed — refreshing config");
+                loadConfigFromSettings();
+            }
+        };
+        for (String key : new String[]{
+                Settings.Secure.IDLE_MANAGER,
+                Settings.Secure.IDLE_MANAGER_APPS,
+                Settings.Secure.IDLE_MANAGER_TIMEOUT}) {
+            cr.registerContentObserver(
+                    Settings.Secure.getUriFor(key), false, mSettingsObserver);
+        }
+    }
+
+    private void unregisterSettingsObserver() {
+        if (mSettingsObserver != null)
+            mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
+    }
+
+    private void registerBatteryReceiver() {
+        mBatteryReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
+                int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
+                int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS,
+                        BatteryManager.BATTERY_STATUS_UNKNOWN);
+                if (level >= 0 && scale > 0)
+                    mBatteryLevel = (int) ((level / (float) scale) * 100);
+                mIsCharging = status == BatteryManager.BATTERY_STATUS_CHARGING
+                        || status == BatteryManager.BATTERY_STATUS_FULL;
+            }
+        };
+        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        Intent sticky = mContext.registerReceiver(mBatteryReceiver, filter);
+        if (sticky != null) mBatteryReceiver.onReceive(mContext, sticky);
+    }
+
+    private void unregisterBatteryReceiver() {
+        if (mBatteryReceiver != null) {
+            try { mContext.unregisterReceiver(mBatteryReceiver); }
+            catch (IllegalArgumentException ignored) {}
+            mBatteryReceiver = null;
+        }
+    }
+
+    private void persistAppConfigs(@NonNull Map<String, AppConfig> configs) {
+        mIoExecutor.execute(() -> {
+            try {
+                JSONArray arr = new JSONArray();
+                for (AppConfig c : configs.values()) arr.put(c.toJson());
+                Settings.Secure.putString(
+                        mContext.getContentResolver(),
+                        Settings.Secure.IDLE_MANAGER_APPS, arr.toString());
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to persist configs", e);
+            }
+        });
+    }
+
+    @NonNull
+    private Map<String, AppConfig> parseAppConfigs(@Nullable String json) {
+        if (json == null || json.isEmpty()) return Collections.emptyMap();
+        Map<String, AppConfig> map = new HashMap<>();
+        try {
+            JSONArray arr = new JSONArray(json);
+            for (int i = 0; i < arr.length(); i++) {
+                AppConfig c = AppConfig.fromJson(arr.getJSONObject(i));
+                map.put(c.packageName, c);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to parse configs: " + e.getMessage());
+        }
+        return map;
+    }
+
+    private void updateKillStats(@NonNull String pkg, long tsMs, @NonNull IdleAction action) {
+        mIoExecutor.execute(() -> {
+            ContentResolver cr = mContext.getContentResolver();
+            try {
+                String existing = Settings.Secure.getString(
+                        cr, Settings.Secure.IDLE_MANAGER_KILL_STATS);
+                Log.d(TAG, "updateKillStats: existing=" + existing);
+
+                JSONObject root = (existing != null && !existing.isEmpty())
+                        ? new JSONObject(existing) : new JSONObject();
+
+                JSONObject entry = root.optJSONObject(pkg);
+                if (entry == null) entry = new JSONObject();
+
+                entry.put("count", entry.optInt("count", 0) + 1);
+                entry.put("last_kill",   tsMs);
+                entry.put("last_action", action.name());
+                root.put(pkg, entry);
+
+                String newJson = root.toString();
+                boolean wrote = Settings.Secure.putString(
+                        cr, Settings.Secure.IDLE_MANAGER_KILL_STATS, newJson);
+                Log.d(TAG, "updateKillStats: wrote=" + wrote
+                        + " pkg=" + pkg + " count=" + entry.optInt("count")
+                        + " action=" + action.name());
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to update stats for " + pkg, e);
+            }
+        });
+    }
+
+    private long getMinConfiguredTimeout() {
+        if (mAppConfigCache.isEmpty()) return DEFAULT_TIMEOUT_MS;
+        long min = Long.MAX_VALUE;
+        for (AppConfig c : mAppConfigCache.values())
+            min = Math.min(min, c.resolvedTimeoutMs());
+        return min == Long.MAX_VALUE ? DEFAULT_TIMEOUT_MS : min;
+    }
+
+    private long getDynamicScanIntervalMs() {
+        if (mIsCharging) 
+            return SCAN_INTERVAL_CHARGING_MS;
+        if (mBatteryLevel <= BATTERY_LOW_THRESHOLD) 
+            return SCAN_INTERVAL_LOW_MS;
+        if (mBatteryLevel > BATTERY_HIGH_THRESHOLD) 
+            return SCAN_INTERVAL_HIGH_MS;
+        return SCAN_INTERVAL_MS;
+    }
+
+    private long getMillisUntilNextAlarm() {
+        if (mAlarmManager == null) return 0;
+        try {
+            AlarmManager.AlarmClockInfo info = mAlarmManager.getNextAlarmClock();
+            if (info != null)
+                return Math.max(0, info.getTriggerTime() - System.currentTimeMillis());
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading next alarm", e);
+        }
+        return 0;
+    }
+
+    private void cancelCallbacks() {
+        if (mScanRunnable != null) 
+            mMainHandler.removeCallbacks(mScanRunnable);
+        if (mHaltRunnable != null) 
+            mMainHandler.removeCallbacks(mHaltRunnable);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBar.java b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBar.java
new file mode 100644
index 0000000000000..77d41163dd610
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBar.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.batterybar;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.graphics.drawable.Animatable;
+import android.os.BatteryManager;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.tuner.TunerService;
+
+public class BatteryBar extends RelativeLayout implements Animatable, TunerService.Tunable {
+
+    private static final String TAG = BatteryBar.class.getSimpleName();
+
+    // Total animation duration
+    private static final int ANIM_DURATION = 1000; // 5 seconds
+
+    // When to use the low battery color
+    private static final int BATTERY_LOW_VALUE = 20;
+
+    private boolean mAttached = false;
+    private int mBatteryLevel = 0;
+    private int mChargingLevel = -1;
+    private boolean mBatteryCharging = false;
+    private boolean shouldAnimateCharging = true;
+    private boolean isAnimating = false;
+
+    int mLocation;
+    private int mColor;
+    private int mChargingColor;
+    private int mBatteryLowColor;
+    private boolean mUseChargingColor;
+    private boolean mBlendColor;
+    private boolean mBlendColorReversed;
+
+    LinearLayout mBatteryBarLayout;
+    View mBatteryBar;
+
+    LinearLayout mChargerLayout;
+    View mCharger;
+
+    public static final int STYLE_REGULAR = 0;
+    public static final int STYLE_SYMMETRIC = 1;
+
+    boolean vertical = false;
+
+    private static final String STATUSBAR_BATTERY_BAR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR;
+    private static final String STATUSBAR_BATTERY_BAR_COLOR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_COLOR;
+    private static final String STATUSBAR_BATTERY_BAR_CHARGING_COLOR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_CHARGING_COLOR;
+    private static final String STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR;
+    private static final String STATUSBAR_BATTERY_BAR_ANIMATE =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_ANIMATE;
+    private static final String STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR;
+    private static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_BLEND_COLOR;
+    private static final String STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE;
+
+    public BatteryBar(Context context) {
+        this(context, null);
+    }
+
+    public BatteryBar(Context context, boolean isCharging, int currentCharge) {
+        this(context, null);
+
+        mBatteryLevel = currentCharge;
+        mBatteryCharging = isCharging;
+    }
+
+    public BatteryBar(Context context, boolean isCharging, int currentCharge, boolean isVertical) {
+        this(context, null);
+
+        mBatteryLevel = currentCharge;
+        mBatteryCharging = isCharging;
+        vertical = isVertical;
+    }
+
+    public BatteryBar(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public BatteryBar(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAttached)
+            return;
+
+        mAttached = true;
+
+        mBatteryBarLayout = new LinearLayout(mContext);
+        addView(mBatteryBarLayout, new RelativeLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                LayoutParams.MATCH_PARENT));
+
+        mBatteryBar = new View(mContext);
+        mBatteryBarLayout.addView(mBatteryBar, new LinearLayout.LayoutParams(
+                LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
+        float dp = 4f;
+        int pixels = (int) (metrics.density * dp + 0.5f);
+
+        // charger
+        mChargerLayout = new LinearLayout(mContext);
+
+        if (vertical)
+            addView(mChargerLayout, new RelativeLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                    pixels));
+        else
+            addView(mChargerLayout, new RelativeLayout.LayoutParams(pixels,
+                    LayoutParams.MATCH_PARENT));
+
+        mCharger = new View(mContext);
+        mChargerLayout.setVisibility(View.GONE);
+        mChargerLayout.addView(mCharger, new LinearLayout.LayoutParams(
+                LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
+        filter.addAction(Intent.ACTION_SCREEN_ON);
+        getContext().registerReceiver(mIntentReceiver, filter, null, getHandler());
+
+        Dependency.get(TunerService.class).addTunable(this,
+                STATUSBAR_BATTERY_BAR,
+                STATUSBAR_BATTERY_BAR_COLOR,
+                STATUSBAR_BATTERY_BAR_CHARGING_COLOR,
+                STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR,
+                STATUSBAR_BATTERY_BAR_ANIMATE,
+                STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR,
+                STATUSBAR_BATTERY_BAR_BLEND_COLOR,
+                STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (!mAttached)
+            return;
+
+        mAttached = false;
+
+        Dependency.get(TunerService.class).removeTunable(this);
+        getContext().unregisterReceiver(mIntentReceiver);
+    }
+
+    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                mBatteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                mBatteryCharging = intent.getIntExtra(BatteryManager.EXTRA_STATUS, 0) == BatteryManager.BATTERY_STATUS_CHARGING;
+                if (mBatteryCharging && mBatteryLevel < 100) {
+                    start();
+                } else {
+                    stop();
+                }
+                setProgress(mBatteryLevel);
+            } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
+                stop();
+            } else if (Intent.ACTION_SCREEN_ON.equals(action)) {
+                if (mBatteryCharging && mBatteryLevel < 100) {
+                    start();
+                }
+            }
+        }
+    };
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case STATUSBAR_BATTERY_BAR:
+                mLocation =
+                        TunerService.parseInteger(newValue, 0);
+                break;
+            case STATUSBAR_BATTERY_BAR_COLOR:
+                mColor =
+                        TunerService.parseInteger(newValue, 0xff76c124);
+                break;
+            case STATUSBAR_BATTERY_BAR_CHARGING_COLOR:
+                mChargingColor =
+                        TunerService.parseInteger(newValue, 0xffffc90f);
+                break;
+            case STATUSBAR_BATTERY_BAR_BATTERY_LOW_COLOR:
+                mBatteryLowColor =
+                        TunerService.parseInteger(newValue, 0xfff90028);
+                break;
+            case STATUSBAR_BATTERY_BAR_ANIMATE:
+                shouldAnimateCharging =
+                        TunerService.parseIntegerSwitch(newValue, true);
+                break;
+            case STATUSBAR_BATTERY_BAR_ENABLE_CHARGING_COLOR:
+                mUseChargingColor =
+                        TunerService.parseIntegerSwitch(newValue, true);
+                break;
+            case STATUSBAR_BATTERY_BAR_BLEND_COLOR:
+                mBlendColor =
+                        TunerService.parseIntegerSwitch(newValue, true);
+                break;
+            case STATUSBAR_BATTERY_BAR_BLEND_COLOR_REVERSE:
+                mBlendColorReversed =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                break;
+            default:
+                break;
+        }
+        if (mLocation > 0 && shouldAnimateCharging && mBatteryCharging && mBatteryLevel < 100) {
+            start();
+        } else {
+            stop();
+        }
+        setProgress(mBatteryLevel);
+    }
+
+    private void setProgress(int n) {
+        if (vertical) {
+            int w = (int) (((getHeight() / 100.0) * n) + 0.5);
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mBatteryBarLayout
+                    .getLayoutParams();
+            params.height = w;
+            mBatteryBarLayout.setLayoutParams(params);
+
+        } else {
+            int w = (int) (((getWidth() / 100.0) * n) + 0.5);
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mBatteryBarLayout
+                    .getLayoutParams();
+            params.width = w;
+            mBatteryBarLayout.setLayoutParams(params);
+        }
+        // Update color
+        int color = getColorForPercent(n);
+        mBatteryBar.setBackgroundColor(color);
+        mCharger.setBackgroundColor(color);
+    }
+
+    @Override
+    public void start() {
+        if (!shouldAnimateCharging)
+            return;
+
+        if (vertical) {
+            TranslateAnimation a = new TranslateAnimation(getX(), getX(), getHeight(),
+                    mBatteryBarLayout.getHeight());
+            a.setInterpolator(new AccelerateInterpolator());
+            a.setDuration(ANIM_DURATION);
+            a.setRepeatCount(Animation.INFINITE);
+            mChargerLayout.startAnimation(a);
+            mChargerLayout.setVisibility(View.VISIBLE);
+        } else {
+            TranslateAnimation a = new TranslateAnimation(getWidth(), mBatteryBarLayout.getWidth(),
+                    getTop(), getTop());
+            a.setInterpolator(new AccelerateInterpolator());
+            a.setDuration(ANIM_DURATION);
+            a.setRepeatCount(Animation.INFINITE);
+            mChargerLayout.startAnimation(a);
+            mChargerLayout.setVisibility(View.VISIBLE);
+        }
+        isAnimating = true;
+    }
+
+    @Override
+    public void stop() {
+        mChargerLayout.clearAnimation();
+        mChargerLayout.setVisibility(View.GONE);
+        isAnimating = false;
+    }
+
+    @Override
+    public boolean isRunning() {
+        return isAnimating;
+    }
+
+    private static int getBlendColorForPercent(int fullColor, int emptyColor, boolean reversed,
+                                        int percentage) {
+        float[] newColor = new float[3];
+        float[] empty = new float[3];
+        float[] full = new float[3];
+        Color.colorToHSV(fullColor, full);
+        int fullAlpha = Color.alpha(fullColor);
+        Color.colorToHSV(emptyColor, empty);
+        int emptyAlpha = Color.alpha(emptyColor);
+        float blendFactor = percentage/100f;
+        if (reversed) {
+            if (empty[0] < full[0]) {
+                empty[0] += 360f;
+            }
+            newColor[0] = empty[0] - (empty[0]-full[0])*blendFactor;
+        } else {
+            if (empty[0] > full[0]) {
+                full[0] += 360f;
+            }
+            newColor[0] = empty[0] + (full[0]-empty[0])*blendFactor;
+        }
+        if (newColor[0] > 360f) {
+            newColor[0] -= 360f;
+        } else if (newColor[0] < 0) {
+            newColor[0] += 360f;
+        }
+        newColor[1] = empty[1] + ((full[1]-empty[1])*blendFactor);
+        newColor[2] = empty[2] + ((full[2]-empty[2])*blendFactor);
+        int newAlpha = (int) (emptyAlpha + ((fullAlpha-emptyAlpha)*blendFactor));
+        return Color.HSVToColor(newAlpha, newColor);
+    }
+
+    private int getColorForPercent(int percentage) {
+        if (mBatteryCharging && mUseChargingColor) {
+            return mChargingColor;
+        } else if (mBlendColor) {
+            return getBlendColorForPercent(mColor, mBatteryLowColor,
+                    mBlendColorReversed, percentage);
+        } else {
+            return percentage > BATTERY_LOW_VALUE ? mColor : mBatteryLowColor;
+        }
+    }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBarController.java b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBarController.java
new file mode 100644
index 0000000000000..32f4617c1d341
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/BatteryBarController.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.batterybar;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.os.BatteryManager;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.tuner.TunerService;
+
+public class BatteryBarController extends LinearLayout implements TunerService.Tunable {
+
+    private static final String TAG = "BatteryBarController";
+
+    BatteryBar mainBar;
+    BatteryBar alternateStyleBar;
+
+    public static final int STYLE_REGULAR = 0;
+    public static final int STYLE_SYMMETRIC = 1;
+    public static final int STYLE_REVERSE = 2;
+
+    int mStyle;
+    int mLocation;
+    int mThickness;
+
+    protected final static int CURRENT_LOC = 1;
+
+    private boolean mAttached = false;
+    private int mBatteryLevel = 0;
+    private boolean mBatteryCharging = false;
+
+    boolean isVertical = false;
+
+    private static final String STATUSBAR_BATTERY_BAR =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR;
+    private static final String STATUSBAR_BATTERY_BAR_STYLE =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_STYLE;
+    private static final String STATUSBAR_BATTERY_BAR_THICKNESS =
+            "system:" + Settings.System.STATUSBAR_BATTERY_BAR_THICKNESS;
+
+    public BatteryBarController(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAttached)
+            return;
+
+        mAttached = true;
+
+        isVertical = (getLayoutParams().height == LayoutParams.MATCH_PARENT);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        getContext().registerReceiver(mIntentReceiver, filter);
+
+        Dependency.get(TunerService.class).addTunable(this,
+                STATUSBAR_BATTERY_BAR,
+                STATUSBAR_BATTERY_BAR_STYLE,
+                STATUSBAR_BATTERY_BAR_THICKNESS);
+    }
+
+    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                mBatteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                mBatteryCharging = intent.getIntExtra(BatteryManager.EXTRA_STATUS, 0) == BatteryManager.BATTERY_STATUS_CHARGING;
+                Prefs.setLastBatteryLevel(context, mBatteryLevel);
+            }
+        }
+    };
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (!mAttached)
+            return;
+
+        mAttached = false;
+
+        Dependency.get(TunerService.class).removeTunable(this);
+        getContext().unregisterReceiver(mIntentReceiver);
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (mAttached) {
+            getHandler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    addBars();
+                }
+            }, 500);
+        }
+    }
+
+    public void configThickness() {
+        DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
+        int pixels = (int) ((metrics.density * mThickness) + 0.5);
+
+        ViewGroup.LayoutParams params = (ViewGroup.LayoutParams) getLayoutParams();
+
+        if (isVertical)
+            params.width = pixels;
+        else
+            params.height = pixels;
+        setLayoutParams(params);
+
+        if (isVertical)
+            params.width = pixels;
+        else
+            params.height = pixels;
+
+        setLayoutParams(params);
+    }
+
+    public void addBars() {
+        removeAllViews();
+
+        if (mLocation == 0)
+            return;
+
+        configThickness();
+
+        mBatteryLevel = Prefs.getLastBatteryLevel(getContext());
+        if (mStyle == STYLE_REGULAR) {
+            addView(new BatteryBar(mContext, mBatteryCharging, mBatteryLevel, isVertical),
+                    new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                            LayoutParams.MATCH_PARENT, 1));
+        } else if (mStyle == STYLE_SYMMETRIC) {
+            BatteryBar bar1 = new BatteryBar(mContext, mBatteryCharging, mBatteryLevel, isVertical);
+            BatteryBar bar2 = new BatteryBar(mContext, mBatteryCharging, mBatteryLevel, isVertical);
+
+            if (isVertical) {
+                bar2.setRotation(180);
+                addView(bar2, (new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        LayoutParams.MATCH_PARENT, 1)));
+                addView(bar1, (new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        LayoutParams.MATCH_PARENT, 1)));
+            } else {
+                bar1.setRotation(180);
+                addView(bar1, (new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        LayoutParams.MATCH_PARENT, 1)));
+                addView(bar2, (new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        LayoutParams.MATCH_PARENT, 1)));
+            }
+        } else if (mStyle == STYLE_REVERSE) {
+            BatteryBar bar = new BatteryBar(mContext, mBatteryCharging, mBatteryLevel, isVertical);
+            bar.setRotation(180);
+            addView(bar, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                        LayoutParams.MATCH_PARENT, 1));
+        }
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case STATUSBAR_BATTERY_BAR:
+                mLocation =
+                        newValue == null ? 0 : Integer.parseInt(newValue);
+                addBars();
+                break;
+            case STATUSBAR_BATTERY_BAR_STYLE:
+                mStyle =
+                        newValue == null ? STYLE_REGULAR : Integer.parseInt(newValue);
+                addBars();
+                break;
+            case STATUSBAR_BATTERY_BAR_THICKNESS:
+                mThickness =
+                        newValue == null ? 2 : Integer.parseInt(newValue);
+                configThickness();
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/Prefs.java b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/Prefs.java
new file mode 100644
index 0000000000000..1157b6801c92b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/batterybar/Prefs.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.batterybar;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class Prefs {
+    private static final String SHARED_PREFS_NAME = "status_bar";
+
+    public static final String LAST_BATTERY_LEVEL = "last_battery_level";
+
+    public static SharedPreferences read(Context context) {
+        return context.getSharedPreferences(Prefs.SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+    }
+
+    public static SharedPreferences.Editor edit(Context context) {
+        return context.getSharedPreferences(Prefs.SHARED_PREFS_NAME, Context.MODE_PRIVATE).edit();
+    }
+
+    public static void setLastBatteryLevel(Context context, int level) {
+        edit(context).putInt(LAST_BATTERY_LEVEL, level).commit();
+    }
+
+    public static int getLastBatteryLevel(Context context) {
+        return read(context).getInt(LAST_BATTERY_LEVEL, 50);
+    }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImage.java b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImage.java
new file mode 100644
index 0000000000000..a67768dddc02d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImage.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ * Copyright (C) 2018-2019 AICP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.logo;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.plugins.DarkIconDispatcher;
+import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;
+import com.android.systemui.res.R;
+
+import java.util.ArrayList;
+
+public abstract class LogoImage extends ImageView implements DarkReceiver {
+
+    private Context mContext;
+
+    private boolean mAttached;
+
+    private boolean mShowLogo;
+    public int mLogoPosition;
+    private int mLogoStyle;
+    private int mTintColor = Color.WHITE;
+
+    private ContentObserver mSettingsObserver;
+
+    public LogoImage(Context context) {
+        this(context, null);
+    }
+
+    public LogoImage(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LogoImage(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mContext = context;
+    }
+
+    protected abstract boolean isLogoVisible();
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mAttached)
+            return;
+
+        mAttached = true;
+
+        mSettingsObserver = new ContentObserver(new Handler()) {
+            @Override
+            public void onChange(boolean selfChange) {
+                super.onChange(selfChange);
+                updateSettings();
+
+            }
+        };
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.STATUS_BAR_LOGO),
+                false, mSettingsObserver, UserHandle.USER_ALL);
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.STATUS_BAR_LOGO_POSITION),
+                false, mSettingsObserver, UserHandle.USER_ALL);
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.STATUS_BAR_LOGO_STYLE),
+                false, mSettingsObserver, UserHandle.USER_ALL);
+        updateSettings();
+
+        Dependency.get(DarkIconDispatcher.class).addDarkReceiver(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (!mAttached)
+            return;
+
+        mAttached = false;
+        mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
+        Dependency.get(DarkIconDispatcher.class).removeDarkReceiver(this);
+    }
+
+    @Override
+    public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {
+        mTintColor = DarkIconDispatcher.getTint(areas, this, tint);
+        if (mShowLogo && isLogoVisible()) {
+            updateLogo();
+        }
+    }
+
+    public void updateLogo() {
+        Drawable drawable = null;
+        switch (mLogoStyle) {
+            case 0:
+            default:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_android_logo);
+                break;
+            case 1:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_adidas);
+                break;
+            case 2:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_alien);
+                break;
+            case 3:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_apple_logo);
+                break;
+            case 4:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_avengers);
+                break;
+            case 5:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_batman);
+                break;
+            case 6:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_batman_tdk);
+                break;
+            case 7:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_beats);
+                break;
+            case 8:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_biohazard);
+                break;
+            case 9:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_blackberry);
+                break;
+            case 10:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_cannabis);
+                break;
+            case 11:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_emoticon_cool);
+                break;
+            case 12:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_emoticon_devil);
+                break;
+            case 13:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_fire);
+                break;
+            case 14:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_heart);
+                break;
+            case 15:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_nike);
+                break;
+            case 16:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_pac_man);
+                break;
+            case 17:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_puma);
+                break;
+            case 18:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_rog);
+                break;
+            case 19:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_spiderman);
+                break;
+            case 20:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_superman);
+                break;
+            case 21:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_windows);
+                break;
+            case 22:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_xbox);
+                break;
+            case 23:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ghost);
+                break;
+            case 24:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ninja);
+                break;
+            case 25:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_robot);
+                break;
+            case 26:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ironman);
+                break;
+            case 27:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_captain_america);
+                break;
+            case 28:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_flash);
+                break;
+            case 29:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_tux_logo);
+                break;
+            case 30:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_ubuntu_logo);
+                break;
+            case 31:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_mint_logo);
+                break;
+            case 32:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_matrixx_logo);
+                break;
+            case 33:
+                drawable = mContext.getResources().getDrawable(R.drawable.ic_amogus);
+                break;
+        }
+
+        drawable.setTint(mTintColor);
+        setImageDrawable(drawable);
+    }
+
+    public void updateSettings() {
+        mShowLogo = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_LOGO, 0, UserHandle.USER_CURRENT) != 0;
+        mLogoPosition = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_LOGO_POSITION, 0, UserHandle.USER_CURRENT);
+        mLogoStyle = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.STATUS_BAR_LOGO_STYLE, 0, UserHandle.USER_CURRENT);
+        if (!mShowLogo || !isLogoVisible()) {
+            setImageDrawable(null);
+            setVisibility(View.GONE);
+            return;
+        }
+        updateLogo();
+        setVisibility(View.VISIBLE);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageView.java b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageView.java
new file mode 100644
index 0000000000000..7e0a3d3356c5c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageView.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ * Copyright (C) 2018-2019 AICP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.logo;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class LogoImageView extends LogoImage {
+
+    public LogoImageView(Context context) {
+        this(context, null);
+    }
+
+    public LogoImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LogoImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected boolean isLogoVisible() {
+        if (mLogoPosition == 0) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageViewRight.java b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageViewRight.java
new file mode 100644
index 0000000000000..76d0ece5c2307
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/matrixx/logo/LogoImageViewRight.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2018-2025 crDroid Android Project
+ * Copyright (C) 2018-2019 AICP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.matrixx.logo;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class LogoImageViewRight extends LogoImage {
+
+    public LogoImageViewRight(Context context) {
+        this(context, null);
+    }
+
+    public LogoImageViewRight(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LogoImageViewRight(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected boolean isLogoVisible() {
+        if (mLogoPosition == 1) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaSessionManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaSessionManager.kt
new file mode 100644
index 0000000000000..f6aa6ff070190
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaSessionManager.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.media
+
+import android.graphics.drawable.Drawable
+import android.media.MediaMetadata
+import android.media.session.PlaybackState
+import com.android.systemui.util.WeakListenerManager
+
+class MediaSessionManager private constructor() {
+
+    interface MediaDataListener {
+        fun onPlaybackStateChanged(state: Int) {}
+        fun onAlbumArtChanged(drawable: Drawable) {}
+        fun onAppIconChanged(drawable: Drawable) {}
+        fun onMediaColorsChanged(color: Int) {}
+        fun onMetadataChanged(track: String, artist: String) {}
+    }
+
+    private val listenerManager = WeakListenerManager<MediaDataListener>()
+
+    @Volatile
+    private var currentPlaybackState: Int = PlaybackState.STATE_NONE
+
+    @Volatile
+    private var currentAlbumArt: Drawable? = null
+
+    @Volatile
+    private var currentAppIcon: Drawable? = null
+
+    @Volatile
+    private var currentMediaColor: Int? = null
+
+    @Volatile
+    var trackTitle: String = "Unknown"
+
+    @Volatile
+    var artist: String = "Unknown"
+
+    val isMediaPlaying: Boolean
+        get() = currentPlaybackState == PlaybackState.STATE_PLAYING
+
+    fun addListener(listener: MediaDataListener) {
+        listenerManager.addListener(listener)
+
+        listenerManager.notifyOnBackground {
+            if (it === listener) {
+                it.onPlaybackStateChanged(currentPlaybackState)
+                it.onMetadataChanged(trackTitle, artist)
+                currentAlbumArt?.let { art -> it.onAlbumArtChanged(art) }
+                currentAppIcon?.let { icon -> it.onAppIconChanged(icon) }
+                currentMediaColor?.let { color -> it.onMediaColorsChanged(color) }
+            }
+        }
+    }
+
+    fun removeListener(listener: MediaDataListener) = listenerManager.removeListener(listener)
+
+    fun onPlaybackStateChanged(state: Int) {
+        if (currentPlaybackState != state) {
+            currentPlaybackState = state
+            listenerManager.notifyOnBackground { it.onPlaybackStateChanged(state) }
+        }
+    }
+
+    fun onAlbumArtChanged(drawable: Drawable) {
+        currentAlbumArt = drawable
+        listenerManager.notifyOnBackground { it.onAlbumArtChanged(drawable) }
+    }
+
+    fun onAppIconChanged(drawable: Drawable) {
+        currentAppIcon = drawable
+        listenerManager.notifyOnBackground { it.onAppIconChanged(drawable) }
+    }
+
+    fun onMediaColorsChanged(color: Int) {
+        currentMediaColor = color
+        listenerManager.notifyOnBackground { it.onMediaColorsChanged(color) }
+    }
+
+    fun onMetadataChanged(metadata: MediaMetadata) {
+        val newTitle = metadata.getString(MediaMetadata.METADATA_KEY_TITLE) ?: "Unknown"
+        val newArtist = metadata.getString(MediaMetadata.METADATA_KEY_ARTIST) ?: "Unknown"
+
+        if (trackTitle != newTitle || artist != newArtist) {
+            trackTitle = newTitle
+            artist = newArtist
+            listenerManager.notifyOnBackground { it.onMetadataChanged(trackTitle, artist) }
+        }
+    }
+
+    companion object {
+        @Volatile
+        private var INSTANCE: MediaSessionManager? = null
+
+        fun get(): MediaSessionManager {
+            return INSTANCE ?: synchronized(this) {
+                INSTANCE ?: MediaSessionManager().also { INSTANCE = it }
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt
new file mode 100644
index 0000000000000..85fae59be78fe
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt
@@ -0,0 +1,736 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ * Copyright (C) 2025 Lunaris Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.media
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.content.Context
+import android.content.res.Configuration
+import android.database.ContentObserver
+import android.graphics.*
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.LayerDrawable
+import android.media.session.PlaybackState
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.provider.Settings
+import android.util.Log
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.ImageView
+import com.android.internal.graphics.ColorUtils
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.media.MediaScrimState.STATE_SCRIM_HIDDEN
+import com.android.systemui.media.MediaScrimState.STATE_SCRIM_VISIBLE
+import com.android.systemui.util.ScrimUtils
+
+import kotlinx.coroutines.*
+import kotlin.math.*
+import javax.inject.Inject
+
+enum class MediaScrimState {
+    STATE_SCRIM_VISIBLE,
+    STATE_SCRIM_HIDDEN
+}
+
+@SysUISingleton
+class MediaViewController @Inject constructor(
+    private val context: Context
+) : MediaSessionManager.MediaDataListener, ScrimUtils.ScrimEventListener {
+
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
+    private var scrimState = STATE_SCRIM_HIDDEN
+
+    private var listening = false
+    private var featureEnabled = false
+    private var aodEnabled = false
+    private var artworkDrawable: Drawable? = null
+    private var isMediaPlaying = false
+    private var bouncerShowingOrKeyguardDismissing = false
+
+    private var mediaFilter = 0
+    private var mediaFadeLevel = 40
+    private var mediaBlurLevel = 90
+    private var pixelSize = 20
+    private var aodDimLevel = 35
+
+    private val settingsObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
+        override fun onChange(selfChange: Boolean) {
+            updateSettings()
+        }
+    }
+
+    private val mediaScrim = ImageView(context).apply {
+        layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        scaleType = ImageView.ScaleType.CENTER_CROP
+    }
+
+    private var mediaArtJob: Job? = null
+    private var isAlbumArtVisible = false
+    private var dismissingKeyguard = false
+    private var retryRunnable: Runnable? = null
+    private var coalesceJob: Job? = null
+    
+    private var showDelayJob: Job? = null
+    private var hideDelayJob: Job? = null
+    
+    private val MEDIA_SHOW_DELAY_MS = 200L
+    private val MEDIA_HIDE_DELAY_MS = 100L
+
+    private val sharedTypedValue = TypedValue()
+    private val grayscaleMatrix = ColorMatrix().apply { setSaturation(0f) }
+
+    init {
+        INSTANCE = this
+
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_ENABLED),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_AOD_ENABLED),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_FILTER),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_FADE_LEVEL),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_BLUR_LEVEL),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_PIXEL_SIZE),
+            false,
+            settingsObserver
+        )
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.LS_MEDIA_ART_AOD_DIM_LEVEL),
+            false,
+            settingsObserver
+        )
+
+        updateSettings()
+    }
+
+    private fun updateSettings() {
+        featureEnabled = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_ENABLED,
+            0,
+            UserHandle.USER_CURRENT
+        ) == 1
+
+        aodEnabled = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_AOD_ENABLED,
+            0,
+            UserHandle.USER_CURRENT
+        ) == 1
+
+        mediaFilter = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_FILTER,
+            1,
+            UserHandle.USER_CURRENT
+        )
+
+        mediaFadeLevel = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_FADE_LEVEL,
+            40,
+            UserHandle.USER_CURRENT
+        )
+
+        mediaBlurLevel = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_BLUR_LEVEL,
+            90,
+            UserHandle.USER_CURRENT
+        ).coerceIn(0, 200)
+
+        pixelSize = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_PIXEL_SIZE,
+            20,
+            UserHandle.USER_CURRENT
+        ).coerceIn(5, 50)
+
+        aodDimLevel = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.LS_MEDIA_ART_AOD_DIM_LEVEL,
+            35,
+            UserHandle.USER_CURRENT
+        ).coerceIn(0, 100)
+
+        if (!featureEnabled) {
+            cleanupResources(false)
+        }
+
+        if (featureEnabled && !listening) {
+            MediaSessionManager.get().addListener(this)
+            ScrimUtils.get().addListener(this)
+            listening = true
+        } else if (!featureEnabled && listening) {
+            MediaSessionManager.get().removeListener(this)
+            ScrimUtils.get().removeListener(this)
+            listening = false
+        }
+    }
+
+    private fun isDozing(): Boolean = ScrimUtils.get().isDozing()
+    private fun isPulsing(): Boolean = ScrimUtils.get().isPulsing()
+
+    private fun setupMediaFilter() {
+        if ((isDozing() || isPulsing()) && aodEnabled) {
+            val grayscaleEffect = RenderEffect.createColorFilterEffect(
+                ColorMatrixColorFilter(grayscaleMatrix)
+            )
+            mediaScrim.setRenderEffect(grayscaleEffect)
+            mediaScrim.colorFilter = null
+            return
+        }
+
+        val effect = when (mediaFilter) {
+            1 -> RenderEffect.createBlurEffect(
+                mediaBlurLevel.toFloat(), 
+                mediaBlurLevel.toFloat(), 
+                Shader.TileMode.MIRROR
+            )
+            2 -> {
+                val grayMatrix = ColorMatrix().apply { setSaturation(0f) }
+                RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(grayMatrix))
+            }
+            3 -> {
+                val sepiaMatrix = ColorMatrix().apply { setSaturation(0f) }
+                val sepia = floatArrayOf(
+                    1f, 0f, 0f, 0f, 30f,
+                    0f, 1f, 0f, 0f, 20f,
+                    0f, 0f, 1f, 0f, -10f,
+                    0f, 0f, 0f, 1f, 0f
+                )
+                sepiaMatrix.postConcat(ColorMatrix(sepia))
+                RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(sepiaMatrix))
+            }
+            4 -> null
+            5 -> {
+                val invertMatrix = floatArrayOf(
+                    -1f, 0f, 0f, 0f, 255f,
+                    0f, -1f, 0f, 0f, 255f,
+                    0f, 0f, -1f, 0f, 255f,
+                    0f, 0f, 0f, 1f, 0f
+                )
+                RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(ColorMatrix(invertMatrix)))
+            }
+            6 -> {
+                val grayMatrix = ColorMatrix().apply { setSaturation(0f) }
+                val grayscaleEffect = RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(grayMatrix))
+                val blurEffect = RenderEffect.createBlurEffect(
+                    mediaBlurLevel.toFloat(),
+                    mediaBlurLevel.toFloat(),
+                    Shader.TileMode.MIRROR
+                )
+                RenderEffect.createChainEffect(blurEffect, grayscaleEffect)
+            }
+            7 -> null
+            else -> null
+        }
+
+        mediaScrim.setRenderEffect(effect)
+        if (mediaFilter == 4) {
+            context.theme.resolveAttribute(android.R.attr.colorAccent, sharedTypedValue, true)
+            val accent = sharedTypedValue.data
+            mediaScrim.colorFilter = PorterDuffColorFilter(
+                Color.argb(150, Color.red(accent), Color.green(accent), Color.blue(accent)),
+                PorterDuff.Mode.SRC_ATOP
+            )
+        } else {
+            mediaScrim.colorFilter = null
+        }
+    }
+
+    private fun shouldShowMediaArt(): Boolean {
+        if (!featureEnabled) return false
+        
+        val dozing = isDozing()
+        val pulsing = isPulsing()
+
+        if ((dozing || pulsing) && !aodEnabled) return false
+        
+        if (artworkDrawable == null) return false
+        val isPortrait = context.resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
+        val isKeyguard = ScrimUtils.get().isKeyguardShowing()
+        val isCollapsed = ScrimUtils.get().isPanelFullyCollapsed()
+        if (!isPortrait || !isKeyguard || !isCollapsed) return false
+        if (!isMediaPlaying) return false
+        if (bouncerShowingOrKeyguardDismissing) return false
+        return true
+    }
+
+    private fun cancelScrimAnim() {
+        mediaScrim.animate().setListener(null).cancel()
+    }
+
+    private fun showMediaArt() {
+        if (isAlbumArtVisible && scrimState == STATE_SCRIM_VISIBLE) {
+            updateAodAlpha()
+            return
+        }
+
+        dismissingKeyguard = false
+        cancelScrimAnim()
+        updateMediaArt()
+        setupMediaFilter()
+        
+        val targetAlpha = getTargetAlpha()
+        
+        mediaScrim.apply {
+            alpha = 0f
+            visibility = View.VISIBLE
+            scrimState = STATE_SCRIM_VISIBLE
+            animate()
+                .alpha(targetAlpha)
+                .setDuration(300)
+                .setListener(null)
+                .start()
+        }
+        isAlbumArtVisible = true
+    }
+
+    private fun getTargetAlpha(): Float {
+        return if ((isDozing() || isPulsing()) && aodEnabled) {
+            aodDimLevel / 100f
+        } else {
+            1f
+        }
+    }
+
+    private fun updateAodAlpha() {
+        if (scrimState != STATE_SCRIM_VISIBLE) return
+        
+        val targetAlpha = getTargetAlpha()
+        
+        cancelScrimAnim()
+        setupMediaFilter()
+        mediaScrim.animate()
+            .alpha(targetAlpha)
+            .setDuration(300)
+            .setListener(null)
+            .start()
+    }
+
+    private fun updateMediaArt() {
+        coalesceJob?.cancel()
+        coalesceJob = coroutineScope.launch {
+            delay(40)
+            mediaArtJob?.cancel()
+            mediaArtJob = launch(Dispatchers.Default) {
+                val drawable = try {
+                    processArtwork()
+                } catch (t: Throwable) {
+                    Log.w(TAG, "processArtwork failed", t)
+                    LayerDrawable(arrayOf())
+                }
+                withContext(Dispatchers.Main) {
+                    mediaScrim.setImageDrawable(null)
+                    mediaScrim.setImageDrawable(drawable)
+                }
+            }
+        }
+    }
+
+    private suspend fun processArtwork(): LayerDrawable = withContext(Dispatchers.Default) {
+        if (!featureEnabled) return@withContext LayerDrawable(arrayOf())
+        val drawable = artworkDrawable ?: return@withContext LayerDrawable(arrayOf())
+
+        val bitmap = drawableToBitmap(drawable)
+        val resizedBitmap = getResizedBitmap(bitmap)
+
+        val processedBitmap = if (mediaFilter == 7) {
+            applyPixelation(resizedBitmap)
+        } else {
+            resizedBitmap
+        }
+
+        val bitmapDrawable = BitmapDrawable(context.resources, processedBitmap).apply {
+            alpha = 255
+        }
+
+        val effectiveFadeLevel = if ((isDozing() || isPulsing()) && aodEnabled) {
+            min(mediaFadeLevel + 15, 100)
+        } else {
+            mediaFadeLevel
+        }
+
+        val fadeColor = ColorUtils.blendARGB(
+            Color.TRANSPARENT,
+            Color.BLACK,
+            effectiveFadeLevel / 100f
+        )
+
+        val overlay = ColorDrawable(fadeColor)
+
+        val layers = arrayOf<Drawable>(bitmapDrawable, overlay)
+        return@withContext LayerDrawable(layers).apply {
+            setBounds(0, 0, processedBitmap.width, processedBitmap.height)
+            setLayerInset(1, 0, 0, 0, 0)
+        }
+    }
+
+    private fun applyPixelation(source: Bitmap): Bitmap {
+        val width = source.width
+        val height = source.height
+        val config = source.config ?: Bitmap.Config.ARGB_8888
+        val pixelated = Bitmap.createBitmap(width, height, config)
+        val canvas = Canvas(pixelated)
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            isFilterBitmap = false
+        }
+
+        var y = 0
+        while (y < height) {
+            var x = 0
+            while (x < width) {
+                val blockWidth = min(pixelSize, width - x)
+                val blockHeight = min(pixelSize, height - y)
+                
+                val sampleX = x + blockWidth / 2
+                val sampleY = y + blockHeight / 2
+                val color = source.getPixel(
+                    min(sampleX, width - 1),
+                    min(sampleY, height - 1)
+                )
+                
+                paint.color = color
+                canvas.drawRect(
+                    x.toFloat(),
+                    y.toFloat(),
+                    (x + blockWidth).toFloat(),
+                    (y + blockHeight).toFloat(),
+                    paint
+                )
+                
+                x += pixelSize
+            }
+            y += pixelSize
+        }
+
+        if (source != pixelated && !source.isRecycled) {
+            source.recycle()
+        }
+
+        return pixelated
+    }
+
+    private fun drawableToBitmap(drawable: Drawable): Bitmap {
+        if (drawable is BitmapDrawable) {
+            drawable.bitmap?.let { return it }
+        }
+
+        val w = max(1, drawable.intrinsicWidth)
+        val h = max(1, drawable.intrinsicHeight)
+
+        val cfg = if (drawable.opacity == PixelFormat.OPAQUE) {
+            Bitmap.Config.RGB_565
+        } else {
+            Bitmap.Config.ARGB_8888
+        }
+        val bitmap = Bitmap.createBitmap(w, h, cfg)
+        val canvas = Canvas(bitmap)
+        val oldBounds = Rect(drawable.bounds)
+        drawable.setBounds(0, 0, canvas.width, canvas.height)
+        drawable.draw(canvas)
+        drawable.setBounds(oldBounds)
+        return bitmap
+    }
+
+    private fun getResizedBitmap(bitmap: Bitmap): Bitmap {
+        val displayBounds = context.getSystemService(WindowManager::class.java)
+            .currentWindowMetrics.bounds
+
+        val ratioW = displayBounds.width() / bitmap.width.toFloat()
+        val ratioH = displayBounds.height() / bitmap.height.toFloat()
+        val ratio = max(ratioH, ratioW)
+
+        val desiredHeight = (ratio * bitmap.height).roundToInt().coerceAtLeast(1)
+        val desiredWidth = (ratio * bitmap.width).roundToInt().coerceAtLeast(1)
+
+        if (abs(desiredWidth - bitmap.width) <= 1 && abs(desiredHeight - bitmap.height) <= 1) {
+            val xPixelShift = max((bitmap.width - displayBounds.width()) / 2, 0)
+            val yPixelShift = max((bitmap.height - displayBounds.height()) / 2, 0)
+            val cropWidth = min(displayBounds.width(), bitmap.width - xPixelShift)
+            val cropHeight = min(displayBounds.height(), bitmap.height - yPixelShift)
+            return Bitmap.createBitmap(bitmap, xPixelShift, yPixelShift, cropWidth, cropHeight)
+        }
+
+        val scaledBitmap = Bitmap.createScaledBitmap(bitmap, desiredWidth, desiredHeight, true)
+
+        val xPixelShift = max((desiredWidth - displayBounds.width()) / 2, 0)
+        val yPixelShift = max((desiredHeight - displayBounds.height()) / 2, 0)
+        val cropWidth = min(displayBounds.width(), scaledBitmap.width - xPixelShift)
+        val cropHeight = min(displayBounds.height(), scaledBitmap.height - yPixelShift)
+
+        val cropped = Bitmap.createBitmap(
+            scaledBitmap,
+            xPixelShift,
+            yPixelShift,
+            cropWidth,
+            cropHeight
+        )
+        if (scaledBitmap != cropped && !scaledBitmap.isRecycled) {
+            scaledBitmap.recycle()
+        }
+        return cropped
+    }
+
+    private fun clearResources() {
+        mediaScrim.setImageDrawable(null)
+        mediaScrim.setRenderEffect(null)
+        mediaScrim.colorFilter = null
+        mediaScrim.visibility = View.GONE
+        scrimState = STATE_SCRIM_HIDDEN
+        isAlbumArtVisible = false
+        dismissingKeyguard = false
+    }
+
+    fun cleanupResources(animate: Boolean) {
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+
+        retryRunnable?.let { mediaScrim.removeCallbacks(it) }
+        retryRunnable = null
+        mediaArtJob?.cancel()
+        cancelScrimAnim()
+        
+        if (!animate) {
+            dismissingKeyguard = false
+            clearResources()
+            return
+        }
+        
+        dismissingKeyguard = true
+        mediaScrim.animate()
+            .alpha(0f)
+            .setDuration(100)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    clearResources()
+                }
+            })
+            .start()
+    }
+
+    override fun onAlbumArtChanged(drawable: Drawable) {
+        coroutineScope.launch {
+            artworkDrawable = drawable
+            updateMediaState()
+        }
+    }
+
+    override fun onPlaybackStateChanged(state: Int) {
+        isMediaPlaying = state == PlaybackState.STATE_PLAYING
+        coroutineScope.launch {
+            if (!isMediaPlaying) artworkDrawable = null
+            updateMediaState()
+        }
+    }
+
+    override fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        bouncerShowingOrKeyguardDismissing = showing
+        if (showing) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            cleanupResources(true)
+        }
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = goingAway
+        if (goingAway) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            cleanupResources(true)
+        }
+    }
+
+    override fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = fadingAway
+        if (fadingAway) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            cleanupResources(true)
+        }
+    }
+
+    override fun onDozingChanged(dozing: Boolean) {
+        coroutineScope.launch {
+            if (scrimState == STATE_SCRIM_VISIBLE) {
+                updateAodAlpha()
+            }
+            updateMediaElevation()
+            updateMediaState()
+        }
+    }
+
+    override fun setPulsing(pulsing: Boolean) {
+        coroutineScope.launch {
+            if (scrimState == STATE_SCRIM_VISIBLE) {
+                updateAodAlpha()
+            }
+            updateMediaElevation()
+            updateMediaState()
+        }
+    }
+
+    private fun updateMediaElevation() {
+        val ambient = isDozing() || isPulsing()
+        mediaScrim.translationZ = if (ambient) 1f else 0f
+    }
+
+    override fun onExpandedFractionChanged(expandedFraction: Float) {
+        coroutineScope.launch {
+            updateMediaState()
+        }
+    }
+
+    override fun onBarStateChanged(state: Int) {
+        coroutineScope.launch {
+            updateMediaState()
+        }
+    }
+
+    override fun onQsVisibilityChanged(visible: Boolean) {
+        coroutineScope.launch {
+            updateMediaState()
+        }
+    }
+
+    override fun onKeyguardShowingChanged(showing: Boolean) {
+        if (showing) {
+            dismissingKeyguard = false
+        } else {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            cleanupResources(false)
+        }
+        coroutineScope.launch {
+            updateMediaState()
+        }
+    }
+
+    override fun onScreenTurnedOff() {
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        dismissingKeyguard = false
+        cleanupResources(false)
+    }
+
+    override fun onStartedWakingUp() {
+        dismissingKeyguard = false
+        coroutineScope.launch {
+            updateMediaState()
+        }
+    }
+
+    private suspend fun updateMediaState() {
+        val shouldShow = shouldShowMediaArt()
+        
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        
+        if (shouldShow && scrimState == STATE_SCRIM_HIDDEN) {
+            showDelayJob = coroutineScope.launch {
+                delay(MEDIA_SHOW_DELAY_MS)
+                if (shouldShowMediaArt() && scrimState == STATE_SCRIM_HIDDEN) {
+                    showMediaArt()
+                }
+            }
+        } else if (!shouldShow && scrimState == STATE_SCRIM_VISIBLE) {
+            hideDelayJob = coroutineScope.launch {
+                delay(MEDIA_HIDE_DELAY_MS)
+                if (!shouldShowMediaArt() && scrimState == STATE_SCRIM_VISIBLE) {
+                    cleanupResources(true)
+                }
+            }
+        } else if (shouldShow && scrimState == STATE_SCRIM_VISIBLE) {
+            updateAodAlpha()
+        }
+    }
+
+    fun getMediaArtScrim() = mediaScrim
+
+    fun albumArtVisible() = isAlbumArtVisible
+
+    fun setSubjectAlpha(alpha: Float) {
+        mediaScrim.post {
+            mediaScrim.alpha = alpha.coerceIn(0f, 1f)
+        }
+    }
+
+    fun onDetachedFromWindow() {
+        context.contentResolver.unregisterContentObserver(settingsObserver)
+        if (listening) {
+            MediaSessionManager.get().removeListener(this)
+            ScrimUtils.get().removeListener(this)
+            listening = false
+        }
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        mediaArtJob?.cancel()
+        mediaScrim.setImageDrawable(null)
+        mediaScrim.setRenderEffect(null)
+        mediaScrim.colorFilter = null
+        artworkDrawable = null
+        isAlbumArtVisible = false
+        retryRunnable?.let { mediaScrim.removeCallbacks(it) }
+        retryRunnable = null
+        coalesceJob?.cancel()
+        coroutineScope.cancel()
+    }
+
+    companion object {
+        private const val TAG = "MediaViewController"
+
+        @Volatile
+        private var INSTANCE: MediaViewController? = null
+
+        @JvmStatic
+        fun get(context: Context): MediaViewController {
+            return INSTANCE ?: throw IllegalStateException(
+                "MediaViewController not initialized"
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/media/NotificationMediaManager.java
index 7339d41b0980d..25ce44e18bf11 100644
--- a/packages/SystemUI/src/com/android/systemui/media/NotificationMediaManager.java
+++ b/packages/SystemUI/src/com/android/systemui/media/NotificationMediaManager.java
@@ -372,6 +372,10 @@ private void updateMediaMetaData(List<MediaListener> callbacks) {
             for (int i = 0; i < callbacks.size(); i++) {
                 callbacks.get(i).onPrimaryMetadataOrStateChanged(mMediaMetadata, state);
             }
+            if (mMediaMetadata != null) {
+                MediaSessionManager.Companion.get().onMetadataChanged(mMediaMetadata);
+            }
+            MediaSessionManager.Companion.get().onPlaybackStateChanged(state);
         });
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt
index 3d1cad0da0bbd..da65471afae4c 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt
@@ -71,6 +71,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
+import kotlin.math.min
 
 /** Loads media information from media style [StatusBarNotification] classes. */
 @SysUISingleton
@@ -89,8 +90,11 @@ constructor(
     private val mediaProcessingJobs = ConcurrentHashMap<String, Job>()
 
     private val artworkWidth: Int =
-        context.resources.getDimensionPixelSize(
-            com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize
+        min(
+            context.resources.getDimensionPixelSize(
+                com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize
+            ),
+            460
         )
     private val artworkHeight: Int =
         context.resources.getDimensionPixelSize(R.dimen.qs_media_session_height_expanded)
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
index f81745704d2bf..2831f45e13d67 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
@@ -26,6 +26,7 @@ import com.android.app.tracing.TraceStateLogger
 import com.android.internal.annotations.VisibleForTesting
 import com.android.systemui.media.controls.ui.drawable.SquigglyProgress
 import com.android.systemui.media.controls.ui.view.MediaViewHolder
+import com.android.systemui.media.controls.ui.view.WaveformSeekBar
 import com.android.systemui.media.controls.ui.viewmodel.SeekBarViewModel
 import com.android.systemui.res.R
 
@@ -109,6 +110,10 @@ open class SeekBarObserver(private val holder: MediaViewHolder) :
             holder.seekBar.contentDescription = ""
             holder.scrubbingElapsedTimeView.text = ""
             holder.scrubbingTotalTimeView.text = ""
+            
+            val waveformSeekBar = holder.seekBar as? WaveformSeekBar
+            waveformSeekBar?.stopWaveAnimation()
+            
             return
         }
 
@@ -120,6 +125,14 @@ open class SeekBarObserver(private val holder: MediaViewHolder) :
         progressDrawable?.animate =
             data.playing && !data.scrubbing && animationEnabled && data.listening
         progressDrawable?.transitionEnabled = !data.seekAvailable
+        
+        val waveformSeekBar = holder.seekBar as? WaveformSeekBar
+        if (data.playing && !data.scrubbing) {
+            waveformSeekBar?.startWaveAnimation()
+        } else {
+            waveformSeekBar?.stopWaveAnimation()
+        }
+
 
         if (holder.seekBar.maxHeight != seekBarEnabledMaxHeight) {
             holder.seekBar.maxHeight = seekBarEnabledMaxHeight
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
index b9056e0c9e432..3e3cff0fa821e 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt
@@ -182,6 +182,8 @@ constructor(
     /** The progress of the transition or 1.0 if there is no transition happening */
     private var currentTransitionProgress: Float = 1.0f
 
+    private var playersInTransition = false
+
     /** The measured width of the carousel */
     private var carouselMeasureWidth: Int = 0
 
@@ -459,7 +461,11 @@ constructor(
         bgExecutor.execute {
             globalSettings.registerContentObserverSync(
                 Settings.Global.getUriFor(Settings.Global.ANIMATOR_DURATION_SCALE),
-                animationScaleObserver,
+                animationScaleObserver
+            )
+            secureSettings.registerContentObserverSync(
+                Settings.Secure.getUriFor(Settings.Secure.MEDIA_SQUIGGLE_ANIMATION),
+                animationScaleObserver
             )
         }
     }
@@ -790,6 +796,17 @@ constructor(
             currentStartLocation = startLocation
             currentEndLocation = endLocation
             currentTransitionProgress = progress
+            val inTransition =
+                startLocation != endLocation &&
+                    startLocation != MediaHierarchyManager.LOCATION_UNKNOWN
+            if (inTransition != playersInTransition) {
+                playersInTransition = inTransition
+                val layerType =
+                    if (inTransition) View.LAYER_TYPE_NONE else View.LAYER_TYPE_HARDWARE
+                for (mediaPlayer in MediaPlayerData.players()) {
+                    mediaPlayer.mediaViewHolder?.player?.setLayerType(layerType, null)
+                }
+            }
             for (mediaPlayer in MediaPlayerData.players()) {
                 updateViewControllerToState(mediaPlayer.mediaViewController, immediately)
             }
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
index 47c801d0fa2d6..9fa99b4ea51ee 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java
@@ -46,6 +46,7 @@
 import android.graphics.drawable.Icon;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.TransitionDrawable;
+import android.media.MediaMetadata;
 import android.media.session.MediaController;
 import android.media.session.MediaSession;
 import android.media.session.PlaybackState;
@@ -102,6 +103,7 @@
 import com.android.systemui.media.controls.util.MediaDataUtils;
 import com.android.systemui.media.controls.util.MediaUiEventLogger;
 import com.android.systemui.media.dialog.MediaOutputDialogManager;
+import com.android.systemui.media.MediaSessionManager;
 import com.android.systemui.monet.ColorScheme;
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.FalsingManager;
@@ -126,6 +128,7 @@
 import com.android.systemui.util.ColorUtilKt;
 import com.android.systemui.util.animation.TransitionLayout;
 import com.android.systemui.util.concurrency.DelayableExecutor;
+import com.android.systemui.util.settings.SecureSettings;
 import com.android.systemui.util.settings.GlobalSettings;
 
 import dagger.Lazy;
@@ -230,6 +233,7 @@ public class MediaControlPanel {
     private TurbulenceNoiseController mTurbulenceNoiseController;
     private LoadingEffect mLoadingEffect;
     private final GlobalSettings mGlobalSettings;
+    private final SecureSettings mSecureSettings;
     private TurbulenceNoiseAnimationConfig mTurbulenceNoiseAnimationConfig;
     private boolean mWasPlaying = false;
     private boolean mButtonClicked = false;
@@ -285,7 +289,8 @@ public MediaControlPanel(
             ActivityIntentHelper activityIntentHelper,
             CommunalSceneInteractor communalSceneInteractor,
             NotificationLockscreenUserManager lockscreenUserManager,
-            GlobalSettings globalSettings
+            GlobalSettings globalSettings,
+            SecureSettings secureSettings
     ) {
         mContext = context;
         mBackgroundExecutor = backgroundExecutor;
@@ -312,7 +317,7 @@ public MediaControlPanel(
         });
 
         mGlobalSettings = globalSettings;
-        updateAnimatorDurationScale();
+        mSecureSettings = secureSettings;
     }
 
     /**
@@ -405,7 +410,9 @@ private void setSeekbarContentDescription(CharSequence elapsedTime, CharSequence
     void updateAnimatorDurationScale() {
         if (mSeekBarObserver != null) {
             mSeekBarObserver.setAnimationEnabled(
-                    mGlobalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) > 0f);
+                    mGlobalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) > 0f &&
+                    mSecureSettings.getIntForUser(Settings.Secure.MEDIA_SQUIGGLE_ANIMATION,
+                    1, UserHandle.USER_CURRENT) != 0);
         }
     }
 
@@ -430,6 +437,7 @@ public void attachPlayer(MediaViewHolder vh) {
         mSeekBarViewModel.setEnabledChangeListener(mEnabledChangeListener);
         mSeekBarViewModel.setContentDescriptionListener(mContentDescriptionListener);
         mMediaViewController.attach(player);
+        updateAnimatorDurationScale();
 
         vh.getPlayer().setOnLongClickListener(v -> {
             if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;
@@ -508,6 +516,7 @@ public void bindPlayer(@NonNull MediaData data, String key) {
 
         if (mToken != null) {
             mController = new MediaController(mContext, mToken);
+            mController.registerCallback(mCb);
         } else {
             mController = null;
         }
@@ -892,6 +901,10 @@ private void bindArtworkAndColors(MediaData data, String key, boolean updateBack
             Drawable artwork;
             boolean isArtworkBound;
             Icon artworkIcon = data.getArtwork();
+            Rect bounds = mContext.getSystemService(android.view.WindowManager.class).getCurrentWindowMetrics().getBounds();
+            int screenWidth = bounds.width();
+            int screenHeight = bounds.height();
+            Drawable albumArt = getScaledBackground(artworkIcon, screenWidth, screenHeight);
             WallpaperColors wallpaperColors = getWallpaperColor(artworkIcon);
             boolean darkTheme = false;
             if (wallpaperColors != null) {
@@ -911,6 +924,8 @@ private void bindArtworkAndColors(MediaData data, String key, boolean updateBack
                             darkTheme, ThemeStyle.CONTENT);
                 } catch (PackageManager.NameNotFoundException e) {
                     Log.w(TAG, "Cannot find icon for package " + data.getPackageName(), e);
+                    mutableColorScheme = new ColorScheme(ColorScheme.GOOGLE_BLUE,
+                            darkTheme, ThemeStyle.CONTENT);
                 }
             }
 
@@ -923,6 +938,9 @@ private void bindArtworkAndColors(MediaData data, String key, boolean updateBack
                 }
                 mArtworkBoundId = reqId;
 
+                MediaSessionManager.Companion.get().onAlbumArtChanged(albumArt);
+                MediaSessionManager.Companion.get().onMediaColorsChanged(colorScheme.getAccent1().getS100());
+
                 // Transition Colors to current color scheme
                 boolean colorSchemeChanged;
                 colorSchemeChanged = mColorSchemeTransition.updateColorScheme(colorScheme);
@@ -992,7 +1010,11 @@ protected WallpaperColors getWallpaperColor(Icon artworkIcon) {
                     Log.d(TAG, "Cannot load wallpaper color from a recycled bitmap");
                     return null;
                 }
-                return WallpaperColors.fromBitmap(artworkBitmap);
+                try {
+                    return WallpaperColors.fromBitmap(artworkBitmap);
+                } catch (Exception e) {
+                    return null;
+                }
             } else {
                 Drawable artworkDrawable = artworkIcon.loadDrawable(mContext);
                 if (artworkDrawable != null) {
@@ -1386,7 +1408,7 @@ private ActivityTransitionAnimator.Controller buildLaunchAnimatorController(
                     @Override
                     protected float getCurrentTopCornerRadius() {
                         return mContext.getResources().getDimension(
-                                R.dimen.notification_corner_radius);
+                                R.dimen.media_notification_corner_radius);
                     }
 
                     @Override
@@ -1557,5 +1579,21 @@ private void setVisibleAndAlpha(ConstraintSet set, int actionId, boolean visible
         set.setVisibility(actionId, visible ? ConstraintSet.VISIBLE : notVisibleValue);
         set.setAlpha(actionId, visible ? 1.0f : 0.0f);
     }
-}
 
+    /**
+      * Here is to solve the problem that the panel title and artist are not syncing in time 
+      * @author alphi-wang-cn
+      */ 
+     private final MediaController.Callback mCb = new MediaController.Callback() { 
+         @Override 
+         public void onMetadataChanged(MediaMetadata metadata) { 
+            if (metadata != null) { 
+                 String title = metadata.getString(MediaMetadata.METADATA_KEY_TITLE); 
+                 String artist = metadata.getString(MediaMetadata.METADATA_KEY_ARTIST); 
+                 mMediaViewHolder.getTitleText().setText(title); 
+                 mMediaViewHolder.getArtistText().setText(artist); 
+                 mMediaViewController.refreshState();        // measure view and refresh the state 
+            }
+         } 
+     };
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt
index 79bfcf5f31ccd..872bdea85f61b 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt
@@ -700,6 +700,12 @@ constructor(
                 R.dimen.lockscreen_shade_media_transition_distance
             )
         inSplitShade = splitShadeStateController.shouldUseSplitNotificationShade(context.resources)
+        allowMediaPlayerOnLockScreen =
+            secureSettings.getBoolForUser(
+                Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN,
+                true,
+                UserHandle.USER_CURRENT
+            )
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
index ce95b9f66af17..44ec5e54422eb 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
@@ -22,8 +22,10 @@ import android.animation.AnimatorSet
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Typeface
+import android.provider.Settings
 import android.view.View
 import android.view.animation.Interpolator
+import android.os.UserHandle
 import androidx.annotation.VisibleForTesting
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.constraintlayout.widget.ConstraintSet.MATCH_CONSTRAINT
@@ -153,6 +155,11 @@ constructor(
         seekBarViewModel.listening = listening
     }
 
+    private val isCompactMode: Boolean = Settings.System.getIntForUser(
+            context.contentResolver,
+            "qs_compact_media_player_mode", 0, UserHandle.USER_CURRENT
+        ) != 0
+
     /** A callback for config changes */
     private val configurationListener =
         object : ConfigurationController.ConfigurationListener {
@@ -290,8 +297,8 @@ constructor(
     }
 
     /** Get the constraintSet for a given expansion */
-    private fun constraintSetForExpansion(expansion: Float): ConstraintSet =
-        if (expansion > 0) expandedLayout else collapsedLayout
+    private fun constraintSetForExpansion(expansion: Float): ConstraintSet = 
+        if (isCompactMode) collapsedLayout else expandedLayout
 
     /** Set the height of UMO background constraints. */
     private fun setBackgroundHeights(height: Int) {
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/drawable/SquigglyProgress.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/drawable/SquigglyProgress.kt
index c417fe60219ae..4e11b35555def 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/drawable/SquigglyProgress.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/drawable/SquigglyProgress.kt
@@ -84,6 +84,12 @@ class SquigglyProgress : Drawable() {
             invalidateSelf()
         }
 
+    var drawRemainingLine: Boolean = true
+        set(value) {
+            field = value
+            invalidateSelf()
+        }
+
     init {
         wavePaint.strokeCap = Paint.Cap.ROUND
         linePaint.strokeCap = Paint.Cap.ROUND
@@ -199,14 +205,14 @@ class SquigglyProgress : Drawable() {
         canvas.drawPath(path, wavePaint)
         canvas.restore()
 
-        if (transitionEnabled) {
+        if (drawRemainingLine && transitionEnabled) {
             // If there's a smooth transition, we draw the rest of the
             // path in a different color (using different clip params)
             canvas.save()
             canvas.clipRect(totalProgressPx, -1f * clipTop, totalWidth, clipTop)
             canvas.drawPath(path, linePaint)
             canvas.restore()
-        } else {
+        } else if (drawRemainingLine) {
             // No transition, just draw a flat line to the end of the region.
             // The discontinuity is hidden by the progress bar thumb shape.
             canvas.drawLine(totalProgressPx, 0f, totalWidth, 0f, linePaint)
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaViewHolder.kt
index 0ff5c49eb45e0..2b4ab672b125d 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaViewHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaViewHolder.kt
@@ -17,6 +17,7 @@
 package com.android.systemui.media.controls.ui.view
 
 import android.graphics.Typeface
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,6 +27,7 @@ import android.widget.ProgressBar
 import android.widget.SeekBar
 import android.widget.TextView
 import androidx.constraintlayout.widget.Barrier
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.android.internal.widget.CachingIconView
 import com.android.systemui.Flags.enableSuggestedDeviceUi
 import com.android.systemui.FontStyles.GSF_BODY_MEDIUM
@@ -71,8 +73,9 @@ class MediaViewHolder constructor(itemView: View) {
         itemView.findViewById<ProgressBar>(R.id.device_suggestion_progressbar)
     val deviceSuggestionButton = itemView.findViewById<View>(R.id.device_suggestion_button)
 
-    // Seekbar views
-    val seekBar = itemView.requireViewById<SeekBar>(R.id.media_progress_bar)
+    // Seekbar views - dynamically replaced based on settings
+    var seekBar: SeekBar = itemView.requireViewById(R.id.media_progress_bar)
+        private set
     // These views are only shown while the user is actively scrubbing
     val scrubbingElapsedTimeView: TextView =
         itemView.requireViewById(R.id.media_scrubbing_elapsed_time)
@@ -95,6 +98,66 @@ class MediaViewHolder constructor(itemView: View) {
     // Pagination
     val pageLeft = itemView.requireViewById<ImageButton>(R.id.page_left)
     val pageRight = itemView.requireViewById<ImageButton>(R.id.page_right)
+    
+    init {
+        replaceSeekBarIfNeeded()
+    }
+
+    private fun replaceSeekBarIfNeeded() {
+        val waveformEnabled = Settings.System.getInt(
+            player.context.contentResolver,
+            Settings.System.MEDIA_WAVEFORM_SEEKBAR,
+            0
+        ) == 1
+
+        if (waveformEnabled && seekBar !is WaveformSeekBar) {
+            val parent = seekBar.parent as ViewGroup
+            val layoutParams = seekBar.layoutParams
+            val index = parent.indexOfChild(seekBar)
+            
+            val oldProgress = seekBar.progress
+            val oldMax = seekBar.max
+            val oldEnabled = seekBar.isEnabled
+            val oldId = seekBar.id
+            
+            parent.removeView(seekBar)
+            
+            val waveformSeekBar = WaveformSeekBar(player.context).apply {
+                id = oldId
+                this.layoutParams = layoutParams
+                progress = oldProgress
+                max = oldMax
+                isEnabled = oldEnabled
+                layoutDirection = View.LAYOUT_DIRECTION_LTR
+            }
+            
+            parent.addView(waveformSeekBar, index)
+            seekBar = waveformSeekBar
+        } else if (!waveformEnabled && seekBar is WaveformSeekBar) {
+            val parent = seekBar.parent as ViewGroup
+            val layoutParams = seekBar.layoutParams
+            val index = parent.indexOfChild(seekBar)
+            
+            val oldProgress = seekBar.progress
+            val oldMax = seekBar.max
+            val oldEnabled = seekBar.isEnabled
+            val oldId = seekBar.id
+            
+            parent.removeView(seekBar)
+            
+            val defaultSeekBar = SeekBar(player.context).apply {
+                id = oldId
+                this.layoutParams = layoutParams
+                progress = oldProgress
+                max = oldMax
+                isEnabled = oldEnabled
+                layoutDirection = View.LAYOUT_DIRECTION_LTR
+            }
+            
+            parent.addView(defaultSeekBar, index)
+            seekBar = defaultSeekBar
+        }
+    }
 
     fun getAction(id: Int): ImageButton {
         return when (id) {
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/WaveformSeekBar.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/WaveformSeekBar.kt
new file mode 100644
index 0000000000000..e49ff9d3284f6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/view/WaveformSeekBar.kt
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.media.controls.ui.view
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.PixelFormat
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+import com.android.systemui.media.MediaSessionManager
+import kotlin.math.*
+
+class WaveformSeekBar @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = android.R.attr.seekBarStyle,
+) : SeekBar(context, attrs, defStyleAttr), MediaSessionManager.MediaDataListener {
+
+    private val density = resources.displayMetrics.density
+    
+    private val progressPath = Path()
+    private val backgroundRect = RectF()
+    private val progressRect = RectF()
+    
+    private val trackHeight = 6f * density
+    private val cornerRadius = 8f * density
+    private val thumbRadius = 8f * density
+    
+    private val waveHeight = 12f * density
+    private val waveLength = 80f * density
+    private val minWaveTrackLength = waveLength * 1.0f
+    
+    private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        color = Color.WHITE
+        alpha = 77
+    }
+    
+    private val progressPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        color = Color.WHITE
+    }
+    
+    private val thumbShadowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        color = Color.BLACK
+        alpha = 60
+    }
+    
+    private val thumbPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        color = Color.WHITE
+        setShadowLayer(4f * density, 0f, 2f * density, Color.argb(80, 0, 0, 0))
+    }
+    
+    private var wavePhase = 0f
+    private var waveAmplitudeMultiplier = 0f
+    private var waveAnimator: ValueAnimator? = null
+    private var fadeAnimator: ValueAnimator? = null
+    var isPlaying = false
+        private set
+    
+    init {
+        thumb = TransparentDrawable()
+        splitTrack = false
+        progressDrawable = TransparentDrawable()
+    }
+    
+    fun startWaveAnimation() {
+        if (isPlaying && waveAnimator?.isRunning == true) return
+        isPlaying = true
+        
+        fadeAnimator?.cancel()
+        fadeAnimator = ValueAnimator.ofFloat(waveAmplitudeMultiplier, 1f).apply {
+            duration = 300L
+            addUpdateListener { 
+                waveAmplitudeMultiplier = it.animatedValue as Float
+                invalidate()
+            }
+            start()
+        }
+        
+        waveAnimator?.cancel()
+        waveAnimator = ValueAnimator.ofFloat(0f, (2 * Math.PI).toFloat()).apply {
+            duration = 3500L
+            repeatCount = ValueAnimator.INFINITE
+            interpolator = LinearInterpolator()
+            addUpdateListener { 
+                wavePhase = it.animatedValue as Float
+                invalidate()
+            }
+            start()
+        }
+    }
+    
+    fun stopWaveAnimation() {
+        isPlaying = false
+        waveAnimator?.cancel()
+        waveAnimator = null
+        
+        fadeAnimator?.cancel()
+        fadeAnimator = ValueAnimator.ofFloat(waveAmplitudeMultiplier, 0f).apply {
+            duration = 300L
+            addUpdateListener { 
+                waveAmplitudeMultiplier = it.animatedValue as Float
+                invalidate()
+            }
+            start()
+        }
+    }
+    
+    fun regenerateWaveform(seed: Long = System.currentTimeMillis()) {
+        invalidate()
+    }
+    
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        MediaSessionManager.get().addListener(this)
+        
+        if (isPlaying && waveAnimator?.isRunning != true) {
+            waveAnimator?.cancel()
+            waveAnimator = ValueAnimator.ofFloat(0f, (2 * Math.PI).toFloat()).apply {
+                duration = 3500L
+                repeatCount = ValueAnimator.INFINITE
+                interpolator = LinearInterpolator()
+                addUpdateListener { 
+                    wavePhase = it.animatedValue as Float
+                    invalidate()
+                }
+                start()
+            }
+        }
+    }
+    
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        MediaSessionManager.get().removeListener(this)
+        waveAnimator?.cancel()
+    }
+    
+    override fun onMediaColorsChanged(color: Int) {
+        post { setWaveformColor(color) }
+    }
+    
+    override fun onDraw(canvas: Canvas) {
+        val width = width.toFloat()
+        val height = height.toFloat()
+        val pLeft = paddingLeft.toFloat()
+        val pRight = paddingRight.toFloat()
+        
+        val drawWidth = width - pLeft - pRight
+        if (drawWidth <= 0) return
+        
+        val centerY = height / 2f
+        val trackTop = centerY - trackHeight / 2f
+        val trackBottom = centerY + trackHeight / 2f
+        
+        val ratio = if (max > 0) progress.toFloat() / max else 0f
+        val progressX = pLeft + drawWidth * ratio
+        
+        backgroundRect.set(pLeft, trackTop, pLeft + drawWidth, trackBottom)
+        canvas.drawRoundRect(backgroundRect, cornerRadius, cornerRadius, backgroundPaint)
+        
+        if (progressX > pLeft) {
+            if (waveAmplitudeMultiplier > 0.01f) {
+                drawWaveProgress(canvas, pLeft, progressX, centerY, trackTop, trackBottom)
+            } else {
+                progressRect.set(pLeft, trackTop, progressX, trackBottom)
+                canvas.drawRoundRect(progressRect, cornerRadius, cornerRadius, progressPaint)
+            }
+        }
+        canvas.drawCircle(progressX, centerY + 2 * density, thumbRadius, thumbShadowPaint)
+        canvas.drawCircle(progressX, centerY, thumbRadius, thumbPaint)
+    }
+    
+    private fun drawWaveProgress(
+        canvas: Canvas,
+        startX: Float,
+        endX: Float,
+        centerY: Float,
+        trackTop: Float,
+        trackBottom: Float
+    ) {
+        progressPath.reset()
+        
+        val progressLength = endX - startX
+        
+        val minLength = waveLength * 0.8f
+        val lengthRatio = (progressLength / minLength).coerceIn(0f, 1f)
+        val progressLengthFactor = (sqrt(lengthRatio) * 0.7f + 0.3f).coerceIn(0.3f, 1f)
+        
+        val edgeRadius = (trackHeight / 2f).coerceAtMost(cornerRadius)
+        
+        progressPath.moveTo(startX + edgeRadius, trackBottom)
+        
+        progressPath.arcTo(
+            startX, trackTop,
+            startX + edgeRadius * 2, trackBottom,
+            90f, 90f, false
+        )
+        
+        val waveStartX = startX + edgeRadius
+        val firstWaveY = calculateWaveY(waveStartX, waveStartX, endX, trackTop, progressLengthFactor)
+        progressPath.quadTo(startX, trackTop, waveStartX, firstWaveY)
+        
+        drawSmoothWave(waveStartX, endX, trackTop, progressLengthFactor)
+        
+        progressPath.lineTo(endX, trackTop)
+        progressPath.lineTo(endX, trackBottom)
+        progressPath.close()
+        
+        canvas.drawPath(progressPath, progressPaint)
+    }
+    
+    private fun calculateWaveY(
+        x: Float,
+        waveStartX: Float,
+        waveEndX: Float,
+        trackTop: Float,
+        progressLengthFactor: Float
+    ): Float {
+        val totalDist = waveEndX - waveStartX
+        if (totalDist <= 0) return trackTop
+        
+        val waveProgress = (x - waveStartX) / waveLength
+        val sinValue = sin(waveProgress * 2 * PI.toFloat() + wavePhase)
+        
+        val normalizedWave = (sinValue + 1f) / 2f
+        
+        val distFromStart = x - waveStartX
+        val distFromEnd = waveEndX - x
+        val taperZone = waveLength * 0.4f
+        
+        val envelope = when {
+            totalDist < taperZone * 2 -> {
+                val t = distFromStart / totalDist
+                4f * t * (1f - t)
+            }
+            distFromStart < taperZone -> {
+                val t = distFromStart / taperZone
+                t * t * (3f - 2f * t)
+            }
+            distFromEnd < taperZone -> {
+                val t = distFromEnd / taperZone
+                t * t * (3f - 2f * t)
+            }
+            else -> 1f
+        }.coerceIn(0f, 1f)
+        
+        return trackTop - (normalizedWave * waveHeight * envelope * waveAmplitudeMultiplier * progressLengthFactor)
+    }
+    
+    private fun drawSmoothWave(
+        startX: Float,
+        endX: Float,
+        trackTop: Float,
+        progressLengthFactor: Float
+    ) {
+        if (endX <= startX) return
+        
+        val step = 2f * density
+        val points = mutableListOf<Pair<Float, Float>>()
+        
+        var x = startX
+        while (x <= endX) {
+            val y = calculateWaveY(x, startX, endX, trackTop, progressLengthFactor)
+            points.add(Pair(x, y))
+            x += step
+        }
+        
+        if (points.isEmpty() || points.last().first < endX) {
+            val y = calculateWaveY(endX, startX, endX, trackTop, progressLengthFactor)
+            points.add(Pair(endX, y))
+        }
+        
+        if (points.size < 2) {
+            progressPath.lineTo(endX, trackTop)
+            return
+        }
+        
+        for (i in 0 until points.size - 1) {
+            val p0 = if (i > 0) points[i - 1] else points[i]
+            val p1 = points[i]
+            val p2 = points[i + 1]
+            val p3 = if (i + 2 < points.size) points[i + 2] else points[i + 1]
+            
+            val tension = 0.5f
+            
+            val cp1x = p1.first + (p2.first - p0.first) * tension / 3f
+            val cp1y = p1.second + (p2.second - p0.second) * tension / 3f
+            val cp2x = p2.first - (p3.first - p1.first) * tension / 3f
+            val cp2y = p2.second - (p3.second - p1.second) * tension / 3f
+            
+            progressPath.cubicTo(cp1x, cp1y, cp2x, cp2y, p2.first, p2.second)
+        }
+    }
+
+    
+    fun setWaveformColor(color: Int) {
+        progressPaint.color = color
+        backgroundPaint.color = color
+        backgroundPaint.alpha = 77
+        invalidate()
+    }
+    
+    fun setThumbColor(color: Int) {
+        thumbPaint.color = color
+        thumbPaint.setShadowLayer(4f * density, 0f, 2f * density, Color.argb(80, 0, 0, 0))
+        invalidate()
+    }
+    
+    private class TransparentDrawable : Drawable() {
+        override fun draw(canvas: Canvas) {}
+        override fun setAlpha(alpha: Int) {}
+        override fun setColorFilter(colorFilter: ColorFilter?) {}
+        override fun getOpacity(): Int = PixelFormat.TRANSPARENT
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java
index 78b6ef66ea207..6ff8d581e3907 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapterLegacy.java
@@ -340,11 +340,6 @@ protected void updateEndAreaVisibility(boolean showEndTouchArea, boolean isCheck
         private void updateSeekBarProgressColor() {
             mSeekBar.setProgressTintList(ColorStateList.valueOf(
                     mController.getColorSchemeLegacy().getColorSeekbarProgress()));
-            final Drawable contrastDotDrawable =
-                    ((LayerDrawable) mSeekBar.getProgressDrawable()).findDrawableByLayerId(
-                            R.id.contrast_dot);
-            contrastDotDrawable.setTintList(ColorStateList.valueOf(
-                    mController.getColorSchemeLegacy().getColorItemContent()));
         }
 
         void updateSeekbarProgressBackground() {
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationModeController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationModeController.java
index 99daf368c8463..cf66e1596ea1e 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationModeController.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationModeController.java
@@ -140,7 +140,6 @@ public void updateCurrentInteractionMode(boolean notify) {
                     Secure.NAVIGATION_MODE, String.valueOf(mode)));
         if (DEBUG) {
             Log.d(TAG, "updateCurrentInteractionMode: mode=" + mode);
-            dumpAssetPaths(mCurrentUserContext);
         }
 
         if (notify) {
@@ -205,15 +204,5 @@ public void dump(PrintWriter pw, String[] args) {
             defaultOverlays = "failed_to_fetch";
         }
         pw.println("  defaultOverlays=" + defaultOverlays);
-        dumpAssetPaths(mCurrentUserContext);
-    }
-
-    private void dumpAssetPaths(Context context) {
-        Log.d(TAG, "  contextUser=" + mCurrentUserContext.getUserId());
-        Log.d(TAG, "  assetPaths=");
-        ApkAssets[] assets = context.getResources().getAssets().getApkAssets();
-        for (ApkAssets a : assets) {
-            Log.d(TAG, "    " + a.getDebugName());
-        }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
index 642f43546b963..5e7e2507fbafe 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
@@ -163,6 +163,10 @@ constructor(
     private var triggerLongSwipe = false
     private var isLongSwipeEnabled = false
 
+    private var backArrowVisibility = true
+
+    private var edgeHapticEnabled = true
+
     internal enum class GestureState {
         /* Arrow is off the screen and invisible */
         GONE,
@@ -663,10 +667,18 @@ constructor(
         setTriggerLongSwipe(isLongSwipeEnabled && triggerLongSwipe)
     }
 
+    override fun setBackArrowVisibility(enabled: Boolean) {
+        backArrowVisibility = enabled
+    }
+
+    override fun setEdgeHapticEnabled(enabled: Boolean) {
+        edgeHapticEnabled = enabled
+    }
+
     private fun setTriggerLongSwipe(enabled: Boolean) {
         if (triggerLongSwipe != enabled) {
             triggerLongSwipe = enabled
-            vibratorHelper.performHapticFeedback(
+            if (edgeHapticEnabled) vibratorHelper.performHapticFeedback(
                     mView,
                     HapticFeedbackConstants.GESTURE_THRESHOLD_ACTIVATE
             )
@@ -938,7 +950,7 @@ constructor(
                 mView.isVisible = false
             }
             GestureState.ENTRY -> {
-                mView.isVisible = true
+                mView.isVisible = backArrowVisibility
 
                 updateRestingArrowDimens()
                 gestureEntryTime = systemClock.uptimeMillis()
@@ -946,7 +958,7 @@ constructor(
             GestureState.ACTIVE -> {
                 previousXTranslationOnActiveOffset = previousXTranslation
                 updateRestingArrowDimens()
-                performActivatedHapticFeedback()
+                if (edgeHapticEnabled) performActivatedHapticFeedback()
                 val popVelocity =
                     if (previousState == GestureState.INACTIVE) {
                         POP_ON_INACTIVE_TO_ACTIVE_VELOCITY
@@ -967,14 +979,14 @@ constructor(
 
                 mView.popOffEdge(POP_ON_INACTIVE_VELOCITY)
 
-                performDeactivatedHapticFeedback()
+                if (edgeHapticEnabled) performDeactivatedHapticFeedback()
                 updateRestingArrowDimens()
             }
             GestureState.FLUNG -> {
                 // Typically a vibration is only played while transitioning to ACTIVE. However there
                 // are instances where a fling to trigger back occurs while not in that state.
                 // (e.g. A fling is detected before crossing the trigger threshold.)
-                if (previousState != GestureState.ACTIVE) {
+                if (edgeHapticEnabled && (previousState != GestureState.ACTIVE)) {
                     performActivatedHapticFeedback()
                 }
                 mainHandler.postDelayed(POP_ON_FLING_DELAY) {
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/DisplayBackGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/DisplayBackGestureHandler.kt
index 42494e5459949..4b5f682b89547 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/DisplayBackGestureHandler.kt
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/DisplayBackGestureHandler.kt
@@ -50,6 +50,10 @@ interface DisplayBackGestureHandler {
 
     fun setLongSwipeEnabled(enabled: Boolean)
 
+    fun setBackArrowVisibility(enabled: Boolean)
+
+    fun setEdgeHapticEnabled(enabled: Boolean)
+
     fun setBatchingEnabled(enabled: Boolean)
 
     fun pilferPointers()
@@ -138,6 +142,10 @@ constructor(
 
     override fun setLongSwipeEnabled(enabled: Boolean) = edgeBackPlugin.setLongSwipeEnabled(enabled)
 
+    override fun setBackArrowVisibility(enabled: Boolean) = edgeBackPlugin.setBackArrowVisibility(enabled)
+
+    override fun setEdgeHapticEnabled(enabled: Boolean) = edgeBackPlugin.setEdgeHapticEnabled(enabled)
+
     override fun setBatchingEnabled(enabled: Boolean) =
         inputEventReceiver.setBatchingEnabled(enabled)
 
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index 12cb7aeb9b817..d7ffe648c9b4d 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -45,7 +45,6 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
@@ -60,7 +59,9 @@
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.util.ArraySet;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -85,6 +86,7 @@
 
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 import com.android.internal.policy.GestureNavigationSettingsObserver;
+import com.android.internal.util.matrixx.Utils;
 import com.android.systemui.LauncherProxyService;
 import com.android.systemui.contextualeducation.GestureType;
 import com.android.systemui.dagger.qualifiers.Background;
@@ -106,6 +108,7 @@
 import com.android.systemui.shared.system.TaskStackChangeListeners;
 import com.android.systemui.statusbar.phone.LightBarController;
 import com.android.systemui.topui.TopUiController;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.concurrency.BackPanelUiThread;
 import com.android.systemui.util.concurrency.UiThreadContext;
 import com.android.systemui.util.kotlin.JavaAdapter;
@@ -142,12 +145,23 @@
 /**
  * Utility class to handle edge swipes for back gesture
  */
-public class EdgeBackGestureHandler {
+public class EdgeBackGestureHandler implements TunerService.Tunable {
 
     private static final String TAG = "EdgeBackGestureHandler";
     private static final int MAX_LONG_PRESS_TIMEOUT = SystemProperties.getInt(
             "gestures.back_timeout", 250);
 
+    private static final String KEY_EDGE_LONG_SWIPE_ACTION =
+            "lineagesystem:" + LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION;
+    private static final String BACK_GESTURE_HEIGHT =
+            "system:" + Settings.System.BACK_GESTURE_HEIGHT;
+    private static final String FORCE_SHOW_NAVBAR =
+            "lineagesystem:" + LineageSettings.System.FORCE_SHOW_NAVBAR;
+    private static final String BACK_GESTURE_ARROW =
+            Settings.Secure.BACK_GESTURE_ARROW;
+    private static final String BACK_GESTURE_HAPTIC =
+            Settings.Secure.BACK_GESTURE_HAPTIC;
+
     private static final int MAX_NUM_LOGGED_PREDICTIONS = 10;
     private static final int MAX_NUM_LOGGED_GESTURES = 10;
 
@@ -248,6 +262,8 @@ public void onPropertiesChanged(DeviceConfig.Properties properties) {
 
     private final JavaAdapter mJavaAdapter;
 
+    private final TunerService mTunerService;
+
     // The left side edge width where touch down is allowed
     private int mEdgeWidthLeft;
     // The right side edge width where touch down is allowed
@@ -304,6 +320,9 @@ public void onPropertiesChanged(DeviceConfig.Properties properties) {
     private long mSysUiFlags;
     private float mLongSwipeWidth;
 
+    private int mEdgeHeight;
+    private int mEdgeHeightSetting = 0;
+
     // For Tf-Lite model.
     private BackGestureTfClassifierProvider mBackGestureTfClassifierProvider;
     private Map<String, Integer> mVocab;
@@ -331,6 +350,10 @@ public void onPropertiesChanged(DeviceConfig.Properties properties) {
     private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;
     private final TopUiController mTopUiController;
 
+    private boolean mNavbarVisible;
+    private boolean mIsBackGestureArrowEnabled;
+    private boolean mIsEdgeHapticEnabled;
+
     private final NavigationEdgeBackPlugin.BackCallback mBackCallback =
             new NavigationEdgeBackPlugin.BackCallback() {
                 @Override
@@ -365,6 +388,7 @@ public void triggerBack(boolean isLongPress) {
                 public void cancelBack() {
                     if (mBackAnimation != null) {
                         mBackAnimation.setTriggerBack(false);
+                        mBackAnimation.setTriggerLongSwipe(false);
                     }
                     logGesture(SysUiStatsLog.BACK_GESTURE__TYPE__INCOMPLETE);
                 }
@@ -434,6 +458,9 @@ public void onInputDeviceRemoved(int deviceId) {
                 mTrackpadsConnected.remove(deviceId);
                 if (mTrackpadsConnected.isEmpty()) {
                     update();
+                    if (mStateChangeCallback != null) {
+                        mStateChangeCallback.run();
+                    }
                 }
             });
         }
@@ -495,7 +522,8 @@ public interface Factory {
             JavaAdapter javaAdapter,
             DisplayManager displayManager,
             DisplayBackGestureHandlerImpl.Factory displayBackGestureHandlerFactory,
-            DesktopState desktopState) {
+            DesktopState desktopState,
+            TunerService tunerService) {
         mContext = context;
         mMainDisplayId = context.getDisplayId();
         mUiThreadContext = uiThreadContext;
@@ -521,9 +549,11 @@ public interface Factory {
         mDisplayManager = displayManager;
         mDisplayBackGestureHandlerFactory = displayBackGestureHandlerFactory;
         mDesktopState = desktopState;
+        mTunerService = tunerService;
 
-        ComponentName recentsComponentName = ComponentName.unflattenFromString(
-                context.getString(com.android.internal.R.string.config_recentsComponentName));
+        int defaultLauncher = SystemProperties.getInt("persist.sys.default_launcher", 0);
+        String[] launcherComponents = context.getResources().getStringArray(com.android.internal.R.array.config_launcherComponents);
+        ComponentName recentsComponentName = ComponentName.unflattenFromString(launcherComponents[defaultLauncher]);
         if (recentsComponentName != null) {
             String recentsPackageName = recentsComponentName.getPackageName();
             PackageManager manager = context.getPackageManager();
@@ -598,6 +628,9 @@ public void updateCurrentUserResources() {
                 && mButtonForcedVisibleCallback != null) {
             mButtonForcedVisibleCallback.accept(mIsButtonForcedVisible);
         }
+        mNavbarVisible = LineageSettings.System.getIntForUser(mContext.getContentResolver(),
+                LineageSettings.System.FORCE_SHOW_NAVBAR, Utils.hasNavbarByDefault(mContext) ? 1 : 0,
+                UserHandle.USER_CURRENT) != 0;
 
         final DisplayMetrics dm = res.getDisplayMetrics();
         final float defaultGestureHeight = res.getDimension(
@@ -613,20 +646,23 @@ public void updateCurrentUserResources() {
         if (mMLEnableWidth > mEdgeWidthRight) mMLEnableWidth = mEdgeWidthRight;
         if (mMLEnableWidth > mEdgeWidthLeft) mMLEnableWidth = mEdgeWidthLeft;
 
-        mContext.getContentResolver().registerContentObserver(
-                LineageSettings.System.getUriFor(LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION),
-                false, new ContentObserver(mUiThreadContext.getHandler()) {
-                    @Override
-                    public void onChange(boolean selfChange) {
-                        mIsLongSwipeEnabled = Action.fromIntSafe(
-                                LineageSettings.System.getInt(mContext.getContentResolver(),
-                                        LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION,
-                                        Action.NOTHING.ordinal())) != Action.NOTHING;
-                        updateLongSwipeWidth();
-                    }
-                });
-        mContext.getContentResolver().notifyChange(LineageSettings.System.getUriFor(
-                LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION), null);
+        mIsLongSwipeEnabled = Action.fromIntSafe(
+                LineageSettings.System.getIntForUser(mContext.getContentResolver(),
+                        LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION,
+                        Action.NOTHING.ordinal(), UserHandle.USER_CURRENT)) != Action.NOTHING;
+        updateLongSwipeWidth();
+
+        mEdgeHeightSetting = Settings.System.getIntForUser(mContext.getContentResolver(),
+                        Settings.System.BACK_GESTURE_HEIGHT, 0, UserHandle.USER_CURRENT);
+        updateEdgeHeightValue();
+
+        mIsBackGestureArrowEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                        Settings.Secure.BACK_GESTURE_ARROW, 1, UserHandle.USER_CURRENT) != 0;
+        updateBackArrowVisibility();
+
+        mIsEdgeHapticEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                        Settings.Secure.BACK_GESTURE_HAPTIC, 1, UserHandle.USER_CURRENT) != 0;
+        updateEdgeHaptic();
 
         // Reduce the default touch slop to ensure that we can intercept the gesture
         // before the app starts to react to it.
@@ -678,6 +714,11 @@ public void onNavBarAttached() {
         }
         updateIsEnabled();
         mUserTracker.addCallback(mUserChangedCallback, mUiThreadContext.getExecutor());
+        mTunerService.addTunable(this, KEY_EDGE_LONG_SWIPE_ACTION);
+        mTunerService.addTunable(this, BACK_GESTURE_HEIGHT);
+        mTunerService.addTunable(this, FORCE_SHOW_NAVBAR);
+        mTunerService.addTunable(this, BACK_GESTURE_ARROW);
+        mTunerService.addTunable(this, BACK_GESTURE_HAPTIC);
     }
 
     /**
@@ -691,6 +732,7 @@ public void onNavBarDetached() {
         mTrackpadsConnected.clear();
         updateIsEnabled();
         mUserTracker.removeCallback(mUserChangedCallback);
+        mTunerService.removeTunable(this);
     }
 
     /**
@@ -802,7 +844,7 @@ private void updateIsEnabledInner() {
 
             mIsGestureHandlingEnabled = mInGestureNavMode || (mUsingThreeButtonNav
                     && !mTrackpadsConnected.isEmpty());
-            boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled;
+            boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled && mNavbarVisible;
             if (isEnabled == mIsEnabled) {
                 return;
             }
@@ -885,6 +927,8 @@ private void updateIsEnabledInner() {
                     // Add a nav bar panel window
                     resetEdgeBackPlugin();
                     updateLongSwipeWidth();
+                    updateEdgeHeightValue();
+                    updateBackArrowVisibility();
                 }
 
                 // Begin listening to changes in blocked activities list
@@ -928,11 +972,32 @@ public boolean isButtonForcedVisible() {
         return mIsButtonForcedVisible;
     }
 
-    private void updateLongSwipeWidth() {
-        if (!mIsEnabled) {
-            return;
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        if (KEY_EDGE_LONG_SWIPE_ACTION.equals(key)) {
+            mIsLongSwipeEnabled = Action.fromIntSafe(TunerService.parseInteger(
+                    newValue, 0)) != Action.NOTHING;
+            updateLongSwipeWidth();
+        } else if (BACK_GESTURE_HEIGHT.equals(key)) {
+            mEdgeHeightSetting = TunerService.parseInteger(newValue, 0);
+            updateEdgeHeightValue();
+        } else if (FORCE_SHOW_NAVBAR.equals(key)) {
+            mNavbarVisible =
+                TunerService.parseIntegerSwitch(newValue, Utils.hasNavbarByDefault(mContext));
+            updateIsEnabled();
+        } else if (BACK_GESTURE_ARROW.equals(key)) {
+            mIsBackGestureArrowEnabled =
+                TunerService.parseIntegerSwitch(newValue, true);
+            updateBackArrowVisibility();
+        } else if (BACK_GESTURE_HAPTIC.equals(key)) {
+            mIsEdgeHapticEnabled =
+                TunerService.parseIntegerSwitch(newValue, true);
+            updateEdgeHaptic();
         }
+    }
 
+    private void updateLongSwipeWidth() {
+        if (!mIsEnabled) return;
         if (DesktopExperienceFlags.ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE.isTrue()) {
             for (DisplayBackGestureHandler displayBackGestureHandler :
                     mDisplayBackGestureHandlers.values()) {
@@ -943,6 +1008,50 @@ private void updateLongSwipeWidth() {
         }
     }
 
+    private void updateEdgeHeightValue() {
+        if (mDisplaySize == null) {
+            return;
+        }
+        // mEdgeHeightSetting cant be range 0 - 3
+        // 0 means full height
+        // 1 measns half of the screen
+        // 2 means lower third of the screen
+        // 3 means lower sicth of the screen
+        if (mEdgeHeightSetting == 0) {
+            mEdgeHeight = mDisplaySize.y;
+        } else if (mEdgeHeightSetting == 1) {
+            mEdgeHeight = (mDisplaySize.y * 3) / 4;
+        } else if (mEdgeHeightSetting == 2) {
+            mEdgeHeight = mDisplaySize.y / 2;
+        } else {
+            mEdgeHeight = mDisplaySize.y / 4;
+        }
+    }
+
+    private void updateBackArrowVisibility() {
+        if (!mIsEnabled) return;
+        if (DesktopExperienceFlags.ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE.isTrue()) {
+            for (DisplayBackGestureHandler displayBackGestureHandler :
+                    mDisplayBackGestureHandlers.values()) {
+                displayBackGestureHandler.setBackArrowVisibility(mIsBackGestureArrowEnabled);
+            }
+        } else if (mEdgeBackPlugin != null) {
+            mEdgeBackPlugin.setBackArrowVisibility(mIsBackGestureArrowEnabled);
+        }
+    }
+
+    private void updateEdgeHaptic() {
+        if (!mIsEnabled) return;
+        if (DesktopExperienceFlags.ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE.isTrue()) {
+            for (DisplayBackGestureHandler displayBackGestureHandler :
+                    mDisplayBackGestureHandlers.values()) {
+                displayBackGestureHandler.setEdgeHapticEnabled(mIsEdgeHapticEnabled);
+            }
+        } else if (mEdgeBackPlugin != null) {
+            mEdgeBackPlugin.setEdgeHapticEnabled(mIsEdgeHapticEnabled);
+        }
+    }
+
     /**
      * Update the PiP bounds, used for exclusion calculation.
      */
@@ -1077,6 +1186,11 @@ private boolean isWithinInsets(int x, int y) {
         if (y >= (mDisplaySize.y - mBottomGestureHeight)) {
             return false;
         }
+        if (mEdgeHeight != 0) {
+            if (y < (mDisplaySize.y - mBottomGestureHeight - mEdgeHeight)) {
+                return false;
+            }
+        }
         // If the point is way too far (twice the margin), it is
         // not interesting to us for logging purposes, nor we
         // should process it.  Simply return false and keep
@@ -1468,6 +1582,8 @@ private void updateDisplaySize() {
         }
         updateBackAnimationThresholds();
         updateLongSwipeWidth();
+        updateEdgeHeightValue();
+        updateBackArrowVisibility();
     }
 
     private void updateBackAnimationThresholds() {
@@ -1486,7 +1602,7 @@ private boolean sendEvent(int action, int code, int flags) {
         final KeyEvent ev = new KeyEvent(when, when, action, code, 0 /* repeat */,
                 0 /* metaState */, KeyCharacterMap.VIRTUAL_KEYBOARD, 0 /* scancode */,
                 flags | KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY,
-                InputDevice.SOURCE_KEYBOARD);
+                InputDevice.SOURCE_NAVIGATION_BAR);
 
         ev.setDisplayId(mContext.getDisplay().getDisplayId());
         return mContext.getSystemService(InputManager.class)
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java
index 417a1d606cbdf..67eecef96238d 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java
@@ -62,6 +62,7 @@
 import android.app.StatusBarManager.NavbarFlags;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
@@ -70,12 +71,16 @@
 import android.graphics.Region;
 import android.inputmethodservice.InputMethodService.BackDispositionMode;
 import android.inputmethodservice.InputMethodService.ImeWindowVisibility;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.RemoteException;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -235,6 +240,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
     private NavigationBarFrame mFrame;
     private MotionEvent mCurrentDownEvent;
 
+    private final ContentObserver mNavBarObserver;
+
     private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING;
 
     @NavbarFlags
@@ -692,6 +699,25 @@ public boolean isSamplingEnabled() {
         mView.setDisplayTracker(mDisplayTracker);
         mView.setRotationPolicyWrapper(rotationPolicyWrapper);
         mNavBarMode = mNavigationModeController.addListener(mModeChangedListener);
+
+        mNavBarObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                super.onChange(selfChange, uri);
+                if (mView != null) {
+                    mView.setNavBarMode(mNavBarMode, mNavigationModeController.getImeDrawsImeNavBar()
+                            && getShowNavBarIme());
+
+                }
+            }
+        };
+    }
+
+    private boolean getShowNavBarIme() {
+        return Settings.Secure.getIntForUser(
+            mContext.getContentResolver(),
+            Settings.Secure.NAVBAR_IME_SPACE, 1,
+            UserHandle.USER_CURRENT) == 1;
     }
 
     public NavigationBarView getView() {
@@ -866,6 +892,13 @@ public void onViewAttached() {
         AutoHideController autoHideController = mAutoHideControllerStore.forDisplay(mDisplayId);
         setAutoHideController(autoHideController);
         restoreAppearanceAndTransientState();
+
+        mContext.getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.NAVBAR_IME_SPACE),
+                false,
+                mNavBarObserver,
+                UserHandle.USER_ALL
+        );
     }
 
     @Override
@@ -899,6 +932,7 @@ public void onViewDetached() {
         mPipOptional.ifPresent(mView::removePipExclusionBoundsChangeListener);
         mFrame = null;
         mOrientationHandle = null;
+        mContext.getContentResolver().unregisterContentObserver(mNavBarObserver);
     }
 
     // TODO: Remove this when we update nav bar recreation
@@ -2035,7 +2069,8 @@ public void setNavigationBarLumaSamplingEnabled(boolean enable) {
     }
 
     private void setNavBarMode(int mode) {
-        mView.setNavBarMode(mode, mNavigationModeController.getImeDrawsImeNavBar());
+        mView.setNavBarMode(mode, mNavigationModeController.getImeDrawsImeNavBar()
+                && getShowNavBarIme());
         if (isGesturalMode(mode)) {
             mRegionSamplingHelper.start(mSamplingBounds);
         } else {
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java
index 559d75f2c54cc..7f021250eccf8 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/views/buttons/KeyButtonView.java
@@ -450,7 +450,7 @@ private void sendEvent(int action, int flags, long when) {
         final KeyEvent ev = new KeyEvent(mDownTime, when, action, mCode, repeatCount,
                 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
                 flags | KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY,
-                InputDevice.SOURCE_KEYBOARD);
+                InputDevice.SOURCE_NAVIGATION_BAR);
 
         int displayId = INVALID_DISPLAY;
 
diff --git a/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingSettingsRepository.kt b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingSettingsRepository.kt
new file mode 100644
index 0000000000000..25cf0d942ab85
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingSettingsRepository.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.nowplaying
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.provider.Settings
+import android.util.Log
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.*
+
+data class NowPlayingSettings(
+    val isEnabled: Boolean,
+    val useAccentColor: Boolean,
+    val iconStyle: Int,
+    val iconSize: Int,
+    val useCompactStyle: Boolean,
+    val verticalPosition: Float,
+    val trackTextSize: Float,
+    val artistTextSize: Float,
+    val showOnAod: Boolean,
+    val showOnLockscreen: Boolean
+)
+
+class NowPlayingSettingsRepository(context: Context) {
+
+    private val resolver: ContentResolver = context.contentResolver
+
+    private val DEFAULT_VERTICAL_POSITION = 98
+    private val DEFAULT_TRACK_SIZE = 14
+    private val DEFAULT_ARTIST_SIZE = 12
+    private val DEFAULT_ICON_STYLE = 0
+    private val DEFAULT_ICON_SIZE = 24
+
+    val settingsFlow: Flow<NowPlayingSettings> = combine(
+        observeSettingInt(SETTING_ENABLED, 0),
+        observeSettingInt(SETTING_USE_ACCENT_COLOR, 0),
+        observeSettingInt(SETTING_ICON_STYLE, DEFAULT_ICON_STYLE),
+        observeSettingInt(SETTING_ICON_SIZE, DEFAULT_ICON_SIZE),
+        observeSettingInt(SETTING_USE_COMPACT_STYLE, 0),
+        observeSettingInt(SETTING_VERTICAL_POSITION, DEFAULT_VERTICAL_POSITION),
+        observeSettingInt(SETTING_TRACK_TEXT_SIZE, DEFAULT_TRACK_SIZE),
+        observeSettingInt(SETTING_ARTIST_TEXT_SIZE, DEFAULT_ARTIST_SIZE),
+        observeSettingInt(SETTING_SHOW_ON_AOD, 1),
+        observeSettingInt(SETTING_SHOW_ON_LOCKSCREEN, 1)
+    ) { flows: Array<Any?> ->
+        val enabled = flows[0] as Int
+        val useAccent = flows[1] as Int
+        val iconStyle = flows[2] as Int
+        val iconSize = flows[3] as Int
+        val compactStyle = flows[4] as Int
+        val positionInt = flows[5] as Int
+        val trackSize = flows[6] as Int
+        val artistSize = flows[7] as Int
+        val showAod = flows[8] as Int
+        val showLock = flows[9] as Int
+        val position = (positionInt / 100f).coerceIn(0.1f, 1.0f)
+        val iconStyleClamped = iconStyle.coerceIn(0, 2)
+        val iconSizeClamped = iconSize.coerceIn(5, 40)
+        val trackSizeClamped = trackSize.toFloat().coerceIn(8f, 24f)
+        val artistSizeClamped = artistSize.toFloat().coerceIn(5f, 20f)
+        
+        NowPlayingSettings(
+            isEnabled = enabled == 1,
+            useAccentColor = useAccent == 1,
+            iconStyle = iconStyleClamped,
+            iconSize = iconSizeClamped,
+            useCompactStyle = compactStyle == 1,
+            verticalPosition = position,
+            trackTextSize = trackSizeClamped,
+            artistTextSize = artistSizeClamped,
+            showOnAod = showAod == 1,
+            showOnLockscreen = showLock == 1
+        )
+    }.distinctUntilChanged()
+
+    fun currentSettings(): NowPlayingSettings {
+        val positionInt = Settings.System.getIntForUser(
+            resolver, 
+            SETTING_VERTICAL_POSITION, 
+            DEFAULT_VERTICAL_POSITION, 
+            UserHandle.USER_CURRENT
+        )
+        val trackSizeInt = Settings.System.getIntForUser(
+            resolver, 
+            SETTING_TRACK_TEXT_SIZE, 
+            DEFAULT_TRACK_SIZE, 
+            UserHandle.USER_CURRENT
+        )
+        val artistSizeInt = Settings.System.getIntForUser(
+            resolver, 
+            SETTING_ARTIST_TEXT_SIZE, 
+            DEFAULT_ARTIST_SIZE, 
+            UserHandle.USER_CURRENT
+        )
+        val iconStyle = Settings.System.getIntForUser(
+            resolver,
+            SETTING_ICON_STYLE,
+            DEFAULT_ICON_STYLE,
+            UserHandle.USER_CURRENT
+        )
+        val iconSize = Settings.System.getIntForUser(
+            resolver,
+            SETTING_ICON_SIZE,
+            DEFAULT_ICON_SIZE,
+            UserHandle.USER_CURRENT
+        )
+        
+        return NowPlayingSettings(
+            isEnabled = Settings.System.getIntForUser(
+                resolver, SETTING_ENABLED, 0, UserHandle.USER_CURRENT
+            ) == 1,
+            useAccentColor = Settings.System.getIntForUser(
+                resolver, SETTING_USE_ACCENT_COLOR, 0, UserHandle.USER_CURRENT
+            ) == 1,
+            iconStyle = iconStyle.coerceIn(0, 2),
+            iconSize = iconSize.coerceIn(5, 40),
+            useCompactStyle = Settings.System.getIntForUser(
+                resolver, SETTING_USE_COMPACT_STYLE, 0, UserHandle.USER_CURRENT
+            ) == 1,
+            verticalPosition = (positionInt / 100f).coerceIn(0.1f, 1.0f),
+            trackTextSize = trackSizeInt.toFloat().coerceIn(8f, 24f),
+            artistTextSize = artistSizeInt.toFloat().coerceIn(5f, 20f),
+            showOnAod = Settings.System.getIntForUser(
+                resolver, SETTING_SHOW_ON_AOD, 1, UserHandle.USER_CURRENT
+            ) == 1,
+            showOnLockscreen = Settings.System.getIntForUser(
+                resolver, SETTING_SHOW_ON_LOCKSCREEN, 1, UserHandle.USER_CURRENT
+            ) == 1
+        )
+    }
+
+    private fun observeSettingInt(key: String, default: Int): Flow<Int> = callbackFlow {
+        val uri = Settings.System.getUriFor(key)
+        val observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                val value = Settings.System.getIntForUser(resolver, key, default, UserHandle.USER_CURRENT)
+                trySend(value)
+            }
+        }
+        
+        try {
+            resolver.registerContentObserver(uri, false, observer)
+            val initialValue = Settings.System.getIntForUser(resolver, key, default, UserHandle.USER_CURRENT)
+            trySend(initialValue)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error observing setting: $key", e)
+            trySend(default)
+        }
+        
+        awaitClose { 
+            try {
+                resolver.unregisterContentObserver(observer)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error unregistering observer: $key", e)
+            }
+        }
+    }.distinctUntilChanged()
+
+    companion object {
+        private const val TAG = "NowPlayingSettings"
+        private const val SETTING_ENABLED = "nowplaying_enabled"
+        private const val SETTING_USE_ACCENT_COLOR = "nowplaying_use_accent_color"
+        private const val SETTING_ICON_STYLE = "nowplaying_icon_style"
+        private const val SETTING_ICON_SIZE = "nowplaying_icon_size"
+        private const val SETTING_USE_COMPACT_STYLE = "nowplaying_use_compact_style"
+        private const val SETTING_VERTICAL_POSITION = "nowplaying_vertical_position"
+        private const val SETTING_TRACK_TEXT_SIZE = "nowplaying_track_text_size"
+        private const val SETTING_ARTIST_TEXT_SIZE = "nowplaying_artist_text_size"
+        private const val SETTING_SHOW_ON_AOD = "nowplaying_show_on_aod"
+        private const val SETTING_SHOW_ON_LOCKSCREEN = "nowplaying_show_on_lockscreen"
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingView.kt b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingView.kt
new file mode 100644
index 0000000000000..43c394803cf4a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingView.kt
@@ -0,0 +1,569 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.nowplaying
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ValueAnimator
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Typeface
+import android.os.Handler
+import android.os.Looper
+import android.text.TextPaint
+import android.text.TextUtils
+import android.util.Log
+import android.view.animation.LinearInterpolator
+import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toBitmap
+import androidx.core.view.isVisible
+import com.android.systemui.res.R
+
+class NowPlayingView(context: Context) : FrameLayout(context) {
+
+    companion object {
+        private const val TAG = "NowPlayingView"
+        const val ICON_STYLE_DISABLED = 0
+        const val ICON_STYLE_APP = 1
+        const val ICON_STYLE_MUSIC = 2
+        private const val MARQUEE_SPEED_PX_PER_SEC = 30f
+        private const val MARQUEE_DELAY_MS = 1500L
+        private const val MARQUEE_GAP_MULTIPLIER = 3f
+        private const val MAX_WIDTH_RATIO = 0.55f
+    }
+
+    private val trackPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+    }
+
+    private val artistPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+    }
+
+    private val compactPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.LEFT
+    }
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var marqueeStartRunnable: Runnable? = null
+
+    var trackTitle: String = ""
+        set(value) {
+            field = value
+            resetMarquee()
+            if (value.isNotEmpty() && visible) {
+                post { 
+                    isVisible = true
+                    alpha = currentAlpha
+                }
+            }
+            invalidate()
+        }
+
+    var artistName: String = ""
+        set(value) {
+            field = value
+            resetMarquee()
+            invalidate()
+        }
+
+    var textColor: Int = 0xFFFFFFFF.toInt()
+        set(value) {
+            field = value
+            trackPaint.color = value
+            artistPaint.color = value and 0x00FFFFFF or 0xB3000000.toInt()
+            compactPaint.color = value
+            updateIconTint()
+            invalidate()
+        }
+
+    var verticalPosition: Float = 0.98f
+        set(value) {
+            field = value.coerceIn(0.1f, 1.0f)
+            invalidate()
+        }
+
+    var iconStyle: Int = ICON_STYLE_DISABLED
+        set(value) {
+            field = value.coerceIn(ICON_STYLE_DISABLED, ICON_STYLE_MUSIC)
+            invalidate()
+        }
+
+    var iconSizeDp: Int = 24
+        set(value) {
+            field = value.coerceIn(5, 40)
+            updateIconSize()
+            invalidate()
+        }
+
+    var useCompactStyle: Boolean = false
+        set(value) {
+            field = value
+            resetMarquee()
+            invalidate()
+        }
+
+    var appPackageName: String = ""
+        set(value) {
+            field = value
+            updateAppIcon()
+        }
+
+    private var appIconBitmap: Bitmap? = null
+    private var defaultIconBitmap: Bitmap? = null
+    private var defaultIconTintedBitmap: Bitmap? = null
+    private var iconSize: Int = 0
+    private val iconPaddingCompact: Float by lazy { 
+        resources.getDimensionPixelSize(R.dimen.nowplaying_icon_padding_compact).toFloat()
+    }
+    private val iconPaddingNormal: Float by lazy { 
+        resources.getDimensionPixelSize(R.dimen.nowplaying_icon_padding_normal).toFloat()
+    }
+    private val titleArtistGap: Float by lazy {
+        resources.getDimensionPixelSize(R.dimen.nowplaying_title_artist_gap).toFloat()
+    }
+
+    private var fadeAnimator: ValueAnimator? = null
+    private var marqueeAnimator: ValueAnimator? = null
+    private var currentAlpha: Float = 0f
+    private var marqueeOffset: Float = 0f
+    private var needsMarquee: Boolean = false
+    private var cachedMaxWidth: Float = 0f
+    private var cachedWidth: Int = 0
+
+    var visible: Boolean
+        get() = isVisible
+        set(value) { 
+            isVisible = value
+            if (!value) {
+                currentAlpha = 0f
+                alpha = 0f
+            }
+        }
+
+    init {
+        layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
+        setWillNotDraw(false)
+        visible = false
+        val density = resources.displayMetrics.density
+        trackPaint.textSize = 14f * density
+        artistPaint.textSize = 12f * density
+        compactPaint.textSize = 14f * density
+        textColor = 0xFFFFFFFF.toInt()
+        updateFontFamily()
+        updateIconSize()
+        loadDefaultIcon()
+    }
+
+    private fun updateFontFamily() {
+        try {
+            val fontFamily = context.resources.getString(
+                com.android.internal.R.string.config_bodyFontFamily
+            )
+            val typeface = Typeface.create(fontFamily, Typeface.NORMAL)
+            trackPaint.typeface = typeface
+            artistPaint.typeface = typeface
+            compactPaint.typeface = typeface
+        } catch (e: Exception) {
+            Log.e(TAG, "Error loading system font, using default", e)
+            val typeface = Typeface.create("sans-serif", Typeface.NORMAL)
+            trackPaint.typeface = typeface
+            artistPaint.typeface = typeface
+            compactPaint.typeface = typeface
+        }
+    }
+
+    private fun updateIconSize() {
+        iconSize = (iconSizeDp * resources.displayMetrics.density).toInt()
+        
+        loadDefaultIcon()
+        if (appPackageName.isNotEmpty()) {
+            updateAppIcon()
+        }
+    }
+
+    private fun loadDefaultIcon() {
+        try {
+            val drawable = ContextCompat.getDrawable(context, R.drawable.ic_music_note_24dp)
+            drawable?.let {
+                defaultIconBitmap?.recycle()
+                defaultIconBitmap = it.toBitmap(iconSize, iconSize)
+                updateIconTint()
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error loading default icon", e)
+        }
+    }
+
+    private fun updateIconTint() {
+        defaultIconBitmap?.let { original ->
+            try {
+                defaultIconTintedBitmap?.recycle()
+                defaultIconTintedBitmap = null
+                
+                val tintedBitmap = Bitmap.createBitmap(iconSize, iconSize, Bitmap.Config.ARGB_8888)
+                val canvas = Canvas(tintedBitmap)
+                
+                val paint = Paint().apply {
+                    colorFilter = android.graphics.PorterDuffColorFilter(
+                        textColor,
+                        android.graphics.PorterDuff.Mode.SRC_IN
+                    )
+                }
+                
+                canvas.drawBitmap(original, 0f, 0f, paint)
+                defaultIconTintedBitmap = tintedBitmap
+            } catch (e: Exception) {
+                Log.e(TAG, "Error tinting icon", e)
+            }
+        }
+    }
+
+    private fun updateAppIcon() {
+        if (appPackageName.isEmpty()) {
+            appIconBitmap?.recycle()
+            appIconBitmap = null
+            invalidate()
+            return
+        }
+
+        try {
+            val pm = context.packageManager
+            val appIcon = pm.getApplicationIcon(appPackageName)
+            appIconBitmap?.recycle()
+            appIconBitmap = appIcon.toBitmap(iconSize, iconSize)
+            invalidate()
+        } catch (e: PackageManager.NameNotFoundException) {
+            appIconBitmap?.recycle()
+            appIconBitmap = null
+            invalidate()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error loading app icon", e)
+        }
+    }
+
+    fun show() {
+        if (trackTitle.isEmpty()) return
+        
+        post {
+            visible = true
+            isVisible = true
+            fadeAnimator?.cancel()
+            
+            fadeAnimator = ValueAnimator.ofFloat(currentAlpha, 1f).apply {
+                duration = 300
+                addUpdateListener { animator ->
+                    currentAlpha = animator.animatedValue as Float
+                    alpha = currentAlpha
+                }
+                addListener(object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        fadeAnimator = null
+                        currentAlpha = 1f
+                        alpha = 1f
+                        startMarqueeIfNeeded()
+                    }
+                })
+                start()
+            }
+        }
+    }
+
+    fun hide() {
+        post {
+            fadeAnimator?.cancel()
+            stopMarquee()
+            
+            fadeAnimator = ValueAnimator.ofFloat(currentAlpha, 0f).apply {
+                duration = 300
+                addUpdateListener { animator ->
+                    currentAlpha = animator.animatedValue as Float
+                    alpha = currentAlpha
+                }
+                addListener(object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        post {
+                            visible = false
+                            currentAlpha = 0f
+                            fadeAnimator = null
+                        }
+                    }
+                })
+                start()
+            }
+        }
+    }
+
+    private fun resetMarquee() {
+        stopMarquee()
+        marqueeOffset = 0f
+        needsMarquee = false
+    }
+
+    private fun stopMarquee() {
+        marqueeAnimator?.cancel()
+        marqueeAnimator = null
+        marqueeStartRunnable?.let { mainHandler.removeCallbacks(it) }
+        marqueeStartRunnable = null
+    }
+
+    private fun startMarqueeIfNeeded() {
+        if (!visible || !needsMarquee || useCompactStyle) return
+        
+        marqueeStartRunnable?.let { mainHandler.removeCallbacks(it) }
+        
+        marqueeStartRunnable = Runnable {
+            if (visible && needsMarquee && isAttachedToWindow) {
+                startMarqueeAnimation()
+            }
+            marqueeStartRunnable = null
+        }
+        
+        mainHandler.postDelayed(marqueeStartRunnable!!, MARQUEE_DELAY_MS)
+    }
+
+    private fun startMarqueeAnimation() {
+        if (marqueeAnimator?.isRunning == true) return
+        
+        val maxWidth = width * MAX_WIDTH_RATIO
+        val separator = if (artistName.isNotEmpty()) " ~ " else ""
+        val fullText = "$trackTitle$separator$artistName"
+        val textWidth = trackPaint.measureText(fullText)
+        
+        if (textWidth <= maxWidth) return
+        
+        val gapWidth = trackPaint.measureText(" ") * MARQUEE_GAP_MULTIPLIER
+        val totalDistance = textWidth + gapWidth
+        val duration = ((totalDistance / MARQUEE_SPEED_PX_PER_SEC) * 1000).toLong()
+        
+        marqueeAnimator = ValueAnimator.ofFloat(0f, totalDistance).apply {
+            this.duration = duration
+            interpolator = LinearInterpolator()
+            repeatCount = ValueAnimator.INFINITE
+            repeatMode = ValueAnimator.RESTART
+            
+            addUpdateListener { animator ->
+                marqueeOffset = animator.animatedValue as Float
+                invalidate()
+            }
+            
+            start()
+        }
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        cachedWidth = w
+        cachedMaxWidth = w * MAX_WIDTH_RATIO
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        
+        fadeAnimator?.cancel()
+        fadeAnimator = null
+        stopMarquee()
+        
+        mainHandler.removeCallbacksAndMessages(null)
+        
+        appIconBitmap?.recycle()
+        appIconBitmap = null
+        defaultIconBitmap?.recycle()
+        defaultIconBitmap = null
+        defaultIconTintedBitmap?.recycle()
+        defaultIconTintedBitmap = null
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        if (trackTitle.isEmpty()) return
+
+        val centerX = width / 2f
+        val yPosition = height * verticalPosition
+
+        if (cachedWidth != width) {
+            cachedWidth = width
+            cachedMaxWidth = width * MAX_WIDTH_RATIO
+        }
+
+        if (useCompactStyle) {
+            drawCompactStyleWithMarquee(canvas, centerX, yPosition, cachedMaxWidth)
+        } else {
+            drawNormalStyle(canvas, centerX, yPosition, cachedMaxWidth)
+        }
+    }
+
+    private fun drawCompactStyleWithMarquee(canvas: Canvas, centerX: Float, yPosition: Float, maxWidth: Float) {
+        val separator = if (artistName.isNotEmpty()) " ~ " else ""
+        val fullText = "$trackTitle$separator$artistName"
+        
+        compactPaint.textSize = trackPaint.textSize
+        compactPaint.color = trackPaint.color
+        compactPaint.typeface = trackPaint.typeface
+        
+        val iconToDraw = when (iconStyle) {
+            ICON_STYLE_APP -> appIconBitmap
+            ICON_STYLE_MUSIC -> defaultIconTintedBitmap
+            else -> null
+        }
+        
+        val iconWidth = if (iconToDraw != null) iconSize + iconPaddingCompact else 0f
+        val availableTextWidth = maxWidth - iconWidth
+        val textWidth = compactPaint.measureText(fullText)
+        
+        needsMarquee = textWidth > availableTextWidth
+        
+        canvas.save()
+        try {
+            if (needsMarquee) {
+                val gapWidth = compactPaint.measureText(" ") * MARQUEE_GAP_MULTIPLIER
+                val totalWidth = textWidth + gapWidth
+                
+                val startX = centerX - (maxWidth / 2f)
+                
+                if (iconToDraw != null) {
+                    val iconX = startX
+                    val iconY = yPosition - (iconSize / 2f) - (compactPaint.textSize / 4f)
+                    canvas.drawBitmap(iconToDraw, iconX, iconY, null)
+                }
+                
+                val textStartX = startX + iconWidth
+                canvas.clipRect(textStartX, 0f, startX + maxWidth, height.toFloat())
+                
+                val offset1 = -marqueeOffset
+                val offset2 = offset1 + totalWidth
+                
+                canvas.drawText(fullText, textStartX + offset1, yPosition, compactPaint)
+                canvas.drawText(fullText, textStartX + offset2, yPosition, compactPaint)
+
+                if (visible && marqueeAnimator?.isRunning != true && isAttachedToWindow) {
+                    marqueeStartRunnable?.let { mainHandler.removeCallbacks(it) }
+                    marqueeStartRunnable = Runnable {
+                        if (isAttachedToWindow) {
+                            startMarqueeAnimation()
+                        }
+                        marqueeStartRunnable = null
+                    }
+                    mainHandler.postDelayed(marqueeStartRunnable!!, MARQUEE_DELAY_MS)
+                }
+            } else {
+                stopMarquee()
+                val totalContentWidth = iconWidth + textWidth
+                val startX = centerX - (totalContentWidth / 2f)
+                
+                if (iconToDraw != null) {
+                    val iconX = startX
+                    val iconY = yPosition - (iconSize / 2f) - (compactPaint.textSize / 4f)
+                    canvas.drawBitmap(iconToDraw, iconX, iconY, null)
+                }
+                
+                val textX = startX + iconWidth
+                canvas.drawText(fullText, textX, yPosition, compactPaint)
+            }
+        } finally {
+            canvas.restore()
+        }
+    }
+
+    private fun drawNormalStyle(canvas: Canvas, centerX: Float, yPosition: Float, maxWidth: Float) {
+        var currentY = yPosition
+        
+        val iconToDraw = when (iconStyle) {
+            ICON_STYLE_APP -> appIconBitmap
+            ICON_STYLE_MUSIC -> defaultIconTintedBitmap
+            else -> null
+        }
+        
+        if (iconToDraw != null) {
+            val iconX = centerX - (iconSize / 2f)
+            val iconY = currentY - iconSize - iconPaddingNormal
+            canvas.drawBitmap(iconToDraw, iconX, iconY, null)
+        }
+        
+        val trackWidth = trackPaint.measureText(trackTitle)
+        needsMarquee = trackWidth > maxWidth
+        
+        canvas.save()
+        try {
+            if (needsMarquee) {
+                val gapWidth = trackPaint.measureText(" ") * MARQUEE_GAP_MULTIPLIER
+                val totalWidth = trackWidth + gapWidth
+                
+                canvas.clipRect(centerX - maxWidth/2f, 0f, centerX + maxWidth/2f, height.toFloat())
+                
+                val offset1 = centerX - maxWidth/2f - marqueeOffset
+                val offset2 = offset1 + totalWidth
+                
+                compactPaint.textSize = trackPaint.textSize
+                compactPaint.color = trackPaint.color
+                compactPaint.typeface = trackPaint.typeface
+                
+                canvas.drawText(trackTitle, offset1, currentY, compactPaint)
+                canvas.drawText(trackTitle, offset2, currentY, compactPaint)
+                
+                if (visible && marqueeAnimator?.isRunning != true && isAttachedToWindow) {
+                    marqueeStartRunnable?.let { mainHandler.removeCallbacks(it) }
+                    marqueeStartRunnable = Runnable {
+                        if (isAttachedToWindow) {
+                            startMarqueeAnimation()
+                        }
+                        marqueeStartRunnable = null
+                    }
+                    mainHandler.postDelayed(marqueeStartRunnable!!, MARQUEE_DELAY_MS)
+                }
+            } else {
+                stopMarquee()
+                val truncatedTrack = TextUtils.ellipsize(
+                    trackTitle,
+                    trackPaint,
+                    maxWidth,
+                    TextUtils.TruncateAt.END
+                ).toString()
+                
+                canvas.drawText(truncatedTrack, centerX, currentY, trackPaint)
+            }
+        } finally {
+            canvas.restore()
+        }
+
+        if (artistName.isNotEmpty()) {
+            val truncatedArtist = TextUtils.ellipsize(
+                artistName,
+                artistPaint,
+                maxWidth,
+                TextUtils.TruncateAt.END
+            ).toString()
+            
+            val artistY = currentY + trackPaint.textSize + titleArtistGap
+            canvas.drawText(truncatedArtist, centerX, artistY, artistPaint)
+        }
+    }
+
+    fun updateTextSize(trackSize: Float, artistSize: Float) {
+        val density = resources.displayMetrics.density
+        trackPaint.textSize = trackSize * density
+        artistPaint.textSize = artistSize * density
+        compactPaint.textSize = trackSize * density
+        resetMarquee()
+        invalidate()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingViewController.kt b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingViewController.kt
new file mode 100644
index 0000000000000..e0d7abd76e3ee
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/nowplaying/NowPlayingViewController.kt
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.nowplaying
+
+import android.content.Context
+import android.media.MediaMetadata
+import android.media.session.MediaController
+import android.media.session.MediaSessionManager
+import android.media.session.PlaybackState
+import android.util.Log
+import android.widget.FrameLayout
+import com.android.settingslib.Utils
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.util.ScrimUtils
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+@SysUISingleton
+class NowPlayingViewController
+@Inject
+constructor(
+    private val context: Context,
+) : ScrimUtils.ScrimEventListener {
+
+    private val nowPlayingView = NowPlayingView(context)
+    private val settingsRepo = NowPlayingSettingsRepository(context)
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+
+    private var currentSettings = settingsRepo.currentSettings()
+    private var settingsJob: Job? = null
+
+    private val mediaSessionManager = context.getSystemService(MediaSessionManager::class.java)!!
+    private var activeController: MediaController? = null
+    private var bouncerShowingOrKeyguardDismissing = false
+    private var currentTrackTitle: String = ""
+    private var currentArtist: String = ""
+    private var currentPackageName: String = ""
+    private var isPlaying: Boolean = false
+
+    private var isKeyguardShowing: Boolean = false
+    private var isDozing: Boolean = false
+
+    private val mediaCallback = object : MediaController.Callback() {
+        override fun onMetadataChanged(metadata: MediaMetadata?) {
+            updateMetadata(metadata)
+        }
+
+        override fun onPlaybackStateChanged(state: PlaybackState?) {
+            updatePlaybackState(state)
+        }
+    }
+
+    private val sessionsChangedListener = MediaSessionManager.OnActiveSessionsChangedListener { controllers ->
+        updateActiveController(controllers)
+    }
+
+    init {
+        INSTANCE = this
+
+        try {
+            ScrimUtils.get()?.addListener(this)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error adding ScrimUtils listener", e)
+        }
+        
+        observeSettings()
+        
+        startMediaMonitoring()
+    }
+
+    fun getNowPlayingView(): FrameLayout = nowPlayingView
+
+    private fun observeSettings() {
+        settingsJob?.cancel()
+        settingsJob = scope.launch {
+            settingsRepo.settingsFlow
+                .catch { e -> 
+                    Log.e(TAG, "Error observing settings", e)
+                }
+                .collect { settings ->
+                    currentSettings = settings
+                    updateViewWithSettings(settings)
+                }
+        }
+    }
+
+    private fun updateViewWithSettings(settings: NowPlayingSettings) {
+        val textColor = if (settings.useAccentColor) {
+            Utils.getColorAccentDefaultColor(context)
+        } else {
+            0xFFFFFFFF.toInt()
+        }
+        
+        nowPlayingView.apply {
+            this.textColor = textColor
+            iconStyle = settings.iconStyle
+            iconSizeDp = settings.iconSize
+            useCompactStyle = settings.useCompactStyle
+            verticalPosition = settings.verticalPosition
+            updateTextSize(settings.trackTextSize, settings.artistTextSize)
+        }
+        
+        updateVisibility()
+    }
+
+    private fun startMediaMonitoring() {
+        try {
+            mediaSessionManager.addOnActiveSessionsChangedListener(
+                sessionsChangedListener,
+                null
+            )
+            
+            val controllers = mediaSessionManager.getActiveSessions(null)
+            updateActiveController(controllers)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error starting media monitoring", e)
+        }
+    }
+
+    private fun updateActiveController(controllers: List<MediaController>?) {
+        activeController?.unregisterCallback(mediaCallback)
+        
+        activeController = controllers?.firstOrNull()
+        activeController?.registerCallback(mediaCallback)
+        
+        currentPackageName = activeController?.packageName ?: ""
+        nowPlayingView.appPackageName = currentPackageName
+        
+        updateMetadata(activeController?.metadata)
+        updatePlaybackState(activeController?.playbackState)
+    }
+
+    private fun updateMetadata(metadata: MediaMetadata?) {
+        currentTrackTitle = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE) ?: ""
+        currentArtist = metadata?.getString(MediaMetadata.METADATA_KEY_ARTIST)
+            ?: metadata?.getString(MediaMetadata.METADATA_KEY_ALBUM_ARTIST)
+            ?: ""
+        
+        nowPlayingView.trackTitle = currentTrackTitle
+        nowPlayingView.artistName = currentArtist
+        
+        updateVisibility()
+    }
+
+    private fun updatePlaybackState(state: PlaybackState?) {
+        isPlaying = state?.state == PlaybackState.STATE_PLAYING
+        updateVisibility()
+    }
+
+    private fun updateVisibility() {
+        if (!currentSettings.isEnabled) {
+            nowPlayingView.hide()
+            return
+        }
+
+        val isPanelCollapsed = try {
+            ScrimUtils.get()?.isPanelFullyCollapsed() ?: true
+        } catch (e: Exception) {
+            Log.e(TAG, "Error checking panel state", e)
+            true
+        }
+
+        val shouldShow = when {
+            !isPlaying || currentTrackTitle.isEmpty() -> false
+            bouncerShowingOrKeyguardDismissing -> false
+            !isPanelCollapsed -> false
+            isDozing -> currentSettings.showOnAod
+            isKeyguardShowing -> currentSettings.showOnLockscreen
+            else -> false
+        }
+
+        if (shouldShow) {
+            nowPlayingView.show()
+        } else {
+            nowPlayingView.hide()
+        }
+    }
+
+    override fun onKeyguardShowingChanged(showing: Boolean) {
+        isKeyguardShowing = showing
+        updateVisibility()
+    }
+
+    override fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        bouncerShowingOrKeyguardDismissing = showing
+        if (showing) {
+            nowPlayingView.hide()
+        } else {
+            updateVisibility()
+        }
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = goingAway
+        if (goingAway) {
+            nowPlayingView.hide()
+        } else {
+            updateVisibility()
+        }
+    }
+
+    override fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = fadingAway
+        if (fadingAway) {
+            nowPlayingView.hide()
+        } else {
+            updateVisibility()
+        }
+    }
+
+    override fun onDozingChanged(dozing: Boolean) {
+        try {
+            isDozing = ScrimUtils.get()?.isDozing() ?: false
+        } catch (e: Exception) {
+            Log.e(TAG, "Error getting dozing state", e)
+        }
+        updateVisibility()
+    }
+
+    override fun setPulsing(pulsing: Boolean) {
+        if (pulsing && currentSettings.showOnAod) {
+            updateVisibility()
+        }
+    }
+
+    override fun onExpandedFractionChanged(expandedFraction: Float) {
+        updateVisibility()
+    }
+
+    override fun onQsVisibilityChanged(visible: Boolean) {
+        updateVisibility()
+    }
+
+    override fun onBarStateChanged(state: Int) {
+        updateVisibility()
+    }
+
+    fun cleanup() {
+        activeController?.unregisterCallback(mediaCallback)
+        try {
+            mediaSessionManager.removeOnActiveSessionsChangedListener(sessionsChangedListener)
+            ScrimUtils.get()?.removeListener(this)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error during cleanup", e)
+        }
+        settingsJob?.cancel()
+        scope.cancel()
+    }
+
+    companion object {
+        private const val TAG = "NowPlayingViewController"
+
+        @Volatile
+        private var INSTANCE: NowPlayingViewController? = null
+        
+        @JvmStatic
+        fun get(context: Context): NowPlayingViewController {
+            return INSTANCE ?: throw IllegalStateException(
+                "NowPlayingViewController not initialized"
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java b/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java
index 90da8912ad752..5c2acef4c2817 100644
--- a/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/power/EnhancedEstimatesImpl.java
@@ -1,43 +1,123 @@
 package com.android.systemui.power;
 
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.Settings;
+import android.util.KeyValueListParser;
+import android.util.Log;
+
+import com.android.internal.util.matrixx.Utils;
 import com.android.settingslib.fuelgauge.Estimate;
-import com.android.settingslib.fuelgauge.EstimateKt;
+import com.android.settingslib.utils.PowerUtil;
 import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.power.EnhancedEstimates;
+import com.android.systemui.util.settings.GlobalSettings;
+
+import java.time.Duration;
 
 import javax.inject.Inject;
 
 @SysUISingleton
-public class EnhancedEstimatesImpl implements EnhancedEstimates {
+public final class EnhancedEstimatesImpl implements EnhancedEstimates {
+
+    private static final String TAG = "EnhancedEstimatesImpl";
+
+    private static final Estimate EMPTY_ESTIMATE = new Estimate(-1L, false, -1L);
+
+    private static final Duration DAY = Duration.ofDays(1L);
+    private static final long HOUR = Duration.ofHours(1L).toMillis();
+    private static final long THREE_HOURS = Duration.ofHours(3L).toMillis();
+    private static final long FIFTEEN_MINUTES = Duration.ofMinutes(15L).toMillis();
+
+    private final Context mContext;
+    private final GlobalSettings mGlobalSettings;
+    private final KeyValueListParser mParser;
 
     @Inject
-    public EnhancedEstimatesImpl() {
+    public EnhancedEstimatesImpl(
+        Context context,
+        GlobalSettings globalSettings
+    ) {
+        mContext = context;
+        mGlobalSettings = globalSettings;
+        mParser = new KeyValueListParser(',');
     }
 
     @Override
     public boolean isHybridNotificationEnabled() {
-        return false;
+        final boolean isTurboInstalled = Utils.isPackageInstalled(
+            mContext,
+            "com.google.android.apps.turbo",
+            false /* ignoreState */
+        );
+        if (!isTurboInstalled) return false;
+        updateFlags();
+        return mParser.getBoolean("hybrid_enabled", true);
     }
 
     @Override
     public Estimate getEstimate() {
-        // Returns an unknown estimate.
-        return new Estimate(EstimateKt.ESTIMATE_MILLIS_UNKNOWN,
-                false /* isBasedOnUsage */,
-                EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
+        final Uri build = new Uri.Builder()
+            .scheme("content")
+            .authority("com.google.android.apps.turbo.estimated_time_remaining")
+            .appendPath("time_remaining")
+            .build();
+        try (final Cursor query = mContext.getContentResolver().query(build, null, null, null, null)) {
+            if (query == null) return EMPTY_ESTIMATE;
+            try {
+                if (query.moveToFirst()) {
+                    long timeRemaining = -1L;
+                    final int usageColumnIndex = query.getColumnIndex("is_based_on_usage");
+                    final boolean isBasedOnUsage = usageColumnIndex != -1 && query.getInt(usageColumnIndex) != 0;
+                    final int batteryLifecolumnIndex = query.getColumnIndex("average_battery_life");
+                    if (batteryLifecolumnIndex != -1) {
+                        final long averageBatteryLife = query.getLong(batteryLifecolumnIndex);
+                        if (averageBatteryLife != -1L) {
+                            final long duration = Duration.ofMillis(averageBatteryLife).compareTo(DAY) >= 0
+                                ? HOUR : FIFTEEN_MINUTES;
+                            timeRemaining = PowerUtil.roundTimeToNearestThreshold(averageBatteryLife, duration);
+                        }
+                    }
+                    return new Estimate(
+                        query.getLong(query.getColumnIndex("battery_estimate")),
+                        isBasedOnUsage,
+                        timeRemaining
+                    );
+                }
+            } catch (Exception ex) {
+                // Catch and release
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Something went wrong when getting an estimate from Turbo", e);
+        }
+        return EMPTY_ESTIMATE;
     }
 
     @Override
     public long getLowWarningThreshold() {
-        return 0;
+        updateFlags();
+        return mParser.getLong("low_threshold", THREE_HOURS);
     }
 
     @Override
     public long getSevereWarningThreshold() {
-        return 0;
+        updateFlags();
+        return mParser.getLong("severe_threshold", HOUR);
     }
 
     @Override
     public boolean getLowWarningEnabled() {
-        return true;
+        updateFlags();
+        return mParser.getBoolean("low_warning_enabled", false);
+    }
+
+    private void updateFlags() {
+        final String string = mGlobalSettings.getString("hybrid_sysui_battery_warning_flags");
+        try {
+            mParser.setString(string);
+        } catch (IllegalArgumentException ex) {
+            Log.e(TAG, "Bad hybrid sysui warning flags");
+        }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
index 4e1bfd15e58c5..71338c3b61465 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java
@@ -70,7 +70,7 @@ public class PowerUI implements
         CommandQueue.Callbacks {
 
     static final String TAG = "PowerUI";
-    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    static final boolean DEBUG = false;
     private static final long TEMPERATURE_INTERVAL = 30 * DateUtils.SECOND_IN_MILLIS;
     private static final long TEMPERATURE_LOGGING_INTERVAL = DateUtils.HOUR_IN_MILLIS;
     private static final int MAX_RECENT_TEMPS = 125; // TEMPERATURE_LOGGING_INTERVAL plus a buffer
@@ -478,9 +478,11 @@ void maybeShowHybridWarning(BatteryStateSnapshot currentSnapshot,
     boolean shouldShowHybridWarning(BatteryStateSnapshot snapshot) {
         if (snapshot.getPlugged()
                 || snapshot.getBatteryStatus() == BatteryManager.BATTERY_STATUS_UNKNOWN) {
-            Slog.d(TAG, "can't show warning due to - plugged: " + snapshot.getPlugged()
-                    + " status unknown: "
-                    + (snapshot.getBatteryStatus() == BatteryManager.BATTERY_STATUS_UNKNOWN));
+            if (DEBUG) {
+                Slog.d(TAG, "can't show warning due to - plugged: " + snapshot.getPlugged()
+                        + " status unknown: "
+                        + (snapshot.getBatteryStatus() == BatteryManager.BATTERY_STATUS_UNKNOWN));
+            }
             return false;
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
index cef410908b74d..7222a5ca7e1e3 100644
--- a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
@@ -17,11 +17,13 @@
 
 package com.android.systemui.power.domain.interactor
 
+import android.graphics.Point
 import android.os.PowerManager
 import com.android.systemui.camera.CameraGestureHelper
 import com.android.systemui.classifier.FalsingCollector
 import com.android.systemui.classifier.FalsingCollectorActual
 import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.keyguard.data.repository.KeyguardRepository
 import com.android.systemui.log.table.TableLogBuffer
 import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.plugins.statusbar.StatusBarStateController
@@ -50,6 +52,7 @@ constructor(
     private val screenOffAnimationController: ScreenOffAnimationController,
     private val statusBarStateController: StatusBarStateController,
     private val cameraGestureHelper: Provider<CameraGestureHelper?>,
+    private val keyguardRepository: KeyguardRepository,
 ) {
     /** Whether the screen is on or off. */
     val isInteractive: StateFlow<Boolean> = repository.isInteractive
@@ -93,6 +96,10 @@ constructor(
     fun onUserTouch(noChangeLights: Boolean = false) =
         repository.userTouch(noChangeLights = noChangeLights)
 
+    fun setLastTouchToSleepPosition(x: Float, y: Float) {
+        keyguardRepository.setLastTouchToSleepPosition(Point(x.toInt(), y.toInt()))
+    }
+
     /**
      * Wakes up the device if the device was dozing.
      *
diff --git a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt
index c57b53bab4422..cd390cffd85cc 100644
--- a/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt
+++ b/packages/SystemUI/src/com/android/systemui/power/shared/model/WakeSleepReason.kt
@@ -60,7 +60,9 @@ enum class WakeSleepReason(
     FOLD(isTouch = false, PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD),
 
     /** Device goes to sleep because it timed out. */
-    TIMEOUT(isTouch = false, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);
+    TIMEOUT(isTouch = false, PowerManager.GO_TO_SLEEP_REASON_TIMEOUT),
+
+    TOUCH_TO_SLEEP(isTouch = true, PowerManager.GO_TO_SLEEP_REASON_TOUCH);
 
     companion object {
         fun fromPowerManagerWakeReason(reason: Int): WakeSleepReason {
@@ -84,6 +86,7 @@ enum class WakeSleepReason(
                 PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON -> SLEEP_BUTTON
                 PowerManager.GO_TO_SLEEP_REASON_TIMEOUT -> TIMEOUT
                 PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD -> FOLD
+                PowerManager.GO_TO_SLEEP_REASON_TOUCH -> TOUCH_TO_SLEEP
                 else -> OTHER
             }
         }
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
index 967a16b1c0ddf..1c3373c53f846 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt
@@ -132,6 +132,10 @@ constructor(
                     if (code in OPS_LOCATION && !locationAvailable) {
                         return
                     }
+                    // Hide incoming chip from sense caller package
+                    if (packageName == "co.aospa.sense") {
+                        return
+                    }
                     if (
                         userTracker.userProfiles.any { it.id == UserHandle.getUserId(uid) } ||
                             code in USER_INDEPENDENT_OPS
@@ -384,6 +388,10 @@ constructor(
                 AppOpsManager.OP_RECORD_AUDIO -> PrivacyType.TYPE_MICROPHONE
                 else -> return null
             }
+        // Hide incoming chip from sense caller package
+        if (appOpItem.packageName == "co.aospa.sense") {
+            return null
+        }
         val app = PrivacyApplication(appOpItem.packageName, appOpItem.uid)
         return PrivacyItem(type, app, appOpItem.timeStartedElapsed, appOpItem.isDisabled)
     }
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
index 3f606640e7a3d..a8a8303a10b27 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
@@ -18,7 +18,8 @@ import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.graphics.drawable.GradientDrawable
-import android.location.flags.Flags.locationIndicatorsEnabled
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.AttributeSet
 import android.view.Gravity.CENTER_VERTICAL
 import android.view.Gravity.END
@@ -55,18 +56,23 @@ constructor(
     val launchableContentView
         get() = iconsContainer
 
+    private val locationIndicatorsEnabled
+        get() = Settings.Secure.getIntForUser(context.contentResolver,
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR, 1,
+            UserHandle.USER_CURRENT) == 1
+
     var privacyList = emptyList<PrivacyItem>()
         set(value) {
             field = value
             updateView(PrivacyChipBuilder(context, field))
-            if (locationIndicatorsEnabled()) {
+            if (locationIndicatorsEnabled) {
                 updateResources()
             }
         }
 
     private val locationOnly: Boolean
         private get() =
-            if (locationIndicatorsEnabled()) {
+            if (locationIndicatorsEnabled) {
                 PrivacyConfig.Companion.privacyItemsAreLocationOnly(privacyList)
             } else {
                 false
@@ -168,7 +174,7 @@ constructor(
             iconsContainer.minimumWidth =
                 context.resources.getDimensionPixelSize(R.dimen.ongoing_appops_chip_min_width)
         }
-        if (locationIndicatorsEnabled()) {
+        if (locationIndicatorsEnabled) {
             if (chipDrawable == null) {
                 chipDrawable =
                     context.getDrawable(R.drawable.statusbar_privacy_chip_bg)?.mutate()
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
index d4ec186f1780a..f2329467fbb07 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt
@@ -16,19 +16,21 @@
 
 package com.android.systemui.privacy
 
-import android.location.flags.Flags.locationIndicatorsEnabled
+import android.database.ContentObserver
+import android.os.Handler
+import android.os.UserHandle
 import android.provider.DeviceConfig
+import android.provider.Settings
 import com.android.internal.annotations.VisibleForTesting
 import com.android.internal.annotations.WeaklyReferencedCallback
-import com.android.internal.config.sysui.SystemUiDeviceConfigFlags
 import com.android.systemui.Dumpable
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.dump.DumpManager
 import com.android.systemui.res.R
-import com.android.systemui.util.DeviceConfigProxy
 import com.android.systemui.util.asIndenting
 import com.android.systemui.util.concurrency.DelayableExecutor
+import com.android.systemui.util.settings.SecureSettings
 import com.android.systemui.util.withIncreasedIndent
 import java.io.PrintWriter
 import java.lang.ref.WeakReference
@@ -39,18 +41,14 @@ class PrivacyConfig
 @Inject
 constructor(
     @Main private val uiExecutor: DelayableExecutor,
-    private val deviceConfigProxy: DeviceConfigProxy,
+    private val secureSettings: SecureSettings,
+    @Main handler: Handler,
     dumpManager: DumpManager,
 ) : Dumpable {
 
     @VisibleForTesting
     companion object {
         const val TAG = "PrivacyConfig"
-        private const val MIC_CAMERA = SystemUiDeviceConfigFlags.PROPERTY_MIC_CAMERA_ENABLED
-        private const val MEDIA_PROJECTION =
-            SystemUiDeviceConfigFlags.PROPERTY_MEDIA_PROJECTION_INDICATORS_ENABLED
-        private const val DEFAULT_MIC_CAMERA = true
-        private const val DEFAULT_MEDIA_PROJECTION = true
 
         fun getPrivacyColor(locationOnly: Boolean): Int {
             if (locationOnly) {
@@ -70,58 +68,52 @@ constructor(
     var micCameraAvailable = isMicCameraEnabled()
         private set
 
-    var locationAvailable = locationIndicatorsEnabled()
+    var locationAvailable = isLocationEnabled()
         private set
 
     var mediaProjectionAvailable = isMediaProjectionEnabled()
         private set
 
-    private val devicePropertiesChangedListener =
-        DeviceConfig.OnPropertiesChangedListener { properties ->
-            if (DeviceConfig.NAMESPACE_PRIVACY == properties.namespace) {
-                // Running on the ui executor so can iterate on callbacks
-                if (properties.keyset.contains(MIC_CAMERA)) {
-                    micCameraAvailable = properties.getBoolean(MIC_CAMERA, DEFAULT_MIC_CAMERA)
-                    callbacks.forEach { it.get()?.onFlagMicCameraChanged(micCameraAvailable) }
-                }
-
-                if (locationAvailable) {
-                    callbacks.forEach { it.get()?.onFlagLocationChanged(locationAvailable) }
-                }
-
-                if (properties.keyset.contains(MEDIA_PROJECTION)) {
-                    mediaProjectionAvailable =
-                        properties.getBoolean(MEDIA_PROJECTION, DEFAULT_MEDIA_PROJECTION)
-                    callbacks.forEach {
-                        it.get()?.onFlagMediaProjectionChanged(mediaProjectionAvailable)
-                    }
-                }
-            }
+    private val settingsObserver = object : ContentObserver(handler) {
+        override fun onChange(selfChange: Boolean) {
+            micCameraAvailable = isMicCameraEnabled()
+            locationAvailable = isLocationEnabled()
+            mediaProjectionAvailable = isMediaProjectionEnabled()
+            callbacks.forEach { it.get()?.onFlagMicCameraChanged(micCameraAvailable) }
+            callbacks.forEach { it.get()?.onFlagLocationChanged(locationAvailable) }
+            callbacks.forEach { it.get()?.onFlagMediaProjectionChanged(mediaProjectionAvailable) }
         }
+    }
 
     init {
         dumpManager.registerNormalDumpable(TAG, this)
-        deviceConfigProxy.addOnPropertiesChangedListener(
-            DeviceConfig.NAMESPACE_PRIVACY,
-            uiExecutor,
-            devicePropertiesChangedListener,
+        secureSettings.registerContentObserverForUserSync(
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR,
+            settingsObserver, UserHandle.USER_CURRENT
+        )
+        secureSettings.registerContentObserverForUserSync(
+            Settings.Secure.ENABLE_CAMERA_PRIVACY_INDICATOR,
+            settingsObserver, UserHandle.USER_CURRENT
+        )
+        secureSettings.registerContentObserverForUserSync(
+            Settings.Secure.ENABLE_PROJECTION_PRIVACY_INDICATOR,
+            settingsObserver, UserHandle.USER_CURRENT
         )
     }
 
     private fun isMicCameraEnabled(): Boolean {
-        return deviceConfigProxy.getBoolean(
-            DeviceConfig.NAMESPACE_PRIVACY,
-            MIC_CAMERA,
-            DEFAULT_MIC_CAMERA,
-        )
+        return  secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_CAMERA_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
+    }
+
+    private fun isLocationEnabled(): Boolean {
+        return secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
     }
 
     private fun isMediaProjectionEnabled(): Boolean {
-        return deviceConfigProxy.getBoolean(
-            DeviceConfig.NAMESPACE_PRIVACY,
-            MEDIA_PROJECTION,
-            DEFAULT_MEDIA_PROJECTION,
-        )
+        return secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_PROJECTION_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
     }
 
     fun addCallback(callback: Callback) {
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
index 31668183b1da3..c7185ea40d724 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
@@ -16,7 +16,8 @@
 
 package com.android.systemui.privacy
 
-import android.location.flags.Flags.locationIndicatorsEnabled
+import android.os.UserHandle
+import android.provider.Settings
 import com.android.internal.annotations.VisibleForTesting
 import com.android.systemui.Dumpable
 import com.android.systemui.appops.AppOpsController
@@ -27,6 +28,7 @@ import com.android.systemui.dump.DumpManager
 import com.android.systemui.privacy.logging.PrivacyLogger
 import com.android.systemui.util.asIndenting
 import com.android.systemui.util.concurrency.DelayableExecutor
+import com.android.systemui.util.settings.SecureSettings
 import com.android.systemui.util.time.SystemClock
 import com.android.systemui.util.withIncreasedIndent
 import java.io.PrintWriter
@@ -42,6 +44,7 @@ class PrivacyItemController @Inject constructor(
     private val privacyItemMonitors: Set<@JvmSuppressWildcards PrivacyItemMonitor>,
     private val logger: PrivacyLogger,
     private val systemClock: SystemClock,
+    private val secureSettings: SecureSettings,
     dumpManager: DumpManager
 ) : Dumpable {
 
@@ -65,11 +68,16 @@ class PrivacyItemController @Inject constructor(
     private var holdingRunnableCanceler: Runnable? = null
 
     val micCameraAvailable
-        get() = privacyConfig.micCameraAvailable
+        get() = secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_CAMERA_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
     val locationAvailable
-        get() = privacyConfig.locationAvailable
+        get() = secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
+    val mediaProjectionAvailable
+        get() = secureSettings.getIntForUser(
+            Settings.Secure.ENABLE_PROJECTION_PRIVACY_INDICATOR, 1, UserHandle.USER_CURRENT) == 1
     val allIndicatorsAvailable
-        get() = micCameraAvailable && locationAvailable && privacyConfig.mediaProjectionAvailable
+        get() = micCameraAvailable && locationAvailable && mediaProjectionAvailable
 
     private val notifyChanges = Runnable {
         val list = privacyList
@@ -186,7 +194,7 @@ class PrivacyItemController @Inject constructor(
      */
     private fun processNewList(list: List<PrivacyItem>): List<PrivacyItem> {
         val allPrivacyItemsAreLocation =
-            locationIndicatorsEnabled() &&
+            locationAvailable &&
                 PrivacyConfig.Companion.privacyItemsAreLocationOnly((list + privacyList).distinct())
         val timeToHold =
             if (allPrivacyItemsAreLocation) {
@@ -287,4 +295,4 @@ class PrivacyItemController @Inject constructor(
             listeningCanceller = delegate.executeDelayed({ setListeningState() }, 0L)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/FadingBlockStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/FadingBlockStyleRenderer.kt
new file mode 100644
index 0000000000000..16ee6ce1e943d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/FadingBlockStyleRenderer.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.*
+import kotlin.math.max
+
+internal class FadingBlockStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private var bufferBitmap: Bitmap? = null
+    private var bufferCanvas: Canvas? = null
+    private val fadePaint = Paint().apply {
+        color = Color.argb(200, 255, 255, 255)
+        xfermode = PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)
+    }
+
+    private val linePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.STROKE
+    }
+
+    private var fftPoints = FloatArray(0)
+    private var divisions = 16
+    private var lastW = 0
+    private var lastH = 0
+    private var lastColor = 0
+
+    private var barCount = 0
+    private var barWidthPx = 0f
+    private var fullBarWidthPx = 0f
+    private var gapPx = 0f
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        if (viewWidth <= 0 || viewHeight <= 0) return
+        if (viewWidth != lastW || viewHeight != lastH) {
+            bufferBitmap?.recycle()
+            bufferBitmap = Bitmap.createBitmap(viewWidth, viewHeight, Bitmap.Config.ARGB_8888)
+            bufferCanvas = Canvas(bufferBitmap!!)
+            lastW = viewWidth
+            lastH = viewHeight
+        }
+        barCount = settings.getBarCount()
+        gapPx = settings.getBarGapPx()
+        val totalGap = (barCount - 1) * gapPx
+        barWidthPx = if (barCount > 0) ((viewWidth - totalGap) / barCount.toFloat()).coerceAtLeast(1f) else 0f
+        fullBarWidthPx = barWidthPx + gapPx
+
+        divisions = validateDivision(settings.getDivisions())
+        val filled = settings.getFilledBlockSizePx()
+        val empty  = settings.getEmptyBlockSizePx()
+        linePaint.pathEffect = DashPathEffect(floatArrayOf(filled, empty), 0f)
+        linePaint.strokeWidth = barWidthPx
+        linePaint.strokeCap = Paint.Cap.BUTT
+        ensurePointsCapacity()
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            linePaint.color = color
+            lastColor = color
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        val c = bufferCanvas ?: return
+        ensurePointsCapacity()
+        val height = lastH
+        val count = minOf(heights.size, barCount)
+        if (count <= 0) return
+
+        var x = barWidthPx * 0.5f
+        var pi = 0
+        for (i in 0 until count) {
+            val y0 = height.toFloat()
+            val y1 = y0 - heights[i]
+            fftPoints[pi++] = x
+            fftPoints[pi++] = y0
+            fftPoints[pi++] = x
+            fftPoints[pi++] = y1
+            x += fullBarWidthPx
+        }
+
+        c.drawLines(fftPoints, 0, count * 4, linePaint)
+        c.drawPaint(fadePaint)
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        bufferBitmap?.let { bmp ->
+            canvas.drawBitmap(bmp, 0f, 0f, null)
+        }
+    }
+
+    override fun cleanup() {
+        bufferCanvas = null
+        bufferBitmap?.recycle()
+        bufferBitmap = null
+        fftPoints = FloatArray(0)
+    }
+
+    private fun ensurePointsCapacity() {
+        val need = max(0, barCount) * 4
+        if (fftPoints.size != need) {
+            fftPoints = FloatArray(need)
+        }
+    }
+
+    private fun validateDivision(valIn: Int): Int {
+        var v = valIn
+        if (v % 2 != 0) v = 16
+        return v.coerceIn(2, 44)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/MatrixStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/MatrixStyleRenderer.kt
new file mode 100644
index 0000000000000..bd835e08c1b49
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/MatrixStyleRenderer.kt
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.*
+import kotlin.math.max
+import kotlin.random.Random
+
+internal class MatrixStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private var baseColor = Color.argb(255, 0, 255, 65)
+    private var currentColorMode = "accent"
+    
+    private val glowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        maskFilter = BlurMaskFilter(18f, BlurMaskFilter.Blur.NORMAL)
+    }
+
+    private val brightTextPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val mediumTextPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val darkTextPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+    }
+
+    private val textGlowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.MONOSPACE
+        style = Paint.Style.FILL
+        maskFilter = BlurMaskFilter(8f, BlurMaskFilter.Blur.NORMAL)
+    }
+
+    private var barColumns: Array<MatrixColumn> = emptyArray()
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var viewW = 0
+    private var viewH = 0
+    private var barCount = 0
+    private var columnWidth = 0f
+    private var charSize = 0f
+    private var maxCharsPerColumn = 0
+
+    private val smoothing = 0.22f
+    private val numbers = arrayOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
+    
+    private var changeCounter = 0
+    private val changeInterval = 3
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        viewW = viewWidth
+        viewH = viewHeight
+        barCount = settings.getBarCount()
+
+        if (barCount <= 0) return
+
+        val gap = settings.getBarGapPx()
+        val totalGap = (barCount - 1) * gap
+        columnWidth = if (barCount > 0) max(1f, (viewWidth - totalGap) / barCount) else 0f
+        
+        charSize = (columnWidth * 0.7f).coerceIn(16f, 36f)
+        
+        brightTextPaint.textSize = charSize
+        mediumTextPaint.textSize = charSize
+        darkTextPaint.textSize = charSize
+        textGlowPaint.textSize = charSize
+
+        maxCharsPerColumn = if (charSize > 0) (viewHeight / (charSize * 1.1f)).toInt().coerceAtLeast(1) else 1
+
+        if (barColumns.size != barCount) {
+            barColumns = Array(barCount) { MatrixColumn(maxCharsPerColumn) }
+            currentHeights = FloatArray(barCount) { 2f }
+            targetHeights = FloatArray(barCount) { 2f }
+        } else {
+            barColumns.forEach { it.ensureCapacity(maxCharsPerColumn) }
+        }
+    }
+
+    override fun onColor(color: Int) {
+        baseColor = color
+        currentColorMode = settings.getColorMode()
+
+        if (currentColorMode != "lavalamp") {
+            updatePaintColors(color)
+        }
+    }
+    
+    private fun updatePaintColors(color: Int) {
+        val r = Color.red(color)
+        val g = Color.green(color)
+        val b = Color.blue(color)
+        
+        brightTextPaint.color = Color.argb(255, r, g, b)
+        mediumTextPaint.color = Color.argb(200, (r * 0.86f).toInt(), (g * 0.86f).toInt(), (b * 0.86f).toInt())
+        darkTextPaint.color = Color.argb(120, (r * 0.63f).toInt(), (g * 0.63f).toInt(), (b * 0.63f).toInt())
+        textGlowPaint.color = Color.argb(150, r, g, b)
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+
+        val wantBars = settings.getBarCount()
+        if (wantBars != barCount && viewW > 0) {
+            barCount = wantBars
+            onSizeChanged(viewW, viewH)
+        }
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        val count = minOf(barCount, barColumns.size, currentHeights.size, targetHeights.size)
+
+        for (i in 0 until count) {
+            val target = targetHeights[i]
+            val current = currentHeights[i]
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            if (h > viewHeight) h = viewHeight.toFloat()
+            currentHeights[i] = h
+        }
+
+        changeCounter++
+        val shouldChange = changeCounter >= changeInterval
+        if (shouldChange) changeCounter = 0
+
+        val gap = settings.getBarGapPx()
+        val fullBarWidth = columnWidth + gap
+
+        if (currentColorMode == "lavalamp") {
+            val time = System.currentTimeMillis()
+            val hue = (time / 50) % 360
+            val lavaColor = Color.HSVToColor(255, floatArrayOf(hue.toFloat(), 1f, 1f))
+            updatePaintColors(lavaColor)
+        }
+
+        for (i in 0 until count) {
+            val column = barColumns[i]
+            val height = currentHeights[i]
+            
+            if (height < 10f) continue
+
+            val x = i * fullBarWidth + columnWidth * 0.5f
+            val baseY = viewHeight.toFloat()
+            
+            if (shouldChange && Random.nextFloat() < 0.4f) {
+                column.regenerateRandomChars()
+            }
+
+            val charSpacingWithGap = charSize * 1.15f
+            val numChars = (height / charSpacingWithGap).toInt().coerceIn(1, maxCharsPerColumn)
+            
+            column.ensureCapacity(numChars)
+
+            val glowWidth = columnWidth * 0.85f
+            val heightRatio = height / viewHeight.toFloat()
+            val glowAlpha = (160 * heightRatio).toInt().coerceIn(0, 160)
+            
+            val r = Color.red(brightTextPaint.color)
+            val g = Color.green(brightTextPaint.color)
+            val b = Color.blue(brightTextPaint.color)
+            glowPaint.color = Color.argb(glowAlpha, (r * 0.78f).toInt(), (g * 0.78f).toInt(), (b * 0.78f).toInt())
+            
+            canvas.drawRect(
+                x - glowWidth / 2f,
+                baseY - height,
+                x + glowWidth / 2f,
+                baseY,
+                glowPaint
+            )
+
+            for (j in 0 until numChars) {
+                val y = baseY - (j * charSpacingWithGap) - charSize * 0.25f
+                val char = column.chars[j % column.chars.size]
+                
+                val fadeRatio = j.toFloat() / numChars.coerceAtLeast(1)
+                
+                val textPaint = when {
+                    fadeRatio < 0.25f -> brightTextPaint
+                    fadeRatio < 0.6f -> mediumTextPaint
+                    else -> darkTextPaint
+                }
+
+                if (fadeRatio < 0.4f) {
+                    val glowStrength = ((1f - fadeRatio * 2.5f) * 200).toInt().coerceIn(0, 200)
+                    textGlowPaint.color = Color.argb(glowStrength, r, g, b)
+                    canvas.drawText(char, x, y, textGlowPaint)
+                }
+                
+                canvas.drawText(char, x, y, textPaint)
+            }
+        }
+    }
+
+    override fun cleanup() {
+        barColumns = emptyArray()
+        currentHeights = FloatArray(0)
+        targetHeights = FloatArray(0)
+        glowPaint.maskFilter = null
+        textGlowPaint.maskFilter = null
+    }
+
+    private inner class MatrixColumn(initialCapacity: Int) {
+        var chars: Array<String> = Array(initialCapacity) { numbers.random() }
+
+        fun ensureCapacity(needed: Int) {
+            if (chars.size < needed) {
+                val newChars = Array(needed) { idx ->
+                    if (idx < chars.size) chars[idx] else numbers.random()
+                }
+                chars = newChars
+            }
+        }
+
+        fun regenerateRandomChars() {
+            val numToChange = Random.nextInt(1, 4).coerceAtMost(chars.size)
+            repeat(numToChange) {
+                val idx = Random.nextInt(chars.size)
+                chars[idx] = numbers.random()
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/MinimalStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/MinimalStyleRenderer.kt
new file mode 100644
index 0000000000000..42e345fa7d9df
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/MinimalStyleRenderer.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *           (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.*
+import kotlin.math.max
+
+internal class MinimalStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private val linePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+        strokeWidth = 2.5f
+    }
+
+    private var points = FloatArray(0)
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var lastColor = 0
+    private val smoothing = 0.3f
+    private var spacing = 0f
+    private var viewH = 0
+    private var lastW = 0
+    private var barCount = 0
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        viewH = viewHeight
+        lastW = viewWidth
+        barCount = settings.getBarCount()
+
+        ensureArrays(barCount)
+        spacing = computeSpacing(lastW, barCount)
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            lastColor = color
+
+            val r = Color.red(color)
+            val g = Color.green(color)
+            val b = Color.blue(color)
+            val subtleAlpha = 180 // More transparent
+
+            linePaint.color = Color.argb(subtleAlpha, r, g, b)
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+
+        val desiredBars = settings.getBarCount()
+        if (desiredBars != barCount) {
+            barCount = desiredBars
+            if (lastW > 0) {
+                spacing = computeSpacing(lastW, barCount)
+            }
+            ensureArrays(barCount)
+        }
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        val count = minOf(barCount, currentHeights.size, targetHeights.size)
+        if (count <= 0) return
+
+        if (points.size < count * 2) {
+            points = FloatArray(count * 2)
+        }
+
+        for (i in 0 until count) {
+            val target = targetHeights[i]
+            val current = currentHeights[i]
+
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            if (h > viewHeight) h = viewHeight.toFloat()
+
+            currentHeights[i] = h
+
+            val x = i * spacing
+            val y = viewHeight - h
+
+            val base = i * 2
+            if (base + 1 < points.size) {
+                points[base] = x
+                points[base + 1] = y
+            }
+        }
+
+        if (count >= 2 && points.size >= 4) {
+            val path = Path()
+            path.moveTo(points[0], points[1])
+
+            for (i in 0 until count - 1) {
+                val x1 = points[i * 2]
+                val y1 = points[i * 2 + 1]
+                val x2 = points[(i + 1) * 2]
+                val y2 = points[(i + 1) * 2 + 1]
+
+                val cx = (x1 + x2) / 2f
+                val cy = (y1 + y2) / 2f
+
+                path.quadTo(x1, y1, cx, cy)
+            }
+
+            path.lineTo(points[(count - 1) * 2], points[(count - 1) * 2 + 1])
+
+            canvas.drawPath(path, linePaint)
+        }
+    }
+
+    override fun cleanup() {
+        points = FloatArray(0)
+        currentHeights = FloatArray(0)
+        targetHeights = FloatArray(0)
+        barCount = 0
+        lastW = 0
+    }
+
+    private fun ensureArrays(targetBars: Int) {
+        if (currentHeights.size != targetBars) {
+            currentHeights = FloatArray(targetBars) { 2f }
+        }
+        if (targetHeights.size != targetBars) {
+            targetHeights = FloatArray(targetBars) { 2f }
+        }
+        if (points.size != targetBars * 2) {
+            points = FloatArray(targetBars * 2)
+        }
+    }
+
+    private fun computeSpacing(width: Int, bars: Int): Float {
+        return if (bars > 1) width.toFloat() / (bars - 1) else width.toFloat()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/NeonStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/NeonStyleRenderer.kt
new file mode 100644
index 0000000000000..ebd4095994ee1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/NeonStyleRenderer.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.*
+import kotlin.math.max
+
+internal class NeonStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private val glowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+    }
+
+    private val corePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+    }
+
+    private var barRects: Array<RectF> = emptyArray()
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var lastColor = 0
+    private val smoothing = 0.25f
+    private var barWidth = 0f
+    private var viewH = 0
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        viewH = viewHeight
+        val count = settings.getBarCount()
+
+        if (barRects.size != count) {
+            barRects = Array(count) { RectF() }
+            currentHeights = FloatArray(count) { 2f }
+            targetHeights = FloatArray(count) { 2f }
+        }
+
+        val gap = settings.getBarGapPx()
+        val totalGap = (count - 1) * gap
+        barWidth = if (count > 0) max(1f, (viewWidth - totalGap) / count) else 0f
+        val fullBarWidth = barWidth + gap
+
+        val coreWidth = (barWidth * 0.3f).coerceAtLeast(2f)
+        val glowWidth = (barWidth * 0.8f).coerceAtLeast(4f)
+
+        corePaint.strokeWidth = coreWidth
+        glowPaint.strokeWidth = glowWidth
+
+        val baseY = viewHeight.toFloat()
+        for (i in 0 until count) {
+            val centerX = i * fullBarWidth + barWidth * 0.5f
+            barRects[i].set(centerX, baseY, centerX, baseY)
+        }
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            lastColor = color
+
+            val r = Color.red(color)
+            val g = Color.green(color)
+            val b = Color.blue(color)
+
+            corePaint.color = Color.argb(255, 255, 255, 255)
+
+            glowPaint.color = Color.argb(180, r, g, b)
+            glowPaint.maskFilter = BlurMaskFilter(12f, BlurMaskFilter.Blur.NORMAL)
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        val count = barRects.size
+
+        for (i in 0 until count) {
+            val rect = barRects[i]
+            val target = targetHeights.getOrElse(i) { 2f }
+            val current = currentHeights.getOrElse(i) { 2f }
+
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            val maxH = rect.bottom
+            if (h > maxH) h = maxH
+
+            currentHeights[i] = h
+
+            val x = rect.left
+            val y1 = rect.bottom
+            val y0 = y1 - h
+
+            // Draw glow layer first (outer)
+            canvas.drawLine(x, y1, x, y0, glowPaint)
+
+            // Draw bright core on top
+            canvas.drawLine(x, y1, x, y0, corePaint)
+        }
+    }
+
+    override fun cleanup() {
+        barRects = emptyArray()
+        currentHeights = FloatArray(0)
+        targetHeights = FloatArray(0)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseAudioDataProcessor.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseAudioDataProcessor.kt
new file mode 100644
index 0000000000000..9c3e12f21d405
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseAudioDataProcessor.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import android.media.audiofx.Visualizer
+import android.os.Handler
+import android.os.Looper
+import java.lang.ref.WeakReference
+
+class PulseAudioDataProcessor(private val context: Context) {
+
+    companion object {
+        private const val TAG = "PulseAudioProcessor"
+    }
+
+    private var visualizer: Visualizer? = null
+    private var dataListener: WeakReference<DataListener>? = null
+    private val handler = Handler(Looper.getMainLooper())
+    private var isProcessing = false
+
+    private val pulseData = PulseFFTData()
+    private var lastUpdateTime = 0L
+    private var updateThrottle = 16L
+    private var lastKnownRefreshRateHz: Float = 60f
+
+    interface DataListener {
+        fun onDataUpdate(data: PulseData)
+    }
+
+    fun setDataListener(listener: DataListener) {
+        dataListener = WeakReference(listener)
+    }
+
+    fun startCapture() {
+        if (isProcessing) return
+
+        try {
+            visualizer = Visualizer(0).apply {
+                captureSize = Visualizer.getCaptureSizeRange()[1]
+                setDataCaptureListener(object : Visualizer.OnDataCaptureListener {
+                    override fun onWaveFormDataCapture(
+                        visualizer: Visualizer?,
+                        waveform: ByteArray?,
+                        samplingRate: Int
+                    ) {
+                    }
+
+                    override fun onFftDataCapture(
+                        visualizer: Visualizer?,
+                        fft: ByteArray?,
+                        samplingRate: Int
+                    ) {
+                        if (fft != null && fft.isNotEmpty()) {
+                            updateThrottle()
+                            processFFTData(fft)
+                        }
+                    }
+                }, Visualizer.getMaxCaptureRate() / 2, false, true)
+
+                enabled = true
+            }
+
+            isProcessing = true
+        } catch (e: Exception) {
+            cleanup()
+        }
+    }
+
+    fun stopCapture() {
+        if (!isProcessing) return
+
+        try {
+            visualizer?.apply {
+                enabled = false
+                setDataCaptureListener(null, 0, false, false)
+                release()
+            }
+            visualizer = null
+            isProcessing = false
+            pulseData.reset()
+        } catch (e: Exception) {
+        }
+    }
+
+    fun cleanup() {
+        stopCapture()
+        dataListener?.clear()
+        dataListener = null
+    }
+
+    private fun processFFTData(fftBytes: ByteArray) {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lastUpdateTime < updateThrottle) {
+            return
+        }
+        lastUpdateTime = currentTime
+        pulseData.updateFFTData(fftBytes)
+        handler.post {
+            dataListener?.get()?.onDataUpdate(pulseData)
+        }
+    }
+
+    private fun updateThrottle() {
+        val display = context.display ?: return
+        val refreshRate = display.refreshRate
+        if (refreshRate != lastKnownRefreshRateHz) {
+            lastKnownRefreshRateHz = refreshRate
+            updateThrottle = (1000f / refreshRate).toLong()
+        }
+    }
+
+    fun isCapturing(): Boolean = isProcessing
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseBassHaptics.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseBassHaptics.kt
new file mode 100644
index 0000000000000..640f6dca565e6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseBassHaptics.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2026 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import android.os.SystemClock
+import android.os.VibrationEffect
+import android.os.Vibrator
+import kotlin.math.sqrt
+
+internal class PulseBassHaptics(
+    context: Context
+) {
+
+    private val vibrator: Vibrator? =
+        context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
+
+    private var smoothedBass: Float = 0f
+    private var primed: Boolean = false
+    private var lastVibrateUptimeMs: Long = 0L
+
+    fun process(fft: ByteArray?) {
+        if (fft == null || fft.size < MIN_FFT_BYTES) return
+
+        val v = vibrator ?: return
+        if (!v.hasVibrator()) return
+
+        var sum = 0f
+        var i = 0
+        while (i < BASS_BIN_COUNT) {
+            val realIdx = i * 2 + 2
+            val imagIdx = realIdx + 1
+            if (imagIdx >= fft.size) break
+            val re = fft[realIdx].toInt()
+            val im = fft[imagIdx].toInt()
+            sum += sqrt((re * re + im * im).toFloat())
+            i++
+        }
+        val mean = sum / BASS_BIN_COUNT.toFloat()
+
+        if (!primed) {
+            smoothedBass = mean
+            primed = true
+            return
+        }
+
+        val now = SystemClock.uptimeMillis()
+        val sinceLast = now - lastVibrateUptimeMs
+
+        val prev = smoothedBass
+        smoothedBass = prev * SMOOTH_ALPHA + mean * SMOOTH_BETA
+
+        if (sinceLast < COOLDOWN_MS) return
+
+        if (mean > prev * SPIKE_RATIO && mean > ABSOLUTE_FLOOR) {
+            lastVibrateUptimeMs = now
+            try {
+                v.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK))
+            } catch (_: Exception) {
+                // No-op
+            }
+        }
+    }
+
+    fun reset() {
+        smoothedBass = 0f
+        primed = false
+        lastVibrateUptimeMs = 0L
+    }
+
+    companion object {
+        private const val BASS_BIN_COUNT = 8
+        private const val MIN_FFT_BYTES = 18
+        private const val COOLDOWN_MS = 220L
+        private const val SPIKE_RATIO = 1.42f
+        private const val ABSOLUTE_FLOOR = 18.0f
+        private const val SMOOTH_ALPHA = 0.88f
+        private const val SMOOTH_BETA = 0.12f
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseData.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseData.kt
new file mode 100644
index 0000000000000..6169e2a13731b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseData.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+interface PulseData {
+    val fftBytes: ByteArray?
+    val isDataValid: Boolean
+
+    fun updateFFTData(bytes: ByteArray)
+    fun reset()
+}
+
+class PulseFFTData : PulseData {
+    private var _fftBytes: ByteArray? = null
+
+    override val fftBytes: ByteArray?
+        get() = _fftBytes
+
+    override val isDataValid: Boolean
+        get() = _fftBytes != null && _fftBytes!!.isNotEmpty()
+
+    override fun updateFFTData(bytes: ByteArray) {
+        _fftBytes = bytes.copyOf()
+    }
+
+    override fun reset() {
+        _fftBytes = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseEngine.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseEngine.kt
new file mode 100644
index 0000000000000..2cbeb29f05c4d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseEngine.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *           (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import kotlinx.coroutines.*
+import kotlin.math.log10
+import kotlin.math.roundToInt
+
+class PulseEngine(
+    private val context: Context,
+    private val settingsRepo: PulseSettingsRepository,
+    private val onDataProcessed: (FloatArray) -> Unit
+) {
+    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+
+    private var fftAverage: Array<FFTAverage>? = null
+    private val fudgeFactor = 20
+
+    fun processFFT(data: ByteArray) {
+        scope.launch {
+            val barCount = settingsRepo.getBarCount()
+            if (fftAverage == null || fftAverage!!.size != barCount) {
+                fftAverage = Array(barCount) { FFTAverage() }
+            }
+            val heightMultiplier = settingsRepo.getHeightMultiplier()
+            val output = FloatArray(barCount)
+            for (i in 0 until barCount) {
+                val realIndex = i * 2 + 2
+                val imagIndex = i * 2 + 3
+                if (realIndex >= data.size || imagIndex >= data.size) continue
+                val rfk = data[realIndex].toInt()
+                val ifk = data[imagIndex].toInt()
+                val magnitude = (rfk * rfk + ifk * ifk).toFloat()
+                var dbValue = if (magnitude > 0) (10 * log10(magnitude.toDouble())).toInt() else 0
+                dbValue = fftAverage!![i].average(dbValue)
+                output[i] = dbValue * fudgeFactor.toFloat() * heightMultiplier
+            }
+            withContext(Dispatchers.Main) {
+                onDataProcessed(output)
+            }
+        }
+    }
+
+    fun stop() {
+        scope.cancel()
+    }
+
+    private class FFTAverage {
+        companion object {
+            private const val WINDOW_LENGTH = 2
+        }
+
+        private val window = ArrayDeque<Float>(WINDOW_LENGTH)
+        private var average = 0f
+
+        fun average(db: Int): Int {
+            if (window.size >= WINDOW_LENGTH) {
+                val removed = window.removeFirst()
+                average -= removed
+            }
+
+            val newVal = db / WINDOW_LENGTH.toFloat()
+            average += newVal
+            window.addLast(newVal)
+
+            return average.roundToInt()
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseRenderer.kt
new file mode 100644
index 0000000000000..4a634a5519b9a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseRenderer.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *           (C) 2025 crDroid Android Project
+ *           (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import android.graphics.*
+import kotlin.math.max
+
+class PulseRenderer(
+    context: Context,
+    private val settingsRepo: PulseSettingsRepository
+) {
+
+    private val context = context.applicationContext
+
+    private val accentColor = context.resources.getColor(android.R.color.system_accent1_100)
+    private var mediaColor = accentColor
+
+    private var style: PulseStyleRenderer = createStyle(settingsRepo.getStyleMode())
+    private var lastViewW = 0
+    private var lastViewH = 0
+    private var lastColor = 0
+    private var lastBarCount = -1
+    private var lastDataSize = -1
+
+    fun updateHeights(newHeights: FloatArray) {
+        ensureStyleUpToDate()
+        val currentBarCount = settingsRepo.getBarCount()
+        val dataSizeChanged = newHeights.size != lastDataSize
+        val barCountChanged = currentBarCount != lastBarCount
+        if ((dataSizeChanged || barCountChanged) && lastViewW > 0 && lastViewH > 0) {
+            style.onSizeChanged(lastViewW, lastViewH)
+            lastBarCount = currentBarCount
+            lastDataSize = newHeights.size
+        }
+        style.onData(newHeights)
+    }
+
+    fun onDraw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        if (!settingsRepo.isPulseEnabled()) return
+        if (lastViewW != viewWidth || lastViewH != viewHeight) {
+            style.onSizeChanged(viewWidth, viewHeight)
+            lastViewW = viewWidth
+            lastViewH = viewHeight
+            lastBarCount = settingsRepo.getBarCount()
+        }
+        style.onColor(getPulseColor())
+        style.draw(canvas, viewWidth, viewHeight)
+    }
+
+    private fun ensureStyleUpToDate() {
+        val want = settingsRepo.getStyleMode()
+        val needsSwap = when (want) {
+            "solid" -> style !is SolidLineStyleRenderer
+            "fading" -> style !is FadingBlockStyleRenderer
+            "neon" -> style !is NeonStyleRenderer
+            "retro" -> style !is RetroVUStyleRenderer
+            "minimal" -> style !is MinimalStyleRenderer
+            "sparkle" -> style !is SparkleStyleRenderer
+            "matrix" -> style !is MatrixStyleRenderer
+            else -> false
+        }
+        
+        if (needsSwap) {
+            val prevW = lastViewW
+            val prevH = lastViewH
+            val prevColor = lastColor.takeIf { it != 0 } ?: getPulseColor()
+            style.cleanup()
+            style = createStyle(want)
+            if (prevW > 0 && prevH > 0) style.onSizeChanged(prevW, prevH)
+            style.onColor(prevColor)
+        }
+    }
+
+    private fun createStyle(mode: String): PulseStyleRenderer {
+        return when (mode) {
+            "fading" -> FadingBlockStyleRenderer(settingsRepo)
+            "neon" -> NeonStyleRenderer(settingsRepo)
+            "retro" -> RetroVUStyleRenderer(settingsRepo)
+            "minimal" -> MinimalStyleRenderer(settingsRepo)
+            "sparkle" -> SparkleStyleRenderer(settingsRepo)
+            "matrix" -> MatrixStyleRenderer(settingsRepo)
+            else -> SolidLineStyleRenderer(settingsRepo)
+        }
+    }
+
+    private fun getPulseColor(): Int {
+        val alpha = (0.88f * 255).toInt()
+        val mode = settingsRepo.getColorMode()
+        val color = when (mode) {
+            "album" -> mediaColor
+            "custom" -> settingsRepo.getCustomColor()
+            "lavalamp" -> {
+                val time = System.currentTimeMillis()
+                val hue = (time / 50) % 360
+                Color.HSVToColor(alpha, floatArrayOf(hue.toFloat(), 1f, 1f))
+            }
+            "accent" -> accentColor
+            else -> Color.WHITE
+        }
+        return if (mode == "lavalamp") {
+            color
+        } else {
+            (alpha shl 24) or (color and 0x00FFFFFF)
+        }
+    }
+
+    fun onMediaColorsChanged(color: Int) {
+        mediaColor = color
+    }
+
+    fun cleanup() {
+        style.cleanup()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseSettingsRepository.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseSettingsRepository.kt
new file mode 100644
index 0000000000000..3a3f50865105d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseSettingsRepository.kt
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *           (C) 2025 crDroid Android Project
+ *           (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import android.database.ContentObserver
+import android.graphics.Color
+import android.net.Uri
+import android.os.Handler
+import android.os.UserHandle
+import android.os.Looper
+import android.provider.Settings
+
+class PulseSettingsRepository(private val context: Context) {
+
+    companion object {
+        private const val PULSE_ENABLED = Settings.Secure.LOCKSCREEN_PULSE_ENABLED
+        private const val PULSE_BAR_COUNT = Settings.Secure.PULSE_BAR_COUNT
+        private const val PULSE_ROUNDED_BARS = Settings.Secure.PULSE_ROUNDED_BARS
+        private const val PULSE_COLOR = Settings.Secure.PULSE_COLOR
+        private const val PULSE_CUSTOM_COLOR = Settings.Secure.PULSE_CUSTOM_COLOR
+        private const val PULSE_RENDERER = Settings.Secure.PULSE_RENDERER
+        private const val PULSE_SHOW_ON_AMBIENT = Settings.Secure.PULSE_SHOW_ON_AMBIENT
+        private const val PULSE_HEIGHT_MULTIPLIER = Settings.Secure.PULSE_HEIGHT_MULTIPLIER
+        private const val PULSE_BASS_HAPTICS = Settings.Secure.PULSE_BASS_HAPTICS
+
+        private const val DEFAULT_ENABLED = false
+        private const val DEFAULT_BAR_COUNT = 32
+        private const val DEFAULT_ROUNDED_BARS = false
+        private const val DEFAULT_COLOR = "lavalamp"
+        private const val DEFAULT_CUSTOM_COLOR = Color.WHITE
+        private const val DEFAULT_RENDERER = "solid"
+        private const val DEFAULT_SHOW_ON_AMBIENT = true
+        private const val DEFAULT_HEIGHT_MULTIPLIER = 100 // 100 = 1.0x (normal height)
+        private const val DEFAULT_HAPTICS_ENABLED = false
+        private const val DEFAULT_HAPTICS_MODE = 0
+    }
+
+    private val handler = Handler(Looper.getMainLooper())
+    private var settingsObserver: SettingsObserver? = null
+    private var onSettingsChangedListener: (() -> Unit)? = null
+
+    private var cachedEnabled: Boolean? = null
+    private var cachedBarCount: Int? = null
+    private var cachedRoundedBars: Boolean? = null
+    private var cachedColorMode: String? = null
+    private var cachedCustomColor: Int? = null
+    private var cachedRenderer: String? = null
+    private var cachedShowOnAmbient: Boolean? = null
+    private var cachedHeightMultiplier: Float? = null
+    private var cachedHapticsEnabled: Boolean? = null
+    private var cachedHapticsMode: Int? = null
+
+    fun startObserving() {
+        if (settingsObserver != null) return
+
+        settingsObserver = SettingsObserver(handler) { invalidateCache() }
+
+        listOf(
+            Settings.Secure.getUriFor(PULSE_ENABLED),
+            Settings.Secure.getUriFor(PULSE_BAR_COUNT),
+            Settings.Secure.getUriFor(PULSE_ROUNDED_BARS),
+            Settings.Secure.getUriFor(PULSE_COLOR),
+            Settings.Secure.getUriFor(PULSE_CUSTOM_COLOR),
+            Settings.Secure.getUriFor(PULSE_RENDERER),
+            Settings.Secure.getUriFor(PULSE_SHOW_ON_AMBIENT),
+            Settings.Secure.getUriFor(PULSE_HEIGHT_MULTIPLIER),
+            Settings.Secure.getUriFor(PULSE_RENDERER),
+            Settings.Secure.getUriFor(PULSE_BASS_HAPTICS)
+        ).forEach { uri ->
+            context.contentResolver.registerContentObserver(uri, false,
+                settingsObserver!!, UserHandle.USER_ALL)
+        }
+    }
+
+    fun stopObserving() {
+        settingsObserver?.let {
+            context.contentResolver.unregisterContentObserver(it)
+            settingsObserver = null
+        }
+    }
+
+    fun setOnSettingsChangedListener(listener: () -> Unit) {
+        onSettingsChangedListener = listener
+    }
+
+    fun isPulseEnabled(): Boolean {
+        if (cachedEnabled == null) {
+            cachedEnabled = getSecureSetting(PULSE_ENABLED, DEFAULT_ENABLED)
+        }
+        return cachedEnabled!!
+    }
+
+    fun getBarCount(): Int {
+        if (cachedBarCount == null) {
+            cachedBarCount = getSecureSetting(PULSE_BAR_COUNT, DEFAULT_BAR_COUNT).coerceIn(8, 64)
+        }
+        return cachedBarCount!!
+    }
+
+    fun isRoundedBarsEnabled(): Boolean {
+        if (cachedRoundedBars == null) {
+            cachedRoundedBars = getSecureSetting(PULSE_ROUNDED_BARS, DEFAULT_ROUNDED_BARS)
+        }
+        return cachedRoundedBars!!
+    }
+
+    fun getColorMode(): String {
+        if (cachedColorMode == null) {
+            cachedColorMode = getSecureStringSetting(PULSE_COLOR, DEFAULT_COLOR)
+        }
+        return cachedColorMode!!
+    }
+
+    fun getCustomColor(): Int {
+        if (cachedCustomColor == null) {
+            cachedCustomColor = getSecureSetting(PULSE_CUSTOM_COLOR, DEFAULT_CUSTOM_COLOR)
+        }
+        return cachedCustomColor!!
+    }
+
+    fun isPulseShowOnAmbient(): Boolean {
+        if (cachedShowOnAmbient == null) {
+            cachedShowOnAmbient = getSecureSetting(PULSE_SHOW_ON_AMBIENT, DEFAULT_SHOW_ON_AMBIENT)
+        }
+        return cachedShowOnAmbient!!
+    }
+
+    fun getStyleMode(): String {
+        // Valid values: "solid", "fading", "neon", "retro", "minimal", "sparkle", "matrix"
+        if (cachedRenderer == null) {
+            val raw = getSecureStringSetting(PULSE_RENDERER, DEFAULT_RENDERER)
+            cachedRenderer = when (raw) {
+                "solid", "fading", "neon", "retro", "minimal", "sparkle", "matrix" -> raw
+                else -> DEFAULT_RENDERER
+            }
+        }
+        return cachedRenderer!!
+    }
+
+    fun getHeightMultiplier(): Float {
+        if (cachedHeightMultiplier == null) {
+            val value = getSecureSetting(PULSE_HEIGHT_MULTIPLIER, DEFAULT_HEIGHT_MULTIPLIER)
+            // Clamp between 25% and 200% (values 25-200)
+            cachedHeightMultiplier = value.coerceIn(25, 200) / 100f
+        }
+        return cachedHeightMultiplier!!
+    }
+
+    fun getPulseHapticsMode(): Int {
+        if (cachedHapticsMode == null) {
+            cachedHapticsMode = getSecureSetting(PULSE_BASS_HAPTICS, DEFAULT_HAPTICS_MODE)
+        }
+        return cachedHapticsMode!!
+    }
+
+    fun invalidateCache() {
+        cachedEnabled = null
+        cachedBarCount = null
+        cachedRoundedBars = null
+        cachedColorMode = null
+        cachedCustomColor = null
+        cachedRenderer = null
+        cachedShowOnAmbient = null
+        cachedHeightMultiplier = null
+        cachedHapticsEnabled = null
+        cachedHapticsMode = null
+        onSettingsChangedListener?.invoke()
+    }
+
+    private fun getSecureSetting(key: String, defaultValue: Boolean): Boolean {
+        return Settings.Secure.getIntForUser(context.contentResolver, key,
+            if (defaultValue) 1 else 0, UserHandle.USER_CURRENT) == 1
+    }
+
+    private fun getSecureSetting(key: String, defaultValue: Int): Int {
+        return Settings.Secure.getIntForUser(context.contentResolver, key,
+            defaultValue, UserHandle.USER_CURRENT)
+    }
+
+    private fun getSecureStringSetting(key: String, defaultValue: String): String {
+        return Settings.Secure.getStringForUser(context.contentResolver, key,
+            UserHandle.USER_CURRENT) ?: defaultValue
+    }
+
+    private inner class SettingsObserver(
+        handler: Handler,
+        private val onChange: () -> Unit
+    ) : ContentObserver(handler) {
+        override fun onChange(selfChange: Boolean, uri: Uri?) {
+            super.onChange(selfChange, uri)
+            onChange()
+        }
+    }
+
+    fun getBarGapPx(): Float = 2f * context.resources.displayMetrics.density
+    fun getDivisions(): Int = 16
+    fun getBlockStrokePx(): Float = 4f * context.resources.displayMetrics.density
+    fun getFilledBlockSizePx(): Float = 4f * context.resources.displayMetrics.density
+    fun getEmptyBlockSizePx(): Float = 1f * context.resources.displayMetrics.density
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseStyleRenderer.kt
new file mode 100644
index 0000000000000..697ce7ec41fa0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseStyleRenderer.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.Canvas
+
+internal interface PulseStyleRenderer {
+    fun onSizeChanged(viewWidth: Int, viewHeight: Int)
+    fun onColor(color: Int)
+    fun onData(heights: FloatArray)
+    fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int)
+    fun cleanup()
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseView.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseView.kt
new file mode 100644
index 0000000000000..a16336031a55d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseView.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *           (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+
+class PulseView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
+
+    private var renderer: PulseRenderer? = null
+    private var engine: PulseEngine? = null
+    private var isAttached = false
+    private var isVisible = false
+    private var settingsRepo: PulseSettingsRepository? = null
+    
+    private var fadeAnimator: ValueAnimator? = null
+    private val fadeInterpolator = DecelerateInterpolator()
+
+    init {
+        layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        // Start with alpha 0 for smooth fade in
+        alpha = 0f
+    }
+
+    fun initialize(settingsRepo: PulseSettingsRepository) {
+        this.settingsRepo = settingsRepo
+
+        renderer = PulseRenderer(context, settingsRepo)
+        engine = PulseEngine(context, settingsRepo) { processedHeights ->
+            renderer?.updateHeights(processedHeights)
+            postInvalidate()
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        isAttached = true
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        isAttached = false
+        fadeAnimator?.cancel()
+        fadeAnimator = null
+        engine?.stop()
+        renderer?.cleanup()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        if (isAttached && isVisible) {
+            renderer?.onDraw(canvas, width, height)
+            postInvalidateOnAnimation()
+        }
+    }
+
+    fun updateVisualizerData(data: PulseData) {
+        if (isAttached && isVisible && data.isDataValid) {
+            engine?.processFFT(data.fftBytes!!)
+        }
+    }
+
+    fun onMediaColorsChanged(color: Int) {
+        post { renderer?.onMediaColorsChanged(color) }
+    }
+
+    fun setVisibility(visible: Boolean) {
+        isVisible = visible
+        visibility = if (visible) VISIBLE else GONE
+    }
+
+    fun fadeIn(durationMs: Long) {
+        fadeAnimator?.cancel()
+        setVisibility(true)
+        fadeAnimator = ValueAnimator.ofFloat(alpha, 1f).apply {
+            duration = durationMs
+            interpolator = fadeInterpolator
+            addUpdateListener { animation ->
+                alpha = animation.animatedValue as Float
+                invalidate()
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    alpha = 1f
+                    fadeAnimator = null
+                }
+                
+                override fun onAnimationCancel(animation: Animator) {
+                    fadeAnimator = null
+                }
+            })
+            start()
+        }
+    }
+
+    fun fadeOut(durationMs: Long, onComplete: (() -> Unit)? = null) {
+        fadeAnimator?.cancel()
+        
+        fadeAnimator = ValueAnimator.ofFloat(alpha, 0f).apply {
+            duration = durationMs
+            interpolator = fadeInterpolator
+            addUpdateListener { animation ->
+                alpha = animation.animatedValue as Float
+                invalidate()
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    alpha = 0f
+                    setVisibility(false)
+                    fadeAnimator = null
+                    onComplete?.invoke()
+                }
+                
+                override fun onAnimationCancel(animation: Animator) {
+                    setVisibility(false)
+                    fadeAnimator = null
+                    onComplete?.invoke()
+                }
+            })
+            start()
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/PulseViewController.kt b/packages/SystemUI/src/com/android/systemui/pulse/PulseViewController.kt
new file mode 100644
index 0000000000000..2dfdab61bda43
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/PulseViewController.kt
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *           (C) 2024-2026 Lunaris AOSP
+ *           (C) 2026 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.content.Context
+import android.media.session.PlaybackState
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.media.MediaSessionManager
+import com.android.systemui.util.ScrimUtils
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@SysUISingleton
+class PulseViewController @Inject constructor(
+    private val context: Context
+) : PulseAudioDataProcessor.DataListener,
+    MediaSessionManager.MediaDataListener,
+    ScrimUtils.ScrimEventListener {
+
+    private val mainScope = MainScope()
+    private var listenersRegistered = false
+
+    private var isMediaPlaying = false
+    private var bouncerShowingOrKeyguardDismissing = false
+    private var keyguardShowing = false
+    private var isDozing = false
+    private var isPulsing = false
+    private var isScreenOff = false
+
+    private val settingsRepository: PulseSettingsRepository =
+        PulseSettingsRepository(context)
+
+    private val view: PulseView =
+        PulseView(context)
+
+    private val audioProcessor: PulseAudioDataProcessor =
+        PulseAudioDataProcessor(context).apply {
+            setDataListener(this@PulseViewController)
+        }
+
+    private val bassHaptics: PulseBassHaptics =
+        PulseBassHaptics(context)
+
+    val pulseEnabled: Boolean
+        get() = settingsRepository.isPulseEnabled()
+
+    private val isCollapsed: Boolean
+        get() = ScrimUtils.get().isPanelFullyCollapsed()
+
+    private val hapticsMode: Int
+        get() = settingsRepository.getPulseHapticsMode()
+
+    var pulseRunning: Boolean = false
+        set(value) {
+            if (value == field) return
+            field = value
+            updatePulseDisplay(value)
+        }
+
+    private var showDelayJob: Job? = null
+    private var hideDelayJob: Job? = null
+    
+    private val PULSE_SHOW_DELAY_MS = 300L
+    private val PULSE_HIDE_DELAY_MS = 100L
+    private val PULSE_FADE_IN_DURATION_MS = 200L
+    private val PULSE_FADE_OUT_DURATION_MS = 150L
+
+    init {
+        INSTANCE = this
+
+        view.initialize(settingsRepository)
+        settingsRepository.setOnSettingsChangedListener { onSettingsChanged() }
+        settingsRepository.startObserving()
+        onSettingsChanged()
+    }
+
+    fun getPulseView(): PulseView = view
+
+    private fun updateState() {
+        if (!pulseEnabled) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            pulseRunning = false
+            return
+        }
+        
+        val shouldShow = isMediaPlaying 
+                && !bouncerShowingOrKeyguardDismissing
+                && isCollapsed
+                && !isScreenOff
+                && ((keyguardShowing && !isDozing && !isPulsing)
+                || ((isDozing || isPulsing) && settingsRepository.isPulseShowOnAmbient()))
+        
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        
+        if (shouldShow && !pulseRunning) {
+            showDelayJob = mainScope.launch {
+                delay(PULSE_SHOW_DELAY_MS)
+                if (isMediaPlaying 
+                    && !bouncerShowingOrKeyguardDismissing
+                    && isCollapsed
+                    && ((keyguardShowing && !isDozing && !isPulsing)
+                    || ((isDozing || isPulsing) && settingsRepository.isPulseShowOnAmbient()))) {
+                    pulseRunning = true
+                }
+            }
+        } else if (!shouldShow && pulseRunning) {
+            hideDelayJob = mainScope.launch {
+                delay(PULSE_HIDE_DELAY_MS)
+                if (!(isMediaPlaying 
+                    && !bouncerShowingOrKeyguardDismissing
+                    && isCollapsed
+                    && ((keyguardShowing && !isDozing && !isPulsing)
+                    || ((isDozing || isPulsing) && settingsRepository.isPulseShowOnAmbient())))) {
+                    pulseRunning = false
+                }
+            }
+        }
+    }
+
+    private fun onSettingsChanged() {
+        val enabled = pulseEnabled
+        if (enabled && !listenersRegistered) {
+            ScrimUtils.get().addListener(this)
+            MediaSessionManager.get().addListener(this)
+            listenersRegistered = true
+        } else if (!enabled && listenersRegistered) {
+            ScrimUtils.get().removeListener(this)
+            MediaSessionManager.get().removeListener(this)
+            listenersRegistered = false
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            pulseRunning = false
+            mainScope.launch {
+                view.setVisibility(false)
+                audioProcessor.stopCapture()
+            }
+        }
+        updateState()
+        // Force update
+        updatePulseDisplay(pulseRunning)
+    }
+
+    private fun updatePulseDisplay(show: Boolean) {
+        mainScope.launch {
+            view.setVisibility(show)
+            if (pulseEnabled && (show || hapticsMode > 1)) {
+                audioProcessor.startCapture()
+                view.fadeIn(PULSE_FADE_IN_DURATION_MS)
+            } else {
+                view.fadeOut(PULSE_FADE_OUT_DURATION_MS) {
+                    audioProcessor.stopCapture()
+                    bassHaptics.reset()
+                }
+            }
+        }
+    }
+
+    override fun onDataUpdate(data: PulseData) {
+        if (hapticsMode > 0) {
+            bassHaptics.process(data.fftBytes)
+        }
+        if (pulseRunning) {
+            mainScope.launch { 
+                view.updateVisualizerData(data) 
+            }
+        }
+    }
+
+    override fun onPlaybackStateChanged(state: Int) {
+        isMediaPlaying = state == PlaybackState.STATE_PLAYING
+        updateState()
+    }
+
+    override fun onMediaColorsChanged(color: Int) {
+        if (pulseEnabled) view.onMediaColorsChanged(color)
+    }
+
+    override fun onKeyguardShowingChanged(showing: Boolean) {
+        keyguardShowing = showing
+        updateState()
+    }
+
+    override fun onDozingChanged(dozing: Boolean) {
+        isDozing = dozing
+        updateViewElevation()
+        updateState()
+    }
+
+    override fun setPulsing(pulsing: Boolean) {
+        isPulsing = pulsing
+        updateViewElevation()
+        updateState()
+    }
+
+    private fun updateViewElevation() {
+        val ambient = ScrimUtils.get().isDozing() || isPulsing
+        view.translationZ = if (ambient) 1f else 0f
+    }
+
+    override fun onExpandedFractionChanged(expandedFraction: Float) {
+        updateState()
+    }
+
+    override fun onBarStateChanged(state: Int) {
+        updateState()
+    }
+
+    override fun onQsVisibilityChanged(visible: Boolean) {
+        updateState()
+    }
+
+    override fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = fadingAway
+        if (fadingAway) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            pulseRunning = false
+        } else {
+            updateState()
+        }
+    }
+
+    override fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        bouncerShowingOrKeyguardDismissing = goingAway
+        if (goingAway) {
+            showDelayJob?.cancel()
+            hideDelayJob?.cancel()
+            pulseRunning = false
+        } else {
+            updateState()
+        }
+    }
+
+    override fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        bouncerShowingOrKeyguardDismissing = showing
+        updateState()
+    }
+
+    override fun onScreenTurnedOff() {
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        pulseRunning = false
+        isScreenOff = true
+        updateState()
+    }
+
+    override fun onStartedWakingUp() {
+        isScreenOff = false
+        updateState()
+    }
+
+    override fun onUserChanged() {
+        settingsRepository.invalidateCache()
+        bassHaptics.reset()
+        updateState()
+    }
+
+    fun destroy() {
+        showDelayJob?.cancel()
+        hideDelayJob?.cancel()
+        pulseRunning = false
+        settingsRepository.stopObserving()
+        if (listenersRegistered) {
+            ScrimUtils.get().removeListener(this)
+            MediaSessionManager.get().removeListener(this)
+            listenersRegistered = false
+        }
+        audioProcessor.cleanup()
+        bassHaptics.reset()
+        mainScope.cancel()
+    }
+
+    companion object {
+        private const val TAG = "PulseViewController"
+
+        @Volatile
+        private var INSTANCE: PulseViewController? = null
+
+        @JvmStatic
+        fun get(context: Context): PulseViewController {
+            return INSTANCE ?: throw IllegalStateException(
+                "PulseViewController not initialized"
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/RetroVUStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/RetroVUStyleRenderer.kt
new file mode 100644
index 0000000000000..9734a42cc5445
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/RetroVUStyleRenderer.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2024-2025 Lunaris AOSP
+ *           (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.*
+import kotlin.math.max
+import kotlin.math.min
+
+internal class RetroVUStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private val segmentPaints = mutableListOf<Paint>()
+    private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        color = Color.argb(40, 100, 100, 100)
+    }
+
+    private var barRects: Array<RectF> = emptyArray()
+    private var segmentRects: Array<Array<RectF>> = emptyArray()
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var lastColor = 0
+    private val smoothing = 0.15f
+    private var barWidth = 0f
+    private var viewH = 0
+    private var segmentCount = 12
+    private var segmentHeight = 0f
+    private var segmentGap = 0f
+
+    init {
+        createSegmentColors()
+    }
+
+    private fun createSegmentColors() {
+        segmentPaints.clear()
+
+        val greenCount = (segmentCount * 0.6f).toInt()
+        for (i in 0 until greenCount) {
+            segmentPaints.add(Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                style = Paint.Style.FILL
+                color = Color.argb(255, 50, 220, 80)
+            })
+        }
+
+        val yellowCount = (segmentCount * 0.25f).toInt()
+        for (i in 0 until yellowCount) {
+            segmentPaints.add(Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                style = Paint.Style.FILL
+                color = Color.argb(255, 255, 200, 50)
+            })
+        }
+
+        val remaining = segmentCount - greenCount - yellowCount
+        for (i in 0 until remaining) {
+            segmentPaints.add(Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                style = Paint.Style.FILL
+                color = Color.argb(255, 255, 50, 50)
+            })
+        }
+    }
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        viewH = viewHeight
+        val count = settings.getBarCount()
+
+        if (barRects.size != count) {
+            barRects = Array(count) { RectF() }
+            currentHeights = FloatArray(count) { 2f }
+            targetHeights = FloatArray(count) { 2f }
+            segmentRects = Array(count) { Array(segmentCount) { RectF() } }
+        }
+
+        val gap = settings.getBarGapPx()
+        val totalGap = (count - 1) * gap
+        barWidth = if (count > 0) max(1f, (viewWidth - totalGap) / count) else 0f
+        val fullBarWidth = barWidth + gap
+
+        segmentGap = 2f
+        val totalSegmentGap = (segmentCount - 1) * segmentGap
+        segmentHeight = if (segmentCount > 0) {
+            max(3f, (viewHeight - totalSegmentGap) / segmentCount)
+        } else 0f
+
+        val baseY = viewHeight.toFloat()
+
+        for (i in 0 until count) {
+            val left = i * fullBarWidth
+            val right = left + barWidth
+            barRects[i].set(left, 0f, right, baseY)
+
+            for (seg in 0 until segmentCount) {
+                val segTop = baseY - (seg + 1) * (segmentHeight + segmentGap) + segmentGap
+                val segBottom = segTop + segmentHeight
+                segmentRects[i][seg].set(left, segTop, right, segBottom)
+            }
+        }
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            lastColor = color
+            val alpha = Color.alpha(color)
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        val count = barRects.size
+        if (count <= 0) return
+
+        val unlitSegments = (0.5f * segmentCount).toInt()
+
+        for (i in 0 until count) {
+            val rect = barRects[i]
+            val target = targetHeights.getOrElse(i) { 2f }
+            val current = currentHeights.getOrElse(i) { 2f }
+
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            val maxH = rect.bottom
+            if (h > maxH) h = maxH
+
+            currentHeights[i] = h
+
+            val heightPercent = if (maxH > 0f) h / maxH else 0f
+            val litSegments = (heightPercent * segmentCount).toInt()
+
+            for (seg in 0 until segmentCount) {
+                val segRect = segmentRects[i][seg]
+
+                if (seg <= litSegments) {
+                    canvas.drawRect(segRect, segmentPaints[seg])
+                } else if (seg < unlitSegments) {
+                    canvas.drawRect(segRect, backgroundPaint)
+                }
+            }
+        }
+    }
+
+    override fun cleanup() {
+        barRects = emptyArray()
+        segmentRects = emptyArray()
+        currentHeights = FloatArray(0)
+        targetHeights = FloatArray(0)
+        segmentPaints.clear()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/SolidLineStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/SolidLineStyleRenderer.kt
new file mode 100644
index 0000000000000..3f78c0d87933a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/SolidLineStyleRenderer.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RectF
+import androidx.core.content.ContextCompat
+import kotlin.math.max
+
+internal class SolidLineStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+    }
+
+    private var barRects: Array<RectF> = emptyArray()
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var roundedPath: Path? = null
+    private var cornerRadii: FloatArray? = null
+    private var lastColor = 0
+    private val smoothing = 0.2f
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        val count = settings.getBarCount()
+        if (barRects.size != count) {
+            barRects = Array(count) { RectF() }
+            currentHeights = FloatArray(count) { 2f }
+            targetHeights  = FloatArray(count) { 2f }
+
+            if (settings.isRoundedBarsEnabled()) {
+                if (roundedPath == null) roundedPath = Path()
+                if (cornerRadii == null) cornerRadii = floatArrayOf(32f, 32f, 32f, 32f, 0f, 0f, 0f, 0f)
+            }
+        }
+
+        val density = viewWidth.coerceAtLeast(1)
+        val gap = settings.getBarGapPx()
+        val totalGap = (count - 1) * gap
+        val barWidth = if (count > 0) max(0f, viewWidth - totalGap) / count else 0f
+        val fullBarWidth = barWidth + gap
+        val baseY = viewHeight.toFloat()
+
+        for (i in 0 until count) {
+            val left = i * fullBarWidth
+            val right = left + barWidth
+            barRects[i].set(left, baseY, right, baseY)
+        }
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            paint.color = color
+            lastColor = color
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        val count = barRects.size
+        val useRounded = settings.isRoundedBarsEnabled()
+        val path = roundedPath
+        val radii = cornerRadii
+
+        for (i in 0 until count) {
+            val rect = barRects[i]
+            val target = targetHeights.getOrElse(i) { 2f }
+            val current = currentHeights.getOrElse(i) { 2f }
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            val maxH = rect.bottom
+            if (h > maxH) h = maxH
+            currentHeights[i] = h
+            rect.top = rect.bottom - h
+
+            if (useRounded && path != null && radii != null) {
+                path.reset()
+                path.addRoundRect(rect, radii, Path.Direction.CW)
+                canvas.drawPath(path, paint)
+            } else {
+                canvas.drawRect(rect, paint)
+            }
+        }
+    }
+
+    override fun cleanup() {
+        barRects = emptyArray()
+        currentHeights = FloatArray(0)
+        targetHeights  = FloatArray(0)
+        roundedPath = null
+        cornerRadii = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/pulse/SparkleStyleRenderer.kt b/packages/SystemUI/src/com/android/systemui/pulse/SparkleStyleRenderer.kt
new file mode 100644
index 0000000000000..8ca46c9932555
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/pulse/SparkleStyleRenderer.kt
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.pulse
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.graphics.BlurMaskFilter
+import kotlin.math.max
+import kotlin.random.Random
+
+internal class SparkleStyleRenderer(
+    private val settings: PulseSettingsRepository
+) : PulseStyleRenderer {
+
+    private val sparklePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+        maskFilter = BlurMaskFilter(6f, BlurMaskFilter.Blur.NORMAL)
+    }
+
+    private val trailPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+    }
+
+    private var viewW = 0
+    private var viewH = 0
+    private var barCount = 0
+    private var spacing = 0f
+    private var baseY = 0f
+
+    private var currentHeights = FloatArray(0)
+    private var targetHeights = FloatArray(0)
+
+    private var sparkles: Array<Sparkle> = emptyArray()
+    private var poolTop = 0
+
+    private var lastColor = 0
+    private var rgbR = 255
+    private var rgbG = 255
+    private var rgbB = 255
+
+    private val smoothing = 0.25f
+    private val maxSparklesPerBar = 10
+    private val sparkleBaseSize = 2.5f
+    private val sparkleVarSize = 3.5f
+    private val sparkleMinVy = 60f
+    private val sparkleVarVy = 220f
+    private val sparkleGravity = -20f
+    private val sparkleFade = 1.4f
+    private val densityScale = 1.0f
+
+    private var lastDrawUptimeMs: Long = 0L
+
+    override fun onSizeChanged(viewWidth: Int, viewHeight: Int) {
+        viewW = viewWidth
+        viewH = viewHeight
+        baseY = viewH.toFloat()
+        barCount = settings.getBarCount()
+        spacing = computeSpacing(viewW, barCount)
+
+        ensureArrays(barCount)
+
+        val desiredPool = (barCount * maxSparklesPerBar * 3).coerceAtLeast(128)
+        if (sparkles.size != desiredPool) {
+            sparkles = Array(desiredPool) { Sparkle() }
+            poolTop = 0
+        }
+    }
+
+    override fun onColor(color: Int) {
+        if (color != lastColor) {
+            lastColor = color
+            rgbR = Color.red(color)
+            rgbG = Color.green(color)
+            rgbB = Color.blue(color)
+        }
+    }
+
+    override fun onData(heights: FloatArray) {
+        if (heights.size != targetHeights.size) {
+            targetHeights = FloatArray(heights.size)
+            currentHeights = FloatArray(heights.size) { 2f }
+        }
+        System.arraycopy(heights, 0, targetHeights, 0, heights.size)
+
+        val wantBars = settings.getBarCount()
+        if (wantBars != barCount && viewW > 0) {
+            barCount = wantBars
+            spacing = computeSpacing(viewW, barCount)
+            ensureArrays(barCount)
+        }
+    }
+
+    override fun draw(canvas: Canvas, viewWidth: Int, viewHeight: Int) {
+        // Delta time
+        val now = android.os.SystemClock.uptimeMillis()
+        val dt = ((now - lastDrawUptimeMs).takeIf { lastDrawUptimeMs != 0L } ?: 16L) / 1000f
+        lastDrawUptimeMs = now
+
+        val count = minOf(barCount, currentHeights.size, targetHeights.size)
+        for (i in 0 until count) {
+            val target = targetHeights[i]
+            val current = currentHeights[i]
+            var h = current + smoothing * (target - current)
+            if (h < 2f) h = 2f
+            if (h > viewH) h = viewH.toFloat()
+            currentHeights[i] = h
+        }
+
+        for (i in 0 until count) {
+            val energy = currentHeights[i] / max(2f, viewH.toFloat()) // 0..1
+            if (energy <= 0f) continue
+
+            val emit = (energy * maxSparklesPerBar * densityScale)
+            var toSpawn = emit.toInt()
+            val fractional = emit - toSpawn
+            if (Random.nextFloat() < fractional) toSpawn++
+
+            if (toSpawn > 0) spawnFromBar(i, toSpawn, energy)
+        }
+
+        val pr = sparklePaint
+        val tr = trailPaint
+        val baseAlpha = (Color.alpha(lastColor)).coerceIn(0, 255)
+
+        for (idx in sparkles.indices) {
+            val p = sparkles[idx]
+            if (!p.alive) continue
+
+            p.vy += sparkleGravity * dt
+            p.x += p.vx * dt
+            p.y += p.vy * dt
+            p.life -= sparkleFade * dt
+
+            if (p.life <= 0f || p.y + p.size < 0f || p.x < -8f || p.x > viewW + 8f) {
+                p.alive = false
+                poolTop = minOf(poolTop, idx)
+                continue
+            }
+
+            val alpha = (baseAlpha * p.life).toInt().coerceIn(0, 255)
+            pr.color = Color.argb(alpha, rgbR, rgbG, rgbB)
+            tr.color = Color.argb((alpha * 0.6f).toInt().coerceIn(0, 255), rgbR, rgbG, rgbB)
+
+            // Simple trail as vertical rect behind sparkle
+            val tailH = (p.vy * -0.03f).coerceAtLeast(0f)
+            if (tailH > 0f) {
+                canvas.drawRect(p.x - p.size * 0.35f, p.y - tailH, p.x + p.size * 0.35f, p.y, tr)
+            }
+            canvas.drawCircle(p.x, p.y, p.size, pr)
+        }
+    }
+
+    override fun cleanup() {
+        sparkles = emptyArray()
+        poolTop = 0
+        currentHeights = FloatArray(0)
+        targetHeights = FloatArray(0)
+        sparklePaint.maskFilter = null
+    }
+
+    private fun ensureArrays(targetBars: Int) {
+        if (currentHeights.size != targetBars) currentHeights = FloatArray(targetBars) { 2f }
+        if (targetHeights.size != targetBars) targetHeights = FloatArray(targetBars) { 2f }
+    }
+
+    private fun computeSpacing(width: Int, bars: Int): Float {
+        return if (bars > 0) width.toFloat() / bars else width.toFloat()
+    }
+
+    private fun spawnFromBar(barIndex: Int, count: Int, energy: Float) {
+        val centerX = (barIndex + 0.5f) * spacing
+        val halfSpan = spacing * 0.45f
+        val speed = sparkleMinVy + sparkleVarVy * energy
+        val sizeBase = sparkleBaseSize + sparkleVarSize * energy
+
+        for (n in 0 until count) {
+            val p = obtainSparkle() ?: return
+            p.alive = true
+            p.size = (sizeBase * (0.7f + 0.6f * Random.nextFloat()))
+            p.x = centerX + (Random.nextFloat() - 0.5f) * halfSpan
+            p.y = baseY - currentHeights.getOrElse(barIndex) { 2f }
+            p.vx = (Random.nextFloat() - 0.5f) * (40f + 50f * energy)
+            p.vy = -(speed * (0.6f + 0.8f * Random.nextFloat()))
+            p.life = 0.65f + 0.7f * energy
+        }
+    }
+
+    private fun obtainSparkle(): Sparkle? {
+        for (i in poolTop until sparkles.size) {
+            if (!sparkles[i].alive) {
+                poolTop = i + 1
+                return sparkles[i]
+            }
+        }
+        for (i in 0 until poolTop.coerceAtMost(sparkles.size)) {
+            if (!sparkles[i].alive) {
+                poolTop = i + 1
+                return sparkles[i]
+            }
+        }
+        return null
+    }
+
+    private class Sparkle {
+        var alive = false
+        var x = 0f
+        var y = 0f
+        var vx = 0f
+        var vy = 0f
+        var size = 0f
+        var life = 0f
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
index bab88c0b0bf93..e1ba1a8d4dfb9 100644
--- a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
+++ b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
@@ -24,11 +24,15 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.SystemClock;
 import android.provider.DeviceConfig;
 import android.provider.Settings;
 import android.util.Log;
 
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
+import com.android.internal.util.matrixx.Utils;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.settings.UserTracker;
@@ -86,6 +90,9 @@ default void onQRCodeScannerPreferenceChanged() {
 
     private static final String TAG = "QRCodeScannerController";
 
+    public static final String GSA_PACKAGE = "com.google.android.googlequicksearchbox";
+    public static final String LENS_ACTIVITY = "com.google.android.apps.lens.MainActivity";
+
     private final Context mContext;
     private final Executor mExecutor;
     private final SecureSettings mSecureSettings;
@@ -266,6 +273,21 @@ private String getDefaultScannerActivity() {
             com.android.internal.R.string.config_defaultQrCodeComponent);
     }
 
+    private Intent getLensIntent() {
+        Intent intent = new Intent();
+        Bundle bundle = new Bundle();
+
+        bundle.putString("caller_package", GSA_PACKAGE);
+        bundle.putLong("start_activity_time_nanos", SystemClock.elapsedRealtimeNanos());
+        intent.setComponent(new ComponentName(GSA_PACKAGE, LENS_ACTIVITY))
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)
+                .setPackage(GSA_PACKAGE)
+                .setData(Uri.parse("google://lens"))
+                .putExtra("lens_activity_params", bundle);
+
+        return intent;
+    }
+
     private void updateQRCodeScannerActivityDetails() {
         String qrCodeScannerActivity = mDeviceConfigProxy.getString(
                 DeviceConfig.NAMESPACE_SYSTEMUI,
@@ -280,16 +302,22 @@ private void updateQRCodeScannerActivityDetails() {
         String prevQrCodeScannerActivity = mQRCodeScannerActivity;
         ComponentName componentName = null;
         Intent intent = new Intent();
-        if (qrCodeScannerActivity != null) {
+        if (qrCodeScannerActivity != null && !qrCodeScannerActivity.isEmpty()) {
             componentName = ComponentName.unflattenFromString(qrCodeScannerActivity);
             intent.setComponent(componentName);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
         }
 
-        if (isActivityAvailable(intent)) {
+        Intent lensIntent = getLensIntent();
+        if (intent != null && isActivityAvailable(intent)) {
             mQRCodeScannerActivity = qrCodeScannerActivity;
             mComponentName = componentName;
             mIntent = intent;
+        } else if (Utils. isPackageInstalled(mContext, GSA_PACKAGE, false) &&
+                lensIntent != null && isActivityCallable(lensIntent)) {
+            mQRCodeScannerActivity = LENS_ACTIVITY;
+            mComponentName = lensIntent.getComponent();
+            mIntent = lensIntent;
         } else {
             mQRCodeScannerActivity = null;
             mComponentName = null;
@@ -346,8 +374,6 @@ private void unregisterQRCodePreferenceObserver() {
 
         // Reset cached values to default as we are no longer listening
         mQRCodeScannerPreferenceObserver = new HashMap<>();
-        mSecureSettings.putStringForUser(Settings.Secure.SHOW_QR_CODE_SCANNER_SETTING, null,
-                mUserTracker.getUserId());
     }
 
     private void unregisterDefaultQRCodeScannerObserver() {
@@ -356,6 +382,8 @@ private void unregisterDefaultQRCodeScannerObserver() {
 
         // Reset cached values to default as we are no longer listening
         mOnDefaultQRCodeScannerChangedListener = null;
+        mSecureSettings.putStringForUser(Settings.Secure.SHOW_QR_CODE_SCANNER_SETTING, null,
+                mUserTracker.getUserId());
     }
 
     private void notifyQRCodeScannerActivityChanged() {
@@ -383,7 +411,10 @@ private void registerDefaultQRCodeScannerObserver() {
 
         // While registering the observers for the first time update the default values in the
         // background
-        mExecutor.execute(() -> updateQRCodeScannerActivityDetails());
+        mExecutor.execute(() -> {
+                updateQRCodeScannerActivityDetails();
+                updateQRCodeScannerPreferenceDetails(/* updateSettings = */true);
+                });
         mOnDefaultQRCodeScannerChangedListener =
                 properties -> {
                     if (DeviceConfig.NAMESPACE_SYSTEMUI.equals(properties.getNamespace())
diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt
index b96f31184d0b1..7c0ef2bd985b2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt
@@ -232,6 +232,10 @@ constructor(
         resources.getStringArray(com.android.internal.R.array.vendor_stoppable_fgs_system_apps)
     }
 
+    private val hiddenPackages by lazy {
+        resources.getStringArray(R.array.config_hideFgsManagerPackages)
+    }
+
     override fun init() {
         synchronized(lock) {
             if (initialized) {
@@ -727,6 +731,11 @@ constructor(
             private set
 
         fun updateUiControl() {
+            if (hiddenPackages.contains(packageName)) {
+                uiControl = UIControl.HIDE_ENTRY
+                uiControlInitialized = true
+                return
+            }
             backgroundRestrictionExemptionReason =
                 activityManager.getBackgroundRestrictionExemptionReason(uid)
             uiControl =
diff --git a/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
index a60502ecd7138..44dbe82bf0a60 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt
@@ -79,9 +79,6 @@ constructor(
     private var locationIndicatorsEnabled = false
     private var privacyChipLogged = false
     private var safetyCenterEnabled = false
-    private val cameraSlot = privacyChip.resources.getString(R.string.status_bar_camera)
-    private val micSlot = privacyChip.resources.getString(R.string.status_bar_microphone)
-    private val locationSlot = privacyChip.resources.getString(R.string.status_bar_location)
     private val dialogContext: Context
         get() = shadeDialogContextInteractor.context
 
@@ -145,7 +142,6 @@ constructor(
             }
 
             private fun update() {
-                updatePrivacyIconSlots()
                 setChipVisibility(privacyChip.privacyList.isNotEmpty())
             }
         }
@@ -168,12 +164,9 @@ constructor(
                 privacyDialogController.showDialog(dialogContext)
             }
         }
-        setChipVisibility(privacyChip.visibility == View.VISIBLE)
         micCameraIndicatorsEnabled = privacyItemController.micCameraAvailable
         locationIndicatorsEnabled = privacyItemController.locationAvailable
-
-        // Ignore privacy icons because they show in the space above QQS
-        updatePrivacyIconSlots()
+        setChipVisibility(privacyChip.visibility == View.VISIBLE)
     }
 
     private fun showSafetyCenter() {
@@ -214,6 +207,7 @@ constructor(
     }
 
     fun onParentInvisible() {
+        setChipVisibility(false)
         chipVisibilityListener = null
         privacyChip.setOnClickListener(null)
     }
@@ -230,6 +224,7 @@ constructor(
         listening = false
         privacyItemController.removeCallback(picCallback)
         privacyChipLogged = false
+        setChipVisibility(false)
     }
 
     private fun setChipVisibility(visible: Boolean) {
@@ -248,25 +243,4 @@ constructor(
         privacyChip.visibility = if (visible) View.VISIBLE else View.GONE
         chipVisibilityListener?.onChipVisibilityRefreshed(visible)
     }
-
-    private fun updatePrivacyIconSlots() {
-        if (getChipEnabled()) {
-            if (micCameraIndicatorsEnabled) {
-                iconContainer.addIgnoredSlot(cameraSlot)
-                iconContainer.addIgnoredSlot(micSlot)
-            } else {
-                iconContainer.removeIgnoredSlot(cameraSlot)
-                iconContainer.removeIgnoredSlot(micSlot)
-            }
-            if (locationIndicatorsEnabled) {
-                iconContainer.addIgnoredSlot(locationSlot)
-            } else {
-                iconContainer.removeIgnoredSlot(locationSlot)
-            }
-        } else {
-            iconContainer.removeIgnoredSlot(cameraSlot)
-            iconContainer.removeIgnoredSlot(micSlot)
-            iconContainer.removeIgnoredSlot(locationSlot)
-        }
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index 0cb695cc35534..cc8f68e6fc44d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -221,7 +221,7 @@ public void onViewDetachedFromWindow(@NonNull View v) {
 
     private void addNonFirstPageAnimators(int page) {
         Pair<HeightExpansionAnimator, TouchAnimator> pair = createSecondaryPageAnimators(page);
-        if (pair != null) {
+        if (pair != null && pair.second != null) {
             // pair is null in one of two cases:
             // * mPagedTileLayout is null, meaning we are still setting up.
             // * the page has no tiles
@@ -493,6 +493,9 @@ private Pair<HeightExpansionAnimator, TouchAnimator> createSecondaryPageAnimator
 
         for (int i = 0; i < specs.size(); i++) {
             QSTileView tileView = mQsPanelController.getTileView(specs.get(i));
+            if (tileView == null) {
+                return null;
+            }
             getRelativePosition(mTmpLoc2, tileView, view);
             int diff = mTmpLoc2[1] - (mQQSTop + qqsLayout.getPhantomTopPosition(i));
             builder.addFloat(tileView, "translationY", -diff, 0);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
index 5a872d699f350..b22dacc3db571 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
@@ -86,20 +86,9 @@ protected void onFinishInflate() {
 
     private void setBuildText() {
         if (mBuildText == null) return;
-        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {
-            mBuildText.setText(mContext.getString(
-                    com.android.internal.R.string.bugreport_status,
-                    Build.VERSION.RELEASE_OR_CODENAME,
-                    Build.ID));
-            // Set as selected for marquee before its made visible, then it won't be announced when
-            // it's made visible.
-            mBuildText.setSelected(true);
-            mShouldShowBuildText = true;
-        } else {
-            mBuildText.setText(null);
-            mShouldShowBuildText = false;
-            mBuildText.setSelected(false);
-        }
+        mBuildText.setText(null);
+        mShouldShowBuildText = false;
+        mBuildText.setSelected(false);
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
index 5d35a69be910e..a732df7a47e61 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java
@@ -65,6 +65,7 @@
 import com.android.systemui.qs.logging.QSLogger;
 import com.android.systemui.qs.tileimpl.QSTileImpl;
 import com.android.systemui.settings.DisplayTracker;
+import com.android.systemui.applocker.AxAppLockerHelper;
 
 import dagger.Lazy;
 import dagger.assisted.Assisted;
@@ -116,6 +117,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener,
     private int mServiceUid = Process.INVALID_UID;
 
     private final IUriGrantsManager mIUriGrantsManager;
+    private final AxAppLockerHelper mAxAppLockerHelper;
 
     @AssistedInject
     CustomTile(
@@ -133,7 +135,8 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener,
             CustomTileStatePersister customTileStatePersister,
             TileServices tileServices,
             DisplayTracker displayTracker,
-            IUriGrantsManager uriGrantsManager
+            IUriGrantsManager uriGrantsManager,
+            AxAppLockerHelper axAppLockerHelper
     ) {
         super(host.get(), uiEventLogger, backgroundLooper, mainHandler, falsingManager,
                 metricsLogger, statusBarStateController, activityStarter, qsLogger);
@@ -150,6 +153,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener,
         mCustomTileStatePersister = customTileStatePersister;
         mDisplayTracker = displayTracker;
         mIUriGrantsManager = uriGrantsManager;
+        mAxAppLockerHelper = axAppLockerHelper;
     }
 
     @Override
@@ -414,6 +418,12 @@ protected void handleClick(@Nullable Expandable expandable) {
         if (mTile.getState() == Tile.STATE_UNAVAILABLE) {
             return;
         }
+
+        if (mAxAppLockerHelper.getState(mComponent.getPackageName()).needsAuth()) {
+            mAxAppLockerHelper.promptUnlock(mComponent.getPackageName(), mUser);
+            return;
+        }
+
         mExpandableClicked = expandable;
         try {
             if (DEBUG) Log.d(TAG, "Adding token");
diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt
index 9a09976c9fc6a..56d190bf371ee 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt
@@ -92,6 +92,9 @@ interface FooterActionsInteractor {
     /** Show the settings. */
     fun showSettings(expandable: Expandable)
 
+    /** Show the custom settings */
+    fun showCustomSettings(expandable: Expandable)
+
     /** Show the user switcher. */
     fun showUserSwitcher(expandable: Expandable)
 }
@@ -197,6 +200,28 @@ constructor(
         )
     }
 
+    override fun showCustomSettings(expandable: Expandable) {
+        if (!deviceProvisionedController.isCurrentUserSetup) {
+            // If user isn't setup just unlock the device and dump them back at SUW.
+            activityStarter.postQSRunnableDismissingKeyguard {}
+            return
+        }
+
+        metricsLogger.action(MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH)
+
+        val intent = Intent()
+        intent.setClassName("com.android.settings",
+                "com.android.settings.Settings\$MatrixxSettingsLayoutActivity")
+        activityStarter.startActivity(
+            intent,
+            true /* dismissShade */,
+            expandable.activityTransitionController(
+                InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON
+            ),
+        )
+        return
+    }
+
     override fun showUserSwitcher(expandable: Expandable) {
         userSwitcherInteractor.showUserSwitcher(expandable)
     }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt
index 120808b7765d2..f3933bba23998 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt
@@ -37,6 +37,7 @@ sealed interface FooterActionsButtonViewModel {
     val iconTintFallback: Int?
     val backgroundColorFallback: Int
     val onClick: (Expandable) -> Unit
+    val onLongClick: ((Expandable) -> Unit)?
 
     data class UserSwitcherViewModel(
         override val icon: Icon,
@@ -45,11 +46,13 @@ sealed interface FooterActionsButtonViewModel {
         override val id: Int = R.id.multi_user_switch
         @ColorInt override val iconTintFallback: Int? = null
         @AttrRes override val backgroundColorFallback: Int = R.attr.shadeInactive
+        override val onLongClick: ((Expandable) -> Unit)? = null
     }
 
     data class SettingsActionViewModel(
         private val context: Context,
         override val onClick: (Expandable) -> Unit,
+        override val onLongClick: (Expandable) -> Unit,
     ) : FooterActionsButtonViewModel {
         override val id: Int = R.id.settings_button_container
         override val icon: Icon =
@@ -77,5 +80,6 @@ sealed interface FooterActionsButtonViewModel {
         override val iconTintFallback: Int =
             Utils.getColorAttrDefaultColor(context, R.attr.onShadeActive)
         @AttrRes override val backgroundColorFallback: Int = R.attr.shadeActive
+        override val onLongClick: ((Expandable) -> Unit)? = null
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
index 95f0b75737e7d..3ba3c5f4a8c19 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
@@ -17,6 +17,10 @@
 package com.android.systemui.qs.footer.ui.viewmodel
 
 import android.content.Context
+import android.os.UserHandle
+import android.provider.Settings
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.util.Log
 import android.view.ContextThemeWrapper
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -24,6 +28,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleOwner
 import com.android.app.tracing.coroutines.launchTraced as launch
+import com.android.systemui.Dependency
 import com.android.systemui.Flags.hsuQsChanges
 import com.android.systemui.animation.Expandable
 import com.android.systemui.common.shared.model.ContentDescription
@@ -45,6 +50,7 @@ import com.android.systemui.qs.panels.ui.viewmodel.TextFeedbackContentViewModel.
 import com.android.systemui.qs.panels.ui.viewmodel.TextFeedbackViewModel
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
+import com.android.systemui.statusbar.policy.KeyguardStateController
 import com.android.systemui.user.domain.interactor.HeadlessSystemUserMode
 import com.android.systemui.user.domain.interactor.SelectedUserInteractor
 import com.android.systemui.util.icuMessageFormat
@@ -132,6 +138,7 @@ class FooterActionsViewModel(
         private val selectedUserInteractor: SelectedUserInteractor,
         private val hsum: HeadlessSystemUserMode,
         @Named(PM_LITE_ENABLED) private val showPowerButton: Boolean,
+        private val keyguardStateController: KeyguardStateController
     ) {
         /** Create a [FooterActionsViewModel] bound to the lifecycle of [lifecycleOwner]. */
         fun create(lifecycleOwner: LifecycleOwner): FooterActionsViewModel {
@@ -161,6 +168,7 @@ class FooterActionsViewModel(
                 showPowerButton,
                 selectedUserInteractor,
                 hsum,
+                keyguardStateController,
             )
         }
 
@@ -188,6 +196,7 @@ class FooterActionsViewModel(
                 showPowerButton,
                 selectedUserInteractor,
                 hsum,
+                keyguardStateController,
             )
         }
     }
@@ -203,7 +212,12 @@ fun createFooterActionsViewModel(
     showPowerButton: Boolean,
     selectedUserInteractor: SelectedUserInteractor,
     hsum: HeadlessSystemUserMode,
+    keyguardStateController: KeyguardStateController
 ): FooterActionsViewModel {
+
+    val vibrator = appContext.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+    val EFFECT_CLICK = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK)
+
     suspend fun observeDeviceMonitoringDialogRequests(quickSettingsContext: Context) {
         footerActionsInteractor.deviceMonitoringDialogRequests.collect {
             footerActionsInteractor.showDeviceMonitoringDialog(
@@ -218,6 +232,7 @@ fun createFooterActionsViewModel(
             return
         }
 
+        vibrator.vibrate(EFFECT_CLICK)
         footerActionsInteractor.showDeviceMonitoringDialog(quickSettingsContext, expandable)
     }
 
@@ -226,6 +241,7 @@ fun createFooterActionsViewModel(
             return
         }
 
+        vibrator.vibrate(EFFECT_CLICK)
         activityStarter.dismissKeyguardThenExecute(
             {
                 footerActionsInteractor.showForegroundServicesDialog(expandable)
@@ -241,6 +257,7 @@ fun createFooterActionsViewModel(
             return
         }
 
+        vibrator.vibrate(EFFECT_CLICK)
         footerActionsInteractor.showUserSwitcher(expandable)
     }
 
@@ -249,14 +266,30 @@ fun createFooterActionsViewModel(
             return
         }
 
+        vibrator.vibrate(EFFECT_CLICK)
         footerActionsInteractor.showSettings(expandable)
     }
 
+    fun onSettingsButtonLongClicked(expandable: Expandable) {
+        if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
+            return
+        }
+
+        footerActionsInteractor.showCustomSettings(expandable)
+        return
+    }
+
     fun onPowerButtonClicked(expandable: Expandable) {
+        if (keyguardStateController.isShowing() && keyguardStateController.isMethodSecure() 
+                && Settings.System.getIntForUser(appContext.getContentResolver(),
+                Settings.System.LOCKSCREEN_ENABLE_POWER_MENU, 1, UserHandle.USER_CURRENT) == 0) {
+            return
+        }
         if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
             return
         }
 
+        vibrator.vibrate(EFFECT_CLICK)
         footerActionsInteractor.showPowerMenuDialog(globalActionsDialogLite, expandable)
     }
 
@@ -297,7 +330,7 @@ fun createFooterActionsViewModel(
     val settings =
         selectedUserInteractor.selectedUser
             .map { selectedUserId ->
-                SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked).takeUnless {
+                SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked, ::onSettingsButtonLongClicked).takeUnless {
                     hsuQsChanges() && hsum.isHeadlessSystemUser(selectedUserId)
                 }
             }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt
index 5ec2cfde14cb7..f3f1e52e9219e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt
@@ -16,15 +16,23 @@
 
 package com.android.systemui.qs.panels.data.repository
 
+import android.content.Context
 import android.content.res.Resources
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.UserHandle
+import android.provider.Settings
 import com.android.systemui.common.ui.data.repository.ConfigurationRepository
 import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.util.kotlin.emitOnStart
 import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.mapLatest
 
@@ -33,6 +41,7 @@ import kotlinx.coroutines.flow.mapLatest
 class LargeTileSpanRepository
 @Inject
 constructor(
+    @Application private val context: Context,
     @ShadeDisplayAware private val resources: Resources,
     @ShadeDisplayAware configurationRepository: ConfigurationRepository,
 ) {
@@ -60,4 +69,33 @@ constructor(
         const val FONT_SCALE_THRESHOLD = 1.8f
         const val DEFAULT_LARGE_TILE_WIDTH = 2
     }
+
+    private fun settingsChanges(): Flow<Unit> = callbackFlow {
+        val observer = object : ContentObserver(/* handler */ null) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Unit)
+            }
+        }
+        val cr = context.contentResolver
+        cr.registerContentObserver(Settings.System.getUriFor(Settings.System.QS_PANEL_STYLE),
+            /* notifyForDescendants */ false, observer, UserHandle.USER_ALL)
+        awaitClose { cr.unregisterContentObserver(observer) }
+    }
+
+    private fun readQSPanelStyleEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                context.contentResolver, Settings.System.QS_PANEL_STYLE, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    val classicStyle: Flow<Boolean> =
+        settingsChanges()
+            .emitOnStart()
+            .mapLatest { readQSPanelStyleEnabled() }
+            .distinctUntilChanged()
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt
index 5420015f744aa..6b86de7f9000d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt
@@ -16,35 +16,78 @@
 
 package com.android.systemui.qs.panels.data.repository
 
+import android.content.Context
+import android.content.res.Configuration
 import android.content.res.Resources
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.UserHandle
+import android.provider.Settings
+import androidx.annotation.IntegerRes
 import com.android.systemui.common.ui.data.repository.ConfigurationRepository
 import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.util.kotlin.emitOnStart
 import javax.inject.Inject
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.merge
 
 @SysUISingleton
 class QSColumnsRepository
 @Inject
 constructor(
+    @Application private val context: Context,
     @ShadeDisplayAware private val resources: Resources,
-    @ShadeDisplayAware configurationRepository: ConfigurationRepository,
+    @ShadeDisplayAware private val configurationRepository: ConfigurationRepository,
 ) {
-    val splitShadeColumns: Flow<Int> =
-        configurationRepository.onConfigurationChange.emitOnStart().mapLatest {
-            resources.getInteger(R.integer.quick_settings_split_shade_num_columns)
-        }
-    val dualShadeColumns: Flow<Int> =
-        configurationRepository.onConfigurationChange.emitOnStart().mapLatest {
-            resources.getInteger(R.integer.quick_settings_dual_shade_num_columns)
+    private fun settingsChanges(): Flow<Unit> = callbackFlow {
+        val uris: List<Uri> = listOf(
+            Settings.System.getUriFor(Settings.System.QS_TILES_COLUMNS),
+            Settings.System.getUriFor(Settings.System.QS_TILES_COLUMNS_LANDSCAPE)
+        )
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Unit)
+            }
         }
+        val cr = context.contentResolver
+        uris.forEach { cr.registerContentObserver(it, /*notifyForDescendants*/ false, observer, UserHandle.USER_ALL) }
+        awaitClose { cr.unregisterContentObserver(observer) }
+    }
+
+    private fun readColumnsWithDefault(@IntegerRes defaultResId: Int): Int {
+        val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+        val key = if (isLandscape) Settings.System.QS_TILES_COLUMNS_LANDSCAPE
+                  else Settings.System.QS_TILES_COLUMNS
+        val def = resources.getInteger(defaultResId)
+        return Settings.System.getIntForUser(
+            context.contentResolver, key, def, UserHandle.USER_CURRENT
+        ).coerceAtLeast(1)
+    }
+
+    private fun reactiveColumns(@IntegerRes defaultResId: Int): Flow<Int> =
+        merge(configurationRepository.onConfigurationChange, settingsChanges())
+            .emitOnStart()
+            .mapLatest { readColumnsWithDefault(defaultResId) }
+
     val columns: Flow<Int> =
-        configurationRepository.onConfigurationChange.emitOnStart().mapLatest {
-            resources.getInteger(R.integer.quick_settings_infinite_grid_num_columns)
-        }
+        reactiveColumns(R.integer.quick_settings_infinite_grid_num_columns)
+
+    val splitShadeColumns: Flow<Int> =
+        reactiveColumns(R.integer.quick_settings_split_shade_num_columns)
+
+    val dualShadeColumns: Flow<Int> =
+        reactiveColumns(R.integer.quick_settings_dual_shade_num_columns)
+
     val defaultColumns: Int =
         resources.getInteger(R.integer.quick_settings_infinite_grid_num_columns)
+    val defaultSplitShadeColumns: Int =
+        resources.getInteger(R.integer.quick_settings_split_shade_num_columns)
+    val defaultDualShadeColumns: Int =
+        resources.getInteger(R.integer.quick_settings_dual_shade_num_columns)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSPaginatedRowsRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSPaginatedRowsRepository.kt
new file mode 100644
index 0000000000000..114082b31f0d4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSPaginatedRowsRepository.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// QSPaginatedRowsRepository.kt
+package com.android.systemui.qs.panels.data.repository
+
+import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.common.ui.data.repository.ConfigurationRepository
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.res.R
+import com.android.systemui.shade.ShadeDisplayAware
+import com.android.systemui.util.kotlin.emitOnStart
+import javax.inject.Inject
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.merge
+
+@SysUISingleton
+class QSPaginatedRowsRepository
+@Inject
+constructor(
+    @Application private val context: Context,
+    @ShadeDisplayAware private val resources: Resources,
+    @ShadeDisplayAware private val configurationRepository: ConfigurationRepository,
+) {
+    private fun settingsChanges(): Flow<Unit> = callbackFlow {
+        val uris: List<Uri> = listOf(
+            Settings.System.getUriFor(Settings.System.QS_TILES_ROWS),
+            Settings.System.getUriFor(Settings.System.QS_TILES_ROWS_LANDSCAPE)
+        )
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Unit)
+            }
+        }
+        val cr = context.contentResolver
+        uris.forEach { cr.registerContentObserver(it, false, observer, UserHandle.USER_ALL) }
+        awaitClose { cr.unregisterContentObserver(observer) }
+    }
+
+    private fun readRows(): Int {
+        val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+        val key = if (isLandscape) Settings.System.QS_TILES_ROWS_LANDSCAPE
+                  else Settings.System.QS_TILES_ROWS
+        val def = resources.getInteger(R.integer.quick_settings_paginated_grid_num_rows)
+        return Settings.System.getIntForUser(
+            context.contentResolver, key, def, UserHandle.USER_CURRENT
+        ).coerceAtLeast(1)
+    }
+
+    val rows: Flow<Int> =
+        merge(configurationRepository.onConfigurationChange, settingsChanges())
+            .emitOnStart()
+            .mapLatest { readRows() }
+
+    val defaultRows: Int =
+        resources.getInteger(R.integer.quick_settings_paginated_grid_num_rows)
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt
index 636f703ac65aa..268aeda20c20f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt
@@ -16,24 +16,64 @@
 
 package com.android.systemui.qs.panels.data.repository
 
+import android.content.Context
+import android.content.res.Configuration
 import android.content.res.Resources
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.UserHandle
+import android.provider.Settings
 import com.android.systemui.common.ui.data.repository.ConfigurationRepository
 import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
 import com.android.systemui.util.kotlin.emitOnStart
 import javax.inject.Inject
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.merge
 
 @SysUISingleton
-class QuickQuickSettingsRowRepository
-@Inject
-constructor(
+class QuickQuickSettingsRowRepository @Inject constructor(
+    @Application private val context: Context,
     @ShadeDisplayAware private val resources: Resources,
-    @ShadeDisplayAware configurationRepository: ConfigurationRepository,
+    @ShadeDisplayAware private val configurationRepository: ConfigurationRepository,
 ) {
-    val rows =
-        configurationRepository.onConfigurationChange.emitOnStart().map {
-            resources.getInteger(R.integer.quick_qs_paginated_grid_num_rows)
+    private fun settingsChanges(): Flow<Unit> = callbackFlow {
+        val uris: List<Uri> = listOf(
+            Settings.System.getUriFor(Settings.System.QQS_TILES_ROWS),
+            Settings.System.getUriFor(Settings.System.QQS_TILES_ROWS_LANDSCAPE)
+        )
+        val observer = object : ContentObserver(/* handler */ null) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                trySend(Unit)
+            }
         }
+        val cr = context.contentResolver
+        uris.forEach { cr.registerContentObserver(it, /* notifyForDescendants */ false, observer, UserHandle.USER_ALL) }
+        awaitClose { cr.unregisterContentObserver(observer) }
+    }
+
+    private fun readRows(): Int {
+        val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+        val key = if (isLandscape) Settings.System.QQS_TILES_ROWS_LANDSCAPE
+                  else Settings.System.QQS_TILES_ROWS
+        val def = resources.getInteger(R.integer.quick_qs_paginated_grid_num_rows)
+        return Settings.System.getIntForUser(
+            context.contentResolver, key, def, UserHandle.USER_CURRENT
+        ).coerceAtLeast(1)
+    }
+
+    val rows: Flow<Int> =
+        merge(configurationRepository.onConfigurationChange, settingsChanges())
+            .emitOnStart()
+            .mapLatest { readRows() }
+            .distinctUntilChanged()
+
+    val defaultRows: Int =
+        resources.getInteger(R.integer.quick_qs_paginated_grid_num_rows)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/LargeTileSpanInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/LargeTileSpanInteractor.kt
index 2d57158437e14..55f08daa6c51a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/LargeTileSpanInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/LargeTileSpanInteractor.kt
@@ -28,4 +28,6 @@ class LargeTileSpanInteractor @Inject constructor(repo: LargeTileSpanRepository)
     val tileMaxWidth: Flow<Int> = repo.tileMaxWidth
 
     val defaultTileMaxWidth: Int = repo.defaultTileMaxWidth
+
+    val classicStyle: Flow<Boolean> = repo.classicStyle
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QSPaginatedRowsInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QSPaginatedRowsInteractor.kt
new file mode 100644
index 0000000000000..9444e3e2614ce
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QSPaginatedRowsInteractor.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.panels.domain.interactor
+
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.qs.panels.data.repository.QSPaginatedRowsRepository
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
+
+@SysUISingleton
+class QSPaginatedRowsInteractor
+@Inject
+constructor(
+    @Application private val scope: CoroutineScope,
+    repo: QSPaginatedRowsRepository,
+) {
+    val rows: StateFlow<Int> =
+        repo.rows.stateIn(scope, SharingStarted.WhileSubscribed(), repo.defaultRows)
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QuickQuickSettingsRowInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QuickQuickSettingsRowInteractor.kt
index 5f001df7a49e4..3ef5f019c170d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QuickQuickSettingsRowInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/domain/interactor/QuickQuickSettingsRowInteractor.kt
@@ -28,5 +28,5 @@ constructor(
 ) {
     val rows = quickQuickSettingsRowRepository.rows
 
-    val defaultRows = 2
+    val defaultRows = quickQuickSettingsRowRepository.defaultRows
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt
index 899cf6bdddefe..633fecee67bb3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt
@@ -78,7 +78,7 @@ constructor(
                 delegateGridLayout.viewModelFactory.create()
             }
 
-        val rows = integerResource(R.integer.quick_settings_paginated_grid_num_rows)
+        val rows = viewModel.rows
         val pages =
             remember(tiles, rows, *delegateGridViewModel.pageKeys) {
                 delegateGridViewModel.splitIntoPages(tiles, rows)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
index 84869c71eac51..ad86eecc8f4c0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
@@ -16,7 +16,9 @@
 
 package com.android.systemui.qs.panels.ui.compose
 
+import android.provider.Settings
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -24,6 +26,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastMap
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.compose.animation.scene.ContentScope
@@ -31,7 +34,9 @@ import com.android.systemui.compose.modifiers.sysuiResTag
 import com.android.systemui.grid.ui.compose.VerticalSpannedGrid
 import com.android.systemui.qs.composefragment.ui.GridAnchor
 import com.android.systemui.qs.flags.QSMaterialExpressiveTiles
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.Tile
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberQSPanelStyle
 import com.android.systemui.qs.panels.ui.viewmodel.BounceableTileViewModel
 import com.android.systemui.qs.panels.ui.viewmodel.QuickQuickSettingsViewModel
 import com.android.systemui.qs.shared.ui.QuickSettings.Elements.toElementKey
@@ -48,6 +53,12 @@ fun ContentScope.QuickQuickSettings(
     val tiles = sizedTiles.fastMap { it.tile }
     val squishiness by viewModel.squishinessViewModel.squishiness.collectAsStateWithLifecycle()
     val scope = rememberCoroutineScope()
+    
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val useModifiedSpacing = remember {
+        Settings.System.getInt(context.contentResolver, Settings.System.QS_USE_MODIFIED_TILE_SPACING, 0) == 1
+    }
+    val classicStyle = rememberQSPanelStyle()
 
     Box(modifier = modifier) {
         GridAnchor()
@@ -63,7 +74,7 @@ fun ContentScope.QuickQuickSettings(
             ) { sizedTile, interactionSource ->
                 Tile(
                     tile = sizedTile.tile,
-                    iconOnly = sizedTile.isIcon,
+                    iconOnly = classicStyle || sizedTile.isIcon,
                     squishiness = { squishiness },
                     coroutineScope = scope,
                     tileHapticsViewModelFactoryProvider =
@@ -80,19 +91,29 @@ fun ContentScope.QuickQuickSettings(
             val bounceables =
                 remember(sizedTiles) { List(sizedTiles.size) { BounceableTileViewModel() } }
             val spans by remember(sizedTiles) { derivedStateOf { sizedTiles.fastMap { it.width } } }
+            
             VerticalSpannedGrid(
                 columns = columns,
-                columnSpacing = dimensionResource(R.dimen.qs_tile_margin_horizontal),
-                rowSpacing = dimensionResource(R.dimen.qs_tile_margin_vertical),
+                columnSpacing = if (useModifiedSpacing) {
+                    CommonTileDefaults.TileColumnSpacing
+                } else {
+                    dimensionResource(R.dimen.qs_tile_margin_horizontal)
+                },
+                rowSpacing = if (useModifiedSpacing) {
+                    CommonTileDefaults.TileRowSpacing
+                } else {
+                    dimensionResource(R.dimen.qs_tile_margin_vertical)
+                },
                 spans = spans,
-                modifier = Modifier.sysuiResTag("qqs_tile_layout"),
+                modifier = Modifier.sysuiResTag("qqs_tile_layout")
+                    .then(if (useModifiedSpacing) Modifier.padding(horizontal = 10.dp) else Modifier),
                 keys = { sizedTiles[it].tile.spec },
             ) { spanIndex, column, isFirstInColumn, isLastInColumn ->
                 val it = sizedTiles[spanIndex]
                 Element(it.tile.spec.toElementKey(), Modifier) {
                     Tile(
                         tile = it.tile,
-                        iconOnly = it.isIcon,
+                        iconOnly = classicStyle || it.isIcon,
                         squishiness = { squishiness },
                         coroutineScope = scope,
                         bounceableInfo =
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/AxTileStyle.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/AxTileStyle.kt
new file mode 100644
index 0000000000000..60b000d369fd9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/AxTileStyle.kt
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.panels.ui.compose.infinitegrid
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.service.quicksettings.Tile.STATE_ACTIVE
+import android.service.quicksettings.Tile.STATE_INACTIVE
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.android.compose.modifiers.thenIf
+import com.android.systemui.Flags
+import com.android.systemui.common.shared.model.Icon
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelSettings
+import com.android.systemui.qs.panels.ui.viewmodel.AccessibilityUiState
+import com.android.systemui.qs.ui.compose.borderOnFocus
+
+object AxTileDefaults {
+    val TileCornerRadius = 50.dp
+    val ActiveTileCornerRadius = 26.dp
+
+    val LargeIconSize = 24.dp
+    val DividerWidth = 1.dp
+    val DividerHeight = 16.dp
+    val IconDividerSpacing = 12.dp
+    val DividerLabelSpacing = 16.dp
+    val LargeTileStartPadding = 24.dp
+    val LargeTileEndPadding = 16.dp
+
+    @Composable
+    fun dividerColor(state: Int): Color {
+        return when (state) {
+            STATE_ACTIVE -> MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.2f)
+            STATE_INACTIVE -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.15f)
+            else -> MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.1f)
+        }
+    }
+
+    @Composable
+    fun animateTileShapeAsState(
+        state: Int,
+        invertRadius: Boolean = false,
+    ): androidx.compose.runtime.State<RoundedCornerShape> = animateAxShape(
+        state = state,
+        activeCornerRadius = if (invertRadius) TileCornerRadius else ActiveTileCornerRadius,
+        inactiveCornerRadius = if (invertRadius) ActiveTileCornerRadius else TileCornerRadius,
+        label = "AxTileCornerRadius",
+    )
+
+    @Composable
+    fun animateIconShapeAsState(
+        state: Int,
+        invertRadius: Boolean = false,
+    ): androidx.compose.runtime.State<RoundedCornerShape> = animateAxShape(
+        state = state,
+        activeCornerRadius = TileCornerRadius,
+        inactiveCornerRadius = TileCornerRadius,
+        label = "AxIconCornerRadius",
+    )
+
+    @Composable
+    private fun animateAxShape(
+        state: Int,
+        activeCornerRadius: Dp,
+        inactiveCornerRadius: Dp,
+        label: String,
+    ): State<RoundedCornerShape> {
+        val radius by animateDpAsState(
+            targetValue = if (state == STATE_ACTIVE) activeCornerRadius else inactiveCornerRadius,
+            label = label,
+        )
+        return remember {
+            mutableStateOf(
+                RoundedCornerShape(
+                    object : CornerSize {
+                        override fun toPx(shapeSize: Size, density: Density): Float =
+                            with(density) { radius.toPx() }
+                    }
+                )
+            )
+        }
+    }
+}
+
+@Composable
+fun AxLargeTileContent(
+    label: String,
+    secondaryLabel: String?,
+    iconProvider: Context.() -> Icon,
+    sideDrawable: Drawable?,
+    colors: TileColors,
+    squishiness: () -> Float,
+    tileState: Int,
+    modifier: Modifier = Modifier,
+    isVisible: () -> Boolean = { true },
+    accessibilityUiState: AccessibilityUiState? = null,
+    iconShape: RoundedCornerShape = RoundedCornerShape(CommonTileDefaults.InactiveCornerRadius),
+    textScale: () -> Float = { 1f },
+    toggleClick: (() -> Unit)? = null,
+    onLongClick: (() -> Unit)? = null,
+) {
+    val isDualTarget = toggleClick != null
+    val dividerColor = AxTileDefaults.dividerColor(tileState)
+    val focusBorderColor = MaterialTheme.colorScheme.secondary
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier.padding(
+            start = AxTileDefaults.LargeTileStartPadding,
+            end = AxTileDefaults.LargeTileEndPadding,
+        ),
+    ) {
+        val longPressLabel = longPressLabelSettings().takeIf { onLongClick != null }
+
+        Box(
+            modifier = Modifier
+                .fillMaxHeight()
+                .thenIf(isDualTarget) {
+                    Modifier
+                        .borderOnFocus(color = focusBorderColor, iconShape.topEnd)
+                        .combinedClickable(
+                            onClick = toggleClick!!,
+                            onLongClick = onLongClick,
+                            onLongClickLabel = longPressLabel,
+                            hapticFeedbackEnabled = !Flags.msdlFeedback(),
+                        )
+                },
+            contentAlignment = Alignment.Center,
+        ) {
+            SmallTileContent(
+                iconProvider = iconProvider,
+                color = colors.icon,
+                size = { AxTileDefaults.LargeIconSize },
+                modifier = Modifier,
+            )
+        }
+
+        if (isDualTarget) {
+            Spacer(modifier = Modifier.width(AxTileDefaults.IconDividerSpacing))
+            Box(
+                modifier = Modifier
+                    .width(AxTileDefaults.DividerWidth)
+                    .height(AxTileDefaults.DividerHeight)
+                    .background(dividerColor)
+            )
+            Spacer(modifier = Modifier.width(AxTileDefaults.DividerLabelSpacing))
+        } else {
+            Spacer(modifier = Modifier.width(AxTileDefaults.DividerLabelSpacing))
+        }
+
+        LargeTileLabels(
+            label = label,
+            secondaryLabel = secondaryLabel,
+            colors = colors,
+            accessibilityUiState = accessibilityUiState,
+            isVisible = isVisible,
+            modifier = Modifier
+                .weight(1f)
+                .bounceScale(TransformOrigin(0f, .5f), textScale),
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt
index 0ae396615b4fa..c52bbce16ba45 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt
@@ -17,10 +17,13 @@
 package com.android.systemui.qs.panels.ui.compose.infinitegrid
 
 import android.content.Context
+import android.graphics.Matrix
+import android.graphics.Path
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.Drawable
 import android.text.TextUtils
+import android.util.PathParser
 import androidx.annotation.VisibleForTesting
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.graphics.res.animatedVectorResource
@@ -39,6 +42,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -68,6 +72,7 @@ import androidx.compose.ui.graphics.ColorProducer
 import androidx.compose.ui.graphics.CompositingStrategy
 import androidx.compose.ui.graphics.DefaultAlpha
 import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.asComposePath
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.painter.Painter
@@ -82,10 +87,15 @@ import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.semantics.toggleableState
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.Hyphens
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.android.compose.modifiers.size
 import com.android.compose.modifiers.thenIf
 import com.android.compose.ui.graphics.painter.rememberDrawablePainter
@@ -115,6 +125,108 @@ private const val TEST_TAG_TOGGLE = "qs_tile_toggle_target"
 private const val TEST_TAG_SMALL = "qs_tile_small"
 private const val TEST_TAG_LARGE = "qs_tile_large"
 
+@Composable
+fun ClassicTileContent(
+    label: String,
+    iconProvider: Context.() -> Icon,
+    iconShapeKey: String,
+    colors: TileColors,
+    labelHide: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val isNoBackground = iconShapeKey in QSTileIconShapes.NO_BACKGROUND_KEYS
+    val iconShape = remember(iconShapeKey) {
+        QSTileIconShapes.shapeForKey(iconShapeKey)
+    }
+
+    val overlayPathData = remember(iconShapeKey) {
+        QSTileIconShapes.OVERLAY_BY_KEY[iconShapeKey]
+    }
+    val overlayPath = remember(overlayPathData) {
+        overlayPathData?.let { pathData ->
+            try {
+                PathParser.createPathFromPathData(pathData)
+            } catch (_: RuntimeException) {
+                null
+            }
+        }
+    }
+
+    val animatedColor by animateColorAsState(colors.background, label = "QSTileCircleBgColor")
+    val animatedOutlineColor by animateColorAsState(colors.outline, label = "QSTileOutlineColor")
+
+    val (tileHeight, iconSize) = remember(labelHide) {
+        if (labelHide) {
+            CommonTileDefaults.TileHeight to CommonTileDefaults.IconSize
+        } else {
+            (CommonTileDefaults.TileHeight - 8.dp) to CommonTileDefaults.LargeTileIconSize
+        }
+    }
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        Box(
+            modifier = Modifier
+                .size(tileHeight)
+                .thenIf(!isNoBackground) {
+                    Modifier
+                        .clip(iconShape)
+                        .drawBehind {
+                            val brush = colors.iconBackgroundGradient
+                            if (brush != null) {
+                                drawRect(brush = brush)
+                            } else {
+                                drawRect(color = animatedColor)
+                            }
+                        }
+                }
+                .thenIf(overlayPath != null) {
+                    Modifier.drawWithContent {
+                        drawContent()
+                        overlayPath?.let { path ->
+                            val scaledPath = Path(path)
+                            val matrix = Matrix()
+                            matrix.setScale(size.width / 100f, size.height / 100f)
+                            scaledPath.transform(matrix)
+                            drawPath(
+                                path = scaledPath.asComposePath(),
+                                color = animatedOutlineColor,
+                            )
+                        }
+                    }
+                },
+        ) {
+            SmallTileContent(
+                iconProvider = iconProvider,
+                color = if (!isNoBackground) colors.icon else animatedOutlineColor,
+                size = { iconSize },
+                modifier = Modifier.align(Alignment.Center),
+            )
+        }
+
+        if (!labelHide) {
+            val labelColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
+            BasicText(
+                text = label,
+                style = TextStyle(
+                    fontSize = CommonTileDefaults.ClassicLabelSize,
+                    textAlign = TextAlign.Center,
+                    hyphens = Hyphens.Auto,
+                ),
+                color = { labelColor },
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier
+                    .padding(top = 4.dp)
+                    .fillMaxWidth(),
+            )
+        }
+    }
+}
+
 @Composable
 fun LargeTileContent(
     label: String,
@@ -148,7 +260,14 @@ fun LargeTileContent(
                     Modifier.borderOnFocus(color = focusBorderColor, iconShape.topEnd)
                         .clip(iconShape)
                         .verticalSquish(squishiness)
-                        .drawBehind { drawRect(animatedBackgroundColor) }
+                        .drawBehind {
+                            val brush = colors.iconBackgroundGradient
+                            if (brush != null) {
+                                drawRect(brush = brush)
+                            } else {
+                                drawRect(color = animatedBackgroundColor)
+                            }
+                        }
                         .combinedClickable(
                             onClick = toggleClick!!,
                             onLongClick = onLongClick,
@@ -213,7 +332,9 @@ fun LargeTileLabels(
     Column(verticalArrangement = Arrangement.Center, modifier = modifier.fillMaxHeight()) {
         TileLabel(
             text = label,
-            style = MaterialTheme.typography.titleSmallEmphasized,
+            style = MaterialTheme.typography.bodyMedium.copy(
+                fontWeight = FontWeight.SemiBold,
+            ),
             color = { animatedLabelColor },
             isVisible = isVisible,
         )
@@ -221,7 +342,9 @@ fun LargeTileLabels(
             TileLabel(
                 secondaryLabel ?: "",
                 color = { animatedSecondaryLabelColor },
-                style = MaterialTheme.typography.labelMedium,
+                style = MaterialTheme.typography.labelSmall.copy(
+                    fontWeight = FontWeight.Normal,
+                ),
                 isVisible = isVisible,
                 modifier =
                     Modifier.thenIf(
@@ -411,19 +534,29 @@ object TileBounceMotionTestKeys {
 }
 
 object CommonTileDefaults {
-    val IconSize = 32.dp
-    val LargeTileIconSize = 28.dp
+    val IconSize = 24.dp
+    val LargeTileIconSize = 24.dp
+
     val SideIconWidth = 32.dp
     val SideIconHeight = 20.dp
     val ChevronSize = 14.dp
     val ToggleTargetSize = 56.dp
+
     val TileHeight = 72.dp
+
     val TileStartPadding = 8.dp
     val TileEndPadding = 12.dp
     val TileDualTargetEndPadding = 8.dp
+
     val TileArrangementPadding = 6.dp
-    val InactiveCornerRadius = 50.dp
+    val TileColumnSpacing = 20.dp
+    val TileRowSpacing = 20.dp
+
+    val InactiveCornerRadius = 36.dp
+    val ActiveTileCornerRadius = 24.dp
+
     val TileLabelBlurWidth = 32.dp
+    val ClassicLabelSize = 10.sp
     const val TILE_MARQUEE_ITERATIONS = 1
     const val TILE_INITIAL_DELAY_MILLIS = 2000
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CustomColorScheme.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CustomColorScheme.kt
new file mode 100644
index 0000000000000..cb0369da010e9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CustomColorScheme.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.qs.panels.ui.compose.infinitegrid
+
+import android.content.Context
+import android.os.SystemProperties
+import android.provider.Settings
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+
+class CustomColorScheme(private val context: Context) {
+    val qsTileColor: Color
+        get() {
+            val resolver = context.contentResolver
+            val blurEnabled = Settings.Global.getInt(
+                resolver,
+                Settings.Global.DISABLE_WINDOW_BLURS,
+                if (blurEnabledByDefault) 0 else 1
+            ) != 1
+
+            val useAlternateColor = Settings.System.getInt(
+                resolver,
+                Settings.System.QS_TILE_ALTERNATE_COLOR,
+                0
+            ) == 1
+
+            val colorRes = if (blurEnabled) {
+                if (useAlternateColor)
+                    com.android.internal.R.color.surface_effect_2
+                else
+                    com.android.internal.R.color.surface_effect_1
+            } else {
+                com.android.internal.R.color.materialColorSurfaceBright
+            }
+
+            return Color(context.resources.getColor(colorRes, context.theme))
+        }
+
+    companion object {
+        private val blurEnabledByDefault: Boolean by lazy {
+            SystemProperties.getBoolean("ro.custom.blur.enable", false)
+        }
+
+        val current: CustomColorScheme
+            @Composable
+            @ReadOnlyComposable
+            get() = CustomColorScheme(LocalContext.current)
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt
index 7bb572aaba610..691b0b0909e3a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt
@@ -177,6 +177,7 @@ import com.android.systemui.qs.panels.ui.compose.EditTileListState.Companion.INV
 import com.android.systemui.qs.panels.ui.compose.dragAndDropRemoveZone
 import com.android.systemui.qs.panels.ui.compose.dragAndDropTileList
 import com.android.systemui.qs.panels.ui.compose.dragAndDropTileSource
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.ActiveTileCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.InactiveCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileArrangementPadding
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileHeight
@@ -188,6 +189,8 @@ import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaul
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.CurrentTilesGridPadding
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.GridBackgroundCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.EditModeTileDefaults.TilePlacementSpec
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberTileShapeMode
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberQSPanelStyle
 import com.android.systemui.qs.panels.ui.compose.selection.InteractiveTileContainer
 import com.android.systemui.qs.panels.ui.compose.selection.MutableSelectionState
 import com.android.systemui.qs.panels.ui.compose.selection.ResizingState
@@ -1057,6 +1060,7 @@ private fun LazyGridItemScope.TileGridCell(
             }
         },
         contentDescription = decorationClickLabel,
+        iconOnly = cell.isIcon
     ) {
         val placeableColor = MaterialTheme.colorScheme.primary.copy(alpha = .4f)
         val backgroundColor by
@@ -1128,7 +1132,7 @@ private fun LazyGridItemScope.TileGridCell(
                     CornerSize(InactiveCornerRadius),
                 )
                 .thenIf(isSelectable) { draggableModifier }
-                .tileBackground { backgroundColor }
+                .tileBackground ( { backgroundColor }, iconOnly = cell.isIcon )
                 .clickable { selectionState.onTap(cell.tile.tileSpec) }
                 .thenIf(isSelectable) { selectableModifier }
         ) {
@@ -1228,7 +1232,7 @@ private fun AvailableTileGridCell(
                         MaterialTheme.colorScheme.secondary,
                         CornerSize(InactiveCornerRadius),
                     )
-                    .tileBackground { colors.background }
+                    .tileBackground ( { colors.background }, iconOnly = true)
                     .clickable(
                         enabled = !cell.isCurrent,
                         onClick = onClick,
@@ -1394,9 +1398,41 @@ private fun MeasureScope.iconHorizontalCenter(containerSize: Int): Float {
         CommonTileDefaults.TileStartPadding.toPx()
 }
 
-private fun Modifier.tileBackground(color: () -> Color): Modifier {
-    // Clip tile contents from overflowing past the tile
-    return clip(RoundedCornerShape(InactiveCornerRadius)).drawBehind { drawRect(color()) }
+@Composable
+private fun editTileShape(shapeMode: Int): RoundedCornerShape {
+    val radius = when (shapeMode) {
+        1 -> InactiveCornerRadius // Circle-ish
+        2 -> ActiveTileCornerRadius // Rounded Square
+        3 -> 0.dp // Square
+        4 -> InactiveCornerRadius // Circle
+        else -> InactiveCornerRadius
+    }
+    return RoundedCornerShape(radius)
+}
+
+@Composable
+private fun Modifier.tileBackground(
+    color: () -> Color,
+    iconOnly: Boolean,
+): Modifier {
+    val panelStyle = rememberQSPanelStyle()
+    val shapeMode = rememberTileShapeMode()
+    return if (panelStyle || (shapeMode == 4 && iconOnly)) {
+        // Draw a centered circle that fits the tile's min dimension
+        drawBehind {
+            val border = 0f
+            val diameter = minOf(size.width, size.height) - border
+            val radius = diameter / 2f
+            drawCircle(
+                color = color(),
+                radius = radius,
+                center = Offset(size.width / 2f, size.height / 2f)
+            )
+        }
+    } else {
+        clip(editTileShape(shapeMode))
+            .drawBehind { drawRect(color()) }
+    }
 }
 
 private object EditModeTileDefaults {
@@ -1422,6 +1458,7 @@ private object EditModeTileDefaults {
             label = MaterialTheme.colorScheme.onSurface,
             secondaryLabel = MaterialTheme.colorScheme.onSurface,
             icon = MaterialTheme.colorScheme.onSurface,
+            outline = MaterialTheme.colorScheme.onSurface,
         )
 }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
index 734377e8d2169..9d62b87cd69e5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
@@ -16,6 +16,8 @@
 
 package com.android.systemui.qs.panels.ui.compose.infinitegrid
 
+import android.provider.Settings
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -28,6 +30,7 @@ import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastMap
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.compose.animation.scene.ContentScope
@@ -83,11 +86,14 @@ constructor(
             rememberViewModel(traceName = "InfiniteGridLayout.TileGrid", key = context) {
                 textFeedbackContentViewModelFactory.create(context)
             }
+        
+        val useModifiedSpacing = remember {
+            Settings.System.getInt(context.contentResolver, Settings.System.QS_USE_MODIFIED_TILE_SPACING, 0) == 1
+        }
 
         val columns = viewModel.columnsWithMediaViewModel.columns
         val largeTilesSpan = viewModel.columnsWithMediaViewModel.largeSpan
         val largeTiles by viewModel.iconTilesViewModel.largeTilesState
-        // Tiles or largeTiles may be updated while this is composed, so listen to any changes
         val sizedTiles =
             remember(tiles, largeTiles, largeTilesSpan) {
                 tiles.map {
@@ -97,6 +103,8 @@ constructor(
         val squishiness by viewModel.squishinessViewModel.squishiness.collectAsStateWithLifecycle()
         val scope = rememberCoroutineScope()
 
+        val classicStyle = rememberQSPanelStyle()
+
         if (QSMaterialExpressiveTiles.isEnabled) {
             ButtonGroupGrid(
                 sizedTiles = sizedTiles,
@@ -108,7 +116,7 @@ constructor(
             ) { sizedTile, interactionSource ->
                 Tile(
                     tile = sizedTile.tile,
-                    iconOnly = iconTilesViewModel.isIconTile(sizedTile.tile.spec),
+                    iconOnly = classicStyle || iconTilesViewModel.isIconTile(sizedTile.tile.spec),
                     squishiness = { squishiness },
                     tileHapticsViewModelFactoryProvider = tileHapticsViewModelFactoryProvider,
                     coroutineScope = scope,
@@ -124,20 +132,31 @@ constructor(
             val bounceables =
                 remember(sizedTiles) { List(sizedTiles.size) { BounceableTileViewModel() } }
             val spans by remember(sizedTiles) { derivedStateOf { sizedTiles.fastMap { it.width } } }
+            
             VerticalSpannedGrid(
                 columns = columns,
-                columnSpacing = dimensionResource(R.dimen.qs_tile_margin_horizontal),
-                rowSpacing = dimensionResource(R.dimen.qs_tile_margin_vertical),
+                columnSpacing = if (useModifiedSpacing) {
+                    CommonTileDefaults.TileColumnSpacing
+                } else {
+                    dimensionResource(R.dimen.qs_tile_margin_horizontal)
+                },
+                rowSpacing = if (useModifiedSpacing) {
+                    CommonTileDefaults.TileRowSpacing
+                } else {
+                    dimensionResource(R.dimen.qs_tile_margin_vertical)
+                },
                 spans = spans,
                 keys = { sizedTiles[it].tile.spec },
-                modifier = modifier,
+                modifier = modifier.then(
+                    if (useModifiedSpacing) Modifier.padding(horizontal = 10.dp) else Modifier
+                ),
             ) { spanIndex, column, isFirstInColumn, isLastInColumn ->
                 val it = sizedTiles[spanIndex]
 
                 Element(it.tile.spec.toElementKey(), Modifier) {
                     Tile(
                         tile = it.tile,
-                        iconOnly = iconTilesViewModel.isIconTile(it.tile.spec),
+                        iconOnly = classicStyle || iconTilesViewModel.isIconTile(it.tile.spec),
                         squishiness = { squishiness },
                         tileHapticsViewModelFactoryProvider = tileHapticsViewModelFactoryProvider,
                         coroutineScope = scope,
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/QSTileIconShapes.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/QSTileIconShapes.kt
new file mode 100644
index 0000000000000..9fad79d402200
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/QSTileIconShapes.kt
@@ -0,0 +1,245 @@
+/*
+ * SPDX-FileCopyrightText: crDroid Android Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.qs.panels.ui.compose.infinitegrid
+
+import android.graphics.Matrix
+import android.util.PathParser
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.asComposePath
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+
+object QSTileIconShapes {
+
+    const val DEFAULT_KEY = "circle"
+
+    val PATH_BY_KEY: Map<String, String> = linkedMapOf(
+        "circle" to
+            "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0",
+        "square" to
+            "M53.689 0.82 L53.689 .82 C67.434 .82 74.306 .82 79.758 2.978 " +
+            "87.649 6.103 93.897 12.351 97.022 20.242 99.18 25.694 99.18 32.566 " +
+            "99.18 46.311 V53.689 C99.18 67.434 99.18 74.306 97.022 79.758 " +
+            "93.897 87.649 87.649 93.897 79.758 97.022 74.306 99.18 67.434 99.18 " +
+            "53.689 99.18 H46.311 C32.566 99.18 25.694 99.18 20.242 97.022 " +
+            "12.351 93.897 6.103 87.649 2.978 79.758 .82 74.306 .82 67.434 " +
+            ".82 53.689 L.82 46.311 C.82 32.566 .82 25.694 2.978 20.242 " +
+            "6.103 12.351 12.351 6.103 20.242 2.978 25.694 .82 32.566 .82 " +
+            "46.311 .82Z",
+        "four_sided_cookie" to
+            "M39.888,4.517C46.338 7.319 53.662 7.319 60.112 4.517L63.605 3" +
+            "C84.733 -6.176 106.176 15.268 97 36.395L95.483 39.888" +
+            "C92.681 46.338 92.681 53.662 95.483 60.112L97 63.605" +
+            "C106.176 84.732 84.733 106.176 63.605 97L60.112 95.483" +
+            "C53.662 92.681 46.338 92.681 39.888 95.483L36.395 97" +
+            "C15.267 106.176 -6.176 84.732 3 63.605L4.517 60.112" +
+            "C7.319 53.662 7.319 46.338 4.517 39.888L3 36.395" +
+            "C -6.176 15.268 15.267 -6.176 36.395 3Z",
+        "seven_sided_cookie" to
+            "M 35.209 6.878 C 36.326 5.895 36.884 5.404 37.397 5.006 " +
+            "C 44.82 -0.742 55.18 -0.742 62.603 5.006 C 63.116 5.404 63.674 5.895 " +
+            "64.791 6.878 C 65.164 7.207 65.351 7.371 65.539 7.529 " +
+            "C 68.167 9.734 71.303 11.248 74.663 11.932 C 74.902 11.981 75.147 12.025 " +
+            "75.637 12.113 C 77.1 12.375 77.831 12.506 78.461 12.66 " +
+            "C 87.573 14.893 94.032 23.011 94.176 32.412 C 94.186 33.062 94.151 33.805 " +
+            "94.08 35.293 C 94.057 35.791 94.045 36.04 94.039 36.285 " +
+            "C 93.958 39.72 94.732 43.121 96.293 46.18 C 96.404 46.399 96.522 46.618 " +
+            "96.759 47.056 C 97.467 48.366 97.821 49.021 98.093 49.611 " +
+            "C 102.032 58.143 99.727 68.266 92.484 74.24 C 91.983 74.653 91.381 75.089 " +
+            "90.177 75.961 C 89.774 76.254 89.572 76.4 89.377 76.548 " +
+            "C 86.647 78.626 84.477 81.353 83.063 84.483 C 82.962 84.707 82.865 84.936 " +
+            "82.671 85.395 C 82.091 86.766 81.8 87.451 81.51 88.033 " +
+            "C 77.31 96.44 67.977 100.945 58.801 98.994 C 58.166 98.859 57.451 98.659 " +
+            "56.019 98.259 C 55.54 98.125 55.3 98.058 55.063 97.998 " +
+            "C 51.74 97.154 48.26 97.154 44.937 97.998 C 44.699 98.058 44.46 98.125 " +
+            "43.981 98.259 C 42.549 98.659 41.834 98.859 41.199 98.994 " +
+            "C 32.023 100.945 22.69 96.44 18.49 88.033 C 18.2 87.451 17.909 86.766 " +
+            "17.329 85.395 C 17.135 84.936 17.038 84.707 16.937 84.483 " +
+            "C 15.523 81.353 13.353 78.626 10.623 76.548 C 10.428 76.4 10.226 76.254 " +
+            "9.823 75.961 C 8.619 75.089 8.017 74.653 7.516 74.24 " +
+            "C 0.273 68.266 -2.032 58.143 1.907 49.611 C 2.179 49.021 2.533 48.366 " +
+            "3.241 47.056 C 3.478 46.618 3.596 46.399 3.707 46.18 " +
+            "C 5.268 43.121 6.042 39.72 5.961 36.285 C 5.955 36.04 5.943 35.791 " +
+            "5.92 35.293 C 5.849 33.805 5.814 33.062 5.824 32.412 " +
+            "C 5.968 23.011 12.427 14.893 21.539 12.66 C 22.169 12.506 22.9 12.375 " +
+            "24.363 12.113 C 24.853 12.025 25.098 11.981 25.337 11.932 " +
+            "C 28.697 11.248 31.833 9.734 34.461 7.529 C 34.649 7.371 34.836 7.207 " +
+            "35.209 6.878 Z",
+        "arch" to
+            "M50 0C77.614 0 100 22.386 100 50C100 85.471 100 86.476 99.9 87.321 " +
+            "99.116 93.916 93.916 99.116 87.321 99.9 86.476 100 85.471 100 83.46 100" +
+            "H16.54C14.529 100 13.524 100 12.679 99.9 6.084 99.116 .884 93.916 " +
+            ".1 87.321 0 86.476 0 85.471 0 83.46L0 50C0 22.386 22.386 0 50 0Z",
+
+        "ios_rounded_square" to
+            "M24.00,0.00L76.00,0.00A24.00 24.00 0 0 1 100.00,24.00L100.00,76.00" +
+            "A24.00 24.00 0 0 1 76.00,100.00L24.00,100.00A24.00 24.00 0 0 1 " +
+            "0.00,76.00L0.00,24.00A24.00 24.00 0 0 1 24.00,0.00z",
+
+        "meow" to
+            "M 4.432 31.65 C 4.656 31.126 4.736 30.551 4.663 29.985 " +
+            "C 4.026 26.269 1.314 11.591 0.116 4.701 C -0.235 2.992 0.443 0.912 " +
+            "1.895 0.145 C 2.336 -0.072 2.839 -0.014 3.293 0.112 " +
+            "C 4.378 0.473 5.381 1.08 6.357 1.718 C 10.502 4.416 14.621 7.167 " +
+            "18.732 9.933 C 19.823 10.666 21.252 10.658 22.334 9.911 " +
+            "C 30.185 4.6 39.651 1.503 49.833 1.503 C 60.18 1.503 69.786 4.701 " +
+            "77.716 10.161 C 78.797 10.922 80.235 10.937 81.331 10.199 " +
+            "C 86.109 6.997 90.875 3.776 95.646 0.564 C 96.99 -0.438 99.098 0.259 " +
+            "99.76 1.907 C 100.193 3.164 99.88 4.529 99.634 5.789 " +
+            "C 98.325 13.019 95.754 27.409 95.207 30.68 C 95.169 31.181 95.249 31.684 " +
+            "95.441 32.148 C 97.788 37.889 99.082 44.17 99.082 50.752 " +
+            "C 99.082 77.932 77.014 100 49.833 100 C 22.653 100 0.585 77.932 " +
+            "0.585 50.752 C 0.585 43.98 1.955 37.526 4.432 31.65 Z",
+
+        "flower" to
+            "M50,0 C60.6,0 69.9,5.3 75.6,13.5 78.5,17.8 82.3,21.5 86.6,24.5 " +
+            "94.7,30.1 100,39.4 100,50 100,60.6 94.7,69.9 86.5,75.6 " +
+            "82.2,78.5 78.5,82.3 75.5,86.6 69.9,94.7 60.6,100 50,100 " +
+            "39.4,100 30.1,94.7 24.4,86.5 21.5,82.2 17.7,78.5 13.4,75.5 " +
+            "5.3,69.9 0,60.6 0,50 0,39.4 5.3,30.1 13.5,24.4 " +
+            "17.8,21.5 21.5,17.7 24.5,13.4 30.1,5.3 39.4,0 50,0 Z",
+
+        "heart" to
+            "M50,20 C45,0 30,0 25,0 20,0 0,5 0,34 0,72 40,97 50,100 " +
+            "60,97 100,72 100,34 100,5 80,0 75,0 70,0 55,0 50,20 Z",
+
+        "hexagon" to
+            "M12,0 88,0 100,50 88,100 12,100 0,50 12,0 Z",
+
+        "leaf" to
+            "M-0.06,0.07h67.37C85.36,0.07,100,14.71,100,32.76v67.37" +
+            "H32.63c-18.06,0-32.69-14.64-32.69-32.69L-0.06,0.07z",
+
+        "cloudy" to
+            "M4,50 C2,45 0,39 0,33 C0,15 15,0 33,0 C39,0 45,2 50,4 " +
+            "C55,2 61,0 67,0 C85,0 100,15 100,33 C100,39 98,45 96,50 " +
+            "C98,55 100,61 100,66 C100,85 85,100 66,100 C61,100 55,98 50,96 " +
+            "C45,98 39,100 33,100 C15,100 0,85 0,66 C0,61 2,55 3,50 Z",
+
+        "cylindrical" to
+            "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z",
+
+        "stretched" to
+            "M100,50 C100,77 77,100 50,100 L10,100 C4,100 0,96 0,90 L0,50 " +
+            "C0,22 22,0 50,0 L90,0 C96,0 100,4 100,10 L100,50 Z",
+
+        "pebble" to
+            "M55,0 C25,0 0,25 0,50 0,78 28,100 55,100 85,100 100,85 100,58 " +
+            "100,30 86,0 55,0 Z",
+
+        "rice_balls" to
+            "M46.16,0.43C45.23,0.49,41.86,0.75,40.93,0.84C40.44,0.88,39.61,0.98,39.07,1.06C38.54,1.14,37.83,1.25,37.5,1.3C36.88,1.39,36.21,1.51,35.42,1.65C34.76,1.77,33.25,2.12,32.91,2.22C32.75,2.27,32.55,2.32,32.47,2.32C32.38,2.32,32.24,2.35,32.15,2.4C32.06,2.45,31.67,2.55,31.27,2.64C30.88,2.73,30.53,2.84,30.5,2.88C30.48,2.93,30.35,2.96,30.23,2.96C30.1,2.96,29.93,3,29.84,3.04C29.75,3.09,29.43,3.2,29.12,3.29C28.82,3.38,28.18,3.59,27.71,3.76C27.23,3.93,26.8,4.07,26.75,4.07C26.69,4.07,26.52,4.13,26.36,4.2C25.52,4.57,24.84,4.82,24.7,4.82C24.62,4.82,24.52,4.86,24.49,4.91C24.46,4.96,24.35,5,24.25,5C24.15,5,24.04,5.06,24.02,5.14C23.98,5.21,23.86,5.28,23.74,5.28C23.62,5.28,23.52,5.32,23.52,5.37C23.52,5.42,23.43,5.46,23.33,5.46C23.23,5.46,23.12,5.53,23.09,5.6C23.06,5.68,22.97,5.74,22.88,5.75C22.8,5.75,22.61,5.83,22.45,5.93C22.3,6.02,22.03,6.18,21.85,6.27C21.67,6.35,21.51,6.45,21.48,6.48C21.46,6.5,21.27,6.61,21.07,6.71C20.86,6.81,20.45,7.04,20.14,7.22C19.83,7.4,19.43,7.62,19.23,7.72C19.04,7.82,18.89,7.93,18.89,7.98C18.89,8.02,18.84,8.05,18.78,8.05C18.63,8.05,17.5,8.8,17.5,8.9C17.5,8.95,17.45,8.98,17.4,8.98C17.34,8.98,17.16,9.1,16.99,9.23C16.82,9.38,16.43,9.7,16.1,9.95C15.77,10.21,15.43,10.49,15.32,10.59C15.22,10.68,14.9,10.95,14.61,11.17C14.31,11.4,14.07,11.62,14.07,11.66C14.07,11.7,13.97,11.79,13.84,11.85C13.71,11.92,13.61,12,13.61,12.04C13.61,12.08,13.14,12.58,12.57,13.16C11.99,13.74,11.41,14.36,11.28,14.54C11.14,14.71,10.92,14.99,10.77,15.14C10.63,15.3,10.41,15.58,10.28,15.77C10.15,15.96,10.02,16.11,9.98,16.11C9.94,16.11,9.91,16.17,9.91,16.25C9.91,16.33,9.88,16.39,9.84,16.39C9.79,16.39,9.69,16.5,9.61,16.64C9.52,16.79,9.36,17,9.24,17.13C9.12,17.26,8.9,17.56,8.75,17.8C8.6,18.04,8.45,18.24,8.41,18.24C8.38,18.24,8.33,18.34,8.3,18.47C8.26,18.6,8.2,18.7,8.15,18.7C8.1,18.7,8.05,18.74,8.05,18.79C8.05,18.84,7.94,19.06,7.79,19.28C7.64,19.5,7.37,19.97,7.18,20.32C6.98,20.68,6.73,21.12,6.62,21.3C6.51,21.47,6.34,21.8,6.25,22.02C6.15,22.23,6.04,22.41,6,22.41C5.96,22.41,5.93,22.48,5.93,22.56C5.93,22.64,5.83,22.84,5.71,23C5.6,23.16,5.46,23.39,5.4,23.52C5.34,23.64,5.19,23.98,5.06,24.26C4.93,24.54,4.76,24.98,4.67,25.23C4.58,25.48,4.47,25.73,4.43,25.78C4.39,25.83,4.35,25.96,4.35,26.07C4.35,26.17,4.32,26.3,4.27,26.35C4.23,26.39,4.12,26.68,4.02,26.99C3.93,27.3,3.83,27.59,3.79,27.64C3.76,27.69,3.66,27.96,3.57,28.24C3.47,28.52,3.34,28.91,3.27,29.1C3.2,29.29,3.15,29.53,3.15,29.63C3.15,29.73,3.11,29.82,3.05,29.82C3,29.82,2.96,29.94,2.96,30.09C2.96,30.24,2.92,30.38,2.88,30.41C2.83,30.44,2.76,30.65,2.73,30.88C2.69,31.11,2.63,31.32,2.58,31.35C2.54,31.38,2.5,31.54,2.5,31.7C2.5,31.86,2.46,32.04,2.43,32.09C2.38,32.14,2.3,32.41,2.23,32.68C2.17,32.96,2.08,33.36,2.04,33.57C1.87,34.28,1.68,35.14,1.58,35.67C1.35,36.88,1.29,37.23,1.16,38.24C1.07,38.83,0.97,39.52,0.93,39.77C0.88,40.02,0.82,40.54,0.79,40.93C0.77,41.31,0.68,42.45,0.59,43.47C0.35,46.14,0.35,53.59,0.59,56.3C0.68,57.34,0.79,58.59,0.83,59.07C0.88,59.56,0.98,60.39,1.06,60.93C1.14,61.46,1.25,62.17,1.3,62.5C1.43,63.48,1.67,64.74,1.89,65.7C1.97,66.05,2.08,66.53,2.13,66.76C2.18,66.99,2.26,67.32,2.31,67.5C2.36,67.68,2.48,68.18,2.59,68.61C2.7,69.04,2.83,69.44,2.88,69.48C2.93,69.54,2.96,69.66,2.96,69.75C2.96,69.95,3.29,70.98,3.76,72.29C3.93,72.77,4.07,73.2,4.07,73.25C4.07,73.31,4.13,73.48,4.2,73.64C4.28,73.8,4.41,74.14,4.5,74.4C4.59,74.65,4.7,74.9,4.74,74.95C4.78,75,4.82,75.13,4.82,75.25C4.82,75.36,4.86,75.48,4.91,75.51C4.96,75.54,5,75.65,5,75.75C5,75.85,5.06,75.96,5.14,75.98C5.21,76.02,5.28,76.14,5.28,76.26C5.28,76.38,5.32,76.48,5.37,76.48C5.42,76.48,5.46,76.57,5.46,76.67C5.46,76.77,5.53,76.88,5.6,76.91C5.68,76.94,5.74,77.03,5.75,77.12C5.75,77.2,5.83,77.39,5.93,77.55C6.02,77.7,6.2,78.01,6.32,78.24C6.65,78.88,7.13,79.73,7.38,80.11C7.5,80.3,7.59,80.49,7.59,80.52C7.59,80.65,8.81,82.5,8.9,82.5C8.94,82.5,8.98,82.55,8.98,82.62C8.98,82.69,9.1,82.88,9.23,83.04C9.38,83.2,9.7,83.59,9.95,83.91C10.21,84.23,10.43,84.51,10.46,84.54C10.49,84.56,10.7,84.81,10.92,85.09C11.69,86.05,13.74,88.11,14.67,88.84C14.86,89,15.11,89.2,15.22,89.3C15.34,89.41,15.58,89.59,15.77,89.72C15.96,89.85,16.11,89.98,16.11,90.02C16.11,90.06,16.17,90.09,16.25,90.09C16.33,90.09,16.39,90.13,16.39,90.18C16.39,90.23,16.5,90.33,16.64,90.41C16.79,90.48,17,90.64,17.14,90.77C17.27,90.89,17.56,91.11,17.78,91.25C18.01,91.39,18.25,91.57,18.32,91.63C18.38,91.7,18.5,91.76,18.56,91.76C18.63,91.76,18.7,91.79,18.72,91.84C18.77,91.95,21.25,93.39,22.73,94.16C22.93,94.27,23.23,94.44,23.38,94.54C23.53,94.63,23.73,94.71,23.82,94.71C23.91,94.72,23.98,94.76,23.98,94.81C23.98,94.86,24.07,94.92,24.19,94.95C24.3,94.98,24.48,95.05,24.58,95.09C24.68,95.14,24.98,95.24,25.23,95.33C25.48,95.42,25.73,95.53,25.78,95.57C25.83,95.61,25.94,95.65,26.03,95.65C26.12,95.65,26.31,95.71,26.45,95.78C26.71,95.91,27.16,96.07,28.2,96.41C28.5,96.51,28.89,96.65,29.05,96.72C29.22,96.79,29.44,96.85,29.54,96.85C29.63,96.85,29.74,96.89,29.77,96.95C29.8,97,29.93,97.04,30.05,97.04C30.18,97.04,30.35,97.07,30.44,97.12C30.71,97.27,31.55,97.5,31.79,97.5C31.92,97.5,32.05,97.54,32.08,97.58C32.11,97.63,32.24,97.68,32.38,97.71C32.52,97.73,33.22,97.88,33.93,98.04C34.65,98.2,35.45,98.38,35.72,98.43C36.69,98.61,37.18,98.7,37.55,98.75C37.75,98.78,38.33,98.87,38.84,98.95C40.09,99.13,40.54,99.18,44.49,99.5C46.86,99.69,53.84,99.64,56.48,99.41C59.71,99.12,60.04,99.09,61.02,98.94C61.55,98.86,62.26,98.75,62.59,98.7C63.23,98.6,63.91,98.49,64.68,98.35C65.14,98.26,67,97.83,67.59,97.67C67.77,97.62,68.06,97.55,68.24,97.5C69.02,97.33,69.45,97.2,69.5,97.12C69.53,97.07,69.64,97.04,69.75,97.04C69.94,97.04,70.27,96.95,70.93,96.71C71.43,96.54,72.4,96.21,72.92,96.05C73.17,95.98,73.5,95.86,73.66,95.79C73.81,95.72,74.14,95.59,74.4,95.5C74.65,95.41,74.9,95.3,74.95,95.26C75,95.22,75.15,95.18,75.3,95.18C75.44,95.18,75.55,95.14,75.55,95.09C75.55,95.04,75.63,95,75.73,95C75.82,95,75.95,94.94,76.02,94.86C76.08,94.79,76.21,94.72,76.31,94.72C76.4,94.72,76.48,94.68,76.48,94.63C76.48,94.58,76.57,94.54,76.67,94.54C76.77,94.54,76.88,94.47,76.91,94.4C76.94,94.32,77.02,94.26,77.08,94.26C77.2,94.26,77.79,93.99,77.87,93.89C77.89,93.87,78.06,93.77,78.24,93.68C78.42,93.6,78.86,93.36,79.21,93.16C79.57,92.96,80.07,92.68,80.32,92.54C81.04,92.16,83.15,90.73,83.15,90.64C83.15,90.59,83.21,90.55,83.28,90.55C83.35,90.55,83.43,90.52,83.44,90.48C83.46,90.44,83.66,90.27,83.89,90.09C84.11,89.91,84.35,89.73,84.41,89.68C84.46,89.62,84.67,89.46,84.86,89.3C85.94,88.45,88.68,85.68,89.05,85.07C89.14,84.93,89.23,84.82,89.27,84.82C89.3,84.82,89.46,84.61,89.64,84.35C89.81,84.1,89.98,83.89,90.02,83.89C90.06,83.89,90.09,83.85,90.09,83.8C90.09,83.7,90.18,83.59,90.61,83.11C90.73,82.97,90.83,82.82,90.83,82.77C90.83,82.73,90.87,82.68,90.91,82.68C90.95,82.68,91.07,82.54,91.16,82.36C91.26,82.18,91.37,82.04,91.41,82.04C91.45,82.04,91.48,81.98,91.48,81.91C91.48,81.83,91.52,81.76,91.56,81.74C91.63,81.71,92.51,80.27,93.15,79.12C93.77,78,93.98,77.63,94.16,77.27C94.27,77.07,94.44,76.77,94.54,76.62C94.63,76.47,94.71,76.27,94.71,76.18C94.72,76.09,94.76,76.02,94.81,76.02C94.86,76.02,94.92,75.93,94.95,75.81C94.98,75.7,95.05,75.52,95.09,75.42C95.13,75.32,95.23,75.04,95.32,74.82C95.41,74.59,95.52,74.32,95.56,74.21C95.6,74.11,95.7,73.88,95.78,73.69C95.86,73.5,95.93,73.27,95.93,73.17C95.93,73.07,95.95,72.96,95.99,72.93C96.06,72.86,96.24,72.39,96.45,71.71C96.53,71.46,96.65,71.11,96.72,70.95C96.79,70.78,96.85,70.56,96.85,70.46C96.85,70.37,96.89,70.26,96.95,70.23C97,70.2,97.04,70.06,97.04,69.92C97.04,69.78,97.08,69.63,97.12,69.58C97.22,69.48,97.4,68.82,97.47,68.31C97.5,68.12,97.56,67.96,97.6,67.96C97.65,67.96,97.68,67.87,97.68,67.76C97.68,67.65,97.73,67.43,97.78,67.27C97.88,66.94,98.23,65.42,98.35,64.77C98.56,63.59,98.64,63.12,98.93,61.25C99.12,60.05,99.16,59.65,99.5,55.51C99.69,53.18,99.63,46.08,99.41,43.52C99.32,42.58,99.21,41.39,99.17,40.88C99.12,40.37,99.02,39.52,98.93,38.98C98.85,38.45,98.75,37.76,98.7,37.45C98.62,36.94,98.54,36.44,98.38,35.51C98.35,35.3,98.21,34.7,98.09,34.17C97.96,33.63,97.82,33.01,97.77,32.78C97.71,32.55,97.63,32.28,97.59,32.18C97.55,32.07,97.45,31.67,97.36,31.27C97.27,30.88,97.16,30.53,97.12,30.5C97.07,30.48,97.04,30.35,97.04,30.23C97.04,30.1,97,29.93,96.96,29.84C96.91,29.75,96.8,29.43,96.71,29.12C96.62,28.82,96.47,28.34,96.37,28.05C96.27,27.78,96.13,27.34,96.05,27.08C95.97,26.83,95.86,26.5,95.79,26.34C95.72,26.19,95.59,25.86,95.5,25.6C95.41,25.35,95.3,25.1,95.26,25.05C95.22,25,95.18,24.87,95.18,24.75C95.18,24.64,95.14,24.52,95.09,24.49C95.04,24.46,95,24.36,95,24.27C95,24.17,94.94,24.05,94.86,23.98C94.79,23.92,94.72,23.79,94.72,23.69C94.72,23.6,94.68,23.52,94.63,23.52C94.58,23.52,94.54,23.43,94.54,23.33C94.54,23.23,94.47,23.12,94.4,23.09C94.32,23.06,94.26,22.97,94.25,22.88C94.25,22.8,94.17,22.61,94.07,22.45C93.98,22.3,93.8,21.99,93.68,21.76C93.56,21.53,93.34,21.13,93.2,20.88C93.06,20.62,92.79,20.14,92.61,19.82C92.11,18.91,91.2,17.5,91.1,17.5C91.05,17.5,91.02,17.45,91.02,17.38C91.02,17.31,90.9,17.12,90.77,16.96C90.62,16.8,90.3,16.41,90.05,16.09C89.79,15.77,89.56,15.49,89.53,15.46C89.5,15.44,89.28,15.17,89.03,14.86C88.24,13.88,86.24,11.87,85.46,11.28C85.29,11.14,85.01,10.92,84.86,10.77C84.7,10.63,84.42,10.41,84.23,10.28C84.04,10.15,83.89,10.02,83.89,9.98C83.89,9.94,83.83,9.91,83.75,9.91C83.67,9.91,83.61,9.88,83.61,9.84C83.61,9.79,83.5,9.69,83.36,9.61C83.21,9.52,82.96,9.32,82.79,9.17C82.61,9.01,82.31,8.79,82.11,8.68C81.92,8.57,81.76,8.45,81.76,8.42C81.76,8.38,81.66,8.33,81.53,8.3C81.4,8.26,81.3,8.2,81.3,8.15C81.3,8.1,81.26,8.05,81.21,8.05C81.16,8.05,80.94,7.94,80.72,7.79C80.5,7.64,80.03,7.37,79.68,7.18C79.32,6.98,78.88,6.73,78.7,6.62C78.53,6.52,78.23,6.35,78.05,6.26C77.88,6.17,77.52,5.98,77.27,5.84C77.02,5.69,76.7,5.52,76.57,5.46C76.45,5.41,76.09,5.24,75.79,5.09C75.48,4.95,75.02,4.76,74.77,4.67C74.52,4.58,74.27,4.47,74.22,4.43C74.17,4.39,74.04,4.35,73.92,4.35C73.81,4.35,73.69,4.32,73.66,4.27C73.64,4.22,73.5,4.16,73.36,4.12C73.21,4.09,72.73,3.93,72.27,3.76C71.81,3.59,71.18,3.37,70.88,3.28C70.57,3.19,70.29,3.08,70.23,3.04C70.19,3,70.01,2.96,69.84,2.96C69.68,2.96,69.54,2.93,69.54,2.89C69.54,2.81,68.93,2.62,68.38,2.54C68.23,2.51,68.02,2.45,67.92,2.41C67.73,2.33,67.45,2.26,66.25,1.99C65.89,1.91,65.43,1.81,65.23,1.76C64.46,1.59,63.92,1.49,62.68,1.3C62.36,1.25,61.67,1.14,61.16,1.07C60.15,0.91,59.33,0.82,56.57,0.6C54.86,0.46,47.56,0.34,46.16,0.43",
+
+        "rounded_rect" to
+            "M50,0L88,0 C94.4,0 100,5.4 100 12 L100,88 C100,94.6 94.6 100 88 100 " +
+            "L12,100 C5.4,100 0,94.6 0,88 L0 12 C0 5.4 5.4 0 12 0 L50,0 Z",
+
+        "squircle" to
+            "M41.8,0h16.4C72.1,0 77.6,1.5 83,4.4c5.4,2.9 9.7,7.2 12.6,12.6" +
+            "c2.9,5.4 4.4,11 4.4,24.7v16.4c0,13.7 -1.5,19.3 -4.4,24.7" +
+            "c-2.9,5.4 -7.2,9.7 -12.6,12.6c-5.4,2.9 -11,4.4 -24.7,4.4H41.8" +
+            "c-13.8,0 -19.3,-1.5 -24.7,-4.4c-5.4,-2.9 -9.7,-7.1 -12.7,-12.5" +
+            "S0,72 0,58.3V41.9c0,-13.8 1.5,-19.3 4.4,-24.7S11.6,7.4 17,4.5" +
+            "S28.1,0 41.8,0z",
+
+        "tapered_rect" to
+            "M20,0 80,0 100,20 100,80 80,100 20,100 0,80 0,20 20,0 Z",
+
+        "teardrop" to
+            "M50,0 C77.6,0 100,22.4 100,50 L100,88 C100,94.6 94.6,100 88,100 " +
+            "L50,100 C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0 Z",
+
+        "vessel" to
+            "M12.97,0 C8.41,0 4.14,2.55 2.21,6.68 -1.03,13.61 -0.71,21.78 " +
+            "3.16,28.46 4.89,31.46 4.89,35.2 3.16,38.2 -1.05,45.48 -1.05,54.52 " +
+            "3.16,61.8 4.89,64.8 4.89,68.54 3.16,71.54 -0.71,78.22 -1.03,86.39 " +
+            "2.21,93.32 4.14,97.45 8.41,100 12.97,100 21.38,100 78.62,100 87.03,100 " +
+            "91.59,100 95.85,97.45 97.79,93.32 101.02,86.39 100.71,78.22 96.84,71.54 " +
+            "95.1,68.54 95.1,64.8 96.84,61.8 101.05,54.52 101.05,45.48 96.84,38.2 " +
+            "95.1,35.2 95.1,31.46 96.84,28.46 100.71,21.78 101.02,13.61 97.79,6.68 " +
+            "95.85,2.55 91.59,0 87.03,0 78.62,0 21.38,0 12.97,0 Z",
+
+        "rounded_hexagon" to
+            "M4.8 33V67c0 5.8 3 11 8 13.7l29.4 17c4.9 2.7 11 2.7 15.9 0l29.4 -17" +
+            "c4.9 -2.7 8 -8 8 -13.7V33c0 -5.8 -3 -11 -8 -13.7l-29.4 -17" +
+            "c-4.9 -2.7 -11 -2.7 -15.9 0l-29.7 17C7.8 22.2 4.8 27.5 4.8 33z",
+
+        "pokesign" to
+            "M50,0C22.8125,0 0.75,22.0417 0.75,49.25c0,27.2083 22.0417,49.25 49.25,49.25c27.1875,0 49.25,-22.0417 49.25,-49.25C99.25,22.0417 77.1875,0 50,0zM50,88.8333c-21.8542,0 -39.5833,-17.7292 -39.5833,-39.5833C10.4167,27.375 28.1458,9.6458 50,9.6458c21.8542,0 39.5833,17.7292 39.5833,39.5833C89.5833,71.1042 71.8542,88.8333 50,88.8333z M49.8125,38.8542c5.2917,0 9.625,3.9583 10.3125,9.0625h20.25C79.6667,31.7292 66.3542,18.8125 50,18.8125S20.3333,31.7292 19.625,47.9167h19.875C40.1875,42.8125 44.5208,38.8542 49.8125,38.8542z M49.8125,59.75c-4.7917,0 -8.7917,-3.25 -10.0208,-7.6667H19.7083C21.1458,67.5625 34.1458,79.6875 50,79.6875c15.8542,0 28.8542,-12.125 30.2917,-27.6042h-20.4583C58.6042,56.5 54.6042,59.75 49.8125,59.75z",
+
+        "ninja" to
+            "M44.7292,50c0,-2.8333 2.25,-5.125 5.0417,-5.25V1.7708l-0.3542,-0.5208l-17.7292,28.375L3.2292,47.75h0.8958l26.5208,20.8333l19.1458,29.5833V55.25C46.9792,55.125 44.7292,52.8333 44.7292,50z M31.2917,68.1458l-26.2292,-20.6458l27.0625,-17.1875l17.3333,-27.6042l0.3125,0.4792l0,-2.8125l-0.3542,-0.5417l-18.2708,29.25l-30.6042,19.4375l3.3125,0l26.2083,20.5833l19.7292,30.4792l0,-2.875z M68.9375,30.4583l-19.1458,-28.6875v42.9792c0.0833,0 0.1458,-0.0208 0.2083,-0.0208c2.8958,0 5.2708,2.3542 5.2708,5.2708S52.9167,55.2708 50,55.2708c-0.0833,0 -0.1458,-0.0208 -0.2083,-0.0208v42.9167L50,98.4792l20.1667,-31.6875l26.1667,-19.0625L68.9375,30.4583z M69.4792,29.8958l-19.7083,-29.5208l0,2.8125l18.5,27.7083l26.6875,16.8958l-25.25,18.375l-19.7292,30.875l-0.2083,-0.3125l0,2.875l0.2292,0.3333l20.75,-32.6042l26.9792,-19.6458z M50,56.8333c-3.7708,0 -6.8333,-3.0625 -6.8333,-6.8333c0,-3.7708 3.0625,-6.8333 6.8333,-6.8333c3.7708,0 6.8333,3.0625 6.8333,6.8333C56.8333,53.7708 53.7708,56.8333 50,56.8333zM50,46.2917c-2.0417,0 -3.7083,1.6667 -3.7083,3.7083c0,2.0417 1.6667,3.7083 3.7083,3.7083c2.0417,0 3.7083,-1.6667 3.7083,-3.7083C53.7083,47.9583 52.0417,46.2917 50,46.2917z",
+
+        "just_icons" to
+            "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0",
+
+        "outline_style" to
+            "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0",
+
+        "dotted_circle" to
+            "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0",
+
+        "squaremedo" to
+            "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0",
+    )
+
+    val NO_BACKGROUND_KEYS: Set<String> = setOf("just_icons", "outline_style", "dotted_circle", "squaremedo")
+
+    val OVERLAY_BY_KEY: Map<String, String> = mapOf(
+        "outline_style" to
+            "M50,0 A50,50 0,1,1 50,100 A50,50 0,1,1 50,0 M50,2.2 A47.8,47.8 0,1,0 50,97.8 A47.8,47.8 0,1,0 50,2.2Z",
+
+        "dotted_circle" to
+            "M95.1042,40.75l3.2292,-0.6458c0,0 0.375,2.4583 0.7292,4.8958c0.125,2.4792 0.25,4.9583 0.25,4.9583h-3.2917c0,0 -0.125,-2.3125 -0.2292,-4.625C95.4375,43.0417 95.1042,40.75 95.1042,40.75z M90.375,27.8542l2.8958,-1.5833c0,0 0.2917,0.5417 0.6875,1.3958c0.3958,0.8333 0.9375,1.9583 1.4792,3.0625c0.4167,1.1667 0.8542,2.3333 1.1667,3.2083c0.3125,0.875 0.5208,1.4583 0.5208,1.4583l-3.1458,0.9792c0,0 -0.1875,-0.5417 -0.4792,-1.3542c-0.2917,-0.8125 -0.6875,-1.8958 -1.0833,-2.9792c-0.5,-1.0417 -1,-2.0833 -1.375,-2.875C90.6458,28.375 90.375,27.8542 90.375,27.8542z M82.0417,16.9375L84.3542,14.5833c0,0 0.4792,0.3958 1.0833,1.1042c0.625,0.6875 1.4583,1.6042 2.2917,2.5208c0.8125,0.9375 1.5,1.9583 2.0833,2.7083c0.5625,0.75 0.9167,1.25 0.9167,1.25l-2.7292,1.8542c0,0 -0.3542,-0.4583 -0.875,-1.1667c-0.5417,-0.6875 -1.1875,-1.6458 -1.9375,-2.5208c-0.7708,-0.8542 -1.5625,-1.7083 -2.1458,-2.3542C82.5,17.3125 82.0417,16.9375 82.0417,16.9375z M70.8958,8.9583l1.5,-2.9375c0,0 0.5833,0.25 1.375,0.7083c0.7917,0.4792 1.8542,1.125 2.9167,1.7708c1.0833,0.6042 2.0208,1.4375 2.7917,1.9583c0.75,0.5625 1.25,0.9167 1.25,0.9167l-2.0625,2.5833c0,0 -0.4583,-0.3542 -1.1667,-0.875c-0.7083,-0.5 -1.5833,-1.2708 -2.6042,-1.8333c-0.9792,-0.6042 -1.9792,-1.2083 -2.7083,-1.6458C71.4167,9.1667 70.8958,8.9583 70.8958,8.9583z M57.875,4.6042l0.5625,-3.25c0,0 0.6042,0.1042 1.5208,0.25c0.8958,0.2292 2.1042,0.5417 3.3125,0.8542c1.2083,0.2708 2.375,0.7083 3.25,1.0417c0.875,0.3125 1.4583,0.5417 1.4583,0.5417l-1.2083,3.0625c0,0 -0.5417,-0.1875 -1.3542,-0.5c-0.8125,-0.2917 -1.8958,-0.7292 -3.0208,-0.9792c-1.125,-0.2917 -2.25,-0.5833 -3.0833,-0.7917C58.4583,4.7083 57.875,4.6042 57.875,4.6042z M44.1667,4.2917l-0.4167,-3.2708c0,0 0.6042,-0.125 1.5417,-0.1875c0.9167,-0.0417 2.1667,-0.1042 3.3958,-0.1667c1.2292,-0.1042 2.4792,0 3.3958,0.0417c0.9167,0.0417 1.5417,0.0833 1.5417,0.0833l-0.25,3.2917c0,0 -0.5833,-0.0208 -1.4375,-0.0833c-0.875,-0.0417 -2.0208,-0.1458 -3.1667,-0.0417c-1.1667,0.0625 -2.3125,0.125 -3.1667,0.1667C44.7292,4.1667 44.1667,4.2917 44.1667,4.2917z M30.9583,8.0208l-1.3542,-3c0,0 0.5417,-0.2917 1.4167,-0.6458c0.875,-0.3125 2.0417,-0.75 3.2083,-1.1667c1.1458,-0.4792 2.375,-0.7083 3.2708,-0.9583c0.8958,-0.2292 1.5,-0.3958 1.5,-0.3958l0.7292,3.2083c0,0 -0.5625,0.1458 -1.3958,0.3542c-0.8333,0.2292 -1.9792,0.4375 -3.0417,0.8958c-1.0833,0.3958 -2.1667,0.7917 -2.9792,1.0833C31.4583,7.7292 30.9583,8.0208 30.9583,8.0208z M19.4583,15.4792L17.2708,13.0208c0,0 0.4583,-0.4167 1.1458,-1.0417c0.7292,-0.5833 1.7292,-1.3125 2.7083,-2.0625c0.9792,-0.7708 2.0417,-1.4167 2.8333,-1.8958c0.7917,-0.4792 1.3333,-0.8125 1.3333,-0.8125l1.6458,2.8542c0,0 -0.5,0.2917 -1.2292,0.75c-0.75,0.4375 -1.75,1.0417 -2.6458,1.7708c-0.9167,0.7083 -1.8542,1.375 -2.5417,1.9167C19.875,15.1042 19.4583,15.4792 19.4583,15.4792z M10.6458,26l-2.8125,-1.7083c0,0 1.2292,-2.1667 2.7917,-4.0833c0.7292,-1 1.4792,-1.9792 2.1458,-2.6458c0.625,-0.6875 1.0417,-1.1458 1.0417,-1.1458l2.4167,2.25c0,0 -0.3958,0.4167 -0.9792,1.0625c-0.6042,0.625 -1.3125,1.5417 -2,2.4792C11.7917,24 10.6458,26 10.6458,26z M5.3333,38.6458l-3.1875,-0.8125c0,0 0.1458,-0.6042 0.3958,-1.5c0.1875,-0.9167 0.6458,-2.0625 1.0625,-3.2292c0.7708,-2.3542 1.9167,-4.5625 1.9167,-4.5625l2.9583,1.4375c0,0 -1.0833,2.0417 -1.7917,4.25c-0.3958,1.0833 -0.8333,2.1667 -1,3.0208C5.4792,38.0833 5.3333,38.6458 5.3333,38.6458z M4,52.3125l-3.2917,0.1667c0,0 -0.0208,-0.625 -0.0833,-1.5417C0.5417,50 0.6458,48.7708 0.7083,47.5208c0.0208,-2.4792 0.4792,-4.9167 0.4792,-4.9167l3.25,0.4792c0,0 -0.4375,2.2708 -0.4583,4.6042c-0.0417,1.1667 -0.1667,2.3125 -0.0625,3.1667C3.9792,51.7292 4,52.3125 4,52.3125z M6.7292,65.75l-3.1042,1.125c0,0 -0.9375,-2.2917 -1.4583,-4.7292c-0.3125,-1.2083 -0.6458,-2.3958 -0.75,-3.3333c-0.1458,-0.9167 -0.2292,-1.5417 -0.2292,-1.5417l3.25,-0.4792c0,0 0.0833,0.5625 0.2083,1.4375c0.0833,0.875 0.4167,1.9792 0.6875,3.1042C5.8542,63.6042 6.7292,65.75 6.7292,65.75z M13.3125,77.7917l-2.625,2c0,0 -0.375,-0.5 -0.9167,-1.25c-0.5833,-0.7292 -1.2292,-1.7708 -1.875,-2.8542c-1.375,-2.0833 -2.375,-4.3542 -2.375,-4.3542l2.9583,-1.4375c0,0 0.9375,2.125 2.2083,4.0625c0.5833,1 1.1875,1.9792 1.75,2.6458C12.9583,77.3125 13.3125,77.7917 13.3125,77.7917z M23.125,87.3542l-1.9167,2.6667c0,0 -0.5,-0.375 -1.25,-0.9167c-0.75,-0.5417 -1.7292,-1.2917 -2.625,-2.1667c-0.9167,-0.8333 -1.8542,-1.6458 -2.5,-2.3125c-0.625,-0.6875 -1.0417,-1.1458 -1.0417,-1.1458l2.4167,-2.25c0,0 0.3958,0.4375 0.9792,1.0625c0.6042,0.625 1.4792,1.375 2.3333,2.1458c0.8333,0.8125 1.75,1.5208 2.4583,2.0208C22.6667,87 23.125,87.3542 23.125,87.3542z M35.3542,93.6042l-1.0417,3.125c0,0 -0.5833,-0.2083 -1.4583,-0.5208c-0.875,-0.3333 -2.0625,-0.6875 -3.1667,-1.2708c-1.125,-0.5417 -2.2292,-1.0833 -3.0625,-1.4792c-0.8125,-0.4375 -1.3333,-0.7917 -1.3333,-0.7917l1.6458,-2.8542c0,0 0.4792,0.3125 1.25,0.7292c0.7917,0.375 1.8333,0.875 2.875,1.375c1.0208,0.5417 2.1458,0.875 2.9375,1.1875C34.8125,93.4167 35.3542,93.6042 35.3542,93.6042z M48.875,95.9583l-0.0833,3.2917c0,0 -0.625,-0.0208 -1.5417,-0.0833c-0.9167,-0.0833 -2.1667,-0.0417 -3.3958,-0.2708c-1.2292,-0.1875 -2.4583,-0.375 -3.375,-0.5208c-0.4583,-0.0625 -0.8333,-0.1667 -1.1042,-0.2292c-0.2708,-0.0625 -0.4167,-0.1042 -0.4167,-0.1042l0.7292,-3.2083c0,0 0.1458,0.0417 0.3958,0.1042c0.25,0.0625 0.5833,0.1667 1.0208,0.2083c0.8542,0.125 2,0.3125 3.1458,0.4792c1.1458,0.2292 2.3125,0.1875 3.1667,0.2708C48.2917,95.9375 48.875,95.9583 48.875,95.9583z M62.4792,94.25l0.8958,3.1667c0,0 -0.6042,0.1458 -1.5,0.3958c-0.8958,0.2292 -2.0833,0.5833 -3.3333,0.7083c-1.2292,0.1875 -2.4583,0.375 -3.375,0.5208c-0.9167,0.0833 -1.5417,0.1042 -1.5417,0.1042l-0.25,-3.2917c0,0 0.5833,0 1.4375,-0.0833c0.8542,-0.125 2,-0.3125 3.1458,-0.4792c1.1458,-0.125 2.2708,-0.4583 3.1042,-0.6667S62.4792,94.25 62.4792,94.25z M74.9792,88.5833l1.7917,2.7708c0,0 -0.5208,0.3125 -1.3125,0.8125c-0.8125,0.4583 -1.8333,1.1875 -2.9583,1.6875c-1.125,0.5417 -2.2292,1.0833 -3.0625,1.4792c-0.8542,0.375 -1.4375,0.5625 -1.4375,0.5625l-1.2083,-3.0625c0,0 0.5625,-0.1667 1.3542,-0.5208c0.7917,-0.375 1.8333,-0.875 2.875,-1.375c1.0625,-0.4583 2.0208,-1.125 2.7708,-1.5625C74.4792,88.8958 74.9792,88.5833 74.9792,88.5833z M85.2708,79.5l2.5208,2.125c0,0 -0.4167,0.4583 -1.0417,1.1458c-0.6458,0.6667 -1.4167,1.6458 -2.3333,2.4792c-0.9167,0.8333 -1.8333,1.6667 -2.5208,2.2917c-0.6667,0.6458 -1.1875,0.9792 -1.1875,0.9792l-2.0625,-2.5833c0,0 0.5,-0.3125 1.125,-0.9167c0.6458,-0.5833 1.5,-1.3542 2.3542,-2.1458c0.8542,-0.7917 1.5833,-1.6875 2.1667,-2.3125C84.875,79.9375 85.2708,79.5 85.2708,79.5z M92.4375,67.7917l3.0417,1.2708c0,0 -1.0625,2.25 -2.1458,4.4583c-0.6458,1.0625 -1.2917,2.125 -1.7708,2.9167c-0.4792,0.7917 -0.8333,1.3125 -0.8333,1.3125l-2.7292,-1.8542c0,0 0.3333,-0.4792 0.7708,-1.2292c0.4583,-0.7292 1.0417,-1.7292 1.6458,-2.7083C91.4375,69.875 92.4375,67.7917 92.4375,67.7917z M95.7917,54.4792l3.2708,0.3125c0,0 -0.0625,0.6042 -0.2083,1.5417c-0.1458,0.9167 -0.3333,2.1458 -0.5208,3.375c-0.6042,2.3958 -1.2083,4.8125 -1.2083,4.8125l-3.1458,-0.9792c0,0 0.5625,-2.25 1.125,-4.4792c0.1667,-1.1458 0.3542,-2.2917 0.4792,-3.1458C95.7292,55.0417 95.7917,54.4792 95.7917,54.4792z",
+
+        "squaremedo" to
+            "M16.5,66.0833l17.3958,17.4167l2.2083,0l-19.625,-19.625z M2.625,50l12.3125,-12.3125l0,-2.2083l-14.5208,14.5208l14.5208,14.5208l0,-2.2083z M50,97.375l-12.3125,-12.3125l-2.2083,0l14.5208,14.5208l14.5208,-14.5208l-2.2083,0z M63.875,83.5l2.2083,0l17.4167,-17.4167l0,-2.2083z M97.375,50l-12.3125,12.3125l0,2.2083l14.5208,-14.5208l-14.5208,-14.5208l0,2.2083z M33.9167,16.5l-17.4167,17.4167l0,2.2083l19.625,-19.625z M50,2.625l12.3125,12.3125l2.2083,0l-14.5208,-14.5208l-14.5208,14.5208l2.2083,0z M83.5,33.9167l-17.4167,-17.4167l-2.2083,0l19.625,19.625z M60.9792,16.5l2.8958,0l-1.5625,-1.5625l-2.8958,0z M40.5833,14.9375l-2.8958,0l-1.5625,1.5625l2.8958,0z M83.5,60.5833l0,3.2917l1.5625,-1.5625l0,-3.2917z M85.0625,40.5833l0,-2.8958l-1.5625,-1.5625l0,2.8958z M85.0625,64.5208l-1.5625,1.5625l0,17.4167l-17.4167,0l-1.5625,1.5625l20.5417,0z M83.5,16.5l0,17.4167l1.5625,1.5625l0,-20.5417l-20.5417,0l1.5625,1.5625z M39.4167,83.5l-3.2917,0l1.5625,1.5625l3.2917,0z M59.0208,85.0625l3.2917,0l1.5625,-1.5625l-3.2917,0z M16.5,39.0208l0,-2.8958l-1.5625,1.5625l0,2.8958z M16.5,16.5l17.4167,0l1.5625,-1.5625l-20.5417,0l0,20.5417l1.5625,-1.5625z M16.5,83.5l0,-17.4167l-1.5625,-1.5625l0,20.5417l20.5208,0l-1.5625,-1.5625z M14.9375,59.0208l0,3.2917l1.5625,1.5625l0,-3.2917z M36.125,83.5l-2.2083,0l1.5625,1.5625l2.2083,0z M63.875,16.5l2.2083,0l-1.5625,-1.5625l-2.2083,0z M83.5,36.125l1.5625,1.5625l0,-2.2083l-1.5625,-1.5625z M36.125,16.5l1.5625,-1.5625l-2.2083,0l-1.5625,1.5625z M63.875,83.5l-1.5625,1.5625l2.2083,0l1.5625,-1.5625z M16.5,63.875l-1.5625,-1.5625l0,2.2083l1.5625,1.5625z M83.5,63.875l0,2.2083l1.5625,-1.5625l0,-2.2083z M16.5,36.125l0,-2.2083l-1.5625,1.5625l0,2.2083z M16.5,59.6875l0,0.8958l22.9167,22.9167l0.8958,0z M59.6875,83.5l0.8958,0l22.9167,-22.9167l0,-0.8958z M50,93.1667l-8.125,-8.125l-0.8958,0l9.0208,9.0208l9.0208,-9.0208l-0.8958,0z M6.8333,50l8.125,-8.125l0,-1.3125l-9.2292,9.2292l9.2292,9.2292l0,-0.8958z M40.3125,16.5l-1.3125,0l-22.5,22.5l0,1.3125z M93.1667,50l-8.125,8.125l0,0.8958l9.2292,-9.2292l-9.2292,-9.2292l0,1.3125z M83.5,40.3125l0,-1.3125l-22.5,-22.5l-1.3125,0z M50,6.8333l8.125,8.125l1.3125,0l-9.4167,-9.4167l-9.4167,9.4167l1.3125,0z M59.6875,16.5l1.3125,0l-1.5625,-1.5625l-1.3125,0z M85.0625,41.875l0,-1.3125l-1.5625,-1.5625l0,1.3125z M41.875,14.9375l-1.3125,0l-1.5625,1.5625l1.3125,0z M16.5,40.3125l0,-1.3125l-1.5625,1.5625l0,1.3125z M14.9375,58.125l0,0.8958l1.5625,1.5625l0,-0.8958z M58.125,85.0625l0.8958,0l1.5625,-1.5625l-0.8958,0z M85.0625,58.125l-1.5625,1.5625l0,0.8958l1.5625,-1.5625z M40.3125,83.5l-0.8958,0l1.5625,1.5625l0.8958,0z M7.9375,49.7917l7,-7.0208l0,-0.8958l-8.125,8.125l8.125,8.125l0,-1.3125z M83.5,41.2292l0,-0.8958l-23.8125,-23.8125l-0.8958,0z M50,7.7292l7.2083,7.2083l0.8958,0l-8.125,-8.125l-8.125,8.125l0.8958,0z M41.2292,16.5l-0.8958,0l-23.8125,23.8125l0,0.8958z M50,91.875l-6.8125,-6.8125l-1.3125,0l8.125,8.125l8.125,-8.125l-1.3125,0z M85.0625,41.875l0,0.8958l7.0208,7.0208l-7.0208,7.0208l0,1.3125l8.125,-8.125z M58.375,83.5l1.3125,0l23.8125,-23.8125l0,-1.3125z M16.5,58.375l0,1.3125l23.8125,23.8125l1.3125,0z M56.8125,85.0625l1.3125,0l1.5625,-1.5625l-1.3125,0z M41.625,83.5l-1.3125,0l1.5625,1.5625l1.3125,0z M14.9375,56.8125l0,1.3125l1.5625,1.5625l0,-1.3125z M85.0625,42.7917l0,-0.8958l-1.5625,-1.5625l0,0.8958z M83.5,58.375l0,1.3125l1.5625,-1.5625l0,-1.3125z M58.7708,16.5l0.8958,0l-1.5625,-1.5625l-0.8958,0z M16.5,41.2292l0,-0.8958l-1.5625,1.5625l0,0.8958z M42.7917,14.9375l-0.8958,0l-1.5625,1.5625l0.8958,0z",
+    )
+
+    val ALL_KEYS: List<String> = PATH_BY_KEY.keys.toList()
+
+    private val shapeCache = LinkedHashMap<String, Shape>()
+
+    fun isKnownKey(key: String): Boolean = PATH_BY_KEY.containsKey(key)
+
+    fun pathForKey(key: String): String =
+        PATH_BY_KEY[key] ?: PATH_BY_KEY[DEFAULT_KEY]!!
+
+    fun shapeForKey(key: String): Shape {
+        if (key in NO_BACKGROUND_KEYS) {
+            return RectangleShape
+        }
+        shapeCache[key]?.let { return it }
+
+        val pathData = pathForKey(key)
+        val shape = PathShape(pathData)
+        shapeCache[key] = shape
+        return shape
+    }
+
+    private class PathShape(pathData: String) : Shape {
+        private val basePath: android.graphics.Path = try {
+            PathParser.createPathFromPathData(pathData)
+        } catch (_: RuntimeException) {
+            PathParser.createPathFromPathData(PATH_BY_KEY[DEFAULT_KEY]!!)
+        }
+
+        override fun createOutline(
+            size: Size,
+            layoutDirection: LayoutDirection,
+            density: Density,
+        ): Outline {
+            val scaled = android.graphics.Path(basePath)
+            val matrix = Matrix()
+            matrix.setScale(size.width / 100f, size.height / 100f)
+            scaled.transform(matrix)
+            return Outline.Generic(scaled.asComposePath())
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
index 1d254bff91a38..47b2a45d19631 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt
@@ -20,47 +20,64 @@ package com.android.systemui.qs.panels.ui.compose.infinitegrid
 
 import android.content.Context
 import android.content.res.Resources
+import android.database.ContentObserver
 import android.os.Trace
+import android.os.UserHandle
+import android.provider.Settings
 import android.service.quicksettings.Tile.STATE_ACTIVE
 import android.service.quicksettings.Tile.STATE_INACTIVE
 import android.service.quicksettings.Tile.STATE_UNAVAILABLE
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.semantics.Role
@@ -90,10 +107,13 @@ import com.android.systemui.haptics.msdl.qs.TileHapticsViewModelFactoryProvider
 import com.android.systemui.lifecycle.rememberViewModel
 import com.android.systemui.qs.flags.QsDetailedView
 import com.android.systemui.qs.panels.ui.compose.BounceableInfo
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.ActiveTileCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.InactiveCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileHeight
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelMoreDetails
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.longPressLabelSettings
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CustomColorScheme
+import com.android.systemui.qs.tiles.impl.ringer.QSTileRingerSlider
 import com.android.systemui.qs.panels.ui.viewmodel.AccessibilityUiState
 import com.android.systemui.qs.panels.ui.viewmodel.BounceableTileViewModel
 import com.android.systemui.qs.panels.ui.viewmodel.DetailsViewModel
@@ -108,6 +128,8 @@ import com.android.systemui.qs.ui.composable.QuickSettingsShade
 import com.android.systemui.qs.ui.compose.borderOnFocus
 import com.android.systemui.res.R
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
 
 @Composable
 fun TileLazyGrid(
@@ -190,14 +212,48 @@ fun ContentScope.Tile(
                 tile.state.collect { value = it.toIconProvider() }
             }
 
-        val colors = TileDefaults.getColorForState(uiState, iconOnly)
+        val useMinimalStyle = rememberAxTileStyle()
+
+        val colors = TileDefaults.getColorForState(uiState, iconOnly, forceMonochrome = useMinimalStyle)
         val hapticsViewModel: TileHapticsViewModel? =
-            rememberViewModel(traceName = "TileHapticsViewModel") {
-                tileHapticsViewModelFactoryProvider.getHapticsViewModelFactory()?.create(tile)
+            if (rememberTileHaptic()) {
+                rememberViewModel(traceName = "TileHapticsViewModel") {
+                    tileHapticsViewModelFactoryProvider.getHapticsViewModelFactory()?.create(tile)
+                }
+            } else {
+                null
+            }
+
+        val classicStyle = rememberQSPanelStyle()
+
+        if (tile.spec.spec == "sound" && !iconOnly) {
+            if (classicStyle) return@trace
+            QSTileRingerSlider()
+            return@trace
+        }
+
+        val iconShapeKey = rememberQSTileIconShapeKey()
+        val labelHide = classicStyle && rememberQSTileLabelHide()
+        val tileHeight = remember(classicStyle, labelHide) {
+            if (!classicStyle || labelHide) {
+                CommonTileDefaults.TileHeight
+            } else {
+                CommonTileDefaults.TileHeight + 8.dp
+            }
+        }
+
+        val shapeMode = if (useMinimalStyle) 0 else rememberTileShapeMode()
+        val wantCircle = !useMinimalStyle && shapeMode == 4 && iconOnly
+        val tileShape =
+            if (wantCircle && !classicStyle) {
+                CircleShape
+            } else if (useMinimalStyle) {
+                val useMinimalInvert = rememberAxMinimalInvert()
+                AxTileDefaults.animateTileShapeAsState(uiState.state, useMinimalInvert).value
+            } else {
+                TileDefaults.animateTileShapeAsState(uiState.state, shapeMode).value
             }
 
-        // TODO(b/361789146): Draw the shapes instead of clipping
-        val tileShape by TileDefaults.animateTileShapeAsState(uiState.state)
         val animatedColor by animateColorAsState(colors.background, label = "QSTileBackgroundColor")
         val isDualTarget = uiState.handlesSecondaryClick
 
@@ -215,16 +271,24 @@ fun ContentScope.Tile(
             contentRevealModifier = Modifier
         }
 
+        val outerShape = if (wantCircle && !classicStyle) RoundedCornerShape(0.dp) else tileShape
+        val outerColor: () -> Color = if (wantCircle || classicStyle) { { Color.Transparent } } else { { animatedColor } }
+        val focusBorderColor = MaterialTheme.colorScheme.secondary
+
         TileExpandable(
-            color = { animatedColor },
-            shape = tileShape,
+            color = outerColor,
+            shape = outerShape,
             squishiness = squishiness,
             hapticsViewModel = hapticsViewModel,
+            classicStyle = classicStyle,
             modifier =
                 modifier
                     .then(surfaceRevealModifier)
-                    .borderOnFocus(color = MaterialTheme.colorScheme.secondary, tileShape.topEnd)
+                    .thenIf(!wantCircle) {
+                        Modifier.borderOnFocus(color = focusBorderColor, outerShape.topEnd)
+                    }
                     .fillMaxWidth()
+                    .height(tileHeight)
                     .thenIf(currentBounceableInfo != null) {
                         Modifier.bounceable(
                             currentBounceableInfo!!.bounceable,
@@ -259,9 +323,8 @@ fun ContentScope.Tile(
                 remember(currentBounceableInfo) {
                     currentBounceableInfo?.bounceable ?: BounceableTileViewModel()
                 }
-            TileContainer(
-                interactionSource = interactionSource.takeIf { bounceContainer },
-                onClick = onClick@{
+            val click: (() -> Unit)? =
+                onClick@{
                         if (!isClickable) return@onClick
 
                         val hasDetails =
@@ -297,49 +360,135 @@ fun ContentScope.Tile(
                             // And show footer text feedback for icons
                             requestToggleTextFeedback(tile.spec)
                         }
-                    },
-                onLongClick = longClick,
-                accessibilityUiState = uiState.accessibilityUiState,
-                iconOnly = iconOnly,
-                isDualTarget = isDualTarget,
-                modifier = contentRevealModifier,
-            ) {
-                val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
-                if (iconOnly) {
-                    SmallTileContent(
-                        iconProvider = iconProvider,
-                        color = colors.icon,
-                        modifier =
-                            Modifier.align(Alignment.Center).bounceScale {
-                                contentBounceable.iconBounceScale
-                            },
-                    )
-                } else {
-                    val iconShape by TileDefaults.animateIconShapeAsState(uiState.state)
-                    val secondaryClick: (() -> Unit)? =
-                        {
-                                hapticsViewModel?.setTileInteractionState(
-                                    TileHapticsViewModel.TileInteractionState.CLICKED
-                                )
-                                tile.toggleClick()
+                    }
+
+            if (wantCircle || classicStyle) {
+                val interaction = remember { MutableInteractionSource() }
+
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .wrapContentSize(Alignment.Center),
+                ) {
+                    Box(
+                        contentAlignment = Alignment.Center,
+                        modifier = Modifier
+                            .size(tileHeight)
+                            .thenIf(!classicStyle) {
+                                Modifier
+                                    .clip(CircleShape)
+                                    .drawBehind {
+                                        val brush = colors.iconBackgroundGradient
+                                        if (brush != null) {
+                                            drawRect(brush = brush)
+                                        } else {
+                                            drawRect(color = animatedColor)
+                                        }
+                                    }
                             }
-                            .takeIf { isDualTarget }
-                    LargeTileContent(
-                        label = uiState.label,
-                        secondaryLabel = uiState.secondaryLabel,
-                        iconProvider = iconProvider,
-                        sideDrawable = uiState.sideDrawable,
-                        colors = colors,
-                        iconShape = iconShape,
-                        toggleClick = secondaryClick,
-                        onLongClick = longClick,
-                        accessibilityUiState = uiState.accessibilityUiState,
-                        squishiness = squishiness,
-                        isVisible = isVisible,
-                        textScale = { contentBounceable.textBounceScale },
-                        modifier =
-                            Modifier.largeTilePadding(isDualTarget = uiState.handlesLongClick),
-                    )
+                            .indication(interaction, LocalIndication.current)
+                            .tileCombinedClickable(
+                                onClick = { click?.invoke() ?: Unit },
+                                onLongClick = { longClick?.invoke() },
+                                accessibilityUiState = uiState.accessibilityUiState,
+                                interactionSource = interactionSource.takeIf { bounceContainer },
+                                iconOnly = true,
+                                isDualTarget = isDualTarget,
+                            )
+                            .tileTestTag(iconOnly),
+                    ) {
+                        val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
+                        if (!classicStyle) {
+                            SmallTileContent(
+                                iconProvider = iconProvider,
+                                color = colors.icon,
+                                modifier = Modifier.bounceScale {
+                                    contentBounceable.iconBounceScale
+                                },
+                            )
+                        } else {
+                            ClassicTileContent(
+                                label = uiState.label,
+                                iconProvider = iconProvider,
+                                iconShapeKey = iconShapeKey,
+                                colors = colors,
+                                labelHide = labelHide,
+                                modifier = Modifier.bounceScale {
+                                    contentBounceable.iconBounceScale
+                                },
+                            )
+                        }
+                    }
+                }
+            } else {
+                TileContainer(
+                    interactionSource = interactionSource.takeIf { bounceContainer },
+                    onClick = click,
+                    onLongClick = longClick,
+                    accessibilityUiState = uiState.accessibilityUiState,
+                    iconOnly = iconOnly,
+                    isDualTarget = isDualTarget,
+                    classicStyle = classicStyle,
+                    modifier = contentRevealModifier,
+                    colors = colors,
+                ) {
+                    val iconProvider: Context.() -> Icon = { getTileIcon(icon = icon) }
+                    if (iconOnly) {
+                        SmallTileContent(
+                            iconProvider = iconProvider,
+                            color = colors.icon,
+                            modifier =
+                                Modifier.align(Alignment.Center).bounceScale {
+                                    contentBounceable.iconBounceScale
+                                },
+                        )
+                    } else {
+                        val secondaryClick: (() -> Unit)? =
+                            {
+                                    hapticsViewModel?.setTileInteractionState(
+                                        TileHapticsViewModel.TileInteractionState.CLICKED
+                                    )
+                                    tile.toggleClick()
+                                }
+                                .takeIf { isDualTarget }
+                        if (useMinimalStyle) {
+                            val useMinimalInvert = rememberAxMinimalInvert()
+                            val iconShape by AxTileDefaults.animateIconShapeAsState(uiState.state, useMinimalInvert)
+                            AxLargeTileContent(
+                                label = uiState.label,
+                                secondaryLabel = uiState.secondaryLabel,
+                                iconProvider = iconProvider,
+                                sideDrawable = uiState.sideDrawable,
+                                colors = colors,
+                                iconShape = iconShape,
+                                tileState = uiState.state,
+                                toggleClick = secondaryClick,
+                                onLongClick = longClick,
+                                accessibilityUiState = uiState.accessibilityUiState,
+                                squishiness = squishiness,
+                                isVisible = isVisible,
+                                textScale = { contentBounceable.textBounceScale },
+                            )
+                        } else {
+                            val iconShape by TileDefaults.animateIconShapeAsState(uiState.state, shapeMode)
+                            LargeTileContent(
+                                label = uiState.label,
+                                secondaryLabel = uiState.secondaryLabel,
+                                iconProvider = iconProvider,
+                                sideDrawable = uiState.sideDrawable,
+                                colors = colors,
+                                iconShape = iconShape,
+                                toggleClick = secondaryClick,
+                                onLongClick = longClick,
+                                accessibilityUiState = uiState.accessibilityUiState,
+                                squishiness = squishiness,
+                                isVisible = isVisible,
+                                textScale = { contentBounceable.textBounceScale },
+                                modifier =
+                                    Modifier.largeTilePadding(isDualTarget = uiState.handlesLongClick),
+                            )
+                        }
+                    }
                 }
             }
         }
@@ -352,12 +501,18 @@ private fun TileExpandable(
     shape: Shape,
     squishiness: () -> Float,
     hapticsViewModel: TileHapticsViewModel?,
+    classicStyle: Boolean,
     modifier: Modifier = Modifier,
     content: @Composable (Expandable) -> Unit,
 ) {
     Expandable(
         controller = rememberExpandableController(color = color, shape = shape),
-        modifier = modifier.clip(shape).verticalSquish(squishiness),
+        modifier = modifier
+            .verticalSquish(squishiness)
+            .thenIf(!classicStyle) {
+                Modifier
+                    .clip(shape)
+            },
         useModifierBasedImplementation = true,
     ) {
         content(hapticsViewModel?.createStateAwareExpandable(it) ?: it)
@@ -371,8 +526,10 @@ fun TileContainer(
     accessibilityUiState: AccessibilityUiState,
     iconOnly: Boolean,
     isDualTarget: Boolean,
+    classicStyle: Boolean,
     interactionSource: MutableInteractionSource?,
     modifier: Modifier = Modifier,
+    colors: TileColors,
     content: @Composable BoxScope.() -> Unit,
 ) {
     Box(
@@ -388,7 +545,16 @@ fun TileContainer(
                     isDualTarget = isDualTarget,
                     interactionSource = interactionSource,
                 )
-                .tileTestTag(iconOnly),
+                .tileTestTag(iconOnly)
+                .thenIf(!classicStyle && (!isDualTarget || iconOnly)) {
+                    Modifier
+                        .drawBehind {
+                            val brush = colors.iconBackgroundGradient
+                            if (brush != null) {
+                                drawRect(brush = brush)
+                            }
+                        }
+                },
         content = content,
     )
 }
@@ -399,12 +565,21 @@ fun LargeStaticTile(
     iconProvider: IconProvider,
     modifier: Modifier = Modifier,
 ) {
+    val shapeMode = rememberTileShapeMode()
+
     val colors = TileDefaults.getColorForState(uiState = uiState, iconOnly = false)
 
     Box(
         modifier
-            .clip(TileDefaults.animateTileShapeAsState(state = uiState.state).value)
-            .background(colors.background)
+            .clip(TileDefaults.animateTileShapeAsState(state = uiState.state, shapeMode = shapeMode).value)
+            .drawBehind {
+                val brush = colors.iconBackgroundGradient
+                if (brush != null) {
+                    drawRect(brush = brush)
+                } else {
+                    drawRect(color = colors.background)
+                }
+            }
             .height(TileHeight)
             .largeTilePadding()
     ) {
@@ -449,7 +624,7 @@ fun Modifier.tileCombinedClickable(
             onLongClick = onLongClick,
             onClickLabel = accessibilityUiState.clickLabel,
             onLongClickLabel = longPressLabel,
-            hapticFeedbackEnabled = !Flags.msdlFeedback(),
+            hapticFeedbackEnabled = rememberTileHaptic() && !Flags.msdlFeedback(),
             interactionSource = interactionSource,
         )
         .semantics {
@@ -476,56 +651,502 @@ data class TileColors(
     val label: Color,
     val secondaryLabel: Color,
     val icon: Color,
+    val iconBackgroundGradient: Brush? = null,
+    val outline: Color,
 )
 
+@Composable
+fun rememberAxTileStyle(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readAxStyle(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_STYLE_MINIMAL, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var axStyle by remember { mutableStateOf(readAxStyle()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    axStyle = readAxStyle()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_STYLE_MINIMAL),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return axStyle
+}
+
+@Composable
+fun rememberTileShapeMode(): Int {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readShapeMode(): Int {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_SHAPE, 0,
+                UserHandle.USER_CURRENT
+            )
+        } catch (_: Throwable) {
+            0
+        }
+    }
+
+    var shapeMode by remember { mutableIntStateOf(readShapeMode()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    shapeMode = readShapeMode()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_SHAPE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return shapeMode
+}
+
+@Composable
+fun rememberAxMinimalInvert(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readMinimalInvert(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_STYLE_MINIMAL_INVERT, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var minimalInvert by remember { mutableStateOf(readMinimalInvert()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    minimalInvert = readMinimalInvert()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_STYLE_MINIMAL_INVERT),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return minimalInvert
+}
+
+@Composable
+fun rememberTileHaptic(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readHapticEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_HAPTIC, 1,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var hapticEnabled by remember { mutableStateOf(readHapticEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    hapticEnabled = readHapticEnabled()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_HAPTIC),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return hapticEnabled
+}
+
+@Composable
+fun rememberQsGradient(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_GRADIENT, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var enabled by remember { mutableStateOf(readEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                enabled = readEnabled()
+            }
+        }
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_GRADIENT),
+            false, observer, UserHandle.USER_ALL
+        )
+        onDispose { contentResolver.unregisterContentObserver(observer) }
+    }
+
+    return enabled
+}
+
+@Composable
+private fun rememberGradientColorMode(): Int {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readMode(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_COLOR_MODE, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var mode by remember { mutableIntStateOf(readMode()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                mode = readMode()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_COLOR_MODE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return mode
+}
+
+@Composable
+private fun rememberGradientCustomColors(): Pair<Color, Color> {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readStart(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_START_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    fun readEnd(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_END_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var startInt by remember { mutableIntStateOf(readStart()) }
+    var endInt by remember { mutableIntStateOf(readEnd()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                startInt = readStart()
+                endInt = readEnd()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_START_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_END_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    val start = if (startInt != 0) Color(startInt) else MaterialTheme.colorScheme.primary
+    val end = if (endInt != 0) Color(endInt) else MaterialTheme.colorScheme.secondary
+    return start to end
+}
+
+@Composable
+fun rememberQSPanelStyle(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readPanelStyleEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_PANEL_STYLE, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var classicStyleEnabled by remember { mutableStateOf(readPanelStyleEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                classicStyleEnabled = readPanelStyleEnabled()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_PANEL_STYLE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return classicStyleEnabled
+}
+
+@Composable
+fun rememberQSTileLabelHide(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readLabelHideEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.QS_TILE_LABEL_HIDE, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var labelHideEnabled by remember { mutableStateOf(readLabelHideEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    labelHideEnabled = readLabelHideEnabled()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_LABEL_HIDE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return labelHideEnabled
+}
+
+@Composable
+fun rememberQSTileIconShapeKey(): String {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readValue(): String {
+        return try {
+            Settings.System.getStringForUser(
+                contentResolver, Settings.System.QS_TILE_ICON_SHAPE,
+                UserHandle.USER_CURRENT
+            ) ?: "circle"
+        } catch (_: Throwable) {
+            "circle"
+        }
+    }
+
+    var value by remember { mutableStateOf(readValue()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                context.mainExecutor.execute {
+                    value = readValue()
+                }
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.QS_TILE_ICON_SHAPE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return value
+}
+
+@Composable
+    internal fun rememberQsTileBackgroundBrush(): Brush? {
+        val enabled = rememberQsGradient()
+        return TileDefaults.qsTileBackgroundBrush(enabled)
+    }
+
 private object TileDefaults {
     val ActiveIconCornerRadius = 16.dp
-    val ActiveTileCornerRadius = 24.dp
 
     /** An active tile uses the active color as background */
     @Composable
-    @ReadOnlyComposable
-    fun activeTileColors(): TileColors =
-        TileColors(
+    fun activeTileColors(): TileColors {
+        val gradientEnabled = rememberQsGradient()
+        val gradient = qsTileBackgroundBrush(gradientEnabled)
+
+        return TileColors(
             background = MaterialTheme.colorScheme.primary,
             iconBackground = MaterialTheme.colorScheme.primary,
             label = MaterialTheme.colorScheme.onPrimary,
             secondaryLabel = MaterialTheme.colorScheme.onPrimary,
             icon = MaterialTheme.colorScheme.onPrimary,
+            iconBackgroundGradient = gradient,
+            outline = MaterialTheme.colorScheme.primary,
         )
+    }
 
     /** An active tile with dual target only show the active color on the icon */
     @Composable
-    @ReadOnlyComposable
-    fun activeDualTargetTileColors(): TileColors =
-        TileColors(
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
-            iconBackground = MaterialTheme.colorScheme.primary,
-            label = MaterialTheme.colorScheme.onSurface,
-            secondaryLabel = MaterialTheme.colorScheme.onSurface,
-            icon = MaterialTheme.colorScheme.onPrimary,
-        )
+    fun activeDualTargetTileColors(): TileColors {
+        val context = LocalContext.current
+        val isSingleToneStyle = DualTargetTileStyleProvider.isSingleToneStyle(context)
+        val gradientEnabled = rememberQsGradient()
+        val gradient = qsTileBackgroundBrush(gradientEnabled)
+
+        return if (isSingleToneStyle) {
+            TileColors(
+                background = MaterialTheme.colorScheme.primary,
+                iconBackground = Color.Transparent,
+                label = MaterialTheme.colorScheme.onPrimary,
+                secondaryLabel = MaterialTheme.colorScheme.onPrimary,
+                icon = MaterialTheme.colorScheme.onPrimary,
+                outline = MaterialTheme.colorScheme.primary,
+            )
+        } else {
+            TileColors(
+                background = CustomColorScheme.current.qsTileColor,
+                iconBackground = MaterialTheme.colorScheme.primary,
+                label = MaterialTheme.colorScheme.onSurface,
+                secondaryLabel = MaterialTheme.colorScheme.onSurface,
+                icon = MaterialTheme.colorScheme.onPrimary,
+                iconBackgroundGradient = gradient,
+                outline = MaterialTheme.colorScheme.primary,
+            )
+        }
+    }
 
     @Composable
     @ReadOnlyComposable
-    fun inactiveDualTargetTileColors(): TileColors =
-        TileColors(
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
-            iconBackground = LocalAndroidColorScheme.current.surfaceEffect2,
-            label = MaterialTheme.colorScheme.onSurface,
-            secondaryLabel = MaterialTheme.colorScheme.onSurface,
-            icon = MaterialTheme.colorScheme.onSurface,
-        )
+    fun inactiveDualTargetTileColors(): TileColors {
+        val context = LocalContext.current
+        val isSingleToneStyle = DualTargetTileStyleProvider.isSingleToneStyle(context)
+
+        return if (isSingleToneStyle) {
+            TileColors(
+                background = CustomColorScheme.current.qsTileColor,
+                iconBackground = Color.Transparent,
+                label = MaterialTheme.colorScheme.onSurface,
+                secondaryLabel = MaterialTheme.colorScheme.onSurface,
+                icon = MaterialTheme.colorScheme.onSurface,
+                outline = MaterialTheme.colorScheme.primary,
+            )
+        } else {
+            TileColors(
+                background = CustomColorScheme.current.qsTileColor,
+                iconBackground = LocalAndroidColorScheme.current.surfaceEffect2,
+                label = MaterialTheme.colorScheme.onSurface,
+                secondaryLabel = MaterialTheme.colorScheme.onSurface,
+                icon = MaterialTheme.colorScheme.onSurface,
+                outline = MaterialTheme.colorScheme.primary,
+            )
+        }
+    }
 
     @Composable
     @ReadOnlyComposable
     fun inactiveTileColors(): TileColors =
         TileColors(
-            background = LocalAndroidColorScheme.current.surfaceEffect1,
+            background = CustomColorScheme.current.qsTileColor,
             iconBackground = Color.Transparent,
             label = MaterialTheme.colorScheme.onSurface,
             secondaryLabel = MaterialTheme.colorScheme.onSurface,
             icon = MaterialTheme.colorScheme.onSurface,
+            outline = MaterialTheme.colorScheme.onSurface,
         )
 
     @Composable
@@ -539,16 +1160,45 @@ private object TileDefaults {
             label = onSurfaceVariantColor,
             secondaryLabel = onSurfaceVariantColor,
             icon = onSurfaceVariantColor,
+            outline = onSurfaceVariantColor,
         )
     }
 
     @Composable
     @ReadOnlyComposable
-    fun getColorForState(uiState: TileUiState, iconOnly: Boolean): TileColors {
+    fun activeDualTargetMonochromeTileColors(): TileColors =
+        TileColors(
+            background = MaterialTheme.colorScheme.primary,
+            iconBackground = Color.Transparent,
+            label = MaterialTheme.colorScheme.onPrimary,
+            secondaryLabel = MaterialTheme.colorScheme.onPrimary,
+            icon = MaterialTheme.colorScheme.onPrimary,
+            outline = MaterialTheme.colorScheme.primary,
+        )
+
+    @Composable
+    @ReadOnlyComposable
+    fun inactiveDualTargetMonochromeTileColors(): TileColors =
+        TileColors(
+            background = CustomColorScheme.current.qsTileColor,
+            iconBackground = Color.Transparent,
+            label = MaterialTheme.colorScheme.onSurface,
+            secondaryLabel = MaterialTheme.colorScheme.onSurface,
+            icon = MaterialTheme.colorScheme.onSurface,
+            outline = MaterialTheme.colorScheme.primary,
+        )
+
+    @Composable
+    fun getColorForState(
+        uiState: TileUiState,
+        iconOnly: Boolean,
+        forceMonochrome: Boolean = false,
+    ): TileColors {
         return when (uiState.state) {
             STATE_ACTIVE -> {
                 if (uiState.handlesSecondaryClick && !iconOnly) {
-                    activeDualTargetTileColors()
+                    if (forceMonochrome) activeDualTargetMonochromeTileColors()
+                    else activeDualTargetTileColors()
                 } else {
                     activeTileColors()
                 }
@@ -556,31 +1206,36 @@ private object TileDefaults {
 
             STATE_INACTIVE -> {
                 if (uiState.handlesSecondaryClick && !iconOnly) {
-                    inactiveDualTargetTileColors()
+                    if (forceMonochrome) inactiveDualTargetMonochromeTileColors()
+                    else inactiveDualTargetTileColors()
                 } else {
                     inactiveTileColors()
                 }
             }
 
+            STATE_UNAVAILABLE -> unavailableTileColors()
+
             else -> unavailableTileColors()
         }
     }
 
     @Composable
-    fun animateIconShapeAsState(state: Int): State<RoundedCornerShape> {
+    fun animateIconShapeAsState(state: Int, shapeMode: Int): State<RoundedCornerShape> {
         return animateShapeAsState(
             state = state,
             activeCornerRadius = ActiveIconCornerRadius,
             label = "QSTileCornerRadius",
+            shapeMode = shapeMode,
         )
     }
 
     @Composable
-    fun animateTileShapeAsState(state: Int): State<RoundedCornerShape> {
+    fun animateTileShapeAsState(state: Int, shapeMode: Int): State<RoundedCornerShape> {
         return animateShapeAsState(
             state = state,
             activeCornerRadius = ActiveTileCornerRadius,
             label = "QSTileIconCornerRadius",
+            shapeMode = shapeMode,
         )
     }
 
@@ -589,28 +1244,50 @@ private object TileDefaults {
         state: Int,
         activeCornerRadius: Dp,
         label: String,
+        shapeMode: Int,
     ): State<RoundedCornerShape> {
-        val animatedCornerRadius by
-            animateDpAsState(
-                targetValue =
-                    if (state == STATE_ACTIVE) {
-                        activeCornerRadius
-                    } else {
-                        InactiveCornerRadius
-                    },
-                label = label,
-            )
+        val animatedCornerRadius by animateDpAsState(
+            targetValue = when (shapeMode) {
+                1 -> InactiveCornerRadius // Circle-ish
+                2 -> activeCornerRadius  // Rounded Square
+                3 -> 0.dp               // Square
+                4 -> InactiveCornerRadius // Circle
+                else -> if (state == STATE_ACTIVE) activeCornerRadius else InactiveCornerRadius
+            },
+            label = label,
+        )
 
         return remember {
-            val corner =
-                object : CornerSize {
-                    override fun toPx(shapeSize: Size, density: Density): Float {
-                        return with(density) { animatedCornerRadius.toPx() }
-                    }
+            val corner = object : CornerSize {
+                override fun toPx(shapeSize: Size, density: Density): Float {
+                    return with(density) { animatedCornerRadius.toPx() }
                 }
+            }
             mutableStateOf(RoundedCornerShape(corner))
         }
     }
+
+    @Composable
+    fun qsTileBackgroundBrush(enabled: Boolean): Brush? {
+        if (!enabled) return null
+
+        val mode = rememberGradientColorMode()
+        val colors = if (mode == 1) {
+            val (start, end) = rememberGradientCustomColors()
+            listOf(start, end)
+        } else {
+            listOf(
+                MaterialTheme.colorScheme.primary,
+                MaterialTheme.colorScheme.secondary
+            )
+        }
+
+        return Brush.linearGradient(
+            colors = colors,
+            start = Offset(0f, 0f),
+            end = Offset.Infinite
+        )
+    }
 }
 
 /**
@@ -623,3 +1300,36 @@ private fun resources(): Resources {
     LocalConfiguration.current
     return LocalResources.current
 }
+
+/**
+ * Enum representing different dual target tile styles.
+ * 
+ * off: Original style where only the icon area shows color
+ * on: Full tile colored between icon and text
+ */
+enum class DualTargetTileStyle {
+    DUAL,
+    SINGLE
+}
+
+object DualTargetTileStyleProvider {
+
+    fun getStyle(context: android.content.Context): DualTargetTileStyle {
+        val value = Settings.System.getInt(
+            context.contentResolver,
+            Settings.System.DUAL_TARGET_TILE_STYLE,
+            0
+        )
+
+        return when (value) {
+            1 -> DualTargetTileStyle.SINGLE
+            else -> DualTargetTileStyle.DUAL
+        }
+    }
+
+    fun isSingleToneStyle(context: android.content.Context): Boolean =
+        getStyle(context) == DualTargetTileStyle.SINGLE
+
+    fun isDualToneStyle(context: android.content.Context): Boolean =
+        getStyle(context) == DualTargetTileStyle.DUAL
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/selection/Selection.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/selection/Selection.kt
index 753848330fb5b..3df79a6ac3d9e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/selection/Selection.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/selection/Selection.kt
@@ -74,7 +74,10 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.toSize
 import androidx.compose.ui.zIndex
 import com.android.compose.modifiers.thenIf
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.ActiveTileCornerRadius
 import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.InactiveCornerRadius
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberQSPanelStyle
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberTileShapeMode
 import com.android.systemui.qs.panels.ui.compose.selection.SelectionDefaults.BADGE_ANGLE_RAD
 import com.android.systemui.qs.panels.ui.compose.selection.SelectionDefaults.BadgeIconSize
 import com.android.systemui.qs.panels.ui.compose.selection.SelectionDefaults.BadgeSize
@@ -113,6 +116,7 @@ fun InteractiveTileContainer(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
     contentDescription: String? = null,
+    iconOnly: Boolean,
     content: @Composable BoxScope.() -> Unit = {},
 ) {
     val transition: Transition<Decoration> = updateTransition(tileState.decoration())
@@ -130,6 +134,7 @@ fun InteractiveTileContainer(
         modifier.resizable(tileState == Selected, resizingState).selectionBorder(
             MaterialTheme.colorScheme.primary,
             SelectedBorderWidth,
+            iconOnly
         ) {
             selectionBorderAlpha
         }
@@ -186,24 +191,56 @@ fun InteractiveTileContainer(
     }
 }
 
+@Composable
 private fun Modifier.selectionBorder(
     selectionColor: Color,
     selectionBorderWidth: Dp,
-    selectionAlpha: () -> Float = { 0f },
+    iconOnly: Boolean,
+    selectionAlpha: () -> Float = { 0f }
 ): Modifier {
+    val shapeMode = rememberTileShapeMode()
+    val panelStyle = rememberQSPanelStyle()
+    val borderRadiusPx = with(LocalDensity.current) {
+        when (shapeMode) {
+            1 -> InactiveCornerRadius.toPx()
+            2 -> ActiveTileCornerRadius.toPx()
+            3 -> 0f
+            4 -> InactiveCornerRadius.toPx()
+            else -> InactiveCornerRadius.toPx()
+        }
+    }
+
     return drawWithContent {
         drawContent()
 
-        // Draw the border on the inside of the tile
-        val borderWidth = selectionBorderWidth.toPx()
-        drawRoundRect(
-            SolidColor(selectionColor),
-            cornerRadius = CornerRadius(InactiveCornerRadius.toPx()),
-            topLeft = Offset(borderWidth / 2, borderWidth / 2),
-            size = Size(size.width - borderWidth, size.height - borderWidth),
-            style = Stroke(borderWidth),
-            alpha = selectionAlpha(),
-        )
+        val borderWidthPx = selectionBorderWidth.toPx()
+        val alpha = selectionAlpha()
+
+        if (panelStyle || (shapeMode == 4 && iconOnly)) {
+            val w = this.size.width
+            val h = this.size.height
+            val radius = (min(w, h) - borderWidthPx) / 2f
+
+            drawCircle(
+                brush = SolidColor(selectionColor),
+                radius = radius,
+                center = Offset(w / 2f, h / 2f),
+                style = Stroke(borderWidthPx),
+                alpha = alpha,
+            )
+        } else {
+            val topLeft = Offset(borderWidthPx / 2f, borderWidthPx / 2f)
+            val sz = Size(this.size.width - borderWidthPx, this.size.height - borderWidthPx)
+
+            drawRoundRect(
+                brush = SolidColor(selectionColor),
+                cornerRadius = CornerRadius(borderRadiusPx),
+                topLeft = topLeft,
+                size = sz,
+                style = Stroke(borderWidthPx),
+                alpha = alpha,
+            )
+        }
     }
 }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt
index 8cf7803f72270..9e061232d2648 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/InfiniteGridViewModel.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.qs.panels.ui.viewmodel
 
+import androidx.compose.runtime.getValue
 import com.android.systemui.lifecycle.ExclusiveActivatable
 import com.android.systemui.lifecycle.Hydrator
 import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.Companion.LOCATION_QS
@@ -58,8 +59,11 @@ constructor(
             )
 
     override fun splitIntoPages(tiles: List<TileViewModel>, rows: Int): List<List<TileViewModel>> {
+        val largeTilesSpan = columnsWithMediaViewModel.largeSpan
+        val largeTiles by iconTilesViewModel.largeTilesState
+
         return splitInRows(
-                tiles.map { SizedTileImpl(it, widthOf(it.spec)) },
+                tiles.map { SizedTileImpl(it, if (largeTiles.contains(it.spec)) largeTilesSpan else 1) },
                 columnsWithMediaViewModel.columns,
             )
             .chunked(rows)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt
index bebc80f32e1fe..336d2f48aa9a0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/PaginatedGridViewModel.kt
@@ -23,6 +23,7 @@ import com.android.systemui.development.ui.viewmodel.BuildNumberViewModel
 import com.android.systemui.inputdevice.domain.interactor.PointerDeviceInteractor
 import com.android.systemui.lifecycle.ExclusiveActivatable
 import com.android.systemui.lifecycle.Hydrator
+import com.android.systemui.qs.panels.domain.interactor.QSPaginatedRowsInteractor
 import com.android.systemui.qs.panels.ui.viewmodel.toolbar.EditModeButtonViewModel
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -39,12 +40,19 @@ constructor(
     val editModeButtonViewModelFactory: EditModeButtonViewModel.Factory,
     private val falsingInteractor: FalsingInteractor,
     pointerDeviceInteractor: PointerDeviceInteractor,
+    private val qsRowsInteractor: QSPaginatedRowsInteractor,
 ) : IconTilesViewModel by iconTilesViewModel, ExclusiveActivatable() {
 
     private val hydrator = Hydrator("PaginatedGridViewModel")
 
     var inFirstPage by inFirstPageViewModel::inFirstPage
 
+    private val rowsInternal by
+        hydrator.hydratedStateOf<Int>(traceName = "qsRows", source = qsRowsInteractor.rows)
+
+    val rows: Int
+        get() = rowsInternal
+
     val showArrowsInPagerDots by
         hydrator.hydratedStateOf(
             traceName = "showArrowsInPagerDots",
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt
index 4f6057409f651..1ed68f95db473 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QSColumnsViewModel.kt
@@ -71,13 +71,22 @@ constructor(
             initialValue = false,
         )
 
-    val largeSpan: Int
-        get() =
-            if (useExtraLargeTiles) {
-                if (columns > maxSpan) columns / 2 else columns
-            } else {
-                largeTileSpanInteractor.defaultTileMaxWidth
-            }
+    private val classicStyle by
+        hydrator.hydratedStateOf(
+            traceName = "classicStyle",
+            source = largeTileSpanInteractor.classicStyle,
+            initialValue = false,
+        )
+
+    val largeSpan: Int by derivedStateOf {
+        if (classicStyle) {
+            1
+        } else if (useExtraLargeTiles) {
+            if (columns > maxSpan) columns / 2 else columns
+        } else {
+            largeTileSpanInteractor.defaultTileMaxWidth
+        }
+    }
 
     private val mediaInRowInLandscapeViewModel =
         if (mediaLocation != null && mediaUiBehavior != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt
index 5515510832944..4ffd61f07f76f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/QuickQuickSettingsViewModel.kt
@@ -29,6 +29,7 @@ import com.android.systemui.qs.panels.domain.interactor.QuickQuickSettingsRowInt
 import com.android.systemui.qs.panels.shared.model.SizedTileImpl
 import com.android.systemui.qs.panels.shared.model.splitInRowsSequence
 import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor
+import com.android.systemui.qs.pipeline.domain.model.TileModel
 import com.android.systemui.qs.pipeline.shared.TileSpec
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -81,9 +82,17 @@ constructor(
     private val currentTiles by
         hydrator.hydratedStateOf(traceName = "currentTiles", source = tilesInteractor.currentTiles)
 
+    private var cachedCurrentTiles: List<TileModel> = emptyList()
+    private var cachedTileVMs: Map<TileSpec, TileViewModel> = emptyMap()
+
     val tileViewModels by derivedStateOf {
-        currentTiles
-            .map { SizedTileImpl(TileViewModel(it.tile, it.spec), it.spec.width()) }
+        val tiles = currentTiles
+        if (tiles !== cachedCurrentTiles) {
+            cachedCurrentTiles = tiles
+            cachedTileVMs = tiles.associate { it.spec to TileViewModel(it.tile, it.spec) }
+        }
+        tiles
+            .map { SizedTileImpl(cachedTileVMs[it.spec]!!, it.spec.width()) }
             .let { splitInRowsSequence(it, columns).take(rows).toList().flatten() }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileGridViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileGridViewModel.kt
index 77faf3fb19e3e..ade00d1394c65 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileGridViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/TileGridViewModel.kt
@@ -23,6 +23,7 @@ import com.android.systemui.qs.panels.domain.interactor.GridLayoutTypeInteractor
 import com.android.systemui.qs.panels.shared.model.GridLayoutType
 import com.android.systemui.qs.panels.ui.compose.GridLayout
 import com.android.systemui.qs.pipeline.domain.interactor.CurrentTilesInteractor
+import com.android.systemui.qs.pipeline.domain.model.TileModel
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import javax.inject.Named
@@ -49,8 +50,18 @@ constructor(
     private val tileModels by
         hydrator.hydratedStateOf(traceName = "tileModels", source = tilesInteractor.currentTiles)
 
+    private var cachedTileModels: List<TileModel> = emptyList()
+    private var cachedTileViewModels: List<TileViewModel> = emptyList()
+
     val tileViewModels: List<TileViewModel>
-        get() = tileModels.map { TileViewModel(it.tile, it.spec) }
+        get() {
+            val current = tileModels
+            if (current !== cachedTileModels) {
+                cachedTileModels = current
+                cachedTileViewModels = current.map { TileViewModel(it.tile, it.spec) }
+            }
+            return cachedTileViewModels
+        }
 
     override suspend fun onActivated(): Nothing {
         hydrator.activate()
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModel.kt
index 1ebd4fb53f0f6..556f44f6e88e2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModel.kt
@@ -92,7 +92,7 @@ constructor(
             initialValue = null,
             source =
                 selectedUserInteractor.selectedUser.map { selectedUserId ->
-                    SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked).takeUnless {
+                    SettingsActionViewModel(qsThemedContext, ::onSettingsButtonClicked, ::onSettingsButtonLongClicked).takeUnless {
                         hsuQsChanges() && hsum.isHeadlessSystemUser(selectedUserId)
                     }
                 },
@@ -154,6 +154,10 @@ constructor(
         falsingInteractor.runIfNotFalseTap { footerActionsInteractor.showSettings(expandable) }
     }
 
+    private fun onSettingsButtonLongClicked(expandable: Expandable) {
+        falsingInteractor.runIfNotFalseTap { footerActionsInteractor.showCustomSettings(expandable) }
+    }
+
     fun onSecurityButtonClicked(quickSettingsContext: Context, expandable: Expandable) {
         falsingInteractor.runIfNotFalseTap {
             footerActionsInteractor.showDeviceMonitoringDialog(quickSettingsContext, expandable)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
index cce67e9f81f28..ae2d1264e1a66 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
@@ -971,12 +971,14 @@ constructor(
         val deltaH = (newHeight - startingHeight) / 2
         val deltaW = (newWidth - startingWidth) / 2
 
-        background.updateBounds(
-            left = -deltaW,
-            top = -deltaH,
-            right = newWidth - deltaW,
-            bottom = newHeight - deltaH,
-        )
+        background?.let {
+            it.updateBounds(
+                left = -deltaW,
+                top = -deltaH,
+                right = newWidth - deltaW,
+                bottom = newHeight - deltaH,
+            )
+        }
 
         // Radius change
         val newRadius =
@@ -1029,12 +1031,14 @@ constructor(
         start + fraction * (end - start)
 
     fun resetLongPressEffectProperties() {
-        background.updateBounds(
-            left = 0,
-            top = 0,
-            right = initialLongPressProperties?.width?.toInt() ?: measuredWidth,
-            bottom = initialLongPressProperties?.height?.toInt() ?: measuredHeight,
-        )
+        background?.let {
+            it.updateBounds(
+                left = 0,
+                top = 0,
+                right = initialLongPressProperties?.width?.toInt() ?: measuredWidth,
+                bottom = initialLongPressProperties?.height?.toInt() ?: measuredHeight,
+            )
+        }
         changeCornerRadius(resources.getDimensionPixelSize(R.dimen.qs_corner_radius).toFloat())
         setAllColors(
             getBackgroundColorForState(lastState, lastDisabledByPolicy),
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AxFiveGUtils.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/AxFiveGUtils.kt
new file mode 100644
index 0000000000000..2d7cc3723dec5
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AxFiveGUtils.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles
+
+import android.content.Context
+import android.provider.Settings
+import android.telephony.RadioAccessFamily
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+@SysUISingleton
+class AxFiveGUtils @Inject constructor(
+    private val context: Context,
+    private val telephonyManager: TelephonyManager,
+) {
+
+    fun getDefaultDataSubId(): Int? {
+        val subId = SubscriptionManager.getDefaultDataSubscriptionId()
+        return if (SubscriptionManager.isValidSubscriptionId(subId)) subId else null
+    }
+
+    fun modemSupportsNr(): Boolean {
+        for (slot in 0 until telephonyManager.activeModemCount) {
+            val defaultNetwork = TelephonyManager.getTelephonyProperty(
+                slot, PROP_DEFAULT_NETWORK, DEFAULT_NETWORK_FALLBACK
+            ).toIntOrNull() ?: continue
+            val raf = RadioAccessFamily.getRafFromNetworkType(defaultNetwork).toLong()
+            if ((raf and NR_BITMASK) > 0) return true
+        }
+        return false
+    }
+
+    fun subscriptionSupportsNr(subId: Int): Boolean {
+        val raf = telephonyManager.createForSubscriptionId(subId).supportedRadioAccessFamily
+        return (raf and NR_BITMASK) != 0L
+    }
+
+    fun isNrAvailable(): Boolean {
+        if (!modemSupportsNr()) return false
+        val subId = getDefaultDataSubId() ?: return false
+        return subscriptionSupportsNr(subId)
+    }
+
+    fun isNrEnabled(): Boolean {
+        val subId = getDefaultDataSubId() ?: return false
+        if (!subscriptionSupportsNr(subId)) return false
+        val carrierRaf = telephonyManager.createForSubscriptionId(subId)
+            .getAllowedNetworkTypesForReason(REASON_CARRIER)
+        return (carrierRaf and NR_BITMASK) != 0L
+    }
+
+    fun setNrEnabled(enable: Boolean) {
+        val subId = getDefaultDataSubId() ?: return
+        if (!subscriptionSupportsNr(subId)) return
+        val tm = telephonyManager.createForSubscriptionId(subId)
+        val carrierRaf = tm.getAllowedNetworkTypesForReason(REASON_CARRIER)
+        val newCarrierRaf = if (enable) {
+            carrierRaf or NR_BITMASK
+        } else {
+            carrierRaf and NR_BITMASK.inv()
+        }
+        tm.setAllowedNetworkTypesForReason(REASON_CARRIER, newCarrierRaf)
+        if (enable) {
+            val userRaf = tm.getAllowedNetworkTypesForReason(REASON_USER)
+            if ((userRaf and NR_BITMASK) == 0L) {
+                tm.setAllowedNetworkTypesForReason(REASON_USER, userRaf or NR_BITMASK)
+            }
+        }
+        Settings.Secure.putInt(context.contentResolver, SETTINGS_5G_ENABLED, if (enable) 1 else 0)
+    }
+
+    fun restoreNrState() {
+        val stored = Settings.Secure.getInt(context.contentResolver, SETTINGS_5G_ENABLED, SETTINGS_5G_DEFAULT)
+        if (stored == SETTINGS_5G_DEFAULT) return
+        val subId = getDefaultDataSubId() ?: return
+        if (!subscriptionSupportsNr(subId)) return
+        val enable = stored == 1
+        val tm = telephonyManager.createForSubscriptionId(subId)
+        val carrierRaf = tm.getAllowedNetworkTypesForReason(REASON_CARRIER)
+        val newCarrierRaf = if (enable) carrierRaf or NR_BITMASK else carrierRaf and NR_BITMASK.inv()
+        tm.setAllowedNetworkTypesForReason(REASON_CARRIER, newCarrierRaf)
+        if (enable) {
+            val userRaf = tm.getAllowedNetworkTypesForReason(REASON_USER)
+            if ((userRaf and NR_BITMASK) == 0L) {
+                tm.setAllowedNetworkTypesForReason(REASON_USER, userRaf or NR_BITMASK)
+            }
+        }
+    }
+
+    fun createForSubscriptionId(subId: Int): TelephonyManager =
+        telephonyManager.createForSubscriptionId(subId)
+
+    companion object {
+        private const val PROP_DEFAULT_NETWORK = "ro.telephony.default_network"
+        private const val DEFAULT_NETWORK_FALLBACK = "1"
+        private const val NR_BITMASK = TelephonyManager.NETWORK_TYPE_BITMASK_NR
+        private const val REASON_CARRIER = TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER
+        private const val REASON_USER = TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER
+        const val SETTINGS_5G_ENABLED = "ax_5g_enabled"
+        private const val SETTINGS_5G_DEFAULT = -1
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CPUInfoTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CPUInfoTile.java
new file mode 100644
index 0000000000000..ef6d551695e2d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CPUInfoTile.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017-2018 Benzo Rom
+ *           (C) 2017-2025 crDroidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.provider.Settings.Secure;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+import com.android.systemui.util.settings.SecureSettings;
+import com.android.systemui.util.settings.SettingObserver;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: CPUInfo overlay **/
+public class CPUInfoTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "cpuinfo";
+
+    private final SettingObserver mSetting;
+    @Nullable
+    private Icon mIcon = null;
+
+    @Inject
+    public CPUInfoTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            SecureSettings secureSettings) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mSetting = new SettingObserver(secureSettings, mHandler, Secure.SHOW_CPU_OVERLAY, getHost().getUserId()) {
+            @Override
+            protected void handleValueChanged(int value, boolean observedChange) {
+                handleRefreshState(value);
+            }
+        };
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        BooleanState state = new BooleanState();
+        state.handlesLongClick = false;
+        return state;
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        mSetting.setValue(mState.value ? 0 : 1);
+        refreshState();
+        toggleState();
+    }
+
+    protected void toggleState() {
+        Intent service = (new Intent())
+                .setClassName("com.android.systemui",
+                "com.android.systemui.CPUInfoService");
+        if (mSetting.getValue() == 0) {
+            mContext.stopService(service);
+        } else {
+            mContext.startService(service);
+        }
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return null;
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        if (mSetting == null) return;
+        final int value = arg instanceof Integer ? (Integer)arg : mSetting.getValue();
+        final boolean cpuInfoEnabled = value != 0;
+        state.value = cpuInfoEnabled;
+        state.label = mContext.getString(R.string.quick_settings_cpuinfo_label);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_cpu_info);
+        }
+        state.icon = mIcon;
+        state.contentDescription =  mContext.getString(
+                R.string.quick_settings_cpuinfo_label);
+        if (cpuInfoEnabled) {
+            state.state = Tile.STATE_ACTIVE;
+        } else {
+            state.state = Tile.STATE_INACTIVE;
+        }
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_cpuinfo_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        // Do nothing
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
index a8e49637586bd..1606a1d69152f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
@@ -76,6 +76,9 @@ public class CastTile extends QSTileImpl<BooleanState> {
 
     private static final String INTERACTION_JANK_TAG = TILE_SPEC;
 
+    private static final Intent CAST_SETTINGS =
+            new Intent(Settings.ACTION_CAST_SETTINGS);
+
     private final CastController mController;
     private final KeyguardStateController mKeyguard;
     private final DialogTransitionAnimator mDialogTransitionAnimator;
@@ -127,7 +130,6 @@ public CastTile(
     @Override
     public BooleanState newTileState() {
         BooleanState state = new BooleanState();
-        state.handlesLongClick = false;
         return state;
     }
 
@@ -148,12 +150,7 @@ protected void handleUserSwitch(int newUserId) {
 
     @Override
     public Intent getLongClickIntent() {
-        return new Intent(Settings.ACTION_CAST_SETTINGS);
-    }
-
-    @Override
-    protected void handleLongClick(@Nullable Expandable expandable) {
-        handleClick(expandable);
+        return CAST_SETTINGS;
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java
new file mode 100644
index 0000000000000..edf7703ab565f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2019-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+
+import javax.inject.Inject;
+
+public class CompassTile extends QSTileImpl<BooleanState> implements SensorEventListener {
+
+    public static final String TILE_SPEC = "compass";
+
+    private final static float ALPHA = 0.97f;
+
+    private boolean mActive = false;
+
+    private SensorManager mSensorManager;
+    private Sensor mAccelerationSensor;
+    private Sensor mGeomagneticFieldSensor;
+
+    private float[] mAcceleration;
+    private float[] mGeomagnetic;
+
+    private boolean mListeningSensors;
+
+    @Inject
+    public CompassTile(QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+        mAccelerationSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        mGeomagneticFieldSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        BooleanState state = new BooleanState();
+        state.handlesLongClick = false;
+        return state;
+    }
+
+    @Override
+    protected void handleDestroy() {
+        super.handleDestroy();
+        setListeningSensors(false);
+        mSensorManager = null;
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        mActive = !mActive;
+        refreshState();
+        setListeningSensors(mActive);
+    }
+
+    @Override
+    public void handleLongClick(@Nullable Expandable expandable) {
+        handleClick(expandable);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return null;
+    }
+
+    private void setListeningSensors(boolean listening) {
+        if (listening == mListeningSensors) return;
+        mListeningSensors = listening;
+        if (mListeningSensors) {
+            mSensorManager.registerListener(
+                    this, mAccelerationSensor, SensorManager.SENSOR_DELAY_GAME);
+            mSensorManager.registerListener(
+                    this, mGeomagneticFieldSensor, SensorManager.SENSOR_DELAY_GAME);
+        } else {
+            mSensorManager.unregisterListener(this);
+        }
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_compass_label);
+    }
+
+    private Drawable rotateDrawable(Drawable drawable, float degrees) {
+        // Convert drawable to bitmap
+        Bitmap bitmap = drawableToBitmap(drawable);
+
+        // Create matrix for rotation
+        Matrix matrix = new Matrix();
+        matrix.postRotate(degrees);
+
+        // Create rotated bitmap
+        Bitmap rotatedBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+
+        // Convert rotated bitmap back to drawable
+        return new BitmapDrawable(mContext.getResources(), rotatedBitmap);
+    }
+
+    private Bitmap drawableToBitmap(Drawable drawable) {
+        if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getBitmap();
+        }
+
+        // If the drawable is not a BitmapDrawable, create a new bitmap and draw the drawable on a canvas
+        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        final Float degrees = arg == null ? 0 : (Float) arg;
+
+        state.value = mActive;
+
+        if (state.value) {
+            state.state = Tile.STATE_ACTIVE;
+            if (arg != null) {
+                state.label = formatValueWithCardinalDirection(degrees);
+            } else {
+                state.label = mContext.getString(R.string.quick_settings_compass_init);
+            }
+        } else {
+            state.label = mContext.getString(R.string.quick_settings_compass_label);
+            state.state = Tile.STATE_INACTIVE;
+        }
+        state.icon = new DrawableIcon(rotateDrawable(
+                mContext.getResources().getDrawable(R.drawable.ic_qs_compass), degrees));
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mSensorManager != null && mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null
+                && mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD) != null;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (!listening) {
+            setListeningSensors(false);
+            mActive = false;
+        }
+    }
+
+    private String formatValueWithCardinalDirection(float degree) {
+        int cardinalDirectionIndex = (int) (Math.floor(((degree - 22.5) % 360) / 45) + 1) % 8;
+        String[] cardinalDirections = mContext.getResources().getStringArray(
+                R.array.cardinal_directions);
+
+        return mContext.getString(R.string.quick_settings_compass_value, degree,
+                cardinalDirections[cardinalDirectionIndex]);
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        float[] values;
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            if (mAcceleration == null) {
+                mAcceleration = event.values.clone();
+            }
+
+            values = mAcceleration;
+        } else {
+            // Magnetic field sensor
+            if (mGeomagnetic == null) {
+                mGeomagnetic = event.values.clone();
+            }
+
+            values = mGeomagnetic;
+        }
+
+        for (int i = 0; i < 3; i++) {
+            values[i] = ALPHA * values[i] + (1 - ALPHA) * event.values[i];
+        }
+
+        if (!mActive || !mListeningSensors || mAcceleration == null || mGeomagnetic == null) {
+            // Nothing to do at this moment
+            return;
+        }
+
+        float R[] = new float[9];
+        float I[] = new float[9];
+        if (!SensorManager.getRotationMatrix(R, I, mAcceleration, mGeomagnetic)) {
+            // Rotation matrix couldn't be calculated
+            return;
+        }
+
+        // Get the current orientation
+        float[] orientation = new float[3];
+        SensorManager.getOrientation(R, orientation);
+
+        // Convert azimuth to degrees
+        Float newDegree = Float.valueOf((float) Math.toDegrees(orientation[0]));
+        newDegree = (newDegree + 360) % 360;
+
+        // Convert the angle to one that points north relative to the device
+        newDegree = -newDegree + 360;
+
+        refreshState(newDegree);
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // noop
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSwitchTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSwitchTile.java
new file mode 100644
index 0000000000000..32a0bc7aafdac
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSwitchTile.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2020-2026 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.qs.tiles;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon;
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class DataSwitchTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "dataswitch";
+
+    private boolean mCanSwitch = true;
+    private boolean mRegistered = false;
+    private int mSimCount = 0;
+    BroadcastReceiver mSimReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "mSimReceiver:onReceive");
+            refreshState();
+        }
+    };
+    private final MyCallStateListener mPhoneStateListener;
+    private final SubscriptionManager mSubscriptionManager;
+    private final TelephonyManager mTelephonyManager;
+    private final PanelInteractor mPanelInteractor;
+
+    class MyCallStateListener extends PhoneStateListener {
+        MyCallStateListener() {
+        }
+
+        public void onCallStateChanged(int state, String arg1) {
+            mCanSwitch = mTelephonyManager.getCallState() == 0;
+            refreshState();
+        }
+    }
+
+    @Inject
+    public DataSwitchTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            PanelInteractor panelInteractor
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mSubscriptionManager = SubscriptionManager.from(host.getContext());
+        mTelephonyManager = TelephonyManager.from(host.getContext());
+        mPhoneStateListener = new MyCallStateListener();
+        mPanelInteractor = panelInteractor;
+    }
+
+    public static boolean isVoiceCapable(Context context) {
+        TelephonyManager telephony =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return telephony != null && telephony.isVoiceCapable();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (!isVoiceCapable(mContext)) return false;
+        int count = TelephonyManager.getDefault().getPhoneCount();
+        Log.d(TAG, "phoneCount: " + count);
+        return count >= 2;
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (listening) {
+            if (!mRegistered) {
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
+                mContext.registerReceiver(mSimReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+                mRegistered = true;
+            }
+            refreshState();
+        } else if (mRegistered) {
+            mContext.unregisterReceiver(mSimReceiver);
+            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+            mRegistered = false;
+        }
+    }
+
+    private void updateSimCount() {
+        String simState = SystemProperties.get("gsm.sim.state");
+        Log.d(TAG, "DataSwitchTile:updateSimCount:simState=" + simState);
+        mSimCount = 0;
+        try {
+            String[] sims = TextUtils.split(simState, ",");
+            for (String sim : sims) {
+                if (!sim.isEmpty()
+                        && !sim.equalsIgnoreCase(IccCardConstants.INTENT_VALUE_ICC_ABSENT)
+                        && !sim.equalsIgnoreCase(IccCardConstants.INTENT_VALUE_ICC_NOT_READY)) {
+                    mSimCount++;
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error to parse sim state");
+        }
+        Log.d(TAG, "DataSwitchTile:updateSimCount:mSimCount=" + mSimCount);
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        if (!mCanSwitch) {
+            Log.d(TAG, "Call state=" + mTelephonyManager.getCallState());
+        } else if (mSimCount == 0) {
+            Log.d(TAG, "handleClick:no sim card");
+        } else if (mSimCount == 1) {
+            Log.d(TAG, "handleClick:only one sim card");
+        } else {
+            AsyncTask.execute(() -> {
+                toggleMobileDataEnabled();
+                refreshState();
+            });
+            mPanelInteractor.collapsePanels();
+        }
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS);
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.qs_data_switch_label);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        boolean activeSIMZero;
+        if (arg == null) {
+            int defaultPhoneId = mSubscriptionManager.getPhoneId(
+                        mSubscriptionManager.getDefaultDataSubscriptionId());
+            Log.d(TAG, "default data phone id=" + defaultPhoneId);
+            activeSIMZero = defaultPhoneId == 0;
+        } else {
+            activeSIMZero = (Boolean) arg;
+        }
+        updateSimCount();
+        switch (mSimCount) {
+            case 0:
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_data_switch_0);
+                state.value = false;
+                state.secondaryLabel = mContext.getString(R.string.tile_unavailable);
+                break;
+            case 1:
+                state.icon = maybeLoadResourceIcon(activeSIMZero
+                        ? R.drawable.ic_qs_data_switch_1
+                        : R.drawable.ic_qs_data_switch_2);
+                state.value = false;
+                state.secondaryLabel = mContext.getString(R.string.tile_unavailable);
+                break;
+            case 2:
+                state.icon = maybeLoadResourceIcon(activeSIMZero
+                        ? R.drawable.ic_qs_data_switch_1
+                        : R.drawable.ic_qs_data_switch_2);
+                state.value = true;
+                state.secondaryLabel = getActiveSlotName();
+                break;
+            default:
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_data_switch_1);
+                state.value = false;
+                state.secondaryLabel = mContext.getString(R.string.tile_unavailable);
+                break;
+        }
+        if (mSimCount < 2) {
+            state.state = 0;
+        } else if (!mCanSwitch) {
+            state.state = 0;
+            Log.d(TAG, "call state isn't idle, set to unavailable.");
+        } else {
+            state.state = state.value ? 2 : 1;
+        }
+
+        state.label = mContext.getString(R.string.qs_data_switch_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    /**
+     * Set whether to enable data for {@code subId}, also whether to disable data for other
+     * subscription
+     */
+    private void toggleMobileDataEnabled() {
+        TelephonyManager telephonyManager;
+        boolean dataEnabled = false;
+        boolean foundActive = false;
+        int subId;
+        List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList(true);
+        if (subInfoList != null) {
+            for (SubscriptionInfo subInfo : subInfoList) {
+                subId = subInfo.getSubscriptionId();
+                telephonyManager =
+                    mTelephonyManager.createForSubscriptionId(subId);
+                dataEnabled = telephonyManager.getDataEnabled();
+                if (subInfo.isOpportunistic() && dataEnabled) {
+                    // We never disable mobile data for opportunistic subscriptions.
+                    continue;
+                } else {
+                    dataEnabled = !dataEnabled && !foundActive;
+                    telephonyManager.setDataEnabled(dataEnabled);
+                    if (dataEnabled) mSubscriptionManager.setDefaultDataSubId(subId);
+                    // Indicate we found sim with active data, disable data on remaining sim.
+                    if (!foundActive) foundActive = dataEnabled;
+                }
+                Log.d(TAG, "Changed subID " + subId + " to "
+                    + !dataEnabled);
+            }
+        }
+    }
+
+    private String getActiveSlotName() {
+        TelephonyManager telephonyManager;
+        String mInitialState = mContext.getString(R.string.tile_unavailable);
+        List<SubscriptionInfo> subInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList(true);
+        if (subInfoList != null) {
+            for (SubscriptionInfo subInfo : subInfoList) {
+                telephonyManager =
+                        mTelephonyManager.createForSubscriptionId(subInfo.getSubscriptionId());
+                if (telephonyManager.getDataEnabled()) {
+                    // Active SIM found
+                    return subInfo.getDisplayName().toString();
+                }
+            }
+        }
+        return mInitialState;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DnsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DnsTile.java
new file mode 100644
index 0000000000000..daa003eecff68
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DnsTile.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2024 Yet Another AOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import static android.net.ConnectivitySettingsManager.PRIVATE_DNS_MODE_OFF;
+import static android.net.ConnectivitySettingsManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+
+import android.content.Intent;
+import android.net.ConnectivitySettingsManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.widget.Switch;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.Prefs;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.res.R;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.util.settings.GlobalSettings;
+import com.android.systemui.util.settings.SettingObserver;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: DNS Tile **/
+public class DnsTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "dns";
+    private static final String KEY_PREV_MODE = "dns_tile_prev_mode";
+
+    private final SettingObserver mSetting;
+    private boolean mListening;
+    @Nullable
+    private Icon mIcon = null;
+
+    @Inject
+    public DnsTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            GlobalSettings globalSettings) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mSetting = new SettingObserver(globalSettings, mHandler, Settings.Global.PRIVATE_DNS_MODE) {
+            @Override
+            protected void handleValueChanged(int value, boolean observedChange) {
+                handleRefreshState(value);
+            }
+        };
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        super.handleSetListening(listening);
+        if (mListening == listening) return;
+        mListening = listening;
+        if (listening) {
+            refreshState();
+        }
+        mSetting.setListening(listening);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return new Intent(Settings.ACTION_PRIVATE_DNS_SETTING);
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        // don't toggle if not needed, just refresh state instead
+        final int mode = ConnectivitySettingsManager.getPrivateDnsMode(mContext);
+        final boolean stateEnabled = mState.value;
+        final boolean isEnabled = mode != PRIVATE_DNS_MODE_OFF;
+        if (stateEnabled && !isEnabled || !stateEnabled && isEnabled) {
+            refreshState();
+            return;
+        }
+
+        setPrivateDnsEnabled(!stateEnabled);
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(
+                com.android.settingslib.R.string.select_private_dns_configuration_title);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        state.label = mContext.getString(
+                com.android.settingslib.R.string.select_private_dns_configuration_title);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_settings_dns);
+        }
+        state.icon = mIcon;
+        state.expandedAccessibilityClassName = Switch.class.getName();
+        state.contentDescription = state.label;
+
+        final int mode = ConnectivitySettingsManager.getPrivateDnsMode(mContext);
+        final boolean isTileActive = mode != PRIVATE_DNS_MODE_OFF;
+        state.value = isTileActive;
+        state.state = isTileActive ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+        state.secondaryLabel = getSecondaryLabel(mode);
+        state.stateDescription = state.secondaryLabel;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    private String getSecondaryLabel(int mode) {
+        if (mode == PRIVATE_DNS_MODE_OFF) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.private_dns_mode_off);
+        } else if (mode == PRIVATE_DNS_MODE_OPPORTUNISTIC) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.private_dns_mode_opportunistic);
+        }
+        // PRIVATE_DNS_MODE_PROVIDER_HOSTNAME
+        return ConnectivitySettingsManager.getPrivateDnsHostname(mContext);
+    }
+
+    private void setPrivateDnsEnabled(boolean enabled) {
+        if (!enabled) {
+            // save current mode for returning
+            // double check it is not off!
+            final int mode = ConnectivitySettingsManager.getPrivateDnsMode(mContext);
+            if (mode == PRIVATE_DNS_MODE_OFF) return;
+            Prefs.putInt(mContext, KEY_PREV_MODE, mode);
+            ConnectivitySettingsManager.setPrivateDnsMode(mContext, PRIVATE_DNS_MODE_OFF);
+            return;
+        }
+        // return to the last state
+        int mode = Prefs.getInt(mContext, KEY_PREV_MODE, PRIVATE_DNS_MODE_OPPORTUNISTIC);
+        // never toggle off to off - use opportunistic
+        if (mode == PRIVATE_DNS_MODE_OFF) mode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
+        ConnectivitySettingsManager.setPrivateDnsMode(mContext, mode);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FPSInfoTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FPSInfoTile.java
new file mode 100644
index 0000000000000..74aec7ef8b8f9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FPSInfoTile.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2019 The OmniROM Project
+ *           (C) 2017-2025 crDroidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.provider.Settings.Secure;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+import com.android.systemui.util.settings.SecureSettings;
+import com.android.systemui.util.settings.SettingObserver;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import java.io.File;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: FPSInfo overlay **/
+public class FPSInfoTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "fpsinfo";
+
+    private final SettingObserver mSetting;
+    private final boolean isAvailable;
+    @Nullable
+    private Icon mIcon = null;
+
+    @Inject
+    public FPSInfoTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            SecureSettings secureSettings) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        final String fpsInfoSysNode = mContext.getResources().getString(
+                R.string.config_fpsInfoSysNode);
+
+        File file = new File(fpsInfoSysNode);
+        isAvailable = fpsInfoSysNode != null && file.exists() && file.canRead();
+
+        mSetting = new SettingObserver(secureSettings, mHandler, Secure.SHOW_FPS_OVERLAY, getHost().getUserId()) {
+            @Override
+            protected void handleValueChanged(int value, boolean observedChange) {
+                handleRefreshState(value);
+            }
+        };
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        BooleanState state = new BooleanState();
+        state.handlesLongClick = false;
+        return state;
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        mSetting.setValue(mState.value ? 0 : 1);
+        refreshState();
+        toggleState();
+    }
+
+    protected void toggleState() {
+        Intent service = (new Intent())
+                .setClassName("com.android.systemui",
+                "com.android.systemui.FPSInfoService");
+        if (mSetting.getValue() == 0) {
+            mContext.stopService(service);
+        } else {
+            mContext.startService(service);
+        }
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return null;
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        if (mSetting == null) return;
+        final int value = arg instanceof Integer ? (Integer)arg : mSetting.getValue();
+        final boolean fpsInfoEnabled = value != 0;
+        state.value = fpsInfoEnabled;
+        state.label = mContext.getString(R.string.quick_settings_fpsinfo_label);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_fps_info);
+        }
+        state.icon = mIcon;
+        state.contentDescription =  mContext.getString(
+                R.string.quick_settings_fpsinfo_label);
+        if (fpsInfoEnabled) {
+            state.state = Tile.STATE_ACTIVE;
+        } else {
+            state.state = Tile.STATE_INACTIVE;
+        }
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_fpsinfo_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        // Do nothing
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return isAvailable;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGCoreStartable.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGCoreStartable.kt
new file mode 100644
index 0000000000000..782703775516a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGCoreStartable.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles
+
+import android.telephony.SubscriptionManager
+import com.android.systemui.CoreStartable
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Background
+import java.util.concurrent.Executor
+import javax.inject.Inject
+
+@SysUISingleton
+class FiveGCoreStartable @Inject constructor(
+    private val fiveGUtils: AxFiveGUtils,
+    private val subscriptionManager: SubscriptionManager,
+    @Background private val bgExecutor: Executor,
+) : CoreStartable {
+
+    private val subscriptionsChangedListener =
+        object : SubscriptionManager.OnSubscriptionsChangedListener() {
+            override fun onSubscriptionsChanged() {
+                bgExecutor.execute { fiveGUtils.restoreNrState() }
+            }
+        }
+
+    override fun start() {
+        subscriptionManager.addOnSubscriptionsChangedListener(bgExecutor, subscriptionsChangedListener)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGTile.kt
new file mode 100644
index 0000000000000..649513a722e22
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FiveGTile.kt
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles
+
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.service.quicksettings.Tile
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyCallback
+import android.telephony.TelephonyManager
+import android.util.Log
+import android.widget.Switch
+import com.android.internal.logging.MetricsLogger
+import com.android.systemui.animation.Expandable
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.plugins.FalsingManager
+import com.android.systemui.plugins.qs.QSTile
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.qs.QSHost
+import com.android.systemui.qs.QsEventLogger
+import com.android.systemui.qs.logging.QSLogger
+import com.android.systemui.qs.tileimpl.QSTileImpl
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.connectivity.IconState
+import com.android.systemui.statusbar.connectivity.NetworkController
+import com.android.systemui.statusbar.connectivity.SignalCallback
+import com.android.systemui.statusbar.policy.BatteryController
+import java.util.concurrent.Executor
+import javax.inject.Inject
+
+class FiveGTile @Inject constructor(
+    host: QSHost,
+    uiEventLogger: QsEventLogger,
+    @Background backgroundLooper: Looper,
+    @Main mainHandler: Handler,
+    falsingManager: FalsingManager,
+    metricsLogger: MetricsLogger,
+    private val statusBarStateController: StatusBarStateController,
+    activityStarter: ActivityStarter,
+    private val qsLogger: QSLogger,
+    private val fiveGUtils: AxFiveGUtils,
+    @Background private val bgExecutor: Executor,
+    batteryController: BatteryController,
+    networkController: NetworkController,
+) : QSTileImpl<QSTile.BooleanState>(
+    host,
+    uiEventLogger,
+    backgroundLooper,
+    mainHandler,
+    falsingManager,
+    metricsLogger,
+    statusBarStateController,
+    activityStarter,
+    qsLogger,
+) {
+
+    private var airplaneMode = false
+    private var activeCallback: FiveGCallback? = null
+    private var trackedSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+
+    private val signalCallback = object : SignalCallback {
+        override fun setIsAirplaneMode(icon: IconState) {
+            val was = airplaneMode
+            airplaneMode = icon.visible
+            if (was != airplaneMode) refreshState()
+        }
+
+        override fun setNoSims(show: Boolean, simDetected: Boolean) {
+            refreshState()
+        }
+    }
+
+    private val subscriptionsChangedListener =
+        object : SubscriptionManager.OnSubscriptionsChangedListener() {
+            override fun onSubscriptionsChanged() {
+                updateTelephonyCallback()
+                refreshState()
+            }
+        }
+
+    private inner class FiveGCallback :
+        TelephonyCallback(), TelephonyCallback.AllowedNetworkTypesListener {
+        override fun onAllowedNetworkTypesChanged(reason: Int, allowedNetworkType: Long) {
+            refreshState()
+        }
+    }
+
+    init {
+        networkController.observe(lifecycle, signalCallback)
+        batteryController.observe(
+            lifecycle,
+            object : BatteryController.BatteryStateChangeCallback {
+                override fun onPowerSaveChanged(isPowerSave: Boolean) {
+                    mHandler.postDelayed({ refreshState() }, POWER_SAVE_DELAY)
+                }
+            },
+        )
+    }
+
+    override fun newTileState() = QSTile.BooleanState()
+
+    override fun handleClick(expandable: Expandable?) {
+        if (mState.state == Tile.STATE_UNAVAILABLE) return
+        val enable = !mState.value
+        qsLogger.logTileClick(tileSpec, statusBarStateController.state, mState.state, mState.state)
+        bgExecutor.execute {
+            try {
+                fiveGUtils.setNrEnabled(enable)
+            } catch (e: Exception) {
+                Log.e(TAG_5G, "Error handling click", e)
+            }
+            refreshState()
+        }
+    }
+
+    override fun handleUpdateState(state: QSTile.BooleanState, arg: Any?) {
+        state.label = mContext.getString(R.string.quick_settings_5g_label)
+        state.icon = ResourceIcon.get(R.drawable.ic_5g_toggle)
+        if (airplaneMode) {
+            state.value = false
+            state.state = Tile.STATE_UNAVAILABLE
+        } else if (!fiveGUtils.isNrAvailable()) {
+            state.value = false
+            state.state = Tile.STATE_UNAVAILABLE
+        } else {
+            state.value = fiveGUtils.isNrEnabled()
+            state.state = if (state.value) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
+        }
+        state.contentDescription = state.label
+        state.expandedAccessibilityClassName = Switch::class.java.name
+    }
+
+    override fun isAvailable() = fiveGUtils.modemSupportsNr()
+
+    override fun getLongClickIntent(): Intent {
+        if (mState.state == Tile.STATE_UNAVAILABLE) {
+            return Intent(Settings.ACTION_WIRELESS_SETTINGS)
+        }
+        val intent = Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS)
+        val subId = SubscriptionManager.getDefaultDataSubscriptionId()
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            intent.putExtra(Settings.EXTRA_SUB_ID, subId)
+        }
+        return intent
+    }
+
+    override fun getTileLabel(): CharSequence =
+        mContext.getString(R.string.quick_settings_5g_editor_label)
+
+    override fun getMetricsCategory() = 0
+
+    override fun handleSetListening(listening: Boolean) {
+        super.handleSetListening(listening)
+        if (listening) {
+            mContext.getSystemService(SubscriptionManager::class.java)
+                ?.addOnSubscriptionsChangedListener(bgExecutor, subscriptionsChangedListener)
+            updateTelephonyCallback()
+        } else {
+            mContext.getSystemService(SubscriptionManager::class.java)
+                ?.removeOnSubscriptionsChangedListener(subscriptionsChangedListener)
+            clearTelephonyCallback()
+        }
+    }
+
+    private fun updateTelephonyCallback() {
+        bgExecutor.execute {
+            val subId = fiveGUtils.getDefaultDataSubId()
+                ?: SubscriptionManager.INVALID_SUBSCRIPTION_ID
+            if (subId == trackedSubId) return@execute
+            clearTelephonyCallbackInternal()
+            trackedSubId = subId
+            if (SubscriptionManager.isValidSubscriptionId(subId)) {
+                val callback = FiveGCallback()
+                activeCallback = callback
+                fiveGUtils.createForSubscriptionId(subId)
+                    .registerTelephonyCallback(bgExecutor, callback)
+            }
+        }
+    }
+
+    private fun clearTelephonyCallback() {
+        bgExecutor.execute { clearTelephonyCallbackInternal() }
+    }
+
+    private fun clearTelephonyCallbackInternal() {
+        activeCallback?.let { cb ->
+            if (SubscriptionManager.isValidSubscriptionId(trackedSubId)) {
+                fiveGUtils.createForSubscriptionId(trackedSubId)
+                    .unregisterTelephonyCallback(cb)
+            }
+        }
+        activeCallback = null
+        trackedSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+    }
+
+    companion object {
+        private const val TAG_5G = "FiveGTile"
+        private const val POWER_SAVE_DELAY = 350L
+        const val TILE_SPEC = "five_g"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
index 2b127d60b2be4..454c6768f8a83 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
@@ -26,8 +26,11 @@
 
 import androidx.annotation.Nullable;
 
+import com.android.internal.jank.InteractionJankMonitor;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.DialogCuj;
+import com.android.systemui.animation.DialogTransitionAnimator;
 import com.android.systemui.animation.Expandable;
 import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.dagger.qualifiers.Main;
@@ -38,11 +41,14 @@
 import com.android.systemui.qs.QSHost;
 import com.android.systemui.qs.QsEventLogger;
 import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tiles.dialog.FlashlightDialogDelegate;
 import com.android.systemui.qs.tileimpl.QSTileImpl;
 import com.android.systemui.res.R;
+import com.android.systemui.statusbar.phone.SystemUIDialog;
 import com.android.systemui.statusbar.policy.FlashlightController;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 
 /**
  * Quick settings tile: Control flashlight
@@ -51,8 +57,15 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements
         FlashlightController.FlashlightListener {
 
     public static final String TILE_SPEC = "flashlight";
+    private static final String FLASHLIGHT_BRIGHTNESS_SETTING = "flashlight_brightness";
+    private static final String INTERACTION_JANK_TAG = "flashlight_strength";
+
     private final FlashlightController mFlashlightController;
 
+    private final Handler mHandler;
+    private final Provider<FlashlightDialogDelegate> mFlashlightDialogProvider;
+    private final DialogTransitionAnimator mDialogTransitionAnimator;
+
     @Inject
     public FlashlightTile(
             QSHost host,
@@ -64,12 +77,17 @@ public FlashlightTile(
             StatusBarStateController statusBarStateController,
             ActivityStarter activityStarter,
             QSLogger qsLogger,
-            FlashlightController flashlightController
+            FlashlightController flashlightController,
+            Provider<FlashlightDialogDelegate> flashlightDialogDelegateProvider,
+            DialogTransitionAnimator dialogTransitionAnimator
     ) {
         super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
                 statusBarStateController, activityStarter, qsLogger);
+        mHandler = mainHandler;
         mFlashlightController = flashlightController;
         mFlashlightController.observe(getLifecycle(), this);
+        mFlashlightDialogProvider = flashlightDialogDelegateProvider;
+        mDialogTransitionAnimator = dialogTransitionAnimator;
     }
 
     @Override
@@ -80,7 +98,7 @@ protected void handleDestroy() {
     @Override
     public BooleanState newTileState() {
         BooleanState state = new BooleanState();
-        state.handlesLongClick = false;
+        state.handlesLongClick = true;
         return state;
     }
 
@@ -103,6 +121,40 @@ protected void handleClick(@Nullable Expandable expandable) {
         if (ActivityManager.isUserAMonkey()) {
             return;
         }
+
+        if (mFlashlightController.isStrengthControlSupported()) {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    SystemUIDialog dialog = mFlashlightDialogProvider.get().createDialog();
+                    if (expandable != null) {
+                        DialogTransitionAnimator.Controller controller =
+                                expandable.dialogTransitionController(
+                                        new DialogCuj(
+                                                InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
+                                                INTERACTION_JANK_TAG));
+                        if (controller != null) {
+                            mDialogTransitionAnimator.show(dialog, controller);
+                        } else {
+                            dialog.show();
+                        }
+                    } else {
+                        dialog.show();
+                    }
+                }
+            };
+
+            mHandler.post(runnable);
+        } else {
+            handleSecondaryClick(expandable);
+        }
+    }
+
+    @Override
+    protected void handleSecondaryClick(@Nullable Expandable expandable) {
+        if (ActivityManager.isUserAMonkey()) {
+            return;
+        }
         boolean newState = !mState.value;
         refreshState(newState);
         mFlashlightController.setFlashlight(newState);
@@ -123,6 +175,7 @@ protected void handleUpdateState(BooleanState state, Object arg) {
         state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label);
         state.secondaryLabel = "";
         state.stateDescription = "";
+        state.handlesSecondaryClick = mFlashlightController.isStrengthControlSupported();
         if (!mFlashlightController.isAvailable()) {
             state.secondaryLabel = mContext.getString(
                     R.string.quick_settings_flashlight_camera_in_use);
@@ -131,6 +184,15 @@ protected void handleUpdateState(BooleanState state, Object arg) {
             state.icon = maybeLoadResourceIcon(R.drawable.qs_flashlight_icon_off);
             return;
         }
+        if (mFlashlightController.isStrengthControlSupported()) {
+            boolean enabled = mFlashlightController.isEnabled();
+            float percent = mFlashlightController.getCurrentPercent();
+
+            if (enabled) {
+                state.secondaryLabel = Math.round(percent * 100f) + "%";
+                state.stateDescription = state.secondaryLabel;
+            }
+        }
         if (arg instanceof Boolean) {
             boolean value = (Boolean) arg;
             if (value == state.value) {
@@ -166,4 +228,9 @@ public void onFlashlightError() {
     public void onFlashlightAvailabilityChanged(boolean available) {
         refreshState();
     }
+
+    @Override
+    public void onFlashlightStrengthChanged(int level) {
+        refreshState();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt
index 85e56305d987e..70ea1d11b81fa 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt
@@ -21,6 +21,7 @@ import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
 import android.widget.Button
+import com.android.settingslib.net.DataUsageController
 import com.android.internal.logging.MetricsLogger
 import com.android.systemui.animation.Expandable
 import com.android.systemui.dagger.qualifiers.Background
@@ -36,8 +37,11 @@ import com.android.systemui.qs.logging.QSLogger
 import com.android.systemui.qs.tileimpl.QSTileImpl
 import com.android.systemui.qs.tiles.dialog.InternetDetailsViewModel
 import com.android.systemui.qs.tiles.dialog.InternetDialogManager
+import com.android.systemui.qs.tiles.dialog.WifiStateWorker
 import com.android.systemui.res.R
+import com.android.systemui.Prefs
 import com.android.systemui.statusbar.connectivity.AccessPointController
+import com.android.systemui.statusbar.connectivity.NetworkController
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.InternetTileBinder
 import com.android.systemui.statusbar.pipeline.shared.ui.model.InternetTileModel
 import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.InternetTileViewModel
@@ -59,6 +63,8 @@ constructor(
     private val internetDialogManager: InternetDialogManager,
     private val accessPointController: AccessPointController,
     private val internetDetailsViewModelFactory: InternetDetailsViewModel.Factory,
+    private val wifiStateWorker: WifiStateWorker,
+    private val networkController: NetworkController
 ) :
     QSTileImpl<QSTile.BooleanState>(
         host,
@@ -72,6 +78,25 @@ constructor(
         qsLogger,
     ) {
     private var model: InternetTileModel = viewModel.tileModel.value
+    private val dataUsageController: DataUsageController = networkController.mobileDataController
+    
+    private var dataEnabled: Boolean
+        get() = dataUsageController.isMobileDataEnabled()
+        set(value) {
+            dataUsageController.setMobileDataEnabled(value)
+        }
+
+    private var wifiEnabled: Boolean
+        get() = wifiStateWorker.isWifiEnabled()
+        set(value) {
+            wifiStateWorker.setWifiEnabled(value)
+        }
+
+    private var lastUsedModel: Int
+        get() = Prefs.getInt(mContext, "internet_tile_model", WIFI)
+        set(value) {
+            Prefs.putInt(mContext, "internet_tile_model", value)
+        }
 
     init {
         InternetTileBinder.bind(lifecycle, viewModel.tileModel) { newModel ->
@@ -84,7 +109,10 @@ constructor(
         mContext.getString(R.string.quick_settings_internet_label)
 
     override fun newTileState(): QSTile.BooleanState {
-        return QSTile.BooleanState().also { it.forceExpandIcon = true }
+        return QSTile.BooleanState().also {
+             it.forceExpandIcon = true
+             it.handlesSecondaryClick = true
+        }
     }
 
     override fun handleClick(expandable: Expandable?) {
@@ -98,6 +126,26 @@ constructor(
         }
     }
 
+    override fun handleSecondaryClick(expandable: Expandable?) {
+        when {
+            wifiEnabled -> {
+                wifiEnabled = false
+                lastUsedModel = WIFI
+            }
+            dataEnabled -> {
+                dataEnabled = false
+                lastUsedModel = DATA
+            }
+            else -> {
+                if (lastUsedModel == WIFI) {
+                    wifiEnabled = true
+                } else {
+                    dataEnabled = true
+                }
+            }
+        }
+    }
+
     override fun getDetailsViewModel(): TileDetailsViewModel {
         return internetDetailsViewModelFactory.create()
     }
@@ -115,5 +163,7 @@ constructor(
         const val TILE_SPEC: String = "internet"
 
         private val WIFI_SETTINGS = Intent(Settings.ACTION_WIFI_SETTINGS)
+        const val WIFI = 0
+        const val DATA = 1
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocaleTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocaleTile.java
new file mode 100644
index 0000000000000..100484eb7d67c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocaleTile.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2017 AICP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.LocaleList;
+import android.os.Looper;
+import android.service.quicksettings.Tile;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.app.LocalePicker;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile;
+import com.android.systemui.plugins.qs.QSTile.State;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: Locale **/
+public class LocaleTile extends QSTileImpl<State> {
+
+    public static final String TILE_SPEC = "locale";
+
+    private boolean mListening;
+
+    private LocaleList mLocaleList;
+
+    // If not null: update pending
+    private Locale currentLocaleBackup;
+
+    // Allow multiple clicks to find the desired locale without immediately applying
+    private static final int TOGGLE_DELAY = 800;
+
+    private final PanelInteractor mPanelInteractor;
+
+    @Inject
+    public LocaleTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            PanelInteractor panelInteractor
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mPanelInteractor = panelInteractor;
+        updateLocaleList();
+    }
+
+    @Override
+    public State newTileState() {
+        return new QSTile.State();
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        if (checkToggleDisabled()) return;
+        toggleLocale();
+    }
+
+    @Override
+    protected void handleSecondaryClick(@Nullable Expandable expandable) {
+        if (checkToggleDisabled()) return;
+        toggleLocale();
+    }
+
+    private void toggleLocale() {
+        if (currentLocaleBackup == null) {
+            currentLocaleBackup = mLocaleList.get(0);
+        }
+        Locale[] newLocales = new Locale[mLocaleList.size()];
+        for (int i = 0; i < newLocales.length; i++) {
+            newLocales[i] = mLocaleList.get((i+1)%newLocales.length);
+        }
+        mLocaleList = new LocaleList(newLocales);
+        mHandler.removeCallbacks(applyLocale);
+        mHandler.postDelayed(applyLocale, TOGGLE_DELAY);
+        refreshState();
+    }
+
+    private Runnable applyLocale = new Runnable() {
+        @Override
+        public void run() {
+            if (!mLocaleList.get(0).equals(currentLocaleBackup)) {
+                mPanelInteractor.collapsePanels();
+                LocalePicker.updateLocales(mLocaleList);
+            }
+            currentLocaleBackup = null;
+        }
+    };
+
+    @Override
+    public Intent getLongClickIntent() {
+        return new Intent().setComponent(new ComponentName(
+            "com.android.settings", "com.android.settings.LanguageSettings"));
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_locale_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    protected void handleUpdateState(State state, Object arg) {
+        state.icon = maybeLoadResourceIcon(
+                currentLocaleBackup == null || currentLocaleBackup.equals(mLocaleList.get(0)) ?
+                        R.drawable.ic_qs_locale :
+                        R.drawable.ic_qs_locale_pending);
+        state.label = mContext.getString(R.string.quick_settings_locale_label);
+        state.secondaryLabel = mLocaleList.get(0).getDisplayLanguage();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (mListening == listening) return;
+        mListening = listening;
+        if (listening) {
+            final IntentFilter filter = new IntentFilter();
+            filter.addAction(Intent.ACTION_LOCALE_CHANGED);
+            mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            mContext.unregisterReceiver(mReceiver);
+        }
+    }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {
+                updateLocaleList();
+                refreshState();
+            }
+        }
+    };
+
+    private void updateLocaleList() {
+        if (currentLocaleBackup != null) return;
+        mLocaleList = LocaleList.getAdjustedDefault();
+    }
+
+    private boolean checkToggleDisabled() {
+        updateLocaleList();
+        if (mLocaleList.size() <= 1) {
+            handleLongClick(null);
+            Toast.makeText(mContext,
+                    mContext.getString(R.string.quick_settings_locale_more_locales_toast),
+                    Toast.LENGTH_LONG).show();
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/MobileDataTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/MobileDataTile.kt
index 9126d5c50f021..65c67643bb4d7 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/MobileDataTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/MobileDataTile.kt
@@ -97,6 +97,10 @@ constructor(
         lifecycle.coroutineScope.launch { userActionInteractor.handleClick(expandable) }
     }
 
+    override fun handleSecondaryClick(expandable: Expandable?) {
+        userActionInteractor.handleSecondaryClick(expandable)
+    }
+
     override fun getLongClickIntent(): Intent = userActionInteractor.longClickIntent
 
     override fun handleUpdateState(state: QSTile.State?, arg: Any?) {
@@ -115,8 +119,13 @@ constructor(
                         DrawableIcon(signalDrawableInstance)
                     }
             label = tileState.label
+            secondaryLabel = tileState.secondaryLabel
             contentDescription = tileState.contentDescription
             expandedAccessibilityClassName = tileState.expandedAccessibilityClassName
+            handlesSecondaryClick =
+                tileState.supportedActions.contains(QSTileState.UserAction.TOGGLE_CLICK)
+            handlesLongClick =
+                tileState.supportedActions.contains(QSTileState.UserAction.LONG_CLICK)
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/OnTheGoTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/OnTheGoTile.java
new file mode 100644
index 0000000000000..0f802734191e0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/OnTheGoTile.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2019 Benzo Rom
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.crdroid.onthego.OnTheGoService;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.matrixx.OnTheGoUtils;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: Enable/Disable OnTheGo Mode **/
+public class OnTheGoTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "onthego";
+
+    @Nullable
+    private Icon mIcon = null;
+    private boolean mIsEnabled;
+
+    @Inject
+    public OnTheGoTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mIsEnabled = isOnTheGoEnabled();
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        BooleanState state = new BooleanState();
+        state.handlesLongClick = false;
+        return state;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        // nothing
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return null;
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        ComponentName cn = new ComponentName("com.android.systemui",
+                "com.android.systemui.crdroid.onthego.OnTheGoService");
+        Intent startIntent = new Intent();
+        startIntent.setComponent(cn);
+        if (isOnTheGoEnabled()) {
+            startIntent.setAction("stop");
+            mIsEnabled = false;
+        } else {
+            startIntent.setAction("start");
+            mIsEnabled = true;
+        }
+        mContext.startService(startIntent);
+        refreshState();
+    }
+
+    protected boolean isOnTheGoEnabled() {
+        String service = OnTheGoService.class.getName();
+        return OnTheGoUtils.isServiceRunning(mContext, service);
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.global_action_onthego);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        state.value = mIsEnabled && isOnTheGoEnabled();
+        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+        state.label = mContext.getString(R.string.global_action_onthego);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_onthego);
+        }
+        state.icon = mIcon;
+        state.contentDescription = state.label;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/PreferredNetworkTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/PreferredNetworkTile.java
new file mode 100644
index 0000000000000..625bc4ec55da9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/PreferredNetworkTile.java
@@ -0,0 +1,593 @@
+/*
+ * Copyright (C) 2022 Nameless-AOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.CDMA;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.EVDO;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.GSM;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.LTE;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.NR;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.RAF_TD_SCDMA;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.RAF_UNKNOWN;
+import static com.android.systemui.qs.tiles.PreferredNetworkTile.RadioConstants.WCDMA;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import com.android.systemui.res.R;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.State;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+
+import javax.inject.Inject;
+
+public class PreferredNetworkTile extends QSTileImpl<State> {
+
+    public static final String TILE_SPEC = "preferred_network";
+
+    @Nullable
+    private Icon mIcon = null;
+
+    private final TelephonyManager mTelephonyManager;
+
+    @Inject
+    public PreferredNetworkTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mTelephonyManager = TelephonyManager.from(host.getContext());
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public State newTileState() {
+        return new State();
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        final int mode = getPreferredNetworkMode();
+        final int newMode = TelephonyManagerConstants.getTargetMode(mode);
+        if (newMode == -1) return;
+        final int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        mTelephonyManager.createForSubscriptionId(subId).setAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
+                getRafFromNetworkType(newMode));
+        refreshState();
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS);
+        int dataSub = SubscriptionManager.getDefaultDataSubscriptionId();
+        if (dataSub != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            intent.putExtra(Settings.EXTRA_SUB_ID,
+                    SubscriptionManager.getDefaultDataSubscriptionId());
+        }
+        return intent;
+    }
+
+    @Override
+    protected void handleUpdateState(State state, Object arg) {
+        state.label = mContext.getResources().getString(R.string.qs_preferred_network_label);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_preferred_network);
+        }
+        state.icon = mIcon;
+        final int mode = getPreferredNetworkMode();
+        final int newMode = TelephonyManagerConstants.getTargetMode(mode);
+        state.state = newMode == -1 ? Tile.STATE_UNAVAILABLE : Tile.STATE_ACTIVE;
+        state.secondaryLabel = newMode == -1 ? mContext.getResources().getString(R.string.qs_preferred_network_unsupported)
+                : (TelephonyManagerConstants.is5gMode(mode) ?
+                mContext.getResources().getString(R.string.qs_preferred_network_nr)
+                : mContext.getResources().getString(R.string.qs_preferred_network_lte));
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.qs_preferred_network_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+    }
+
+    private int getPreferredNetworkMode() {
+        final int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        return getNetworkTypeFromRaf(
+                (int) mTelephonyManager.createForSubscriptionId(subId).getAllowedNetworkTypesForReason(
+                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
+    }
+
+    private static int getNetworkTypeFromRaf(int raf) {
+        raf = getAdjustedRaf(raf);
+
+        switch (raf) {
+            case (GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF;
+            case GSM:
+                return TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY;
+            case WCDMA:
+                return TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY;
+            case (CDMA | EVDO):
+                return TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO;
+            case (LTE | CDMA | EVDO):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
+            case (LTE | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
+            case (LTE | CDMA | EVDO | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
+            case LTE:
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY;
+            case (LTE | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA;
+            case CDMA:
+                return TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO;
+            case EVDO:
+                return TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA;
+            case (GSM | WCDMA | CDMA | EVDO):
+                return TelephonyManagerConstants.NETWORK_MODE_GLOBAL;
+            case RAF_TD_SCDMA:
+                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY;
+            case (RAF_TD_SCDMA | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA;
+            case (LTE | RAF_TD_SCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA;
+            case (RAF_TD_SCDMA | GSM):
+                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM;
+            case (LTE | RAF_TD_SCDMA | GSM):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
+            case (RAF_TD_SCDMA | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;
+            case (LTE | RAF_TD_SCDMA | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
+            case (LTE | RAF_TD_SCDMA | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
+            case (RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+            case (LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+            case (NR):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
+            case (NR | LTE):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
+            case (NR | LTE | CDMA | EVDO):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
+            case (NR | LTE | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
+            case (NR | LTE | CDMA | EVDO | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
+            case (NR | LTE | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA;
+            case (NR | LTE | RAF_TD_SCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA;
+            case (NR | LTE | RAF_TD_SCDMA | GSM):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
+            case (NR | LTE | RAF_TD_SCDMA | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
+            case (NR | LTE | RAF_TD_SCDMA | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
+            case (NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA):
+                return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+            default:
+                return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
+        }
+    }
+
+    private static long getRafFromNetworkType(int type) {
+        switch (type) {
+            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
+                return GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
+                return GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
+                return WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
+                return GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
+                return CDMA | EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+                return LTE | CDMA | EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
+                return LTE | GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                return LTE | CDMA | EVDO | GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
+                return LTE;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
+                return LTE | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
+                return CDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
+                return EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
+                return GSM | WCDMA | CDMA | EVDO;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
+                return RAF_TD_SCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
+                return RAF_TD_SCDMA | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
+                return LTE | RAF_TD_SCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
+                return RAF_TD_SCDMA | GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
+                return LTE | RAF_TD_SCDMA | GSM;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+                return RAF_TD_SCDMA | GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+                return LTE | RAF_TD_SCDMA | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+                return LTE | RAF_TD_SCDMA | GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                return RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
+            case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                return LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_ONLY):
+                return NR;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE):
+                return NR | LTE;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO):
+                return NR | LTE | CDMA | EVDO;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA):
+                return NR | LTE | GSM | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA):
+                return NR | LTE | CDMA | EVDO | GSM | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA):
+                return NR | LTE | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA):
+                return NR | LTE | RAF_TD_SCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM):
+                return NR | LTE | RAF_TD_SCDMA | GSM;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA):
+                return NR | LTE | RAF_TD_SCDMA | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA):
+                return NR | LTE | RAF_TD_SCDMA | GSM | WCDMA;
+            case (TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA):
+                return NR | LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA;
+            default:
+                return RAF_UNKNOWN;
+        }
+    }
+
+    private static int getAdjustedRaf(int raf) {
+        raf = ((GSM & raf) > 0) ? (GSM | raf) : raf;
+        raf = ((WCDMA & raf) > 0) ? (WCDMA | raf) : raf;
+        raf = ((CDMA & raf) > 0) ? (CDMA | raf) : raf;
+        raf = ((EVDO & raf) > 0) ? (EVDO | raf) : raf;
+        raf = ((LTE & raf) > 0) ? (LTE | raf) : raf;
+        raf = ((NR & raf) > 0) ? (NR | raf) : raf;
+        return raf;
+    }
+
+    static class TelephonyManagerConstants {
+
+        // Network modes are in turn copied from RILConstants
+        // with one difference: NETWORK_MODE_CDMA is named NETWORK_MODE_CDMA_EVDO
+
+        public static final int NETWORK_MODE_UNKNOWN = -1;
+
+        /**
+         * GSM, WCDMA (WCDMA preferred)
+         */
+        public static final int NETWORK_MODE_WCDMA_PREF = 0;
+
+        /**
+         * GSM only
+         */
+        public static final int NETWORK_MODE_GSM_ONLY = 1;
+
+        /**
+         * WCDMA only
+         */
+        public static final int NETWORK_MODE_WCDMA_ONLY = 2;
+
+        /**
+         * GSM, WCDMA (auto mode, according to PRL)
+         */
+        public static final int NETWORK_MODE_GSM_UMTS = 3;
+
+        /**
+         * CDMA and EvDo (auto mode, according to PRL)
+         * this is NETWORK_MODE_CDMA in RILConstants.java
+         */
+        public static final int NETWORK_MODE_CDMA_EVDO = 4;
+
+        /**
+         * CDMA only
+         */
+        public static final int NETWORK_MODE_CDMA_NO_EVDO = 5;
+
+        /**
+         * EvDo only
+         */
+        public static final int NETWORK_MODE_EVDO_NO_CDMA = 6;
+
+        /**
+         * GSM, WCDMA, CDMA, and EvDo (auto mode, according to PRL)
+         */
+        public static final int NETWORK_MODE_GLOBAL = 7;
+
+        /**
+         * LTE, CDMA and EvDo
+         */
+        public static final int NETWORK_MODE_LTE_CDMA_EVDO = 8;
+
+        /**
+         * LTE, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_GSM_WCDMA = 9;
+
+        /**
+         * LTE, CDMA, EvDo, GSM, and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10;
+
+        /**
+         * LTE only mode.
+         */
+        public static final int NETWORK_MODE_LTE_ONLY = 11;
+
+        /**
+         * LTE and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_WCDMA = 12;
+
+        /**
+         * TD-SCDMA only
+         */
+        public static final int NETWORK_MODE_TDSCDMA_ONLY = 13;
+
+        /**
+         * TD-SCDMA and WCDMA
+         */
+        public static final int NETWORK_MODE_TDSCDMA_WCDMA = 14;
+
+        /**
+         * LTE and TD-SCDMA
+         */
+        public static final int NETWORK_MODE_LTE_TDSCDMA = 15;
+
+        /**
+         * TD-SCDMA and GSM
+         */
+        public static final int NETWORK_MODE_TDSCDMA_GSM = 16;
+
+        /**
+         * TD-SCDMA, GSM and LTE
+         */
+        public static final int NETWORK_MODE_LTE_TDSCDMA_GSM = 17;
+
+        /**
+         * TD-SCDMA, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_TDSCDMA_GSM_WCDMA = 18;
+
+        /**
+         * LTE, TD-SCDMA and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_TDSCDMA_WCDMA = 19;
+
+        /**
+         * LTE, TD-SCDMA, GSM, and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20;
+
+        /**
+         * TD-SCDMA, CDMA, EVDO, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21;
+
+        /**
+         * LTE, TDCSDMA, CDMA, EVDO, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22;
+
+        /**
+         * NR 5G only mode
+         */
+        public static final int NETWORK_MODE_NR_ONLY = 23;
+
+        /**
+         * NR 5G, LTE
+         */
+        public static final int NETWORK_MODE_NR_LTE = 24;
+
+        /**
+         * NR 5G, LTE, CDMA and EvDo
+         */
+        public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO = 25;
+
+        /**
+         * NR 5G, LTE, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_GSM_WCDMA = 26;
+
+        /**
+         * NR 5G, LTE, CDMA, EvDo, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = 27;
+
+        /**
+         * NR 5G, LTE and WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_WCDMA = 28;
+
+        /**
+         * NR 5G, LTE and TDSCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_TDSCDMA = 29;
+
+        /**
+         * NR 5G, LTE, TD-SCDMA and GSM
+         */
+        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM = 30;
+
+        /**
+         * NR 5G, LTE, TD-SCDMA, WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA = 31;
+
+        /**
+         * NR 5G, LTE, TD-SCDMA, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = 32;
+
+        /**
+         * NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA
+         */
+        public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;
+
+        public static int getTargetMode(int mode) {
+            switch (mode) {
+                case NETWORK_MODE_LTE_CDMA_EVDO:
+                    return NETWORK_MODE_NR_LTE_CDMA_EVDO;
+                case NETWORK_MODE_LTE_GSM_WCDMA:
+                    return NETWORK_MODE_NR_LTE_GSM_WCDMA;
+                case NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                    return NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
+                case NETWORK_MODE_LTE_ONLY:
+                    return NETWORK_MODE_NR_LTE;
+                case NETWORK_MODE_LTE_WCDMA:
+                    return NETWORK_MODE_NR_LTE_WCDMA;
+                case NETWORK_MODE_LTE_TDSCDMA:
+                    return NETWORK_MODE_NR_LTE_TDSCDMA;
+                case NETWORK_MODE_LTE_TDSCDMA_GSM:
+                    return NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
+                case NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+                    return NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
+                case NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+                    return NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
+                case NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                    return NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+                case NETWORK_MODE_NR_ONLY:
+                    return NETWORK_MODE_LTE_ONLY;
+                case NETWORK_MODE_NR_LTE:
+                    return NETWORK_MODE_LTE_ONLY;
+                case NETWORK_MODE_NR_LTE_CDMA_EVDO:
+                    return NETWORK_MODE_LTE_CDMA_EVDO;
+                case NETWORK_MODE_NR_LTE_GSM_WCDMA:
+                    return NETWORK_MODE_LTE_GSM_WCDMA;
+                case NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
+                    return NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
+                case NETWORK_MODE_NR_LTE_WCDMA:
+                    return NETWORK_MODE_LTE_WCDMA;
+                case NETWORK_MODE_NR_LTE_TDSCDMA:
+                    return NETWORK_MODE_LTE_TDSCDMA;
+                case NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
+                    return NETWORK_MODE_LTE_TDSCDMA_GSM;
+                case NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
+                    return NETWORK_MODE_LTE_TDSCDMA_WCDMA;
+                case NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
+                    return NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
+                case NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                    return NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+                default:
+                    return -1;
+            }
+        }
+
+        public static boolean is5gMode(int mode) {
+            return mode == NETWORK_MODE_NR_ONLY ||
+                    mode == NETWORK_MODE_NR_LTE ||
+                    mode == NETWORK_MODE_NR_LTE_CDMA_EVDO ||
+                    mode == NETWORK_MODE_NR_LTE_GSM_WCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_WCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_TDSCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_TDSCDMA_GSM ||
+                    mode == NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA ||
+                    mode == NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+        }
+    }
+
+    static class RadioConstants {
+        // 2G
+        public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
+        public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
+        public static final int RAF_GPRS = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GPRS;
+        public static final int RAF_EDGE = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
+        public static final int RAF_IS95A = (int) TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+        public static final int RAF_IS95B = (int) TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+        public static final int RAF_1xRTT = (int) TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
+        // 3G
+        public static final int RAF_EVDO_0 = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0;
+        public static final int RAF_EVDO_A = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A;
+        public static final int RAF_EVDO_B = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B;
+        public static final int RAF_EHRPD = (int) TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
+        public static final int RAF_HSUPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA;
+        public static final int RAF_HSDPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA;
+        public static final int RAF_HSPA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSPA;
+        public static final int RAF_HSPAP = (int) TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
+        public static final int RAF_UMTS = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
+        public static final int RAF_TD_SCDMA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
+        // 4G
+        public static final int RAF_LTE = (int) TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
+        public static final int RAF_LTE_CA = (int) TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
+        // 5G
+        public static final int RAF_NR = (int) TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+
+        // Grouping of RAFs
+        // 2G
+        public static final int GSM = RAF_GSM | RAF_GPRS | RAF_EDGE;
+        public static final int CDMA = RAF_IS95A | RAF_IS95B | RAF_1xRTT;
+        // 3G
+        public static final int EVDO = RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_EHRPD;
+        public static final int HS = RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP;
+        public static final int WCDMA = HS | RAF_UMTS;
+        // 4G
+        public static final int LTE = RAF_LTE | RAF_LTE_CA;
+        // 5G
+        public static final int NR = RAF_NR;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
index 467233d5f71fb..45434fcb813c9 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
@@ -138,7 +138,7 @@ public int getMetricsCategory() {
 
     @Override
     public boolean isAvailable() {
-        return mQRCodeScannerController.isCameraAvailable();
+        return mQRCodeScannerController.isAbleToLaunchScannerActivity();
     }
 
     @Nullable
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RefreshRateTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RefreshRateTile.java
new file mode 100644
index 0000000000000..1201e17abe7dd
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RefreshRateTile.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2022-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.qs.tiles;
+
+import static android.provider.Settings.System.MIN_REFRESH_RATE;
+import static android.provider.Settings.System.PEAK_REFRESH_RATE;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.util.matrixx.DisplayRefreshRateHelper;
+
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.plugins.qs.QSTile;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+import com.android.systemui.util.settings.SystemSettings;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import org.derpfest.display.IRefreshRateListener;
+import org.derpfest.display.RefreshRateManager;
+
+public class RefreshRateTile extends QSTileImpl<QSTile.BooleanState> {
+
+    public static final String TILE_SPEC = "refresh_rate";
+
+    private static final Intent SCREEN_REFRESH_RATE_SETTINGS =
+            new Intent().setComponent(new ComponentName(
+                    "com.android.settings",
+                    "com.android.settings.Settings$ScreenRefreshRateActivity"));
+
+    private final ArrayList<Integer> mSupportedList;
+    private final DisplayRefreshRateHelper mHelper;
+    private final RefreshRateManager mManager;
+    private final SettingsObserver mObserver;
+
+    @Nullable
+    private Icon mIcon = null;
+
+    private int mMinRefreshRate;
+    private int mPeakRefreshRate;
+
+    private boolean mUpdateRefreshRate = true;
+
+    private int mRequestedRefreshRate = -1;
+    private int mRequestedMemcRefreshRate = -1;
+
+    private boolean mRegistered = false;
+
+    private final IRefreshRateListener.Stub mRefreshRateListener =
+            new IRefreshRateListener.Stub() {
+        @Override
+        public void onRequestedRefreshRate(int refreshRate) {
+            mRequestedRefreshRate = refreshRate;
+            refreshState();
+        }
+
+        @Override
+        public void onRequestedMemcRefreshRate(int refreshRate) {
+            mRequestedMemcRefreshRate = refreshRate;
+            refreshState();
+        }
+    };
+
+    @Inject
+    public RefreshRateTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            SystemSettings systemSettings) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager,
+                metricsLogger, statusBarStateController, activityStarter, qsLogger);
+
+        mHelper = DisplayRefreshRateHelper.getInstance(mContext);
+        mManager = mContext.getSystemService(RefreshRateManager.class);
+        mSupportedList = mHelper.getSupportedRefreshRateList();
+
+        mObserver = new SettingsObserver(mHandler, systemSettings);
+
+        mMinRefreshRate = mHelper.getMinimumRefreshRate();
+        mPeakRefreshRate = mHelper.getPeakRefreshRate();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mSupportedList.size() > 1;
+    }
+
+    @Override
+    public QSTile.BooleanState newTileState() {
+        QSTile.BooleanState state = new QSTile.BooleanState();
+        state.forceExpandIcon = true;
+        return state;
+    }
+
+    @Override
+    protected void handleInitialize() {
+        mObserver.observe();
+    }
+
+    @Override
+    protected void handleDestroy() {
+        super.handleDestroy();
+        mObserver.unobserve();
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        if (mRequestedRefreshRate > 0 || mRequestedMemcRefreshRate > 0) {
+            return;
+        }
+        if (!isRefreshRateValid()) {
+            mMinRefreshRate = mSupportedList.get(mSupportedList.size() - 1);
+            mPeakRefreshRate = mMinRefreshRate;
+        } else if (mSupportedList.indexOf(mPeakRefreshRate) == mSupportedList.size() - 1) {
+            if (mMinRefreshRate == mPeakRefreshRate) {
+                mMinRefreshRate = mSupportedList.get(0);
+            } else {
+                mMinRefreshRate = mSupportedList.get(mSupportedList.indexOf(mMinRefreshRate) + 1);
+            }
+            mPeakRefreshRate = mMinRefreshRate;
+        } else {
+            mPeakRefreshRate = mSupportedList.get(mSupportedList.indexOf(mPeakRefreshRate) + 1);
+        }
+        mUpdateRefreshRate = false;
+        mHelper.setRefreshRate(mMinRefreshRate, mPeakRefreshRate);
+        mUpdateRefreshRate = true;
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return SCREEN_REFRESH_RATE_SETTINGS;
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.refresh_rate_tile_label);
+    }
+
+    @Override
+    protected void handleUpdateState(QSTile.BooleanState state, Object arg) {
+        if (!isAvailable()) {
+            return;
+        }
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_refresh_rate);
+        }
+        state.state = mRequestedRefreshRate > 0 || mRequestedMemcRefreshRate > 0
+                ? Tile.STATE_UNAVAILABLE : Tile.STATE_ACTIVE;
+        state.icon = mIcon;
+        state.label = mContext.getString(R.string.refresh_rate_tile_label);
+        state.contentDescription = mContext.getString(R.string.refresh_rate_tile_label);
+        state.secondaryLabel = getRefreshRateLabel();
+        state.expandedAccessibilityClassName = Button.class.getName();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        super.handleSetListening(listening);
+
+        if (!isAvailable()) {
+            return;
+        }
+
+        if (listening && !mRegistered) {
+            mManager.registerRefreshRateListener(mRefreshRateListener);
+            mRegistered = true;
+        } else if (!listening && mRegistered) {
+            mManager.unregisterRefreshRateListener(mRefreshRateListener);
+            mRegistered = false;
+        }
+    }
+
+    private boolean isRefreshRateValid() {
+        return mHelper.isRefreshRateValid(mMinRefreshRate) &&
+                mHelper.isRefreshRateValid(mPeakRefreshRate) &&
+                mMinRefreshRate <= mPeakRefreshRate;
+    }
+
+    private String getRefreshRateLabel() {
+        if (mRequestedMemcRefreshRate > 0) {
+            return String.valueOf((int) mRequestedMemcRefreshRate) + " Hz";
+        }
+        if (mRequestedRefreshRate > 0) {
+            return String.valueOf((int) mRequestedRefreshRate) + " Hz";
+        }
+        if (!isRefreshRateValid()) {
+            return mContext.getString(R.string.refresh_rate_unknown);
+        }
+        if (mMinRefreshRate == mPeakRefreshRate) {
+            return String.valueOf(mPeakRefreshRate) + " Hz";
+        }
+        return String.valueOf(mMinRefreshRate) + " ~ " + String.valueOf(mPeakRefreshRate) + " Hz";
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+
+        private final SystemSettings mSystemSettings;
+
+        private boolean mObserving = false;
+
+        SettingsObserver(Handler handler, SystemSettings systemSettings) {
+            super(handler);
+            mSystemSettings = systemSettings;
+        }
+
+        void observe() {
+            if (mObserving) {
+                return;
+            }
+            mSystemSettings.registerContentObserverSync(MIN_REFRESH_RATE, this);
+            mSystemSettings.registerContentObserverSync(PEAK_REFRESH_RATE, this);
+            mObserving = true;
+        }
+
+        void unobserve() {
+            if (!mObserving) {
+                return;
+            }
+            mSystemSettings.unregisterContentObserverSync(this);
+            mObserving = false;
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            if (mUpdateRefreshRate) {
+                mMinRefreshRate = mHelper.getMinimumRefreshRate();
+                mPeakRefreshRate = mHelper.getPeakRefreshRate();
+            }
+            refreshState();
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenshotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenshotTile.java
new file mode 100644
index 0000000000000..c021026cc1319
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenshotTile.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2020 The OmniROM Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.view.WindowManager;
+import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_GLOBAL_ACTIONS;
+import static android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN;
+import static android.view.WindowManager.TAKE_SCREENSHOT_SELECTED_REGION;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.util.ScreenshotHelper;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.pipeline.domain.interactor.PanelInteractor;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.internal.R;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: Screenshot **/
+public class ScreenshotTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "screenshot";
+
+    private final PanelInteractor mPanelInteractor;
+
+    @Nullable
+    private Icon mIcon = null;
+
+    @Inject
+    public ScreenshotTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            PanelInteractor panelInteractor
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mPanelInteractor = panelInteractor;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {}
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void handleClick(@Nullable Expandable expandable) {
+        mPanelInteractor.collapsePanels();
+        final ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);
+        mHandler.postDelayed(() -> {
+            screenshotHelper.takeScreenshot(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_GLOBAL_ACTIONS, mHandler, null);
+        }, 1000);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return null;
+    }
+
+    @Override
+    public void handleLongClick(@Nullable Expandable expandable) {
+        mPanelInteractor.collapsePanels();
+        final ScreenshotHelper screenshotHelper = new ScreenshotHelper(mContext);
+        mHandler.postDelayed(() -> {
+            screenshotHelper.takeScreenshot(TAKE_SCREENSHOT_SELECTED_REGION, SCREENSHOT_GLOBAL_ACTIONS, mHandler, null);
+        }, 1000);
+        refreshState();
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.global_action_screenshot);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        state.label = mContext.getString(
+                R.string.global_action_screenshot);
+        state.contentDescription =  mContext.getString(
+                R.string.global_action_screenshot);
+        state.secondaryLabel = mContext.getString(
+                com.android.systemui.res.R.string.screenshot_long_press);
+        if (mIcon == null) {
+            mIcon = maybeLoadResourceIcon(R.drawable.ic_screenshot);
+        }
+        state.icon = mIcon;
+        state.value = true;
+        state.state = Tile.STATE_INACTIVE;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/SleepModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/SleepModeTile.java
new file mode 100644
index 0000000000000..4038bd42f2629
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/SleepModeTile.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2021 Havoc-OS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+import com.android.systemui.res.R;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.UserSettingObserver;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.settings.UserTracker;
+import com.android.systemui.util.settings.SecureSettings;
+
+import java.time.format.DateTimeFormatter;
+import java.time.LocalTime;
+
+import javax.inject.Inject;
+
+public class SleepModeTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "sleep_mode";
+
+    private static final ComponentName SLEEP_MODE_SETTING_COMPONENT = new ComponentName(
+            "com.android.settings", "com.android.settings.Settings$SleepModeActivity");
+
+    private static final Intent SLEEP_MODE_SETTINGS =
+            new Intent().setComponent(SLEEP_MODE_SETTING_COMPONENT);
+
+    private final Icon mIcon = ResourceIcon.get(com.android.internal.R.drawable.ic_sleep);
+
+    private final UserSettingObserver mSetting;
+
+    private boolean mIsTurningOn = false;
+
+    @Inject
+    public SleepModeTile(
+            QsEventLogger uiEventLogger,
+            QSHost host,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            SecureSettings secureSettings,
+            UserTracker userTracker
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mSetting = new UserSettingObserver(secureSettings, mHandler, Settings.Secure.SLEEP_MODE_ENABLED,
+                userTracker.getUserId()) {
+            @Override
+            protected void handleValueChanged(int value, boolean observedChange) {
+                handleRefreshState(value);
+            }
+        };
+        SettingsObserver settingsObserver = new SettingsObserver(mainHandler);
+        settingsObserver.observe();
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        if (mIsTurningOn) {
+            return;
+        }
+        mIsTurningOn = true;
+        setEnabled(!mState.value);
+        refreshState();
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mIsTurningOn = false;
+            }
+        }, 1500);
+    }
+
+    private void setEnabled(boolean enabled) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue();
+        final boolean sleep = value != 0;
+        final int mode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_AUTO_MODE, 0, UserHandle.USER_CURRENT);
+        final boolean sleepModeOn = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+
+        String timeValue = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_AUTO_TIME, UserHandle.USER_CURRENT);
+        if (timeValue == null || timeValue.equals("")) timeValue = "20:00,07:00";
+        String[] time = timeValue.split(",", 0);
+        String outputFormat = DateFormat.is24HourFormat(mContext) ? "HH:mm" : "h:mm a";
+        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern(outputFormat);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+        LocalTime sinceValue = LocalTime.parse(time[0], formatter);
+        LocalTime tillValue = LocalTime.parse(time[1], formatter);
+
+        state.value = sleep;
+        state.label = mContext.getString(R.string.quick_settings_sleep_mode_label);
+        state.icon = mIcon;
+        state.contentDescription = TextUtils.isEmpty(state.secondaryLabel)
+                ? state.label
+                : TextUtils.concat(state.label, ", ", state.secondaryLabel);
+        switch (mode) {
+            default:
+            case 0:
+                state.secondaryLabel = null;
+                break;
+            case 1:
+                state.secondaryLabel = mContext.getResources().getString(sleepModeOn
+                    ? R.string.quick_settings_night_secondary_label_until_sunrise
+                    : R.string.quick_settings_night_secondary_label_on_at_sunset);
+                break;
+            case 2:
+                if (sleepModeOn) {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_secondary_label_until, tillValue.format(outputFormatter));
+                } else {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_night_secondary_label_on_at, sinceValue.format(outputFormatter));
+                }
+                break;
+            case 3:
+                if (sleepModeOn) {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_secondary_label_until, tillValue.format(outputFormatter));
+                } else {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_night_secondary_label_on_at_sunset);
+                }
+                break;
+            case 4:
+                if (sleepModeOn) {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_night_secondary_label_until_sunrise);
+                } else {
+                    state.secondaryLabel = mContext.getResources().getString(
+                            R.string.quick_settings_night_secondary_label_on_at, sinceValue.format(outputFormatter));
+                }
+                break;
+        }
+        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.VIEW_UNKNOWN;
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return SLEEP_MODE_SETTINGS;
+    }
+
+    @Override
+    protected void handleSetListening(boolean listening) {
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return getState().label;
+    }
+
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_ENABLED), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_AUTO_MODE), false, this,
+                    UserHandle.USER_ALL);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            refreshState();
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java
new file mode 100644
index 0000000000000..4120af26f75a9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Vibrator;
+import android.os.VibrationEffect;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.res.R;
+import com.android.systemui.broadcast.BroadcastDispatcher;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+
+import javax.inject.Inject;
+
+public class SoundTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "sound";
+
+    private boolean mListening = false;
+
+    private final AudioManager mAudioManager;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            refreshState();
+        }
+    };
+
+    private Vibrator mVibrator;
+    private static final VibrationEffect VIBRATE_MODE_HAPTIC =
+            VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
+
+    @Inject
+    public SoundTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (mAudioManager == null) {
+            return;
+        }
+        if (mListening == listening) return;
+        mListening = listening;
+        if (listening) {
+            final IntentFilter filter = new IntentFilter(
+                    AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+            mContext.registerReceiver(mReceiver, filter);
+        } else {
+            mContext.unregisterReceiver(mReceiver);
+        }
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        int oldState = mAudioManager.getRingerModeInternal();
+        int newState = oldState;
+        switch (oldState) {
+            case AudioManager.RINGER_MODE_NORMAL:
+                newState = AudioManager.RINGER_MODE_VIBRATE;
+                if (mVibrator == null) mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
+                if (mVibrator != null) {
+                    if (mVibrator.hasVibrator()) { mVibrator.vibrate(VIBRATE_MODE_HAPTIC); }
+                }
+                break;
+            case AudioManager.RINGER_MODE_VIBRATE:
+                newState = AudioManager.RINGER_MODE_SILENT;
+                break;
+            case AudioManager.RINGER_MODE_SILENT:
+                newState = AudioManager.RINGER_MODE_NORMAL;
+                break;
+        }
+        mAudioManager.setRingerModeInternal(newState);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return new Intent(Settings.ACTION_SOUND_SETTINGS);
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_sound_label);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        state.label = getTileLabel();
+        if (mAudioManager == null) {
+            return;
+        }
+        switch (mAudioManager.getRingerModeInternal()) {
+            case AudioManager.RINGER_MODE_NORMAL:
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_ringer_audible);
+                state.secondaryLabel = mContext.getString(R.string.quick_settings_sound_ring);
+                state.state = Tile.STATE_ACTIVE;
+                break;
+            case AudioManager.RINGER_MODE_VIBRATE:
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_ringer_vibrate);
+                state.secondaryLabel = mContext.getString(R.string.quick_settings_sound_vibrate);
+                state.state = Tile.STATE_INACTIVE;
+                break;
+            case AudioManager.RINGER_MODE_SILENT:
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_ringer_silent);
+                state.secondaryLabel = mContext.getString(R.string.quick_settings_sound_silent);
+                state.state = Tile.STATE_INACTIVE;
+                break;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/VPNTetheringTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/VPNTetheringTile.java
new file mode 100644
index 0000000000000..7977129dcd74a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/VPNTetheringTile.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2017-2021 The LineageOS Project
+ * Copyright (C) 2022 The LibreMobileOS Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import static com.android.internal.logging.MetricsLogger.VIEW_UNKNOWN;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.provider.Settings.Secure;
+import android.service.quicksettings.Tile;
+import android.text.TextUtils;
+import com.android.systemui.animation.Expandable;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.systemui.res.R;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.qs.UserSettingObserver;
+import com.android.systemui.settings.UserTracker;
+import com.android.systemui.util.settings.SecureSettings;
+
+import javax.inject.Inject;
+
+/** Quick settings tile: VPN Tethering **/
+public class VPNTetheringTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "vpn_tethering";
+
+    private final Icon mIcon = ResourceIcon.get(R.drawable.ic_qs_vpn_tethering);
+    private static final Intent TETHER_SETTINGS = new Intent().setComponent(new ComponentName(
+            "com.android.settings", "com.android.settings.TetherSettings"));
+
+    private final UserSettingObserver mSetting;
+
+    @Inject
+    public VPNTetheringTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger,
+            UserTracker userTracker,
+            SecureSettings secureSettings
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+
+        mSetting = new UserSettingObserver(secureSettings, mHandler, Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS,
+                userTracker.getUserId(), 0) {
+            @Override
+            protected void handleValueChanged(int value, boolean observedChange) {
+                handleRefreshState(value);
+            }
+        };
+    }
+
+    @Override
+    protected void handleDestroy() {
+        super.handleDestroy();
+        mSetting.setListening(false);
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        super.handleSetListening(listening);
+        mSetting.setListening(listening);
+    }
+
+    @Override
+    protected void handleUserSwitch(int newUserId) {
+        mSetting.setUserId(newUserId);
+        handleRefreshState(mSetting.getValue());
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        mSetting.setValue(mState.value ? 0 : 1);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return new Intent(TETHER_SETTINGS);
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue();
+        final boolean enable = value != 0;
+        state.value = enable;
+        state.label = mContext.getString(R.string.vpn_tethering_label);
+        state.icon = mIcon;
+        if (enable) {
+            state.contentDescription =  mContext.getString(
+                    R.string.vpn_tethering_changed_on);
+            state.state = Tile.STATE_ACTIVE;
+        } else {
+            state.contentDescription =  mContext.getString(
+                    R.string.vpn_tethering_changed_off);
+            state.state = Tile.STATE_INACTIVE;
+        }
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.vpn_tethering_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return VIEW_UNKNOWN;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeQSTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeQSTile.kt
new file mode 100644
index 0000000000000..849e6c29f6045
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeQSTile.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+ 
+package com.android.systemui.qs.tiles
+
+import android.content.Intent
+import android.media.AudioManager
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.service.quicksettings.Tile
+import android.widget.SeekBar
+import com.android.internal.logging.MetricsLogger
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent
+import com.android.systemui.animation.Expandable
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.plugins.FalsingManager
+import com.android.systemui.plugins.qs.QSTile.BooleanState
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.qs.QSHost
+import com.android.systemui.qs.QsEventLogger
+import com.android.systemui.qs.logging.QSLogger
+import com.android.systemui.qs.tileimpl.QSTileImpl
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.policy.VolumeController
+import javax.inject.Inject
+
+class VolumeQSTile @Inject constructor(
+    host: QSHost,
+    uiEventLogger: QsEventLogger,
+    @Background backgroundLooper: Looper,
+    @Main mainHandler: Handler,
+    falsingManager: FalsingManager,
+    metricsLogger: MetricsLogger,
+    statusBarStateController: StatusBarStateController,
+    activityStarter: ActivityStarter,
+    qsLogger: QSLogger,
+    private val ctl: VolumeController
+) : QSTileImpl<BooleanState>(
+    host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+    statusBarStateController, activityStarter, qsLogger
+), VolumeController.VolumeListener {
+
+    companion object {
+        const val TILE_SPEC = "volume"
+    }
+    
+    private var muted = false
+
+    private val am: AudioManager = 
+        mContext.getSystemService(AudioManager::class.java)
+
+    override fun handleSetListening(listening: Boolean) {
+        super.handleSetListening(listening)
+        if (listening) {
+            ctl.addListener(this)
+        } else {
+            ctl.removeListener(this)
+        }
+    }
+
+    override fun handleDestroy() {
+        super.handleDestroy()
+        ctl.removeListener(this)
+    }
+
+    override fun newTileState(): BooleanState {
+        return BooleanState().apply {
+            handlesLongClick = false
+        }
+    }
+
+    override fun getLongClickIntent(): Intent {
+        return Intent(Settings.ACTION_SOUND_SETTINGS)
+    }
+
+    override fun isAvailable(): Boolean {
+        return am != null
+    }
+
+    override fun handleClick(expandable: Expandable?) {
+        ctl.expandDialog(expandable)
+    }
+
+    override fun getTileLabel(): CharSequence {
+        return mContext.getString(R.string.quick_settings_volume_label)
+    }
+
+    override fun handleLongClick(expandable: Expandable?) {
+        val intent = longClickIntent
+        mActivityStarter.postStartActivityDismissingKeyguard(intent, 0)
+    }
+
+    override fun handleUpdateState(state: BooleanState, arg: Any?) {
+        state.label = mHost.context.getString(R.string.quick_settings_volume_label)
+
+        val percent = if (ctl.max > 0 && !muted) {
+            (ctl.current * 100f / ctl.max).toInt()
+        } else {
+            0
+        }
+
+        state.value = percent > 0
+        state.secondaryLabel = "$percent%"
+        state.stateDescription = state.secondaryLabel
+        state.contentDescription = mContext.getString(R.string.quick_settings_volume_label) + ", $percent%"
+        when {
+            percent <= 0 -> {
+                state.state = Tile.STATE_INACTIVE
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_volume_media_mute)
+            }
+            else -> {
+                state.state = Tile.STATE_ACTIVE
+                state.icon = maybeLoadResourceIcon(R.drawable.ic_volume_media)
+            }
+        }
+    }
+
+    override fun getMetricsCategory(): Int {
+        return MetricsEvent.QS_PANEL
+    }
+
+    override fun onVolumeChanged(volume: Int) {
+        refreshState(volume)
+    }
+
+    override fun onMuteStateChanged(muted: Boolean) {
+        this.muted = muted
+        refreshState()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeTile.java
new file mode 100644
index 0000000000000..29808828e3118
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/VolumeTile.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2017 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.media.AudioManager;
+import android.provider.Settings;
+import android.service.quicksettings.Tile;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+
+import javax.inject.Inject;
+
+public class VolumeTile extends QSTileImpl<BooleanState> {
+
+    public static final String TILE_SPEC = "volume_panel";
+
+    private static final Intent SOUND_SETTINGS = new Intent(Settings.Panel.ACTION_VOLUME);
+
+    @Inject
+    public VolumeTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        AudioManager am = mContext.getSystemService(AudioManager.class);
+        am.adjustVolume(AudioManager.ADJUST_SAME, AudioManager.FLAG_SHOW_UI);
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        return SOUND_SETTINGS;
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        state.label = mContext.getString(R.string.quick_settings_volume_panel_label);
+        state.icon = ResourceIcon.get(R.drawable.ic_qs_volume_panel); // TODO needs own icon
+        state.state = Tile.STATE_ACTIVE;
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getString(R.string.quick_settings_volume_panel_label);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        // Do nothing
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WeatherTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WeatherTile.java
new file mode 100644
index 0000000000000..5ed4a8c71c829
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WeatherTile.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2017 The OmniROM project
+ * Copyright (C) 2022-2025 crDroid Android project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles;
+
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.service.quicksettings.Tile;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.matrixx.OmniJawsClient;
+import com.android.internal.util.matrixx.Utils;
+import com.android.systemui.animation.Expandable;
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.QsEventLogger;
+import com.android.systemui.qs.logging.QSLogger;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.res.R;
+
+import javax.inject.Inject;
+
+public class WeatherTile extends QSTileImpl<BooleanState> implements OmniJawsClient.OmniJawsObserver {
+
+    public static final String TILE_SPEC = "weather";
+    private static final String SERVICE_PACKAGE = "org.omnirom.omnijaws";
+
+    private static final String TAG = "WeatherTile";
+    private static final boolean DEBUG = false;    private Drawable mWeatherImage;
+    private OmniJawsClient.WeatherInfo mWeatherData;
+    private boolean mEnabled;
+    private final ActivityStarter mActivityStarter;
+    private String mFormattedCondition; 
+
+    private static final String[] ALTERNATIVE_WEATHER_APPS = {
+            "cz.martykan.forecastie",
+            "com.accuweather.android",
+            "com.wunderground.android.weather",
+            "com.samruston.weather",
+            "jp.miyavi.androiod.gnws",
+    };
+
+    @Inject
+    public WeatherTile(
+            QSHost host,
+            QsEventLogger uiEventLogger,
+            @Background Looper backgroundLooper,
+            @Main Handler mainHandler,
+            FalsingManager falsingManager,
+            MetricsLogger metricsLogger,
+            StatusBarStateController statusBarStateController,
+            ActivityStarter activityStarter,
+            QSLogger qsLogger
+    ) {
+        super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger,
+                statusBarStateController, activityStarter, qsLogger);
+        mEnabled = OmniJawsClient.get().isOmniJawsEnabled(mContext);
+        mActivityStarter = activityStarter;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MATRIXX;
+    }
+
+    @Override
+    public BooleanState newTileState() {
+        return new BooleanState();
+    }
+
+    @Override
+    public void handleSetListening(boolean listening) {
+        if (DEBUG) Log.d(TAG, "setListening " + listening);
+        mEnabled = OmniJawsClient.get().isOmniJawsEnabled(mContext);
+
+        if (listening) {
+            OmniJawsClient.get().addObserver(mContext, this);
+            queryAndUpdateWeather();
+        } else {
+            OmniJawsClient.get().removeObserver(mContext, this);
+        }
+    }
+
+    @Override
+    public void weatherUpdated() {
+        if (DEBUG) Log.d(TAG, "weatherUpdated");
+        queryAndUpdateWeather();
+    }
+
+    @Override
+    public void weatherError(int errorReason) {
+        if (DEBUG) Log.d(TAG, "weatherError " + errorReason);
+        if (errorReason != OmniJawsClient.EXTRA_ERROR_DISABLED) {
+            mWeatherData = null;
+            refreshState();
+        }
+    }
+
+    @Override
+    protected void handleDestroy() {
+        OmniJawsClient.get().removeObserver(mContext, this);
+        super.handleDestroy();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return OmniJawsClient.get().isOmniJawsServiceInstalled(mContext);
+    }
+
+    @Override
+    protected void handleClick(@Nullable Expandable expandable) {
+        if (DEBUG) Log.d(TAG, "handleClick");
+        if (!mState.value || mWeatherData == null) {
+            mActivityStarter.postStartActivityDismissingKeyguard(
+                OmniJawsClient.get().getSettingsIntent(), 0);
+        } else {
+            PackageManager pm = mContext.getPackageManager();
+            for (String app: ALTERNATIVE_WEATHER_APPS) {
+                if (Utils.isPackageInstalled(mContext, app)) {
+                    Intent intent = pm.getLaunchIntentForPackage(app);
+                    if (intent != null) {
+                        mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
+                    }
+                }
+            }
+            if (Utils.isPackageInstalled(mContext, "com.google.android.googlequicksearchbox")) {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse("dynact://velour/weather/ProxyActivity"));
+                intent.setComponent(new ComponentName("com.google.android.googlequicksearchbox",
+                        "com.google.android.apps.gsa.velour.DynamicActivityTrampoline"));
+                mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
+            } else {
+                final Intent weatherActivityIntent = new Intent();
+                weatherActivityIntent.setAction(Intent.ACTION_MAIN);
+                weatherActivityIntent.setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherActivity");
+                mActivityStarter.postStartActivityDismissingKeyguard(weatherActivityIntent, 0);
+            }
+        }
+        mEnabled = OmniJawsClient.get().isOmniJawsEnabled(mContext);
+        refreshState();
+    }
+
+    @Override
+    public Intent getLongClickIntent() {
+        if (DEBUG) Log.d(TAG, "getLongClickIntent");
+        return OmniJawsClient.get().getSettingsIntent();
+    }
+
+    @Override
+    protected void handleUpdateState(BooleanState state, Object arg) {
+        if (DEBUG) Log.d(TAG, "handleUpdateState " + mEnabled);
+        state.value = mEnabled;
+        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
+        state.icon = ResourceIcon.get(R.drawable.ic_qs_weather);
+        state.label = mContext.getResources().getString(R.string.omnijaws_label_default);
+        state.secondaryLabel = mContext.getResources().getString(R.string.omnijaws_service_unknown);
+        if (mEnabled) {
+            if (mWeatherData == null || mWeatherImage == null) {
+                state.label = mContext.getResources().getString(R.string.omnijaws_label_default);
+                state.secondaryLabel = mContext.getResources().getString(R.string.omnijaws_service_error);
+            } else {
+                state.icon = new DrawableIcon(mWeatherImage);
+                state.label = mWeatherData.city;
+                state.secondaryLabel = mWeatherData.temp + mWeatherData.tempUnits +
+                    " · " + mFormattedCondition;
+            }
+        }
+    }
+
+    @Override
+    public CharSequence getTileLabel() {
+        return mContext.getResources().getString(R.string.omnijaws_label_default);
+    }
+
+    private void queryAndUpdateWeather() {
+        if (DEBUG) Log.d(TAG, "queryAndUpdateWeather " + mEnabled);
+        try {
+            mWeatherData = null;
+            if (mEnabled) {
+                OmniJawsClient.get().queryWeather(mContext);
+                mWeatherData = OmniJawsClient.get().getWeatherInfo();
+                mFormattedCondition = mWeatherData.condition;
+                if (mFormattedCondition.toLowerCase().contains("clouds")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_clouds);
+                } else if (mFormattedCondition.toLowerCase().contains("rain")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_rain);
+                } else if (mFormattedCondition.toLowerCase().contains("clear")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_clear);
+                } else if (mFormattedCondition.toLowerCase().contains("storm")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_storm);
+                } else if (mFormattedCondition.toLowerCase().contains("snow")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_snow);
+                } else if (mFormattedCondition.toLowerCase().contains("wind")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_wind);
+                } else if (mFormattedCondition.toLowerCase().contains("mist")) {
+                    mFormattedCondition = mContext.getResources().getString(R.string.weather_condition_mist);
+                }
+                if (mWeatherData != null) {
+                    mWeatherImage = OmniJawsClient.get().getWeatherConditionImage(mContext, mWeatherData.conditionCode);
+                    mWeatherImage = mWeatherImage.mutate();
+                }
+            }
+        } catch(Exception e) {
+            // Do nothing
+        }
+        refreshState();
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.kt
index 031c4ea3e9b75..0d80b8c5a857b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.kt
@@ -95,14 +95,14 @@ constructor(
     }
 
     override fun handleClick(expandable: Expandable?) {
-        lifecycle.coroutineScope.launch { userActionInteractor.handleClick(expandable) }
+        userActionInteractor.handleClick()
     }
 
-    override fun handleSecondaryClick(expandable: Expandable?) {
-        userActionInteractor.handleSecondaryClick(expandable)
+    override fun handleLongClick(expandable: Expandable?) {
+        lifecycle.coroutineScope.launch { userActionInteractor.handleLongClick(expandable) }
     }
 
-    override fun getLongClickIntent(): Intent = userActionInteractor.longClickIntent
+    override fun getLongClickIntent(): Intent? = null
 
     override fun handleUpdateState(state: QSTile.State?, arg: Any?) {
         val model = arg as? WifiTileModel ?: return
@@ -115,7 +115,7 @@ constructor(
                     maybeLoadResourceIcon(resId)
                 } ?: SignalIcon(SignalDrawable.getState(0, 4, false))
             label = tileState.label
-            secondaryLabel = tileState.secondaryLabel
+            secondaryLabel = null
             contentDescription = tileState.contentDescription
             expandedAccessibilityClassName = tileState.expandedAccessibilityClassName
             handlesSecondaryClick =
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/DataUsageRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/DataUsageRepository.kt
new file mode 100644
index 0000000000000..a69e1cbf3ea1e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/DataUsageRepository.kt
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles.dialog
+
+import android.net.NetworkStats
+import android.content.Context
+import android.net.NetworkTemplate
+import android.net.wifi.WifiManager
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import com.android.settingslib.net.DataUsageController
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.res.R
+import android.util.Log
+import java.text.DecimalFormat
+import java.util.concurrent.Executor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class DataUsageRepository @Inject constructor(
+    private val context: Context,
+    @Background private val bgExecutor: Executor,
+) {
+
+    private val mobileDataUsageController = DataUsageController(context)
+    private val wifiDataUsageController = DataUsageController(context)
+    private val telephonyManager =
+        context.getSystemService(TelephonyManager::class.java)
+    private val wifiManager =
+        context.getSystemService(WifiManager::class.java)
+
+    private val wifiTemplate = NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build()
+
+    private val _mobileUsageFormatted = MutableStateFlow<String?>(null)
+    val mobileUsageFormatted: StateFlow<String?> = _mobileUsageFormatted.asStateFlow()
+
+    private val _mobileCarrier = MutableStateFlow<String?>(null)
+    val mobileCarrier: StateFlow<String?> = _mobileCarrier.asStateFlow()
+
+    private val _wifiUsageFormatted = MutableStateFlow<String?>(null)
+    val wifiUsageFormatted: StateFlow<String?> = _wifiUsageFormatted.asStateFlow()
+
+    private val _wifiSsid = MutableStateFlow<String?>(null)
+    val wifiSsid: StateFlow<String?> = _wifiSsid.asStateFlow()
+
+    init {
+        refresh()
+    }
+
+    fun refresh() {
+        Log.d(TAG, "refresh() called")
+        bgExecutor.execute {
+            queryMobileUsage()
+            queryWifiUsage()
+        }
+    }
+
+    private fun queryMobileUsage() {
+        try {
+            val subId = SubscriptionManager.getDefaultDataSubscriptionId()
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                _mobileUsageFormatted.value = null
+                _mobileCarrier.value = null
+                return
+            }
+            val template = getMobileTemplateForSubId(subId)
+            mobileDataUsageController.setSubscriptionId(subId)
+            val info = mobileDataUsageController.getDataUsageInfo(template)
+            if (info != null && info.usageLevel >= 0) {
+                val formatted = context.getString(
+                    R.string.quick_settings_cellular_detail_data_used,
+                    formatBytes(info.usageLevel),
+                )
+                Log.d(TAG, "mobile usage: ${info.usageLevel} bytes -> $formatted")
+                _mobileUsageFormatted.value = formatted
+                _mobileCarrier.value = info.carrier
+            } else {
+                Log.d(TAG, "mobile usage: info=${info != null}, level=${info?.usageLevel}")
+                _mobileUsageFormatted.value = null
+                _mobileCarrier.value = null
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "queryMobileUsage failed", e)
+            _mobileUsageFormatted.value = null
+            _mobileCarrier.value = null
+        }
+    }
+
+    private fun queryWifiUsage() {
+        try {
+            val info = wifiDataUsageController.getDataUsageInfo(wifiTemplate)
+            if (info != null && info.usageLevel >= 0) {
+                val formatted = context.getString(
+                    R.string.quick_settings_cellular_detail_data_used,
+                    formatBytes(info.usageLevel),
+                )
+                Log.d(TAG, "wifi usage: ${info.usageLevel} bytes -> $formatted")
+                _wifiUsageFormatted.value = formatted
+                
+                val ssid = wifiManager.connectionInfo.ssid
+                _wifiSsid.value = if (ssid != WifiManager.UNKNOWN_SSID) {
+                    removeDoubleQuotes(ssid)
+                } else {
+                    null
+                }
+            } else {
+                Log.d(TAG, "wifi usage: info=${info != null}, level=${info?.usageLevel}")
+                _wifiUsageFormatted.value = null
+                _wifiSsid.value = null
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "queryWifiUsage failed", e)
+            _wifiUsageFormatted.value = null
+            _wifiSsid.value = null
+        }
+    }
+
+    private fun getMobileTemplateForSubId(subId: Int): NetworkTemplate {
+        val subscriberId = telephonyManager.createForSubscriptionId(subId).subscriberId
+        val builder = if (subscriberId != null) {
+            NetworkTemplate.Builder(NetworkTemplate.MATCH_CARRIER)
+                .setSubscriberIds(setOf(subscriberId))
+        } else {
+            NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+        }
+        return builder.setMeteredness(NetworkStats.METERED_YES).build()
+    }
+
+    companion object {
+        private const val TAG = "DataUsageRepository"
+        private const val KB = 1024.0
+        private const val MB = 1024.0 * KB
+        private const val GB = 1024.0 * MB
+        private val FORMAT = DecimalFormat("#.##")
+
+        fun formatBytes(bytes: Long): String {
+            val b = bytes.toDouble()
+            val value: Double
+            val suffix: String
+            when {
+                b > 100 * MB -> { value = b / GB; suffix = "GB" }
+                b > 100 * KB -> { value = b / MB; suffix = "MB" }
+                else -> { value = b / KB; suffix = "KB" }
+            }
+            return FORMAT.format(value) + " " + suffix
+        }
+
+        fun appendUsage(label: CharSequence?, usage: String?): CharSequence? {
+            if (usage == null) return label
+            if (label == null) return usage
+            return "$label · $usage"
+        }
+
+        fun removeDoubleQuotes(string: String?): String? {
+            if (string == null) return null
+            return if (string.firstOrNull() == '"' && string.lastOrNull() == '"') {
+                string.substring(1, string.length - 1)
+            } else string
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/FlashlightDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/FlashlightDialogDelegate.kt
new file mode 100644
index 0000000000000..c5c02cb3c663b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/FlashlightDialogDelegate.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2025 Neoteric OS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.qs.tiles.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.widget.FrameLayout
+import android.view.ContextThemeWrapper
+import android.view.Gravity
+import androidx.annotation.MainThread
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import com.android.systemui.statusbar.policy.FlashlightController
+import com.android.systemui.util.concurrency.DelayableExecutor
+import com.google.android.material.slider.Slider
+import javax.inject.Inject
+
+class FlashlightDialogDelegate @Inject constructor(
+    private val context: Context,
+    private val systemUIDialogFactory: SystemUIDialog.Factory,
+    @Main private val mainExecutor: DelayableExecutor,
+    @Background private val backgroundExecutor: DelayableExecutor,
+    private val flashlightController: FlashlightController
+) : SystemUIDialog.Delegate {
+
+    private lateinit var slider: Slider
+
+    private val vibrator = context.getSystemService(Vibrator::class.java)
+    private val flashlightMoveHaptic: VibrationEffect =
+        VibrationEffect.get(VibrationEffect.EFFECT_TICK)
+
+    override fun createDialog(): SystemUIDialog = systemUIDialogFactory.create(this)
+
+    override fun beforeCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) {
+        dialog.setTitle(R.string.flashlight_strength_title)
+        
+        val container = FrameLayout(dialog.context)
+
+        val themedContext = ContextThemeWrapper(dialog.context, 
+                com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight)
+        slider = Slider(themedContext).apply {
+            layoutParams = FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER
+            )
+        }
+
+        container.addView(slider)
+        dialog.setView(container)
+        dialog.setPositiveButton(R.string.quick_settings_done, null, true)
+        dialog.setNeutralButton(
+            if (flashlightController.isEnabled())
+                R.string.flashlight_strength_turn_off
+            else
+                R.string.flashlight_strength_turn_on,
+            { _, _ ->
+                val newState = !flashlightController.isEnabled()
+                flashlightController.setFlashlight(newState)
+                dialog.getButton(SystemUIDialog.BUTTON_NEUTRAL)?.text =
+                    if (newState)
+                        dialog.context.getString(R.string.flashlight_strength_turn_off)
+                    else
+                        dialog.context.getString(R.string.flashlight_strength_turn_on)
+            },
+            false
+        )
+    }
+
+    override fun onCreate(dialog: SystemUIDialog, savedInstanceState: Bundle?) {
+        val maxLevel = flashlightController.getMaxLevel()
+        val currentPercent = flashlightController.getCurrentPercent()
+
+        slider.isEnabled = true
+        slider.valueFrom = 1f
+        slider.valueTo = 100f
+        slider.value = (currentPercent * 100f).coerceAtLeast(1f)
+        slider.setLabelFormatter { value -> value.toInt().toString() }
+
+        var last = -1
+        slider.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) {
+                val percent = value / 100f
+                val p = Math.round(percent * 100)
+                if (p != last) {
+                    vibrator?.vibrate(flashlightMoveHaptic)
+                    last = p
+                }
+                
+                updateFlashlightStrength(percent, maxLevel)
+            }
+        }
+    }
+
+    @MainThread
+    private fun updateFlashlightStrength(percent: Float, maxLevel: Int) {
+        val level = (percent * maxLevel).toInt().coerceAtLeast(1)
+        flashlightController.setFlashlightStrengthLevel(level)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContent.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContent.kt
index 847fd95dffcdf..b41ccea8426dd 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContent.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContent.kt
@@ -17,16 +17,82 @@
 package com.android.systemui.qs.tiles.dialog
 
 import android.view.LayoutInflater
+import android.view.View
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.compose.ComposeInitializer
+import com.android.settingslib.R as SettingsLibR
 import com.android.systemui.res.R
 
+fun setupExtrasComposeView(
+    rootView: View,
+    composeView: ComposeView,
+    viewModel: InternetTileExtrasViewModel,
+    canConfigMobileData: Boolean,
+    canConfigWifi: Boolean,
+) {
+    ComposeInitializer.onAttachedToWindow(rootView)
+    composeView.setContent {
+        PlatformTheme {
+            InternetDialogExtras(viewModel, canConfigMobileData, canConfigWifi)
+        }
+    }
+}
+
+@Composable
+fun InternetDialogExtras(
+    viewModel: InternetTileExtrasViewModel,
+    canConfigMobileData: Boolean,
+    canConfigWifi: Boolean,
+) {
+    DisposableEffect(viewModel) {
+        viewModel.start()
+        onDispose { viewModel.stop() }
+    }
+    InternetTileExtras(viewModel, canConfigMobileData, canConfigWifi)
+}
+
 @Composable
 fun InternetDetailsContent(viewModel: InternetDetailsViewModel) {
     val coroutineScope = rememberCoroutineScope()
+    val extrasVm = viewModel.extrasViewModel
+
+    DisposableEffect(extrasVm) {
+        extrasVm.start()
+        onDispose { extrasVm.stop() }
+    }
 
     AndroidView(
         modifier = Modifier.fillMaxWidth(),
@@ -36,9 +102,199 @@ fun InternetDetailsContent(viewModel: InternetDetailsViewModel) {
                 LayoutInflater.from(context).inflate(R.layout.internet_connectivity_details, null)
             viewModel.internetDetailsContentManager.bind(view, coroutineScope)
 
+            view.findViewById<ComposeView>(R.id.internet_extras_compose).setContent {
+                PlatformTheme {
+                    InternetTileExtras(
+                        extrasVm,
+                        viewModel.canConfigMobileData,
+                        viewModel.canConfigWifi,
+                    )
+                }
+            }
+
             view
             // TODO: b/377388104 - Polish the internet details view UI
         },
         onRelease = { viewModel.internetDetailsContentManager.unBind() },
     )
 }
+
+@Composable
+private fun InternetTileExtras(
+    viewModel: InternetTileExtrasViewModel,
+    canConfigMobileData: Boolean,
+    canConfigWifi: Boolean,
+) {
+    val hotspotAvailable by viewModel.hotspotAvailable.collectAsState()
+    val hotspotEnabled by viewModel.hotspotEnabled.collectAsState()
+    val fiveGAvailable by viewModel.fiveGAvailable.collectAsState()
+    val fiveGEnabled by viewModel.fiveGEnabled.collectAsState()
+    val mobileUsage by viewModel.mobileDataUsage.collectAsState()
+    val wifiUsage by viewModel.wifiDataUsage.collectAsState()
+    val mobileCarrier by viewModel.mobileCarrier.collectAsState()
+    val wifiSsid by viewModel.wifiSsid.collectAsState()
+
+    val showMobileUsage = mobileUsage != null && canConfigMobileData
+    val showWifiUsage = wifiUsage != null && canConfigWifi
+
+    val showFiveG = fiveGAvailable && canConfigMobileData
+    val showHotspot = hotspotAvailable && canConfigMobileData
+
+    val hasUsage = showMobileUsage || showWifiUsage
+    val hasToggles = showFiveG || showHotspot
+
+    if (!hasUsage && !hasToggles) return
+
+    Column(modifier = Modifier.fillMaxWidth().padding(horizontal = MARGIN_H)) {
+        if (hasUsage) {
+            DataUsageSummary(
+                mobileUsage = if (canConfigMobileData) mobileUsage else null,
+                wifiUsage = if (canConfigWifi) wifiUsage else null,
+                mobileCarrier = mobileCarrier,
+                wifiSsid = wifiSsid,
+            )
+            HorizontalDivider(
+                color = MaterialTheme.colorScheme.outlineVariant,
+                modifier = Modifier.padding(horizontal = PADDING_H),
+            )
+        }
+
+        if (showFiveG) {
+            ToggleRow(
+                iconRes = R.drawable.ic_5g_toggle,
+                label = "5G",
+                checked = fiveGEnabled,
+                onToggle = { viewModel.toggleFiveG() },
+            )
+        }
+
+        if (showHotspot) {
+            ToggleRow(
+                iconRes = R.drawable.ic_hotspot,
+                label = stringResource(R.string.quick_settings_hotspot_label),
+                checked = hotspotEnabled,
+                onToggle = { viewModel.toggleHotspot() },
+            )
+        }
+    }
+}
+
+@Composable
+private fun DataUsageSummary(
+    mobileUsage: String?,
+    wifiUsage: String?,
+    mobileCarrier: String?,
+    wifiSsid: String?,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(ROW_HEIGHT)
+            .padding(horizontal = PADDING_H),
+        horizontalArrangement = Arrangement.spacedBy(24.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (mobileUsage != null) {
+            DataUsageItem(
+                iconRes = SettingsLibR.drawable.ic_mobile_4_4_bar,
+                label = mobileCarrier ?: stringResource(R.string.quick_settings_cellular_detail_title),
+                usage = mobileUsage,
+                modifier = Modifier.weight(1f),
+            )
+        }
+        if (wifiUsage != null) {
+            DataUsageItem(
+                iconRes = SettingsLibR.drawable.ic_wifi_3,
+                label = wifiSsid ?: stringResource(R.string.quick_settings_wifi_label),
+                usage = wifiUsage,
+                modifier = Modifier.weight(1f),
+            )
+        }
+    }
+}
+
+@Composable
+private fun DataUsageItem(
+    iconRes: Int,
+    label: String,
+    usage: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            painter = painterResource(iconRes),
+            contentDescription = null,
+            modifier = Modifier.size(20.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+        Spacer(modifier = Modifier.width(12.dp))
+        Column {
+            Text(
+                text = label,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+            Text(
+                text = usage,
+                style = MaterialTheme.typography.titleSmall,
+                color = MaterialTheme.colorScheme.onSurface,
+            )
+        }
+    }
+}
+
+@Composable
+private fun ToggleRow(
+    iconRes: Int,
+    label: String,
+    checked: Boolean,
+    onToggle: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(ROW_HEIGHT)
+            .padding(horizontal = PADDING_H),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            painter = painterResource(iconRes),
+            contentDescription = null,
+            modifier = Modifier.size(24.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+        Spacer(modifier = Modifier.width(16.dp))
+        Text(
+            text = label,
+            style = MaterialTheme.typography.titleMedium.copy(fontSize = 16.sp),
+            color = MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.weight(1f),
+        )
+        Spacer(modifier = Modifier.width(7.dp))
+        Box(
+            modifier = Modifier
+                .width(1.dp)
+                .height(28.dp)
+                .background(MaterialTheme.colorScheme.outlineVariant),
+        )
+        Spacer(modifier = Modifier.width(16.dp))
+        Switch(
+            checked = checked,
+            onCheckedChange = { onToggle() },
+            thumbContent = {
+                Icon(
+                    imageVector = if (checked) Icons.Filled.Check else Icons.Filled.Clear,
+                    contentDescription = null,
+                    modifier = Modifier.size(SwitchDefaults.IconSize),
+                )
+            }
+        )
+    }
+}
+
+private val MARGIN_H = 16.dp
+private val PADDING_H = 22.dp
+private val ROW_HEIGHT = 72.dp
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
index fc8f586ea75ca..6f0c3a559a039 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
@@ -68,6 +68,7 @@
 import androidx.annotation.WorkerThread;
 
 import com.android.internal.logging.UiEventLogger;
+import com.android.internal.util.ArrayUtils;
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.settingslib.DeviceInfoUtils;
@@ -358,7 +359,11 @@ void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) {
         mSubIdTelephonyManagerMap.put(mDefaultDataSubId, mTelephonyManager);
         registerInternetTelephonyCallback(mTelephonyManager, mDefaultDataSubId);
         // Listen the connectivity changes
-        mConnectivityManager.registerDefaultNetworkCallback(mConnectivityManagerNetworkCallback);
+        try {
+            mConnectivityManager.registerDefaultNetworkCallback(mConnectivityManagerNetworkCallback);
+        } catch (Exception e) {
+            // Do nothing
+        }
         mCanConfigWifi = canConfigWifi;
         scanWifiAccessPoints();
 
@@ -429,7 +434,16 @@ void setAirplaneModeDisabled() {
     }
 
     protected int getDefaultDataSubscriptionId() {
-        return mSubscriptionManager.getDefaultDataSubscriptionId();
+        int dds = mSubscriptionManager.getDefaultDataSubscriptionId();
+        if (dds == SubscriptionManager.INVALID_SUBSCRIPTION_ID
+                || !mSubscriptionManager.isActiveSubscriptionId(dds)) {
+            Log.d(TAG, "DDS " + dds + "is invalid or inactive, fallback to first active subId");
+            final int[] activeSubIds = mSubscriptionManager.getActiveSubscriptionIdList();
+            if (!ArrayUtils.isEmpty(activeSubIds)) {
+                dds = activeSubIds[0];
+            }
+        }
+        return dds;
     }
 
     @VisibleForTesting
@@ -1057,7 +1071,7 @@ private void refreshHasActiveSubIdOnDds() {
         int dds = getDefaultDataSubscriptionId();
         if (dds == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             mHasActiveSubIdOnDds = false;
-            Log.d(TAG, "DDS is INVALID_SUBSCRIPTION_ID");
+            Log.d(TAG, "DDS is still INVALID_SUBSCRIPTION_ID");
             return;
         }
         SubscriptionInfo ddsSubInfo = mSubscriptionManager.getActiveSubscriptionInfo(dds);
@@ -1154,7 +1168,7 @@ boolean isVoiceStateInService(int subId) {
     }
 
     public boolean isDeviceLocked() {
-        return !mKeyguardStateController.isUnlocked();
+        return false;
     }
 
     int getCurrentSatelliteState() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsViewModel.kt
index 8dc73e3517037..91177b78e355e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsViewModel.kt
@@ -30,11 +30,15 @@ constructor(
     private val accessPointController: AccessPointController,
     private val contentManagerFactory: InternetDetailsContentManager.Factory,
     private val qsTileIntentUserActionHandler: QSTileIntentUserInputHandler,
+    val extrasViewModel: InternetTileExtrasViewModel,
 ) : TileDetailsViewModel {
+    val canConfigMobileData = accessPointController.canConfigMobileData()
+    val canConfigWifi = accessPointController.canConfigWifi()
+
     val internetDetailsContentManager by lazy {
         contentManagerFactory.create(
-            canConfigMobileData = accessPointController.canConfigMobileData(),
-            canConfigWifi = accessPointController.canConfigWifi(),
+            canConfigMobileData = canConfigMobileData,
+            canConfigWifi = canConfigWifi,
         )
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
index 29df2814cc811..f1519eefaa870 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
@@ -47,9 +47,11 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.Switch;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import android.widget.TextView;
 
+import androidx.compose.ui.platform.ComposeView;
+
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -125,6 +127,7 @@ public class InternetDialogDelegateLegacy implements
     private AlertDialog mAlertDialog;
     private final UiEventLogger mUiEventLogger;
     private final InternetDetailsContentController mInternetDetailsContentController;
+    private final InternetTileExtrasViewModel mExtrasViewModel;
     private TextView mInternetDialogTitle;
     private TextView mInternetDialogSubTitle;
     private View mDivider;
@@ -147,15 +150,16 @@ public class InternetDialogDelegateLegacy implements
     private TextView mMobileTitleText;
     private TextView mMobileSummaryText;
     private TextView mAirplaneModeSummaryText;
-    private Switch mMobileDataToggle;
+    private MaterialSwitch mMobileDataToggle;
     private View mMobileToggleDivider;
-    private Switch mWiFiToggle;
+    private MaterialSwitch mWiFiToggle;
     private Button mDoneButton;
 
     @VisibleForTesting
     protected Button mShareWifiButton;
     private Button mAirplaneModeButton;
     private Drawable mBackgroundOn;
+    private Drawable mSecondaryBackgroundOn;
     private final KeyguardStateController mKeyguard;
     @Nullable
     private Drawable mBackgroundOff = null;
@@ -200,6 +204,7 @@ public InternetDialogDelegateLegacy(
             @ShadeDisplayAware Context context,
             InternetDialogManager internetDialogManager,
             InternetDetailsContentController internetDetailsContentController,
+            InternetTileExtrasViewModel extrasViewModel,
             @Assisted(CAN_CONFIG_MOBILE_DATA) boolean canConfigMobileData,
             @Assisted(CAN_CONFIG_WIFI) boolean canConfigWifi,
             @Assisted(ABOVE_STATUS_BAR) boolean aboveStatusBar,
@@ -230,6 +235,7 @@ public InternetDialogDelegateLegacy(
         mBackgroundExecutor = executor;
         mInternetDialogManager = internetDialogManager;
         mInternetDetailsContentController = internetDetailsContentController;
+        mExtrasViewModel = extrasViewModel;
         mDefaultDataSubId = mInternetDetailsContentController.getDefaultDataSubscriptionId();
         mCanConfigMobileData = canConfigMobileData;
         mCanConfigWifi = canConfigWifi;
@@ -317,6 +323,7 @@ public void onCreate(SystemUIDialog dialog, Bundle savedInstanceState) {
         mInternetDialogTitle.setText(getDialogTitleText());
         mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
         mBackgroundOff = context.getDrawable(R.drawable.internet_dialog_selected_effect);
+        mSecondaryBackgroundOn = mBackgroundOn.getConstantState().newDrawable().mutate();
         setOnClickListener(dialog);
         mTurnWifiOnLayout.setBackground(null);
         mAirplaneModeButton.setVisibility(
@@ -325,6 +332,10 @@ public void onCreate(SystemUIDialog dialog, Bundle savedInstanceState) {
         mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(context));
         mWifiRecyclerView.setAdapter(mAdapter);
 
+        ComposeView extrasCompose = mDialogView.requireViewById(R.id.internet_extras_compose);
+        InternetDetailsContentKt.setupExtrasComposeView(
+                mDialogView, extrasCompose, mExtrasViewModel, mCanConfigMobileData, mCanConfigWifi);
+
         updateDialogUI(getWifiNetworkContent());
     }
 
@@ -366,7 +377,7 @@ public void onStop(SystemUIDialog dialog) {
             mSecondaryMobileNetworkLayout.setOnClickListener(null);
         }
         mSeeAllLayout.setOnClickListener(null);
-        mWiFiToggle.setOnCheckedChangeListener(null);
+        mWiFiToggle.setOnClickListener(null);
         mDoneButton.setOnClickListener(null);
         mShareWifiButton.setOnClickListener(null);
         mAirplaneModeButton.setOnClickListener(null);
@@ -449,7 +460,7 @@ private InternetContent getInternetContent(boolean shouldUpdateMobileNetwork) {
         internetContent.mCurrentSatelliteState =
                 mInternetDetailsContentController.getCurrentSatelliteState();
         internetContent.mDefaultSubSignalStrengthIcon =
-                mInternetDetailsContentController.getSignalStrengthDrawable(mDefaultDataSubId);
+                mInternetDetailsContentController.getSignalStrengthDrawable(mDefaultDataSubId).mutate();
 
         return internetContent;
     }
@@ -640,7 +651,7 @@ private void setMobileDataLayout(SystemUIDialog dialog, InternetContent internet
                         mSecondaryMobileNetworkLayout.setOnClickListener(
                                 this::onClickConnectedSecondarySub);
                     }
-                    mSecondaryMobileNetworkLayout.setBackground(mBackgroundOn);
+                    mSecondaryMobileNetworkLayout.setBackground(mSecondaryBackgroundOn);
 
                     TextView mSecondaryMobileTitleText = mDialogView.requireViewById(
                             R.id.secondary_mobile_title);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetTileExtrasViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetTileExtrasViewModel.kt
new file mode 100644
index 0000000000000..e655cc57061e2
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetTileExtrasViewModel.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.qs.tiles.dialog
+
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyCallback
+import android.util.Log
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.qs.tiles.AxFiveGUtils
+import com.android.systemui.statusbar.policy.HotspotController
+import java.util.concurrent.Executor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class InternetTileExtrasViewModel @Inject constructor(
+    private val hotspotController: HotspotController,
+    private val subscriptionManager: SubscriptionManager,
+    private val fiveGUtils: AxFiveGUtils,
+    @Background private val bgExecutor: Executor,
+    private val dataUsageRepository: DataUsageRepository,
+) {
+
+    private val _hotspotEnabled = MutableStateFlow(false)
+    val hotspotEnabled: StateFlow<Boolean> = _hotspotEnabled.asStateFlow()
+
+    private val _hotspotAvailable = MutableStateFlow(false)
+    val hotspotAvailable: StateFlow<Boolean> = _hotspotAvailable.asStateFlow()
+
+    private val _fiveGEnabled = MutableStateFlow(false)
+    val fiveGEnabled: StateFlow<Boolean> = _fiveGEnabled.asStateFlow()
+
+    private val _fiveGAvailable = MutableStateFlow(false)
+    val fiveGAvailable: StateFlow<Boolean> = _fiveGAvailable.asStateFlow()
+
+    val mobileDataUsage: StateFlow<String?> = dataUsageRepository.mobileUsageFormatted
+    val mobileCarrier: StateFlow<String?> = dataUsageRepository.mobileCarrier
+    val wifiDataUsage: StateFlow<String?> = dataUsageRepository.wifiUsageFormatted
+    val wifiSsid: StateFlow<String?> = dataUsageRepository.wifiSsid
+
+    private val callbacks = mutableMapOf<Int, FiveGCallback>()
+
+    private val hotspotCallback = object : HotspotController.Callback {
+        override fun onHotspotChanged(enabled: Boolean, numDevices: Int) {
+            _hotspotEnabled.value = enabled
+        }
+
+        override fun onHotspotAvailabilityChanged(available: Boolean) {
+            _hotspotAvailable.value = available
+        }
+    }
+
+    private val subscriptionsChangedListener = object : SubscriptionManager.OnSubscriptionsChangedListener() {
+        override fun onSubscriptionsChanged() {
+            refreshCallbacks()
+        }
+    }
+
+    private inner class FiveGCallback : TelephonyCallback(), TelephonyCallback.AllowedNetworkTypesListener {
+        override fun onAllowedNetworkTypesChanged(reason: Int, allowedNetworkType: Long) {
+            bgExecutor.execute { refreshFiveGState() }
+        }
+    }
+
+    fun start() {
+        _hotspotAvailable.value = hotspotController.isHotspotSupported
+        _hotspotEnabled.value = hotspotController.isHotspotEnabled
+        hotspotController.addCallback(hotspotCallback)
+        subscriptionManager.addOnSubscriptionsChangedListener(bgExecutor, subscriptionsChangedListener)
+        refreshCallbacks()
+        dataUsageRepository.refresh()
+    }
+
+    fun stop() {
+        hotspotController.removeCallback(hotspotCallback)
+        subscriptionManager.removeOnSubscriptionsChangedListener(subscriptionsChangedListener)
+        clearCallbacks()
+    }
+
+    fun toggleHotspot() {
+        val newState = !_hotspotEnabled.value
+        hotspotController.setHotspotEnabled(newState)
+    }
+
+    fun toggleFiveG() {
+        bgExecutor.execute {
+            try {
+                fiveGUtils.setNrEnabled(!_fiveGEnabled.value)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error toggling 5G", e)
+            }
+            refreshFiveGState()
+        }
+    }
+
+    private fun refreshCallbacks() {
+        bgExecutor.execute {
+            val subInfoList = subscriptionManager.activeSubscriptionInfoList ?: emptyList()
+            val activeSubIds = subInfoList.map { it.subscriptionId }.toSet()
+
+            val iterator = callbacks.iterator()
+            while (iterator.hasNext()) {
+                val entry = iterator.next()
+                if (entry.key !in activeSubIds) {
+                    fiveGUtils.createForSubscriptionId(entry.key)
+                        .unregisterTelephonyCallback(entry.value)
+                    iterator.remove()
+                }
+            }
+
+            for (subId in activeSubIds) {
+                if (subId !in callbacks) {
+                    val callback = FiveGCallback()
+                    callbacks[subId] = callback
+                    fiveGUtils.createForSubscriptionId(subId)
+                        .registerTelephonyCallback(bgExecutor, callback)
+                }
+            }
+            refreshFiveGState()
+        }
+    }
+
+    private fun clearCallbacks() {
+        bgExecutor.execute {
+            for ((subId, callback) in callbacks) {
+                fiveGUtils.createForSubscriptionId(subId)
+                    .unregisterTelephonyCallback(callback)
+            }
+            callbacks.clear()
+        }
+    }
+
+    private fun refreshFiveGState() {
+        _fiveGAvailable.value = fiveGUtils.isNrAvailable()
+        _fiveGEnabled.value = if (_fiveGAvailable.value) fiveGUtils.isNrEnabled() else false
+    }
+
+    companion object {
+        private const val TAG = "InternetTileExtrasVM"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractor.kt
index 5091623390113..d2ed552eb3c52 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileDataInteractor.kt
@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles.impl.cell.domain.interactor
 
 import android.content.Context
 import android.os.UserHandle
+import android.telephony.TelephonyManager
 import com.android.settingslib.graph.SignalDrawable
 import com.android.systemui.Flags as AconfigFlags
 import com.android.systemui.common.shared.model.ContentDescription
@@ -27,6 +28,7 @@ import com.android.systemui.qs.pipeline.shared.QSPipelineFlagsRepository
 import com.android.systemui.qs.tiles.base.domain.interactor.QSTileDataInteractor
 import com.android.systemui.qs.tiles.base.domain.model.DataUpdateTrigger
 import com.android.systemui.qs.tiles.impl.cell.domain.model.MobileDataTileIcon
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.qs.tiles.impl.cell.domain.model.MobileDataTileModel
 import com.android.systemui.res.R
 import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor
@@ -36,6 +38,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 
 class MobileDataTileDataInteractor
@@ -44,6 +47,7 @@ constructor(
     @Application private val context: Context,
     private val mobileIconsInteractor: MobileIconsInteractor,
     private val qsPipelineFlagsRepository: QSPipelineFlagsRepository,
+    private val dataUsageRepository: DataUsageRepository,
 ) : QSTileDataInteractor<MobileDataTileModel> {
     private val mobileDataLabel: String =
         context.getString(R.string.quick_settings_cellular_detail_title)
@@ -56,7 +60,7 @@ constructor(
     fun tileData(): Flow<MobileDataTileModel> =
         mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
             if (it == null) {
-                    flowOf(
+                    dataUsageRepository.mobileUsageFormatted.map { usageSummary ->
                         MobileDataTileModel(
                             isSimActive = false,
                             isEnabled = false,
@@ -67,11 +71,16 @@ constructor(
                                         ContentDescription.Loaded(mobileDataLabel),
                                     )
                                 ),
+                            dataUsageSummary = usageSummary,
                         )
-                    )
+                    }
                 } else {
-                    combine(it.isDataEnabled, it.signalLevelIcon) { isDataEnabled, signalLevelIcon
-                        ->
+                    combine(
+                        it.isDataEnabled,
+                        it.signalLevelIcon,
+                        it.networkName,
+                        dataUsageRepository.mobileUsageFormatted,
+                    ) { isDataEnabled, signalLevelIcon, networkNameModel, usageSummary ->
                         val icon =
                             if (isDataEnabled) {
                                 when (signalLevelIcon) {
@@ -106,27 +115,37 @@ constructor(
                             isSimActive = true,
                             isEnabled = isDataEnabled,
                             icon = icon,
+                            networkName = networkNameModel.name,
+                            dataUsageSummary = usageSummary,
                         )
                     }
                 }
                 .onStart {
-                    MobileDataTileModel(
-                        isSimActive = false,
-                        isEnabled = false,
-                        icon =
-                            MobileDataTileIcon.ResourceIcon(
-                                Icon.Resource(
-                                    R.drawable.ic_signal_mobile_data_off,
-                                    ContentDescription.Loaded(mobileDataLabel),
-                                )
-                            ),
+                    dataUsageRepository.refresh()
+                    emit(
+                        MobileDataTileModel(
+                            isSimActive = false,
+                            isEnabled = false,
+                            icon =
+                                MobileDataTileIcon.ResourceIcon(
+                                    Icon.Resource(
+                                        R.drawable.ic_signal_mobile_data_off,
+                                        ContentDescription.Loaded(mobileDataLabel),
+                                    )
+                                ),
+                        )
                     )
                 }
         }
 
     override fun availability(user: UserHandle): Flow<Boolean> = flowOf(isAvailable())
 
+    fun isVoiceCapable(): Boolean {
+        val telephony = context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
+        return telephony?.isVoiceCapable == true
+    }
+
     fun isAvailable(): Boolean {
-        return AconfigFlags.qsSplitInternetTile()
+        return isVoiceCapable() && AconfigFlags.qsSplitInternetTile()
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileUserActionInteractor.kt
index 3433d091cb2d7..e31999847c118 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileUserActionInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/interactor/MobileDataTileUserActionInteractor.kt
@@ -55,6 +55,9 @@ constructor(
             is QSTileUserAction.LongClick -> {
                 qsTileIntentUserActionHandler.handle(input.action.expandable, longClickIntent)
             }
+            is QSTileUserAction.ToggleClick -> {
+                handleSecondaryClick(input.action.expandable)
+            }
             else -> {}
         }
     }
@@ -70,6 +73,17 @@ constructor(
         }
     }
 
+    fun handleSecondaryClick(expandable: Expandable?) {
+        val activeRepo = mobileConnectionsRepository.activeMobileDataRepository.value ?: return
+        // If mobile data is disabled, turn it on.
+        if (!activeRepo.dataEnabled.value) {
+            activeRepo.setDataEnabled(true)
+        } else {
+            // Otherwise, just turn it off.
+            activeRepo.setDataEnabled(false)
+        }
+    }
+
     private fun showEnableConfirmationDialog(expandable: Expandable?) {
         val dialog: SystemUIDialog = systemUIDialogFactory.create()
         dialog.setTitle(context.getString(R.string.mobile_data_enable_title))
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/model/MobileDataTileModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/model/MobileDataTileModel.kt
index b2156741aeac7..cf539eca67383 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/model/MobileDataTileModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/domain/model/MobileDataTileModel.kt
@@ -36,4 +36,6 @@ data class MobileDataTileModel(
     val isSimActive: Boolean,
     val isEnabled: Boolean,
     val icon: MobileDataTileIcon,
+    val networkName: String? = null,
+    val dataUsageSummary: String? = null,
 )
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/ui/mapper/MobileDataTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/ui/mapper/MobileDataTileMapper.kt
index 2f582215d7c84..9dc09153ecc6b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/ui/mapper/MobileDataTileMapper.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/cell/ui/mapper/MobileDataTileMapper.kt
@@ -25,6 +25,7 @@ import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.qs.tiles.base.shared.model.QSTileConfig
 import com.android.systemui.qs.tiles.base.shared.model.QSTileState
 import com.android.systemui.qs.tiles.base.ui.model.QSTileDataToStateMapper
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.qs.tiles.impl.cell.domain.model.MobileDataTileIcon
 import com.android.systemui.qs.tiles.impl.cell.domain.model.MobileDataTileModel
 import com.android.systemui.res.R
@@ -61,6 +62,23 @@ constructor(
                 }
             }
 
+            val statusLabel =
+                if (data.isSimActive) {
+                    if (data.isEnabled) {
+                        data.networkName ?: resources.getString(R.string.mobile_data_connection_active)
+                    } else {
+                        resources.getString(R.string.cell_data_off)
+                    }
+                } else {
+                    resources.getString(R.string.quick_settings_networks_unavailable)
+                }
+
+            secondaryLabel =
+                if (data.isSimActive && data.isEnabled) {
+                    DataUsageRepository.appendUsage(statusLabel, data.dataUsageSummary)
+                } else {
+                    null
+                }
             contentDescription = "$label".toString()
             activationState =
                 if (data.isSimActive) {
@@ -73,6 +91,10 @@ constructor(
                     QSTileState.ActivationState.UNAVAILABLE
                 }
             supportedActions =
-                setOf(QSTileState.UserAction.CLICK, QSTileState.UserAction.LONG_CLICK)
+                setOf(
+                    QSTileState.UserAction.CLICK,
+                    QSTileState.UserAction.LONG_CLICK,
+                    QSTileState.UserAction.TOGGLE_CLICK,
+                )
         }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt
index 2fd2486a47c33..b907efafbaa31 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/interactor/FlashlightTileDataInteractor.kt
@@ -70,6 +70,7 @@ constructor(
                                 else FlashlightModel.Unavailable.Temporarily.CameraInUse
                             )
                         }
+                        override fun onFlashlightStrengthChanged(level: Int) {}
                     }
                 flashlightController.addCallback(callback)
                 awaitClose { flashlightController.removeCallback(callback) }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractor.kt
index 01b6a0e6cefd6..4132e2cda6925 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractor.kt
@@ -26,6 +26,7 @@ import com.android.systemui.common.shared.model.Text
 import com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.qs.tiles.base.domain.interactor.QSTileDataInteractor
 import com.android.systemui.qs.tiles.base.domain.model.DataUpdateTrigger
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.qs.tiles.impl.internet.domain.model.InternetTileModel
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
@@ -62,26 +63,36 @@ constructor(
     mobileIconsInteractor: MobileIconsInteractor,
     mobileContextProvider: MobileContextProvider,
     wifiInteractor: WifiInteractor,
+    private val dataUsageRepository: DataUsageRepository,
 ) : QSTileDataInteractor<InternetTileModel> {
     private val internetLabel: String = context.getString(R.string.quick_settings_internet_label)
 
     // Three symmetrical Flows that can be switched upon based on the value of
     // [DefaultConnectionModel]
     private val wifiIconFlow: Flow<InternetTileModel> =
-        wifiInteractor.wifiNetwork.flatMapLatest {
-            val wifiIcon = WifiIcon.fromModel(it, context, showHotspotInfo = true)
-            if (it is WifiNetworkModel.Active && wifiIcon is WifiIcon.Visible) {
-                val secondary = removeDoubleQuotes(it.ssid)
-                flowOf(
-                    InternetTileModel.Active(
-                        secondaryTitle = secondary,
-                        icon = InternetTileIconModel.ResourceId(wifiIcon.icon.resId),
-                        stateDescription = wifiIcon.contentDescription,
-                        contentDescription = ContentDescription.Loaded("$internetLabel,$secondary"),
+        combine(
+            wifiInteractor.wifiNetwork.flatMapLatest {
+                val wifiIcon = WifiIcon.fromModel(it, context, showHotspotInfo = true)
+                if (it is WifiNetworkModel.Active && wifiIcon is WifiIcon.Visible) {
+                    val secondary = removeDoubleQuotes(it.ssid)
+                    flowOf(
+                        InternetTileModel.Active(
+                            secondaryTitle = secondary,
+                            icon = InternetTileIconModel.ResourceId(wifiIcon.icon.resId),
+                            stateDescription = wifiIcon.contentDescription,
+                            contentDescription = ContentDescription.Loaded("$internetLabel,$secondary"),
+                        )
                     )
-                )
+                } else {
+                    notConnectedFlow
+                }
+            },
+            dataUsageRepository.wifiUsageFormatted,
+        ) { model, wifiUsage ->
+            if (model is InternetTileModel.Active) {
+                model.copy(dataUsageSummary = wifiUsage)
             } else {
-                notConnectedFlow
+                model
             }
         }
 
@@ -109,48 +120,57 @@ constructor(
         }
 
     private val mobileIconFlow: Flow<InternetTileModel> =
-        mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
-            if (it == null) {
-                notConnectedFlow
-            } else {
-                combine(it.networkName, it.signalLevelIcon, mobileDataContentName) {
-                        networkNameModel,
-                        signalIcon,
-                        dataContentDescription ->
-                        Triple(networkNameModel, signalIcon, dataContentDescription)
-                    }
-                    .mapLatestConflated { (networkNameModel, signalIcon, dataContentDescription) ->
-                        when (signalIcon) {
-                            is SignalIconModel.Cellular -> {
-                                val secondary =
-                                    mobileDataContentConcat(
-                                        networkNameModel.name,
-                                        dataContentDescription,
-                                    )
+        combine(
+            mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
+                if (it == null) {
+                    notConnectedFlow
+                } else {
+                    combine(it.networkName, it.signalLevelIcon, mobileDataContentName) {
+                            networkNameModel,
+                            signalIcon,
+                            dataContentDescription ->
+                            Triple(networkNameModel, signalIcon, dataContentDescription)
+                        }
+                        .mapLatestConflated { (networkNameModel, signalIcon, dataContentDescription) ->
+                            when (signalIcon) {
+                                is SignalIconModel.Cellular -> {
+                                    val secondary =
+                                        mobileDataContentConcat(
+                                            networkNameModel.name,
+                                            dataContentDescription,
+                                        )
 
-                                InternetTileModel.Active(
-                                    secondaryTitle = secondary,
-                                    icon = InternetTileIconModel.Cellular(signalIcon.level),
-                                    stateDescription =
-                                        ContentDescription.Loaded(secondary.toString()),
-                                    contentDescription = ContentDescription.Loaded(internetLabel),
-                                )
-                            }
-                            is SignalIconModel.Satellite -> {
-                                val secondary =
-                                    signalIcon.icon.contentDescription.loadContentDescription(
-                                        context
+                                    InternetTileModel.Active(
+                                        secondaryTitle = secondary,
+                                        icon = InternetTileIconModel.Cellular(signalIcon.level),
+                                        stateDescription =
+                                            ContentDescription.Loaded(secondary.toString()),
+                                        contentDescription = ContentDescription.Loaded(internetLabel),
                                     )
+                                }
+                                is SignalIconModel.Satellite -> {
+                                    val secondary =
+                                        signalIcon.icon.contentDescription.loadContentDescription(
+                                            context
+                                        )
 
-                                InternetTileModel.Active(
-                                    secondaryTitle = secondary,
-                                    icon = InternetTileIconModel.Satellite(signalIcon.icon),
-                                    stateDescription = ContentDescription.Loaded(secondary),
-                                    contentDescription = ContentDescription.Loaded(internetLabel),
-                                )
+                                    InternetTileModel.Active(
+                                        secondaryTitle = secondary,
+                                        icon = InternetTileIconModel.Satellite(signalIcon.icon),
+                                        stateDescription = ContentDescription.Loaded(secondary),
+                                        contentDescription = ContentDescription.Loaded(internetLabel),
+                                    )
+                                }
                             }
                         }
-                    }
+                }
+            },
+            dataUsageRepository.mobileUsageFormatted,
+        ) { model, mobileUsage ->
+            if (model is InternetTileModel.Active) {
+                model.copy(dataUsageSummary = mobileUsage)
+            } else {
+                model
             }
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/model/InternetTileModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/model/InternetTileModel.kt
index 15b4e472eec74..e6a4f0aced819 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/model/InternetTileModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/domain/model/InternetTileModel.kt
@@ -24,6 +24,7 @@ import com.android.systemui.statusbar.pipeline.shared.ui.model.InternetTileIconM
 sealed interface InternetTileModel {
     val secondaryTitle: CharSequence?
     val secondaryLabel: Text?
+    val dataUsageSummary: String?
     val icon: InternetTileIconModel
     val stateDescription: ContentDescription?
     val contentDescription: ContentDescription?
@@ -31,6 +32,7 @@ sealed interface InternetTileModel {
     data class Active(
         override val secondaryTitle: CharSequence? = null,
         override val secondaryLabel: Text? = null,
+        override val dataUsageSummary: String? = null,
         override val icon: InternetTileIconModel = InternetTileIconModel.Cellular(1),
         override val stateDescription: ContentDescription? = null,
         override val contentDescription: ContentDescription? = null,
@@ -39,6 +41,7 @@ sealed interface InternetTileModel {
     data class Inactive(
         override val secondaryTitle: CharSequence? = null,
         override val secondaryLabel: Text? = null,
+        override val dataUsageSummary: String? = null,
         override val icon: InternetTileIconModel = InternetTileIconModel.Cellular(1),
         override val stateDescription: ContentDescription? = null,
         override val contentDescription: ContentDescription? = null,
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/ui/mapper/InternetTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/ui/mapper/InternetTileMapper.kt
index b31d48e606381..265b051817167 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/ui/mapper/InternetTileMapper.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/internet/ui/mapper/InternetTileMapper.kt
@@ -19,7 +19,7 @@ package com.android.systemui.qs.tiles.impl.internet.ui.mapper
 import android.content.Context
 import android.content.res.Resources
 import android.os.Handler
-import android.widget.Switch
+import com.google.android.material.materialswitch.MaterialSwitch
 import com.android.settingslib.graph.SignalDrawable
 import com.android.systemui.common.shared.model.ContentDescription.Companion.loadContentDescription
 import com.android.systemui.common.shared.model.Icon
@@ -46,15 +46,11 @@ constructor(
 
     override fun map(config: QSTileConfig, data: InternetTileModel): QSTileState =
         QSTileState.build(resources, theme, config.uiConfig) {
-            label = resources.getString(R.string.quick_settings_internet_label)
-            expandedAccessibilityClass = Switch::class
+            label = data.secondaryTitle
+                ?: resources.getString(R.string.quick_settings_internet_label)
+            expandedAccessibilityClass = MaterialSwitch::class
 
-            secondaryLabel =
-                if (data.secondaryLabel != null) {
-                    data.secondaryLabel.loadText(context)
-                } else {
-                    data.secondaryTitle
-                }
+            secondaryLabel = data.dataUsageSummary ?: ""
 
             stateDescription = data.stateDescription.loadContentDescription(context)
             contentDescription = data.contentDescription.loadContentDescription(context)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerDefaults.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerDefaults.kt
new file mode 100644
index 0000000000000..413794cf5a2a1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerDefaults.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.qs.tiles.impl.ringer
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.android.compose.theme.LocalAndroidColorScheme
+import com.android.systemui.common.ringer.RingerSliderDimens
+import com.android.systemui.common.ringer.RingerSliderTheme
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CustomColorScheme
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberQsGradient
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberQsTileBackgroundBrush
+
+class QSTileRingerTheme(
+) : RingerSliderTheme {
+    override val activeBg: Color
+        @Composable get() = MaterialTheme.colorScheme.primary
+
+    override val activeBgBrush: Brush?
+        @Composable get() = rememberQsTileBackgroundBrush()
+    
+    override val neutralBg: Color
+        @Composable get() = CustomColorScheme.current.qsTileColor
+
+    override val activeIcon: Color
+        @Composable get() = MaterialTheme.colorScheme.onPrimary
+    
+    override val neutralIcon: Color
+        @Composable get() = MaterialTheme.colorScheme.onSurface
+
+    override val dndBg: Color
+        @Composable get() = MaterialTheme.colorScheme.primary
+    
+    override val dndIcon: Color
+        @Composable get() = MaterialTheme.colorScheme.onPrimary
+    
+    override val dozeStroke: Dp = 2.dp
+}
+
+class QSTileRingerDimens(
+    private val tileHeight: Dp
+) : RingerSliderDimens {
+    override val totalWidth: Dp? = null
+    override val thumbSize: Dp = tileHeight
+    override val iconSize: Dp = 24.dp
+    override val thumbPadding: Dp = 8.dp
+    override val dotSize: Dp = 6.dp
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerSlider.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerSlider.kt
new file mode 100644
index 0000000000000..534c74de9808a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/ringer/QSTileRingerSlider.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.qs.tiles.impl.ringer
+
+import android.app.NotificationManager
+import android.content.Context
+import android.media.AudioManager
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import com.android.systemui.common.ringer.RingerSliderWidget
+import com.android.systemui.common.ringer.RingerModeInteractorImpl
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.CommonTileDefaults.TileHeight
+import com.android.systemui.qs.panels.ui.compose.infinitegrid.rememberTileShapeMode
+
+@Composable
+fun QSTileRingerSlider(
+    border: Modifier = Modifier
+) {
+    val context = LocalContext.current
+
+    val interactor = remember {
+        val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        RingerModeInteractorImpl(context, audioManager, notificationManager)
+    }
+
+    val shapeMode = rememberTileShapeMode()
+
+    // Our scheme: 0 = default, 1 = circle-ish, 2 = rounded square, 3 = square, 4 = full circle (round for this tile)
+    val containerCornerRadius = when (shapeMode) {
+        1, 4 -> CommonTileDefaults.InactiveCornerRadius
+        2 -> CommonTileDefaults.ActiveTileCornerRadius
+        3 -> CommonTileDefaults.ActiveTileCornerRadius
+        else -> CommonTileDefaults.ActiveTileCornerRadius
+    }
+
+    val thumbCornerRadius = when (shapeMode) {
+        1 -> CommonTileDefaults.InactiveCornerRadius
+        4 -> CommonTileDefaults.InactiveCornerRadius
+        else -> 16.dp
+    }
+
+    val animatedContainerRadius by animateDpAsState(targetValue = containerCornerRadius, label = "RingerContainerRadius")
+    val animatedThumbRadius by animateDpAsState(targetValue = thumbCornerRadius, label = "RingerThumbRadius")
+    
+    RingerSliderWidget(
+        interactor = interactor,
+        theme = QSTileRingerTheme(),
+        dimens = QSTileRingerDimens(TileHeight),
+        modifier = Modifier.fillMaxWidth(),
+        isDozing = false,
+        border = border,
+        containerShape = RoundedCornerShape(animatedContainerRadius),
+        thumbShape = RoundedCornerShape(animatedThumbRadius),
+        onLongClick = {
+            interactor.toggleDnd()
+        }
+    )
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractor.kt
index 760faa0893d47..f3181817c0070 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileDataInteractor.kt
@@ -27,6 +27,7 @@ import com.android.systemui.common.shared.model.Text
 import com.android.systemui.dagger.qualifiers.Application
 import com.android.systemui.qs.tiles.base.domain.interactor.QSTileDataInteractor
 import com.android.systemui.qs.tiles.base.domain.model.DataUpdateTrigger
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.qs.tiles.impl.wifi.domain.model.WifiTileModel
 import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeDisplayAware
@@ -35,6 +36,7 @@ import com.android.systemui.statusbar.connectivity.ui.MobileContextProvider
 import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepository
 import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor
 import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel
+import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel
 import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
@@ -50,6 +52,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 
 /** Observes wifi tile state changes providing the [WifiTileModel]. */
@@ -60,9 +63,8 @@ constructor(
     @Application private val scope: CoroutineScope,
     airplaneModeRepository: AirplaneModeRepository,
     private val connectivityRepository: ConnectivityRepository,
-    mobileIconsInteractor: MobileIconsInteractor,
-    mobileContextProvider: MobileContextProvider,
     val wifiInteractor: WifiInteractor,
+    private val dataUsageRepository: DataUsageRepository,
 ) : QSTileDataInteractor<WifiTileModel> {
 
     private val wifiIconFlow: Flow<WifiTileModel> =
@@ -86,98 +88,6 @@ constructor(
             }
         }
 
-    private val mobileDataContentName: Flow<CharSequence?> =
-        mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
-            if (it == null) {
-                flowOf(null)
-            } else {
-                combine(it.isRoaming, it.networkTypeIconGroup) { isRoaming, networkTypeIconGroup ->
-                    val mobileContext =
-                        mobileContextProvider.getMobileContextForSub(it.subscriptionId, context)
-                    val cd = loadString(networkTypeIconGroup.contentDescription, mobileContext)
-                    if (isRoaming) {
-                        val roaming = mobileContext.getString(R.string.data_connection_roaming)
-                        if (cd != null) {
-                            mobileContext.getString(R.string.mobile_data_text_format, roaming, cd)
-                        } else {
-                            roaming
-                        }
-                    } else {
-                        cd
-                    }
-                }
-            }
-        }
-
-    private val mobileDescriptionFlow: Flow<CharSequence> =
-        mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
-            if (it == null) {
-                notConnectedDescriptionFlow
-            } else {
-                it.isDataConnected.flatMapLatest { isConnected ->
-                    if (!isConnected) {
-                        notConnectedDescriptionFlow
-                    } else {
-                        combine(it.networkName, it.signalLevelIcon, mobileDataContentName) {
-                                networkNameModel,
-                                signalIcon,
-                                dataContentDescription ->
-                                Triple(networkNameModel, signalIcon, dataContentDescription)
-                            }
-                            .mapLatestConflated {
-                                (networkNameModel, signalIcon, dataContentDescription) ->
-                                when (signalIcon) {
-                                    is SignalIconModel.Cellular -> {
-                                        mobileDataContentConcat(
-                                            networkNameModel.name,
-                                            dataContentDescription,
-                                        )
-                                    }
-                                    is SignalIconModel.Satellite -> {
-                                        val satelliteDescription =
-                                            signalIcon.icon.contentDescription
-                                                ?.loadContentDescription(context)
-                                        if (satelliteDescription.isNullOrBlank()) {
-                                            notConnectedDescriptionFlow.value
-                                        } else {
-                                            satelliteDescription
-                                        }
-                                    }
-                                }
-                            }
-                    }
-                }
-            }
-        }
-
-    private fun mobileDataContentConcat(
-        networkName: String?,
-        dataContentDescription: CharSequence?,
-    ): CharSequence {
-        if (dataContentDescription == null) {
-            return networkName ?: ""
-        }
-        if (networkName == null) {
-            return Html.fromHtml(dataContentDescription.toString(), 0)
-        }
-
-        return Html.fromHtml(
-            context.getString(
-                R.string.mobile_carrier_text_format,
-                networkName,
-                dataContentDescription,
-            ),
-            0,
-        )
-    }
-
-    private fun loadString(@StringRes resId: Int, context: Context): CharSequence? =
-        if (resId != 0) {
-            context.getString(resId)
-        } else {
-            null
-        }
-
     private val notConnectedDescriptionFlow: StateFlow<CharSequence> =
         combine(wifiInteractor.areNetworksAvailable, airplaneModeRepository.isAirplaneMode) {
                 networksAvailable,
@@ -207,12 +117,22 @@ constructor(
 
     fun tileData(): Flow<WifiTileModel> =
         combine(
-            connectivityRepository.defaultConnections,
-            wifiInteractor.wifiToggleState,
-            wifiInteractor.isEnabled,
-            wifiIconFlow,
-            mobileDescriptionFlow,
-        ) { defaultConnections, toggleState, isEnabled, wifiModel, mobileDescription ->
+            combine(
+                connectivityRepository.defaultConnections,
+                wifiInteractor.wifiToggleState,
+                wifiInteractor.isEnabled,
+                wifiIconFlow,
+                notConnectedDescriptionFlow,
+            ) { defaultConnections, toggleState, isEnabled, wifiModel, notConnectedDescription ->
+                WifiTileIntermediate(
+                    defaultConnections, toggleState, isEnabled, wifiModel, notConnectedDescription
+                )
+            },
+            dataUsageRepository.wifiUsageFormatted,
+        ) { intermediate, wifiUsage ->
+            val (defaultConnections, toggleState, isEnabled, wifiModel, notConnectedDescription) =
+                intermediate
+
             if (defaultConnections.ethernet.isDefault) {
                 return@combine if (defaultConnections.isValidated) {
                     WifiTileModel.Active(
@@ -236,7 +156,7 @@ constructor(
             if (toggleState == WifiToggleState.Pausing) {
                 return@combine WifiTileModel.Inactive(
                     icon = WifiTileIconModel(WifiIcons.WIFI_NO_SIGNAL),
-                    secondaryLabel = mobileDescription,
+                    secondaryLabel = notConnectedDescription,
                 )
             } else if (toggleState == WifiToggleState.Scanning) {
                 return@combine WifiTileModel.Active(
@@ -248,7 +168,7 @@ constructor(
             if (defaultConnections.wifi.isDefault) {
                 return@combine WifiTileModel.Active(
                     icon = wifiModel.icon,
-                    secondaryLabel = wifiModel.secondaryLabel,
+                    secondaryLabel = DataUsageRepository.appendUsage(wifiModel.secondaryLabel, wifiUsage),
                 )
             }
 
@@ -261,14 +181,22 @@ constructor(
                             R.drawable.ic_signal_wifi_off
                         }
                     ),
-                secondaryLabel = mobileDescription,
+                secondaryLabel = notConnectedDescription,
             )
-        }
+        }.onStart { dataUsageRepository.refresh() }
 
     override fun availability(user: UserHandle): Flow<Boolean> = flowOf(isAvailable())
 
     fun isAvailable(): Boolean = AconfigFlags.qsSplitInternetTile()
 
+    private data class WifiTileIntermediate(
+        val defaultConnections: DefaultConnectionModel,
+        val toggleState: WifiToggleState,
+        val isEnabled: Boolean,
+        val wifiModel: WifiTileModel,
+        val notConnectedDescription: CharSequence,
+    )
+
     private companion object {
         fun removeDoubleQuotes(string: String?): String? {
             if (string == null) return null
@@ -276,11 +204,5 @@ constructor(
                 string.substring(1, string.length - 1)
             } else string
         }
-
-        fun ContentDescription.toText(): Text =
-            when (this) {
-                is ContentDescription.Loaded -> Text.Loaded(this.description)
-                is ContentDescription.Resource -> Text.Resource(this.res)
-            }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileUserActionInteractor.kt
index 96039b07cf1f9..439c3948e2021 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileUserActionInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/domain/interactor/WifiTileUserActionInteractor.kt
@@ -16,18 +16,14 @@
 
 package com.android.systemui.qs.tiles.impl.wifi.domain.interactor
 
-import android.content.Intent
-import android.provider.Settings
 import com.android.systemui.animation.Expandable
 import com.android.systemui.dagger.qualifiers.Main
-import com.android.systemui.qs.tiles.base.domain.actions.QSTileIntentUserInputHandler
 import com.android.systemui.qs.tiles.base.domain.interactor.QSTileUserActionInteractor
 import com.android.systemui.qs.tiles.base.domain.model.QSTileInput
 import com.android.systemui.qs.tiles.base.shared.model.QSTileUserAction
 import com.android.systemui.qs.tiles.dialog.InternetDialogManager
 import com.android.systemui.qs.tiles.impl.wifi.domain.model.WifiTileModel
 import com.android.systemui.statusbar.connectivity.AccessPointController
-import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
@@ -41,47 +37,33 @@ constructor(
     private val internetDialogManager: InternetDialogManager,
     private val accessPointController: AccessPointController,
     private val wifiRepository: WifiRepository,
-    private val qsTileIntentUserActionHandler: QSTileIntentUserInputHandler,
 ) : QSTileUserActionInteractor<WifiTileModel> {
-    val longClickIntent = Intent(Settings.ACTION_WIFI_SETTINGS)
 
     override suspend fun handleInput(input: QSTileInput<WifiTileModel>): Unit =
         with(input) {
             when (action) {
-                is QSTileUserAction.Click -> {
-                    handleClick(action.expandable)
-                }
-                is QSTileUserAction.LongClick -> {
-                    handleLongClick(action.expandable)
-                }
-                is QSTileUserAction.ToggleClick -> {
-                    handleSecondaryClick(action.expandable)
-                }
+                is QSTileUserAction.Click -> handleClick()
+                is QSTileUserAction.LongClick -> handleLongClick(action.expandable)
+                is QSTileUserAction.ToggleClick -> {}
             }
         }
 
-    suspend fun handleClick(expandable: Expandable?) {
+    fun handleClick() {
+        if (!wifiRepository.isWifiEnabled.value) {
+            wifiRepository.enableWifi()
+        } else {
+            wifiRepository.disableWifi()
+        }
+    }
+
+    suspend fun handleLongClick(expandable: Expandable?) {
         withContext(mainContext) {
             internetDialogManager.create(
                 aboveStatusBar = true,
-                false, /* canConfigMobileData */
+                false,
                 accessPointController.canConfigWifi(),
                 expandable,
             )
         }
     }
-
-    suspend fun handleLongClick(expandable: Expandable?) {
-        withContext(mainContext) {
-            qsTileIntentUserActionHandler.handle(expandable, Intent(Settings.ACTION_WIFI_SETTINGS))
-        }
-    }
-
-    fun handleSecondaryClick(expandable: Expandable?) {
-        if (!wifiRepository.isWifiEnabled.value) {
-            wifiRepository.enableWifi()
-        } else {
-            wifiRepository.disableWifi()
-        }
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/ui/mapper/WifiTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/ui/mapper/WifiTileMapper.kt
index 561f78068e7d1..718cd2c919218 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/ui/mapper/WifiTileMapper.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/wifi/ui/mapper/WifiTileMapper.kt
@@ -18,7 +18,7 @@ package com.android.systemui.qs.tiles.impl.wifi.ui.mapper
 
 import android.content.Context
 import android.content.res.Resources
-import android.widget.Switch
+import com.google.android.material.materialswitch.MaterialSwitch
 import com.android.systemui.common.shared.model.Icon
 import com.android.systemui.qs.tiles.base.shared.model.QSTileConfig
 import com.android.systemui.qs.tiles.base.shared.model.QSTileState
@@ -40,7 +40,7 @@ constructor(
     override fun map(config: QSTileConfig, data: WifiTileModel): QSTileState =
         QSTileState.build(resources, theme, config.uiConfig) {
             label = resources.getString(R.string.quick_settings_wifi_label)
-            expandedAccessibilityClass = Switch::class
+            expandedAccessibilityClass = MaterialSwitch::class
 
             secondaryLabel =
                 if (data.secondaryLabel != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/quicklook/QuickLookClient.kt b/packages/SystemUI/src/com/android/systemui/quicklook/QuickLookClient.kt
new file mode 100644
index 0000000000000..271c35717b5be
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/quicklook/QuickLookClient.kt
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.systemui.quicklook
+
+import android.app.PendingIntent
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.os.RemoteException
+import android.util.Log
+import com.android.axion.quicklook.IAxQuickLookService
+import com.android.axion.quicklook.IQuickLookCallback
+import com.android.axion.quicklook.QuickLookTarget
+import com.android.axion.quicklook.SportsData
+import com.android.axion.quicklook.nowPlayingData
+import com.android.axion.quicklook.sportsData
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.util.WeakListenerManager
+import javax.inject.Inject
+
+@SysUISingleton
+class QuickLookClient @Inject constructor(
+    private val context: Context
+) {
+
+    interface Callback {
+        fun onNowPlayingUpdate(nowPlayingText: String, tapAction: PendingIntent?) {}
+        fun onSportsUpdate(sports: List<SportsData>) {}
+    }
+
+    private val handler = Handler(Looper.getMainLooper())
+    private var service: IAxQuickLookService? = null
+    private var isBound = false
+    private var rebindAttempts = 0
+
+    private var cachedNowPlaying: String = ""
+    private var cachedNowPlayingAction: PendingIntent? = null
+    private var cachedSports: List<SportsData> = emptyList()
+
+    private val callbacks = WeakListenerManager<Callback>()
+
+    private val quickLookCallback = object : IQuickLookCallback.Stub() {
+        override fun onTargetsUpdated(targets: MutableList<QuickLookTarget>) {
+            handler.post { processTargets(targets) }
+        }
+    }
+
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
+            service = IAxQuickLookService.Stub.asInterface(binder)
+            rebindAttempts = 0
+            try {
+                service?.registerCallback(quickLookCallback)
+                service?.getCurrentTargets()?.let { targets ->
+                    handler.post { processTargets(targets) }
+                }
+            } catch (e: RemoteException) {
+                Log.e(TAG, "Failed to register callback", e)
+            }
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+            service = null
+            scheduleRebind()
+        }
+    }
+
+    fun addCallback(callback: Callback) {
+        callbacks.addListener(callback)
+        if (!isBound) {
+            bindService()
+        }
+        deliverCachedData(callback)
+    }
+
+    fun removeCallback(callback: Callback) {
+        callbacks.removeListener(callback)
+        if (callbacks.isEmpty()) {
+            unbindService()
+        }
+    }
+
+    private fun deliverCachedData(callback: Callback) {
+        if (cachedNowPlaying.isNotEmpty()) {
+            callback.onNowPlayingUpdate(cachedNowPlaying, cachedNowPlayingAction)
+        }
+        if (cachedSports.isNotEmpty()) {
+            callback.onSportsUpdate(cachedSports)
+        }
+    }
+
+    private fun processTargets(targets: List<QuickLookTarget>) {
+        var hasNowPlaying = false
+        val sportsTargets = mutableListOf<SportsData>()
+
+        for (target in targets) {
+            when (target.targetType) {
+                QuickLookTarget.TYPE_NOW_PLAYING -> {
+                    hasNowPlaying = true
+                    val np = target.nowPlayingData ?: continue
+                    val npAction = target.primaryAction?.pendingIntent
+                    if (np.title != cachedNowPlaying || npAction != cachedNowPlayingAction) {
+                        cachedNowPlaying = np.title
+                        cachedNowPlayingAction = npAction
+                        callbacks.notify { it.onNowPlayingUpdate(np.title, npAction) }
+                    }
+                }
+                QuickLookTarget.TYPE_SPORTS -> {
+                    val s = target.sportsData ?: continue
+                    sportsTargets.add(s)
+                    val sportTitle = when {
+                        s.score1.isNotEmpty() && s.score2.isNotEmpty() ->
+                            "${s.team1Name} ${s.score1} - ${s.score2} ${s.team2Name}"
+                        s.team1Name.isNotEmpty() && s.team2Name.isNotEmpty() ->
+                            "${s.team1Name} vs ${s.team2Name}"
+                        else -> target.title ?: ""
+                    }
+                }
+            }
+        }
+
+        if (sportsTargets != cachedSports) {
+            cachedSports = sportsTargets
+            callbacks.notify { it.onSportsUpdate(sportsTargets) }
+        }
+
+        if (!hasNowPlaying && cachedNowPlaying.isNotEmpty()) {
+            cachedNowPlaying = ""
+            cachedNowPlayingAction = null
+            callbacks.notify { it.onNowPlayingUpdate("", null) }
+        }
+    }
+
+    private fun bindService() {
+        if (isBound) return
+        val intent = Intent(SERVICE_ACTION).apply {
+            setPackage(SERVICE_PACKAGE)
+        }
+        try {
+            isBound = context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
+        } catch (e: SecurityException) {
+            Log.e(TAG, "Failed to bind to AxQuickLook service", e)
+        }
+    }
+
+    private fun unbindService() {
+        if (!isBound) return
+        try {
+            service?.unregisterCallback(quickLookCallback)
+        } catch (e: RemoteException) {
+            Log.e(TAG, "Failed to unregister callback", e)
+        }
+        try {
+            context.unbindService(serviceConnection)
+        } catch (e: IllegalArgumentException) {
+            Log.w(TAG, "Service not registered", e)
+        }
+        service = null
+        isBound = false
+        handler.removeCallbacksAndMessages(null)
+    }
+
+    private fun scheduleRebind() {
+        if (!isBound || callbacks.isEmpty()) return
+        rebindAttempts++
+        val delay = (REBIND_DELAY_MS * rebindAttempts).coerceAtMost(MAX_REBIND_DELAY_MS)
+        handler.postDelayed({ bindService() }, delay)
+    }
+
+    companion object {
+        private const val TAG = "QuickLookClient"
+        private const val SERVICE_ACTION = "com.android.axion.quicklook.SERVICE"
+        private const val SERVICE_PACKAGE = "com.android.axion.quicklook"
+        private const val REBIND_DELAY_MS = 5000L
+        private const val MAX_REBIND_DELAY_MS = 30000L
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/IRecordingCallback.aidl b/packages/SystemUI/src/com/android/systemui/screenrecord/IRecordingCallback.aidl
new file mode 100644
index 0000000000000..ee4a463939899
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/IRecordingCallback.aidl
@@ -0,0 +1,6 @@
+package com.android.systemui.screenrecord;
+
+interface IRecordingCallback {
+    void onRecordingStart();
+    void onRecordingEnd();
+}
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/IRemoteRecording.aidl b/packages/SystemUI/src/com/android/systemui/screenrecord/IRemoteRecording.aidl
new file mode 100644
index 0000000000000..13cbf8dfb39b1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/IRemoteRecording.aidl
@@ -0,0 +1,12 @@
+package com.android.systemui.screenrecord;
+
+import com.android.systemui.screenrecord.IRecordingCallback;
+
+interface IRemoteRecording {
+    void startRecording();
+    void stopRecording();
+    boolean isRecording();
+    boolean isStarting();
+    void addRecordingCallback(in IRecordingCallback callback);
+    void removeRecordingCallback(in IRecordingCallback callback);
+}
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
index 520966bb382d3..14ffbd6c54786 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
@@ -26,6 +26,7 @@
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
 import android.media.MediaRecorder;
@@ -39,6 +40,7 @@
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.service.notification.StatusBarNotification;
 import android.util.Log;
 import android.view.Display;
 import android.widget.Toast;
@@ -59,6 +61,7 @@
 import com.android.systemui.statusbar.phone.KeyguardDismissUtil;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -74,6 +77,8 @@ public class RecordingService extends Service implements ScreenMediaRecorderList
     protected static final int NOTIF_GROUP_ID_SAVED = NOTIF_BASE_ID + 1;
     protected static final int NOTIF_GROUP_ID_ERROR_SAVING = NOTIF_BASE_ID + 2;
     protected static final int NOTIF_GROUP_ID_ERROR_STARTING = NOTIF_BASE_ID + 3;
+    protected static final int PROGRESS_NOTIF_ID = NOTIF_BASE_ID + 4; // YAAP
+    protected static final int ERROR_NOTIF_ID = NOTIF_BASE_ID + 5; // YAAP
     private static final String TAG = "RecordingService";
     private static final String CHANNEL_ID = "screen_record";
     @VisibleForTesting static final String GROUP_KEY_SAVED = "screen_record_saved";
@@ -96,10 +101,13 @@ public class RecordingService extends Service implements ScreenMediaRecorderList
     protected static final String ACTION_STOP = "com.android.systemui.screenrecord.STOP";
     protected static final String ACTION_STOP_NOTIF =
             "com.android.systemui.screenrecord.STOP_FROM_NOTIF";
+    private static final String ACTION_SHOW_DIALOG = "com.android.systemui.screenrecord.SHOW_DIALOG";
     protected static final String ACTION_SHARE = "com.android.systemui.screenrecord.SHARE";
+    protected static final String ACTION_DELETE = "com.android.systemui.screenrecord.DELETE";
     private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF";
     protected static final String EXTRA_NOTIFICATION_ID = "notification_id";
 
+    private final RecordingServiceBinder mBinder;
     private final ScreenRecordUxController mController;
     protected final KeyguardDismissUtil mKeyguardDismissUtil;
     private final Handler mMainHandler;
@@ -136,6 +144,7 @@ public RecordingService(ScreenRecordUxController controller, @LongRunning Execut
         mUserContextTracker = userContextTracker;
         mKeyguardDismissUtil = keyguardDismissUtil;
         mScreenRecordingStartTimeStore = screenRecordingStartTimeStore;
+        mBinder = new RecordingServiceBinder();
     }
 
     /**
@@ -293,25 +302,55 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     startActivity(Intent.createChooser(shareIntent, shareLabel)
                             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                     // Remove notification
-                    mNotificationManager.cancelAsUser(null, mNotificationId, currentUser);
+                    final int id = intent.getIntExtra(EXTRA_NOTIFICATION_ID, mNotificationId);
+                    mNotificationManager.cancelAsUser(null, id, currentUser);
+                    maybeDismissGroup(currentUser);
                     return false;
                 }, false, false);
 
                 // Close quick shade
                 closeSystemDialogs();
                 break;
+            case ACTION_SHOW_DIALOG:
+                if (mController != null) {
+                    mController.createScreenRecordDialog(null).show();
+                }
+                break;
+            case ACTION_DELETE:
+                Uri uri = Uri.parse(intent.getStringExtra(EXTRA_PATH));
+                getContentResolver().delete(uri, null, null);
+                Toast.makeText(
+                        this,
+                        R.string.screenrecord_delete_description,
+                        Toast.LENGTH_LONG).show();
+                // Remove notification
+                final int id = intent.getIntExtra(EXTRA_NOTIFICATION_ID, mNotificationId);
+                mNotificationManager.cancelAsUser(null, id, currentUser);
+                maybeDismissGroup(currentUser);
+                Log.d(TAG, "Deleted recording " + uri);
+
+                // Close quick shade
+                maybeCloseSystemDialogs();
+                break;
         }
         return Service.START_STICKY;
     }
 
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return mBinder;
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
+        mController.addCallback((ScreenRecordUxController.StateChangeCallback) mBinder);
+    }
+
+    @Override
+    public void onDestroy() {
+        mController.removeCallback((ScreenRecordUxController.StateChangeCallback) mBinder);
+        super.onDestroy();
     }
 
     @Nullable
@@ -391,7 +430,7 @@ private void createErrorNotification(
                 .setContentTitle(notificationContentTitle)
                 .setGroup(groupKey)
                 .addExtras(extras);
-        startForeground(mNotificationId, builder.build());
+        startForeground(ERROR_NOTIF_ID, builder.build());
     }
 
     @VisibleForTesting
@@ -427,7 +466,7 @@ protected void createRecordingNotification() {
                 .setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE)
                 .addAction(stopAction)
                 .addExtras(extras);
-        startForeground(mNotificationId, builder.build());
+        startForeground(PROGRESS_NOTIF_ID, builder.build());
     }
 
     @VisibleForTesting
@@ -461,11 +500,24 @@ protected Notification createSaveNotification(@Nullable SavedRecording recording
                 strings().getShareLabel(),
                 PendingIntent.getService(
                         this,
-                        REQUEST_CODE,
+                        mNotificationId, /* unique request code */
                         getShareIntent(this, uri),
                         PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))
                 .build();
 
+        Notification.Action deleteAction = null;
+        if (uri != null) {
+            deleteAction = new Notification.Action.Builder(
+                    Icon.createWithResource(this, R.drawable.ic_screenrecord),
+                    getResources().getString(R.string.screenrecord_delete_label),
+                    PendingIntent.getService(
+                            this,
+                            mNotificationId, /* unique request code */
+                            getDeleteIntent(this, uri.toString()),
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))
+                    .build();
+        }
+
         Bundle extras = new Bundle();
         extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME, strings().getTitle());
 
@@ -475,11 +527,14 @@ protected Notification createSaveNotification(@Nullable SavedRecording recording
                 .setContentText(strings().getSaveText())
                 .setContentIntent(PendingIntent.getActivity(
                         this,
-                        REQUEST_CODE,
+                        mNotificationId, /* unique request code */
                         viewIntent,
                         PendingIntent.FLAG_IMMUTABLE))
-                .addAction(shareAction)
-                .setAutoCancel(true)
+                .addAction(shareAction);
+        if (deleteAction != null) {
+            builder.addAction(deleteAction);
+        }
+        builder.setAutoCancel(true)
                 .setGroup(GROUP_KEY_SAVED)
                 .addExtras(extras);
 
@@ -509,6 +564,8 @@ private void postGroupSummaryNotification(
             String notificationContentTitle,
             String groupKey,
             int notificationIdForGroup) {
+        if (countGroupNotifications() < 1)
+            return; // only post after we show the 2nd notification
         Bundle extras = new Bundle();
         extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,
                 strings().getTitle());
@@ -517,12 +574,37 @@ private void postGroupSummaryNotification(
                 .setContentTitle(notificationContentTitle)
                 .setGroup(groupKey)
                 .setGroupSummary(true)
+                .setAutoCancel(true)
                 .setExtras(extras)
                 .build();
         mNotificationManager.notifyAsUser(
                 getTag(), notificationIdForGroup, groupNotif, currentUser);
     }
 
+    private void maybeDismissGroup(UserHandle currentUser) {
+        if (countGroupNotifications() >= 1)
+            return; // dismiss only when we have one notification left
+        mNotificationManager.cancelAsUser(TAG, NOTIF_GROUP_ID_SAVED, currentUser);
+    }
+
+    private void maybeCloseSystemDialogs() {
+        if (countGroupNotifications() > 0)
+            return; // only dismiss when we cancel the last group notification
+        closeSystemDialogs();
+    }
+
+    private int countGroupNotifications() {
+        StatusBarNotification[] notifications = mNotificationManager.getActiveNotifications();
+        int count = 0;
+        for (StatusBarNotification notification : notifications) {
+            final String tag = notification.getTag();
+            if (tag == null || !tag.equals(TAG)) continue;
+            final int id = notification.getId();
+            if (id != NOTIF_GROUP_ID_SAVED) count++;
+        }
+        return count;
+    }
+
     private void stopService(int userId, @StopReason int stopReason) {
         if (userId == USER_ID_NOT_SPECIFIED) {
             userId = mUserContextTracker.getUserContext().getUserId();
@@ -566,13 +648,14 @@ private void stopService(int userId, @StopReason int stopReason) {
 
     private void saveRecording(int userId) {
         UserHandle currentUser = new UserHandle(userId);
-        mNotificationManager.notifyAsUser(null, mNotificationId,
+        mNotificationManager.notifyAsUser(null, PROGRESS_NOTIF_ID,
                 createProcessingNotification(), currentUser);
 
         mLongExecutor.execute(() -> {
             try {
                 Log.d(getTag(), "saving recording");
                 SavedRecording savedRecording = getRecorder() != null ? getRecorder().save() : null;
+                mNotificationManager.cancelAsUser(null, PROGRESS_NOTIF_ID, currentUser);
                 postGroupSummaryNotification(
                         currentUser,
                         strings().getSaveTitle(),
@@ -583,7 +666,8 @@ private void saveRecording(int userId) {
                 Log.e(getTag(), "Error saving screen recording: " + e.getMessage());
                 e.printStackTrace();
                 showErrorToast(R.string.screenrecord_save_error);
-                mNotificationManager.cancelAsUser(null, mNotificationId, currentUser);
+                mNotificationManager.cancelAsUser(null, PROGRESS_NOTIF_ID, currentUser);
+                maybeDismissGroup(currentUser);
             }
         });
     }
@@ -617,6 +701,11 @@ private void setHEVC(boolean hevc) {
         }
     }
 
+    private PendingIntent getStopPendingIntent() {
+        return PendingIntent.getService(this, REQUEST_CODE, getStopIntent(this),
+                                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+    }
+
     protected String getTag() {
         return TAG;
     }
@@ -658,9 +747,23 @@ protected Intent getNotificationIntent(Context context) {
     }
 
     private Intent getShareIntent(Context context, Uri path) {
-        return new Intent(context, this.getClass()).setAction(ACTION_SHARE)
+        return getShareIntent(context, path, mNotificationId);
+    }
+
+    private static Intent getShareIntent(Context context, Uri path, int id) {
+        return new Intent(context, RecordingService.class).setAction(ACTION_SHARE)
                 .putExtra(EXTRA_PATH, path)
-                .putExtra(EXTRA_NOTIFICATION_ID, mNotificationId);
+                .putExtra(EXTRA_NOTIFICATION_ID, id);
+    }
+
+    private Intent getDeleteIntent(Context context, String path) {
+        return getDeleteIntent(context, path, mNotificationId);
+    }
+
+    private static Intent getDeleteIntent(Context context, String path, int id) {
+        return new Intent(context, RecordingService.class).setAction(ACTION_DELETE)
+                .putExtra(EXTRA_PATH, path)
+                .putExtra(EXTRA_NOTIFICATION_ID, id);
     }
 
     @Override
@@ -685,4 +788,66 @@ public void onStopped(int userId, @StopReason int stopReason) {
             stopService(userId, stopReason);
         }
     }
+
+    private class RecordingServiceBinder extends IRemoteRecording.Stub
+            implements ScreenRecordUxController.StateChangeCallback {
+
+        private ArrayList<IRecordingCallback> mCallbackList = new ArrayList<>();
+
+        @Override
+        public void startRecording() throws RemoteException {
+            Intent intent = new Intent(RecordingService.this, RecordingService.class);
+            intent.setAction(ACTION_SHOW_DIALOG);
+            RecordingService.this.startService(intent);
+        }
+
+        @Override
+        public void stopRecording() throws RemoteException {
+            Intent intent = new Intent(RecordingService.this, RecordingService.class);
+            intent.setAction(ACTION_STOP_NOTIF);
+            RecordingService.this.startService(intent);
+        }
+
+        @Override
+        public boolean isRecording() throws RemoteException {
+            return mController.isRecording();
+        }
+
+        @Override
+        public boolean isStarting() throws RemoteException {
+            return mController.isStarting();
+        }
+
+        public void addRecordingCallback(IRecordingCallback callback) throws RemoteException {
+            if (!mCallbackList.contains(callback)) {
+                mCallbackList.add(callback);
+            }
+        }
+
+        public void removeRecordingCallback(IRecordingCallback callback) throws RemoteException {
+            mCallbackList.remove(callback);
+        }
+
+        @Override
+        public void onRecordingStart() {
+            for (IRecordingCallback callback : mCallbackList) {
+                try {
+                    callback.onRecordingStart();
+                } catch (RemoteException e) {
+                    // do nothing
+                }
+            }
+        }
+
+        @Override
+        public void onRecordingEnd() {
+            for (IRecordingCallback callback : mCallbackList) {
+                try {
+                    callback.onRecordingEnd();
+                } catch (RemoteException e) {
+                    // do nothing
+                }
+            }
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
index 8274713d3cb7e..3336a1840ca76 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
@@ -48,6 +48,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Size;
@@ -207,6 +208,9 @@ private void prepare() throws IOException, RemoteException, RuntimeException {
         int resRatio = mLowQuality ? LOW_VIDEO_FRAME_RATE_TO_RESOLUTION_RATIO
                 : VIDEO_FRAME_RATE_TO_RESOLUTION_RATIO;
         int vidBitRate = width * height * refreshRate / VIDEO_FRAME_RATE * resRatio;
+        boolean unlimit = Settings.System.getInt(
+                mContext.getContentResolver(),
+                Settings.System.UNLIMIT_SCREENRECORD, 0) != 0;
         long maxFilesize = mLongerDuration ? MAX_FILESIZE_BYTES_LONGER : MAX_FILESIZE_BYTES;
         if (!mHEVC) {
             mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
@@ -225,7 +229,7 @@ private void prepare() throws IOException, RemoteException, RuntimeException {
         mMediaRecorder.setVideoFrameRate(refreshRate);
         mMediaRecorder.setVideoEncodingBitRate(vidBitRate);
         mMediaRecorder.setMaxDuration(mLongerDuration ? 0 : MAX_DURATION_MS);
-        mMediaRecorder.setMaxFileSize(maxFilesize);
+        mMediaRecorder.setMaxFileSize(unlimit ? 0 : maxFilesize);
 
         // Set up audio
         if (mAudioSource == MIC) {
@@ -471,7 +475,7 @@ public SavedRecording save() throws IOException, IllegalStateException {
      * Returns the required {@code Size} of the thumbnail.
      */
     private Size getRequiredThumbnailSize() {
-        boolean isLowRam = ActivityManager.isLowRamDeviceStatic();
+        boolean isLowRam = true;
         int thumbnailIconHeight = mContext.getResources().getDimensionPixelSize(isLowRam
                 ? R.dimen.notification_big_picture_max_height_low_ram
                 : R.dimen.notification_big_picture_max_height);
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionContentManager.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionContentManager.kt
index 71f8ce079b1f7..6e98c37dccf47 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionContentManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionContentManager.kt
@@ -38,8 +38,8 @@ import android.view.View.VISIBLE
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.CompoundButton
 import android.widget.Spinner
-import android.widget.Switch
 import androidx.annotation.LayoutRes
 import com.android.systemui.Prefs
 import com.android.systemui.mediaprojection.MediaProjectionCaptureTarget
@@ -109,12 +109,12 @@ class ScreenRecordPermissionContentManager(
         ): ScreenRecordPermissionContentManager
     }
 
-    private lateinit var tapsSwitch: Switch
-    private lateinit var audioSwitch: Switch
-    private lateinit var lowQualitySwitch: Switch
-    private lateinit var longerDurationSwitch: Switch
-    private lateinit var skipTimeSwitch: Switch
-    private lateinit var hevcSwitch: Switch
+    private lateinit var tapsSwitch: CompoundButton
+    private lateinit var audioSwitch: CompoundButton
+    private lateinit var lowQualitySwitch: CompoundButton
+    private lateinit var longerDurationSwitch: CompoundButton
+    private lateinit var skipTimeSwitch: CompoundButton
+    private lateinit var hevcSwitch: CompoundButton
     private lateinit var tapsView: View
     private lateinit var options: Spinner
 
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
index 8610ebf390105..3ae268f081da4 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
@@ -24,6 +24,7 @@ import androidx.annotation.StyleRes
 import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger
 import com.android.systemui.mediaprojection.permission.BaseMediaProjectionPermissionContentManager
 import com.android.systemui.mediaprojection.permission.BaseMediaProjectionPermissionDialogDelegate
+import com.android.systemui.mediaprojection.permission.ENTIRE_SCREEN
 import com.android.systemui.mediaprojection.permission.SINGLE_APP
 import com.android.systemui.mediaprojection.permission.ScreenShareMode
 import com.android.systemui.plugins.ActivityStarter
@@ -84,7 +85,7 @@ class ScreenRecordPermissionDialogDelegate(
         onStartRecordingClicked,
         mediaProjectionMetricsLogger,
         systemUIDialogFactory,
-        defaultSelectedMode = SINGLE_APP,
+        defaultSelectedMode = ENTIRE_SCREEN,
         theme = SystemUIDialog.DEFAULT_THEME,
         context,
         displayManager,
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentCreator.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentCreator.kt
index 8af4917a7f973..8f864344a2ee6 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentCreator.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentCreator.kt
@@ -145,6 +145,21 @@ constructor(
         )
     }
 
+    fun createLens(rawUri: Uri, context: Context, owner: UserHandle): PendingIntent {
+        return PendingIntent.getBroadcast(context, rawUri.toString().hashCode(),
+                Intent(context, LensScreenshotReceiver::class.java)
+                        .putExtra(
+                            LensScreenshotReceiver.EXTRA_LENS_SCREENSHOT_URI_ID,
+                            rawUri.toString())
+                        .putExtra(
+                            LensScreenshotReceiver.EXTRA_SCREENSHOT_USER_HANDLE,
+                            owner)
+                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
+                        (PendingIntent.FLAG_CANCEL_CURRENT
+                        or PendingIntent.FLAG_ONE_SHOT
+                        or PendingIntent.FLAG_IMMUTABLE))
+    }
+
     /** @return an Intent to start the LongScreenshotActivity */
     fun createLongScreenshotIntent(owner: UserHandle): Intent {
         return Intent(context, LongScreenshotActivity::class.java)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
index e21faa166c02f..286ea48cad6d6 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
@@ -507,19 +507,8 @@ static ContentValues createMetadata(ZonedDateTime captureTime, CompressFormat fo
 
     static void updateExifAttributes(ExifInterface exif, UUID uniqueId, int width, int height,
             ZonedDateTime captureTime) {
-        exif.setAttribute(ExifInterface.TAG_IMAGE_UNIQUE_ID, uniqueId.toString());
-
-        exif.setAttribute(ExifInterface.TAG_SOFTWARE, "Android " + Build.DISPLAY);
         exif.setAttribute(ExifInterface.TAG_IMAGE_WIDTH, Integer.toString(width));
         exif.setAttribute(ExifInterface.TAG_IMAGE_LENGTH, Integer.toString(height));
-
-        String dateTime = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").format(captureTime);
-        String subSec = DateTimeFormatter.ofPattern("SSS").format(captureTime);
-        String timeZone = DateTimeFormatter.ofPattern("xxx").format(captureTime);
-
-        exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, dateTime);
-        exif.setAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIGINAL, subSec);
-        exif.setAttribute(ExifInterface.TAG_OFFSET_TIME_ORIGINAL, timeZone);
     }
 
     static String getMimeType(CompressFormat format) {
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LensScreenshotReceiver.java b/packages/SystemUI/src/com/android/systemui/screenshot/LensScreenshotReceiver.java
new file mode 100644
index 0000000000000..39006201786f8
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/LensScreenshotReceiver.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2022 ShapeShiftOS
+ *           (C) 2024-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.screenshot;
+
+import static com.android.systemui.screenshot.SmartActionsReceiver.EXTRA_ACTION_TYPE;
+import static com.android.systemui.screenshot.SmartActionsReceiver.EXTRA_ID;
+import static com.android.systemui.screenshot.SmartActionsReceiver.EXTRA_SMART_ACTIONS_ENABLED;
+
+import android.content.BroadcastReceiver;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Process;
+import android.os.UserHandle;
+
+import com.android.internal.util.matrixx.Utils;
+
+import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.res.R;
+
+import java.util.concurrent.Executor;
+
+import javax.inject.Inject;
+
+public class LensScreenshotReceiver extends BroadcastReceiver {
+
+    protected static final String EXTRA_LENS_SCREENSHOT_URI_ID = "lens_screenshot_uri_id";
+    private static final String GSA_PACKAGE = "com.google.android.googlequicksearchbox";
+    private static final String LENS_ACTIVITY = "com.google.android.apps.lens.MainActivity";
+    private static final String LENS_SHARE_ACTIVITY = "com.google.android.apps.search.lens.LensShareEntryPointActivity";
+    private static final String LENS_URI = "google://lens";
+    protected static final String EXTRA_SCREENSHOT_USER_HANDLE = "lens_screenshot_userhandle";
+
+    private final ActionIntentExecutor mActionExecutor;
+    private final Executor mBackgroundExecutor;
+    private final ScreenshotSmartActions mScreenshotSmartActions;
+    private UserHandle mScreenshotUserHandle;
+
+    @Inject
+    public LensScreenshotReceiver(
+            ActionIntentExecutor actionExecutor,
+            @Background Executor bgExecutor,
+            ScreenshotSmartActions screenshotSmartActions) {
+        mActionExecutor = actionExecutor;
+        mBackgroundExecutor = bgExecutor;
+        mScreenshotSmartActions = screenshotSmartActions;
+    }
+
+    public static boolean isGSAEnabled(Context context) {
+        return Utils.isPackageInstalled(context, GSA_PACKAGE, false /* ignoreState */);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (!intent.hasExtra(EXTRA_LENS_SCREENSHOT_URI_ID)) {
+            return;
+        }
+
+        mScreenshotUserHandle = intent.getParcelableExtra(EXTRA_SCREENSHOT_USER_HANDLE,
+                UserHandle.class);
+        if (mScreenshotUserHandle == null) {
+            mScreenshotUserHandle = Process.myUserHandle();
+        }
+
+        final Uri uri = Uri.parse(intent.getStringExtra(EXTRA_LENS_SCREENSHOT_URI_ID));
+        mBackgroundExecutor.execute(() -> {
+            // action to execute goes here
+            ClipData clipdata = new ClipData(new ClipDescription("content",
+                    new String[]{"image/png"}),
+                    new ClipData.Item(uri));
+            Intent lensIntent = new Intent();
+            lensIntent.setAction(Intent.ACTION_SEND)
+                    .setComponent(new ComponentName(GSA_PACKAGE, LENS_SHARE_ACTIVITY))
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    .setType("image/png")
+                    .putExtra(Intent.EXTRA_STREAM, uri)
+                    .setClipData(clipdata);
+            try {
+                mActionExecutor.launchIntentAsync(
+                        lensIntent, mScreenshotUserHandle, false,
+                        /* activityOptions */ null, /* transitionCoordinator */ null);
+
+            } catch (Exception e) {
+                return;
+            }
+        });
+
+        if (intent.getBooleanExtra(EXTRA_SMART_ACTIONS_ENABLED, false)) {
+            mScreenshotSmartActions.notifyScreenshotAction(
+                    intent.getStringExtra(EXTRA_ID), intent.getStringExtra(EXTRA_ACTION_TYPE),
+                    false, null);
+
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
index a13f579769822..3a21a6d5abbe3 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
@@ -27,6 +27,7 @@ import com.android.systemui.log.DebugLogger.debugLog
 import com.android.systemui.res.R
 import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_DELETE_TAPPED
 import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_EDIT_TAPPED
+import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_LENS_TAPPED
 import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_PREVIEW_TAPPED
 import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_SHARE_TAPPED
 import com.android.systemui.screenshot.ui.viewmodel.ActionButtonAppearance
@@ -159,6 +160,23 @@ constructor(
                 )
             }
         }
+
+        actionsCallback.provideActionButton(
+            ActionButtonAppearance(
+                AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_lens),
+                context.resources.getString(R.string.screenshot_lens_label),
+                context.resources.getString(R.string.screenshot_lens_label),
+            ),
+            showDuringEntrance = true,
+        ) {
+            debugLog(LogConfig.DEBUG_ACTIONS) { "Lens tapped" }
+            uiEventLogger.log(SCREENSHOT_LENS_TAPPED, 0, request.packageNameString)
+            onDeferrableActionTapped { result ->
+                actionExecutor.sendPendingIntent(
+                    actionIntentCreator.createLens(result.uri, context, result.user)
+                )
+            }
+        }
     }
 
     override fun onScrollChipReady(onClick: Runnable) {
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt
index 2b825d1abbceb..075e622ff41aa 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt
@@ -28,10 +28,13 @@ import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Insets
 import android.graphics.Rect
+import android.media.AudioManager
 import android.net.Uri
 import android.os.Process
 import android.os.UserHandle
 import android.os.UserManager
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.provider.Settings
 import android.util.DisplayMetrics
 import android.util.Log
@@ -108,7 +111,6 @@ internal constructor(
     private val currentRequestCallbacks: MutableList<TakeScreenshotService.RequestCallback> =
         mutableListOf()
 
-    private var screenBitmap: Bitmap? = null
     private var screenshotTakenInPortrait = false
     private var screenshotAnimation: Animator? = null
     private var packageName = ""
@@ -125,12 +127,18 @@ internal constructor(
                 ActivityInfo.CONFIG_ASSETS_PATHS
         )
 
+    private val audioManager: AudioManager
+    private val vibrator: Vibrator?
+
     init {
         screenshotHandler.defaultTimeoutMillis = SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS
 
         window = screenshotWindowFactory.create(display)
         context = window.getContext()
 
+        audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator?
+
         viewProxy = viewProxyFactory.getProxy(context, display.displayId)
 
         screenshotHandler.setOnTimeoutRunnable {
@@ -192,7 +200,6 @@ internal constructor(
             return
         }
 
-        screenBitmap = currentBitmap
         val oldPackageName = packageName
         packageName = screenshot.packageNameString
 
@@ -318,8 +325,11 @@ internal constructor(
 
     // Any cleanup needed when the service is being destroyed.
     override fun onDestroy() {
+        screenshotAnimation?.cancel()
+        screenshotAnimation = null
         removeWindow()
         screenshotSoundController.releaseScreenshotSoundAsync()
+        scrollCaptureExecutor.close()
         releaseContext()
         bgExecutor.shutdown()
         screenshotHandler.cancelTimeout()
@@ -329,7 +339,9 @@ internal constructor(
 
     /** Release the constructed window context. */
     private fun releaseContext() {
-        broadcastDispatcher.unregisterReceiver(copyBroadcastReceiver)
+        try {
+            broadcastDispatcher.unregisterReceiver(copyBroadcastReceiver)
+        } catch (t: Throwable) { }
         context.release()
     }
 
@@ -354,8 +366,7 @@ internal constructor(
                 }
 
                 override fun onTouchOutside() {
-                    // TODO(159460485): Remove this when focus is handled properly in the system
-                    window.setFocusable(false)
+                    viewProxy.requestDismissal(ScreenshotEvent.SCREENSHOT_DISMISSED_OTHER)
                 }
             }
 
@@ -480,13 +491,45 @@ internal constructor(
         viewProxy.stopInputListening()
     }
 
+    private fun playScreenshotSound() {
+        var playSound = false
+        var playHaptic = false
+        when (audioManager.ringerMode) {
+            AudioManager.RINGER_MODE_SILENT -> {
+                // do nothing
+            }
+            AudioManager.RINGER_MODE_VIBRATE -> {
+                playHaptic = true
+            }
+            AudioManager.RINGER_MODE_NORMAL -> {
+                // in this case we want to play sound even if not forced on
+                playSound = true
+                playHaptic = true
+            }
+        }
+        if (playSound && Settings.System.getIntForUser(
+                context.contentResolver,
+                Settings.System.SCREENSHOT_SHUTTER_SOUND,
+                1,
+                UserHandle.USER_CURRENT
+            ) == 1
+        ) {
+            screenshotSoundController.playScreenshotSoundAsync()
+        }
+        if (playHaptic) {
+            vibrator?.takeIf { it.hasVibrator() }?.vibrate(
+                VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
+            )
+        }
+    }
+
     /**
      * Save the bitmap but don't show the normal screenshot UI.. just a toast (or notification on
      * failure).
      */
     private fun saveScreenshotAndToast(screenshot: ScreenshotData, finisher: Consumer<Uri?>) {
         // Play the shutter sound to notify that we've taken a screenshot
-        screenshotSoundController.playScreenshotSoundAsync()
+        playScreenshotSound()
 
         saveScreenshotInBackground(screenshot, UUID.randomUUID(), finisher) {
             result: ImageExporter.Result ->
@@ -513,9 +556,12 @@ internal constructor(
 
         screenshotAnimation =
             viewProxy.createScreenshotDropInAnimation(screenRect, showFlash).apply {
-                doOnEnd { onAnimationComplete?.run() }
+                doOnEnd {
+                    onAnimationComplete?.run()
+                    screenshotAnimation = null
+                }
                 // Play the shutter sound to notify that we've taken a screenshot
-                screenshotSoundController.playScreenshotSoundAsync()
+                playScreenshotSound()
                 if (LogConfig.DEBUG_ANIM) {
                     Log.d(TAG, "starting post-screenshot animation")
                 }
@@ -526,6 +572,8 @@ internal constructor(
     /** Reset screenshot view and then call onCompleteRunnable */
     private fun finishDismiss() {
         Log.d(TAG, "finishDismiss")
+        screenshotAnimation?.cancel()
+        screenshotAnimation = null
         actionsController.endScreenshotSession()
         scrollCaptureExecutor.close()
         currentRequestCallbacks.forEach { it.onFinish() }
@@ -563,9 +611,7 @@ internal constructor(
                     finisher.accept(result.uri)
                 } catch (e: Exception) {
                     Log.d(TAG, "Failed to store screenshot", e)
-                    if (LogConfig.DEBUG_CALLBACK) {
-                        Log.d(TAG, "calling back with uri: null")
-                    }
+                    logScreenshotResultStatus(null, screenshot.userHandle)
                     finisher.accept(null)
                 }
             },
@@ -594,13 +640,6 @@ internal constructor(
         ) == 1
     }
 
-    private val fullScreenRect: Rect
-        get() {
-            val displayMetrics = DisplayMetrics()
-            display.getRealMetrics(displayMetrics)
-            return Rect(0, 0, displayMetrics.widthPixels, displayMetrics.heightPixels)
-        }
-
     /** Injectable factory to create screenshot controller instances for a specific display. */
     @AssistedFactory
     interface Factory : InteractiveScreenshotHandler.Factory {
@@ -618,7 +657,7 @@ internal constructor(
         // From WizardManagerHelper.java
         private const val SETTINGS_SECURE_USER_SETUP_COMPLETE = "user_setup_complete"
 
-        const val SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS: Int = 6000
+        const val SCREENSHOT_CORNER_DEFAULT_TIMEOUT_MILLIS: Int = 3000
 
         val SCREENSHOT_MULTIDISPLAY_FOCUS_CHANGE =
             DesktopExperienceFlags.DesktopExperienceFlag(
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
index 51ec515cd1653..cf39f5a90803f 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java
@@ -59,6 +59,8 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
     SCREENSHOT_SHARE_TAPPED(309),
     @UiEvent(doc = "screenshot delete button tapped")
     SCREENSHOT_DELETE_TAPPED(369),
+    @UiEvent(doc = "screenshot lens button tapped")
+    SCREENSHOT_LENS_TAPPED(370),
     @UiEvent(doc = "screenshot smart action chip tapped")
     SCREENSHOT_SMART_ACTION_TAPPED(374),
     @UiEvent(doc = "screenshot scroll tapped")
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt
index 6955d43eeadc0..28d16a86ec666 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSoundProvider.kt
@@ -46,7 +46,7 @@ class ScreenshotSoundProviderImpl @Inject constructor(private val context: Conte
     override fun getScreenshotSound(): MediaPlayer {
         return MediaPlayer.create(
             context,
-            Uri.fromFile(File(context.resources.getString(R.string.config_cameraShutterSound))),
+            Uri.fromFile(File(context.resources.getString(R.string.config_screenshotSound))),
             /* holder = */ null,
             AudioAttributes.Builder()
                 .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java
index 15a1d1d61626d..cb1702b1e2174 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java
@@ -29,7 +29,9 @@
 import static com.android.systemui.screenshot.appclips.AppClipsTrampolineActivity.PERMISSION_SELF;
 
 import android.app.Activity;
+import android.app.ActivityTaskManager;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
@@ -43,7 +45,9 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.os.ResultReceiver;
+import android.content.pm.ActivityInfo;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -72,7 +76,11 @@
 import com.android.systemui.screenshot.appclips.InternalBacklinksData.CrossProfileError;
 import com.android.systemui.screenshot.scroll.CropView;
 import com.android.systemui.settings.UserTracker;
+import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -127,6 +135,37 @@ public class AppClipsActivity extends ComponentActivity {
     private String mCallingPackageName;
     private int mCallingPackageUid;
 
+    private ComponentName mTaskComponentName;
+    private final ExecutorService mBgExecutor;
+
+    private final TaskStackChangeListener mTaskListener = new TaskStackChangeListener() {
+        @Override
+        public void onTaskStackChanged() {
+            mBgExecutor.execute(() -> updateForegroundTaskSync());
+        }
+    };
+
+    private void updateForegroundTaskSync() {
+        try {
+            final ActivityTaskManager.RootTaskInfo focusedStack =
+                    ActivityTaskManager.getService().getFocusedRootTaskInfo();
+            if (focusedStack != null && focusedStack.topActivity != null) {
+                mTaskComponentName = focusedStack.topActivity;
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to get foreground task component", e);
+        }
+    }
+
+    private String getForegroundAppLabel() {
+        try {
+            final ActivityInfo ai = mPackageManager.getActivityInfo(mTaskComponentName, 0);
+            return ai.applicationInfo.loadLabel(mPackageManager).toString();
+        } catch (PackageManager.NameNotFoundException e) {
+             return null;
+        }
+    }
+
     @Inject
     public AppClipsActivity(AppClipsViewModel.Factory viewModelFactory,
             PackageManager packageManager, UserTracker userTracker, UiEventLogger uiEventLogger) {
@@ -151,6 +190,14 @@ public void onReceive(Context context, Intent intent) {
         };
 
         mIntentFilter = new IntentFilter(ACTION_FINISH_FROM_TRAMPOLINE);
+
+        mBgExecutor = Executors.newSingleThreadExecutor();
+
+        // Register task stack listener
+        TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskListener);
+
+        // Initialize current foreground package name
+        updateForegroundTaskSync();
     }
 
     @Override
@@ -232,6 +279,9 @@ protected void onDestroy() {
 
         unregisterReceiver(mBroadcastReceiver);
 
+        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskListener);
+        mBgExecutor.shutdown();
+
         // If neither error nor result was set, it implies that the activity is finishing due to
         // some other reason such as user dismissing this activity using back gesture. Inform error.
         if (isFinishing() && mViewModel.getErrorLiveData().getValue() == null
@@ -298,7 +348,7 @@ private void saveScreenshotThenFinish() {
         }
 
         updateImageDimensions();
-        mViewModel.saveScreenshotThenFinish(drawable, bounds, getUser());
+        mViewModel.saveScreenshotThenFinish(drawable, bounds, getUser(), getForegroundAppLabel());
     }
 
     private void setResultThenFinish(Uri uri) {
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java
index d4f08d0e80624..8d05cdd3183e6 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java
@@ -200,14 +200,14 @@ LiveData<List<InternalBacklinksData>> getBacklinksLiveData() {
      * Saves the provided {@link Drawable} to storage then informs the result {@link Uri} to
      * {@link LiveData}.
      */
-    void saveScreenshotThenFinish(Drawable screenshotDrawable, Rect bounds, UserHandle user) {
+    void saveScreenshotThenFinish(Drawable screenshotDrawable, Rect bounds, UserHandle user, String foregroundAppName) {
         mBgExecutor.execute(() -> {
             // Render the screenshot bitmap in background.
             Bitmap screenshotBitmap = renderBitmap(screenshotDrawable, bounds);
 
             // Export and save the screenshot in background.
             ListenableFuture<ImageExporter.Result> exportFuture = mImageExporter.export(mBgExecutor,
-                    UUID.randomUUID(), screenshotBitmap, user, Display.DEFAULT_DISPLAY, null);
+                    UUID.randomUUID(), screenshotBitmap, user, Display.DEFAULT_DISPLAY, foregroundAppName);
 
             // Get the result and update state on main thread.
             exportFuture.addListener(() -> {
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/scroll/ScrollCaptureController.java b/packages/SystemUI/src/com/android/systemui/screenshot/scroll/ScrollCaptureController.java
index 8c8ceba12fe29..3073605e37dcf 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/scroll/ScrollCaptureController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/scroll/ScrollCaptureController.java
@@ -286,7 +286,7 @@ private void onStartComplete() {
             }
             mEventLogger.log(ScreenshotEvent.SCREENSHOT_LONG_SCREENSHOT_STARTED, 0, mWindowOwner);
             requestNextTile(0);
-        } catch (InterruptedException | ExecutionException e) {
+        } catch (InterruptedException | ExecutionException | CancellationException e) {
             // Failure to start, propagate to caller
             Log.e(TAG, "session start failed!");
             if (mCaptureCompleter != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
index 36aa39fa9fe4e..7feb7d18867fb 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
@@ -41,7 +41,9 @@ class ActionButtonViewBinder @Inject constructor() {
         if (!viewModel.appearance.tint) {
             iconView.setImageTintList(null)
         }
-        textView.text = viewModel.appearance.label
+        // hide text for now.
+        textView.text = ""
+        textView.visibility = View.GONE
 
         viewModel.appearance.customBackground?.also {
             if (it.canApplyTheme()) {
@@ -50,7 +52,7 @@ class ActionButtonViewBinder @Inject constructor() {
             view.background = it
         }
 
-        setMargins(iconView, textView, viewModel.appearance.label?.isNotEmpty() ?: false)
+        setMargins(iconView, textView, false)
         if (viewModel.onClicked != null) {
             view.setOnClickListener { viewModel.onClicked.invoke() }
         } else {
diff --git a/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java b/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
index 5af999ad794e3..0e350359d491e 100644
--- a/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
+++ b/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
@@ -32,6 +32,9 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -161,6 +164,14 @@ public void setClickable(boolean clickable) {
         });
     }
 
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility
+            (isNotificationScrim() 
+                ? View.GONE 
+                : visibility);
+    }
+
     /**
      * Sets the color of the scrim, without animating them.
      */
@@ -333,6 +344,7 @@ public void enableBottomEdgeConcave(boolean clipScrim) {
 
     public void setScrimName(String scrimName) {
         mScrimName = scrimName;
+        setVisibility(getVisibility());
     }
 
     @Override
@@ -385,13 +397,17 @@ public void setCornerRadius(int radius) {
      * Blur the view with the specific blur radius or clear any blurs if the radius is 0
      */
     public void setBlurRadius(float blurRadius) {
+        if (isNotificationScrim()) {
+            setRenderEffect(null);
+            return;
+        }
         if (blurRadius > 0) {
             debugLog("Apply blur RenderEffect to ScrimView " + mScrimName + " for radius "
                     + blurRadius);
             setRenderEffect(RenderEffect.createBlurEffect(
                     blurRadius,
                     blurRadius,
-                    Shader.TileMode.CLAMP));
+                    Shader.TileMode.MIRROR));
         } else {
             debugLog("Resetting blur RenderEffect to ScrimView " + mScrimName);
             setRenderEffect(null);
@@ -403,4 +419,14 @@ private void debugLog(String logMsg) {
             Log.d(TAG, logMsg);
         }
     }
+
+    private boolean isSingleQsToneEnabled() {
+        return Settings.System.getIntForUser(getContext().getContentResolver(),
+            Settings.System.SINGLE_QS_TONE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+    }
+
+    private boolean isNotificationScrim() {
+        return isSingleQsToneEnabled() && TextUtils.equals(
+            mScrimName, "notifications_scrim");
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
index d5bc74c18d2e7..677de205d581d 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java
@@ -101,6 +101,7 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
     private final DisplayTracker.Callback mBrightnessListener = new DisplayTracker.Callback() {
         @Override
         public void onDisplayChanged(int displayId) {
+            if (mUserChangedBrightness) return;
             mBackgroundHandler.post(mUpdateSliderRunnable);
         }
     };
@@ -116,6 +117,7 @@ public void onDisplayChanged(int displayId) {
     private boolean mIsBrightnessOverriddenByWindow = false;
 
     private ValueAnimator mSliderAnimator;
+    private boolean mUserChangedBrightness;
 
     @Override
     public void setMirror(@Nullable MirrorController controller) {
@@ -386,6 +388,7 @@ public void onChanged(boolean tracking, int value, boolean stopTracking) {
                     BrightnessSynchronizer.brightnessFloatToInt(valFloat));
 
         }
+        mUserChangedBrightness = tracking && !stopTracking;
         setBrightness(valFloat);
         if (starting) {
             logBrightnessChange(mDisplayId, valFloat, true);
diff --git a/packages/SystemUI/src/com/android/systemui/shade/CombinedShadeHeadersConstraintManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/CombinedShadeHeadersConstraintManagerImpl.kt
index b2e473685daa4..eabdc472a9b82 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/CombinedShadeHeadersConstraintManagerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/CombinedShadeHeadersConstraintManagerImpl.kt
@@ -32,6 +32,9 @@ object CombinedShadeHeadersConstraintManagerImpl : CombinedShadeHeadersConstrain
         return ConstraintsChanges(
             qqsConstraintsChanges = {
                 setAlpha(R.id.shade_header_system_icons, constraintAlpha)
+            },
+            largeScreenConstraintsChanges = {
+                setAlpha(R.id.shade_header_system_icons, constraintAlpha)
             }
         )
     }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 7f4965936a0a1..3be8f7420414c 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -62,15 +62,23 @@
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.RenderEffect;
+import android.graphics.drawable.Animatable;
 import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.TransitionDrawable;
+import android.hardware.power.Boost;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.os.PowerManagerInternal;
 import android.os.Trace;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.IndentingPrintWriter;
 import android.util.Log;
 import android.util.MathUtils;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.GestureDetector;
 import android.view.HapticFeedbackConstants;
@@ -80,12 +88,14 @@
 import android.view.View;
 import android.view.View.AccessibilityDelegate;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.ImageView;
 
 import com.android.app.animation.Interpolators;
 import com.android.internal.annotations.VisibleForTesting;
@@ -98,6 +108,7 @@
 import com.android.keyguard.KeyguardUnfoldTransition;
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.dagger.KeyguardStatusBarViewComponent;
+import com.android.server.LocalServices;
 import com.android.systemui.DejankUtils;
 import com.android.systemui.Dumpable;
 import com.android.systemui.Flags;
@@ -106,6 +117,7 @@
 import com.android.systemui.classifier.Classifier;
 import com.android.systemui.classifier.FalsingCollector;
 import com.android.systemui.common.domain.interactor.SysUIStateDisplaysInteractor;
+import com.android.systemui.crdroid.header.StatusBarHeaderMachine;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.DisplayId;
 import com.android.systemui.dagger.qualifiers.Main;
@@ -202,12 +214,16 @@
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.SplitShadeStateController;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.unfold.SysUIUnfoldComponent;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.Utils;
 import com.android.systemui.util.time.SystemClock;
 import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor;
 import com.android.wm.shell.animation.FlingAnimationUtils;
 
+import com.bosphere.fadingedgelayout.FadingEdgeLayout;
+
 import dalvik.annotation.optimization.NeverCompile;
 
 import com.google.android.msdl.data.model.MSDLToken;
@@ -264,6 +280,17 @@ public final class NotificationPanelViewController implements
     private static final String COUNTER_PANEL_OPEN = "panel_open";
     public static final String COUNTER_PANEL_OPEN_QS = "panel_open_qs";
     private static final String COUNTER_PANEL_OPEN_PEEK = "panel_open_peek";
+    private static final String DOUBLE_TAP_SLEEP_GESTURE =
+            "lineagesystem:" + LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE;
+     private static final String DOUBLE_TAP_SLEEP_LOCKSCREEN =
+             "system:" + Settings.System.DOUBLE_TAP_SLEEP_LOCKSCREEN;
+     private static final String STATUS_BAR_CUSTOM_HEADER =
+             "system:" + Settings.System.STATUS_BAR_CUSTOM_HEADER;
+     private static final String STATUS_BAR_CUSTOM_HEADER_HEIGHT =
+             "system:" + Settings.System.STATUS_BAR_CUSTOM_HEADER_HEIGHT;
+     private static final String STATUS_BAR_CUSTOM_HEADER_SHADOW =
+             "system:" + Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW;
+
     private static final Rect M_DUMMY_DIRTY_RECT = new Rect(0, 0, 1, 1);
     private static final Rect EMPTY_RECT = new Rect();
     //TODO(b/394977231) delete this temporary workaround used only by tests
@@ -295,7 +322,6 @@ public final class NotificationPanelViewController implements
     private final ShadeHeadsUpChangedListener mOnHeadsUpChangedListener =
             new ShadeHeadsUpChangedListener();
     private final ConfigurationListener mConfigurationListener = new ConfigurationListener();
-    private final ContentObserver mDoubleTapToSleepObserver;
     private final StatusBarStateListener mStatusBarStateListener = new StatusBarStateListener();
     private final NotificationPanelView mView;
     private final VibratorHelper mVibratorHelper;
@@ -341,6 +367,7 @@ public final class NotificationPanelViewController implements
     private final TouchHandler mTouchHandler = new TouchHandler();
     private final BlurConfig mBlurConfig;
     private final WindowRootViewBlurInteractor mWindowRootViewBlurInteractor;
+    private final TunerService mTunerService;
 
     private long mDownTime;
     private long mStatusBarLongPressDowntime = -1L;
@@ -484,6 +511,8 @@ public final class NotificationPanelViewController implements
     private boolean mDoubleTapToSleepEnabled;
     private GestureDetector mDoubleTapGesture;
 
+    private boolean mIsLockscreenDoubleTapEnabled;
+
     private final KeyguardIndicationController mKeyguardIndicationController;
     private int mHeadsUpInset;
     private boolean mHeadsUpPinnedMode;
@@ -514,6 +543,17 @@ public final class NotificationPanelViewController implements
     private int mSplitShadeScrimTransitionDistance;
 
     private final NotificationListContainer mNotificationListContainer;
+    private FadingEdgeLayout mQsHeaderLayout;
+    private ImageView mQsHeaderImageView;
+    private boolean mHeaderImageEnabled;
+    private int mOrientation = -1;
+    private int mHeaderImageHeight;
+    private int mBottomFadeHeight;
+    private int mHeaderImageShadow;
+    private float mShadeHeaderExpansion;
+    private Drawable mCurrentBackground;
+    private StatusBarHeaderMachine mStatusBarHeaderMachine;
+
     private final NPVCDownEventState.Buffer mLastDownEvents;
     private final KeyguardClockInteractor mKeyguardClockInteractor;
     private float mMinExpandHeight;
@@ -666,6 +706,7 @@ public NotificationPanelViewController(NotificationPanelView view,
             BlurConfig blurConfig,
             Lazy<ShadeDisplaysRepository> shadeDisplaysRepository,
             WindowRootViewBlurInteractor windowRootViewBlurInteractor,
+            TunerService tunerService,
             Context context) {
         mBlurConfig = blurConfig;
         mWindowRootViewBlurInteractor = windowRootViewBlurInteractor;
@@ -760,6 +801,7 @@ public void onViewDetachedFromWindow(View v) {}
                 mSplitShadeStateController.shouldUseSplitNotificationShade(mResources);
         mView.setWillNotDraw(!DEBUG_DRAWABLE);
         mShadeHeaderController = shadeHeaderController;
+        mTunerService = tunerService;
         mAnimateBack = predictiveBackAnimateShade();
         mFalsingCollector = falsingCollector;
         mPowerManager = powerManager;
@@ -793,20 +835,13 @@ public void onViewDetachedFromWindow(View v) {}
             @Override
             public boolean onDoubleTap(MotionEvent e) {
                 if (mPowerManager != null) {
-                    mPowerManager.goToSleep(e.getEventTime());
+                    mPowerInteractor.setLastTouchToSleepPosition(e.getX(), e.getY());
+                    mPowerManager.goToSleep(e.getEventTime(),
+                            PowerManager.GO_TO_SLEEP_REASON_TOUCH, 0);
                 }
                 return true;
             }
         });
-        mDoubleTapToSleepObserver = new ContentObserver(handler) {
-            @Override
-            public void onChange(boolean selfChange) {
-                mDoubleTapToSleepEnabled = LineageSettings.System.getInt(mContentResolver,
-                        LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE,
-                        mResources.getBoolean(org.lineageos.platform.internal.R.bool.
-                                config_dt2sGestureEnabledByDefault) ? 1 : 0) != 0;
-            }
-        };
         mConversationNotificationManager = conversationNotificationManager;
         mScreenOffAnimationController = screenOffAnimationController;
         mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
@@ -868,6 +903,9 @@ public void onUnlockAnimationStarted(
                     }
                 });
         mAlternateBouncerInteractor = alternateBouncerInteractor;
+        mQsHeaderLayout = mView.requireViewById(R.id.layout_header);
+        mQsHeaderImageView = mView.requireViewById(R.id.qs_header_image_view);
+        mStatusBarHeaderMachine = new StatusBarHeaderMachine(context);
         dumpManager.registerDumpable(this);
     }
 
@@ -1040,7 +1078,7 @@ private void handleBouncerShowingChanged(Boolean isBouncerShowing) {
                 mBlurRenderEffect = RenderEffect.createBlurEffect(
                         mBlurConfig.getMaxBlurRadiusPx(),
                         mBlurConfig.getMaxBlurRadiusPx(),
-                        Shader.TileMode.CLAMP);
+                        Shader.TileMode.MIRROR);
             }
             debugLog("Applying blur RenderEffect to shade.");
             Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_APP, "ShadeBlurRenderEffect", "active",
@@ -1239,6 +1277,16 @@ private ClockSize computeDesiredClockSizeForSplitShade() {
         return ClockSize.LARGE;
     }
 
+    private boolean shouldForceSmallClock() {
+        return !isOnAod()
+                // True on small landscape screens
+                && mResources.getBoolean(R.bool.force_small_clock_on_lockscreen) ||
+                (Settings.Secure.getIntForUser(
+                    mContentResolver, Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_STYLE, 0, UserHandle.USER_CURRENT) != 0 ||
+                 Settings.System.getIntForUser(
+                    mContentResolver, "lockscreen_widgets_enabled", 0, UserHandle.USER_CURRENT) != 0);
+    }
+
     private void updateKeyguardStatusViewAlignment() {
         boolean shouldBeCentered = shouldKeyguardStatusViewBeCentered();
         mKeyguardUnfoldTransition.ifPresent(t -> t.setStatusViewCentered(shouldBeCentered));
@@ -1530,6 +1578,7 @@ public void onAnimationEnd(Animator animation) {
         }
         setAnimator(animator);
         animator.start();
+        boostInteraction((int) animator.getDuration());
     }
 
     @VisibleForTesting
@@ -1946,6 +1995,9 @@ private void onHeightUpdated(float expandedHeight) {
         updateHeader();
         updatePanelExpanded();
         updateGestureExclusionRect();
+        if (mHeaderImageEnabled) {
+            mView.post(() -> updateHeaderImage());
+        }
         if (DEBUG_DRAWABLE) {
             mView.invalidate();
         }
@@ -2504,6 +2556,13 @@ public void performHapticFeedback(int constant) {
         }
     }
 
+    private void boostInteraction(int durationMs) {
+        PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
+        if (pmi != null) {
+            pmi.setPowerBoost(Boost.INTERACTION, durationMs);
+        }
+    }
+
     private class ShadeHeadsUpTrackerImpl implements ShadeHeadsUpTracker {
         @Override
         public void addTrackingHeadsUpListener(Consumer<ExpandableNotificationRow> listener) {
@@ -2848,6 +2907,7 @@ void notifyExpandingStarted() {
             mExpanding = true;
             mIsExpandingOrCollapsing = true;
             mQsController.onExpandingStarted(mQsController.getFullyExpanded());
+            boostInteraction(700);
         }
     }
 
@@ -2909,6 +2969,7 @@ private void startOpening(MotionEvent event) {
     private void maybeVibrateOnOpening(boolean openingWithTouch) {
         if (mVibrateOnOpening && mBarState != KEYGUARD && mBarState != SHADE_LOCKED) {
             if (!openingWithTouch || !mHasVibratedOnOpen) {
+                boostInteraction(500);
                 performHapticFeedback(HapticFeedbackConstants.GESTURE_START);
                 mHasVibratedOnOpen = true;
                 mShadeLog.v("Vibrating on opening, mHasVibratedOnOpen=true");
@@ -3100,6 +3161,7 @@ public void onAnimationEnd(Animator animation) {
         });
         setAnimator(animator);
         animator.start();
+        boostInteraction(500);
     }
 
     @VisibleForTesting
@@ -3155,6 +3217,7 @@ private void setExpandedHeightInternal(float h) {
             }
             mExpandedFraction = Math.min(1f,
                     maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);
+            ScrimUtils.get().setExpandedFraction(mExpandedFraction);
             if (mExpandedFraction > 0f && mExpectingSynthesizedDown) {
                 mExpectingSynthesizedDown = false;
             }
@@ -3564,6 +3627,10 @@ public void onConfigChanged(Configuration newConfig) {
             if (ShadeWindowGoesAround.isEnabled()) {
                 updateResources();
             }
+            if (mHeaderImageEnabled) {
+                mOrientation = newConfig.orientation;
+                mView.post(() -> updateHeaderImage());
+            }
         }
 
         @Override
@@ -3595,6 +3662,7 @@ private void onStateChanged(
 
             // TODO: maybe add a listener for barstate
             mBarState = statusBarState;
+            ScrimUtils.get().setBarState(mBarState);
             mQsController.setBarState(statusBarState);
 
             boolean fromShadeToKeyguard = statusBarState == KEYGUARD
@@ -3703,7 +3771,8 @@ public void setOverStretchAmount(float amount) {
         positionClockAndNotifications(true /* forceUpdate */);
     }
 
-    private final class ShadeAttachStateChangeListener implements View.OnAttachStateChangeListener {
+    private final class ShadeAttachStateChangeListener implements View.OnAttachStateChangeListener,
+            TunerService.Tunable, StatusBarHeaderMachine.IStatusBarHeaderMachineObserver {
         @Override
         public void onViewAttachedToWindow(View v) {
             mFragmentService.getFragmentHostManager(mView)
@@ -3714,10 +3783,16 @@ public void onViewAttachedToWindow(View v) {
                 mStatusBarStateListener.onStateChanged(mStatusBarStateController.getState(), true);
             }
             mConfigurationController.addCallback(mConfigurationListener);
-            mContentResolver.registerContentObserver(LineageSettings.System.getUriFor(
-                    LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE), false,
-                    mDoubleTapToSleepObserver);
-            mDoubleTapToSleepObserver.onChange(true);
+
+            mStatusBarHeaderMachine.addObserver(this);
+            mStatusBarHeaderMachine.updateEnablement();
+
+            mTunerService.addTunable(this, DOUBLE_TAP_SLEEP_GESTURE);
+            mTunerService.addTunable(this, DOUBLE_TAP_SLEEP_LOCKSCREEN);
+            mTunerService.addTunable(this, STATUS_BAR_CUSTOM_HEADER);
+            mTunerService.addTunable(this, STATUS_BAR_CUSTOM_HEADER_HEIGHT);
+            mTunerService.addTunable(this, STATUS_BAR_CUSTOM_HEADER_SHADOW);
+
             // Theme might have changed between inflating this view and attaching it to the
             // window, so
             // force a call to onThemeChanged
@@ -3728,13 +3803,77 @@ public void onViewAttachedToWindow(View v) {
 
         @Override
         public void onViewDetachedFromWindow(View v) {
-            mContentResolver.unregisterContentObserver(mDoubleTapToSleepObserver);
             mFragmentService.getFragmentHostManager(mView)
                     .removeTagListener(QS.TAG, mQsController.getQsFragmentListener());
             mStatusBarStateController.removeCallback(mStatusBarStateListener);
             mConfigurationController.removeCallback(mConfigurationListener);
+            mStatusBarHeaderMachine.removeObserver(this);
+            mTunerService.removeTunable(this);
             mFalsingManager.removeTapListener(mFalsingTapListener);
         }
+
+        @Override
+        public void onTuningChanged(String key, String newValue) {
+            switch (key) {
+                case DOUBLE_TAP_SLEEP_GESTURE:
+                    mDoubleTapToSleepEnabled =
+                            TunerService.parseIntegerSwitch(newValue,
+                                mResources.getBoolean(org.lineageos.platform.internal.R.bool.
+                                config_dt2sGestureEnabledByDefault));
+                    break;
+                case DOUBLE_TAP_SLEEP_LOCKSCREEN:
+                    mIsLockscreenDoubleTapEnabled =
+                            TunerService.parseIntegerSwitch(newValue,
+                                mResources.getBoolean(org.lineageos.platform.internal.R.bool.
+                                config_dt2sGestureEnabledByDefault));
+                    break;
+                case STATUS_BAR_CUSTOM_HEADER:
+                    mHeaderImageEnabled =
+                            TunerService.parseIntegerSwitch(newValue, false);
+                    if (!mHeaderImageEnabled) {
+                        mQsHeaderLayout.setVisibility(View.GONE);
+                    } else {
+                        mOrientation = mView.getResources().getConfiguration().orientation;
+                        mView.post(() -> updateHeaderImage());
+                    }
+                    break;
+                case STATUS_BAR_CUSTOM_HEADER_HEIGHT:
+                    mHeaderImageHeight =
+                            TunerService.parseInteger(newValue, 142);
+                    mBottomFadeHeight = (int) Math.round(mHeaderImageHeight * 0.555);
+                    if (mHeaderImageEnabled) {
+                        mView.post(() -> updateHeaderImage());
+                    }
+                    break;
+                case STATUS_BAR_CUSTOM_HEADER_SHADOW:
+                    mHeaderImageShadow =
+                            TunerService.parseInteger(newValue, 0);
+                    if (mHeaderImageEnabled) {
+                        mView.post(() -> updateHeaderImage());
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        @Override
+        public void updateHeader(Drawable headerImage, boolean force) {
+            mView.post(() -> doUpdateStatusBarCustomHeader(headerImage, force));
+        }
+
+        @Override
+        public void disableHeader() {
+            mView.post(() -> {
+                mCurrentBackground = null;
+                mQsHeaderImageView.setVisibility(View.GONE);
+            });
+        }
+
+        @Override
+        public void refreshHeader() {
+            mView.post(() -> doUpdateStatusBarCustomHeader(mCurrentBackground, true));
+        }
     }
 
     private final class ShadeLayoutChangeListener implements View.OnLayoutChangeListener {
@@ -3756,6 +3895,9 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
             mQsController.handleShadeLayoutChanged(oldMaxHeight);
             updateExpandedHeight(getExpandedHeight());
             updateHeader();
+            if (mHeaderImageEnabled) {
+                mView.post(() -> updateHeaderImage());
+            }
 
             // If we are running a size change animation, the animation takes care of the height
             // of the container. However, if we are not animating, we always need to make the QS
@@ -4060,7 +4202,10 @@ public boolean onTouchEvent(MotionEvent event) {
                 return false;
             }
 
-            if (mDoubleTapToSleepEnabled && !mPulsing && !mDozing) {
+            if ((mIsLockscreenDoubleTapEnabled && !mPulsing && !mDozing
+                    && mBarState == StatusBarState.KEYGUARD) ||
+                    (!mQsController.getExpanded() && mDoubleTapToSleepEnabled
+                    && event.getY() < mStatusBarHeaderHeightKeyguard)) {
                 mDoubleTapGesture.onTouchEvent(event);
             }
 
@@ -4079,9 +4224,10 @@ public boolean onTouchEvent(MotionEvent event) {
 
             // If pulse is expanding already, let's give it the touch. There are situations
             // where the panel starts expanding even though we're also pulsing
-            boolean pulseShouldGetTouch = (!mIsExpandingOrCollapsing
+            boolean pulseShouldGetTouch = ((!mIsExpandingOrCollapsing
                     && !mQsController.shouldQuickSettingsIntercept(mDownX, mDownY, 0))
-                    || mPulseExpansionHandler.isExpanding();
+                    || mPulseExpansionHandler.isExpanding() 
+                    || mPulseExpansionHandler.getSwipeDownWhenForbidden());
             if (pulseShouldGetTouch && mPulseExpansionHandler.onTouchEvent(event)) {
                 // We're expanding all the other ones shouldn't get this anymore
                 mShadeLog.logMotionEvent(event, "onTouch: PulseExpansionHandler handled event");
@@ -4373,4 +4519,101 @@ public boolean performAccessibilityAction(View host, int action, Bundle args) {
             return super.performAccessibilityAction(host, action, args);
         }
     }
+
+    private void doUpdateStatusBarCustomHeader(Drawable drawable, boolean force) {
+        if (drawable != null) {
+            mQsHeaderImageView.setVisibility(View.VISIBLE);
+            mCurrentBackground = drawable;
+            setNotificationPanelHeaderBackground(drawable, force);
+        } else {
+            mCurrentBackground = null;
+            mQsHeaderImageView.setVisibility(View.GONE);
+        }
+        if (mHeaderImageEnabled) {
+            updateHeaderImage();
+        }
+    }
+
+    private void updateHeaderImage() {
+        float shadeHeaderExpansion = mShadeHeaderController.getShadeExpandedFraction();
+        if (shadeHeaderExpansion > 0f &&
+            mOrientation != Configuration.ORIENTATION_LANDSCAPE &&
+            mCurrentBackground != null && mQsHeaderImageView.getDrawable() != null) {
+
+            if (mQsHeaderLayout.getVisibility() != View.VISIBLE) {
+                int headerImageHeight = (int) TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP,
+                        mHeaderImageHeight,
+                        mView.getResources().getDisplayMetrics());
+
+                ViewGroup.LayoutParams params = mQsHeaderLayout.getLayoutParams();
+                params.height = headerImageHeight;
+                mQsHeaderLayout.setLayoutParams(params);
+
+                mQsHeaderLayout.setFadeSizes(0, 0,
+                        (int) TypedValue.applyDimension(
+                                TypedValue.COMPLEX_UNIT_DIP,
+                                mBottomFadeHeight,
+                                mView.getResources().getDisplayMetrics()),
+                        0);
+
+                mQsHeaderLayout.setVisibility(View.VISIBLE);
+            }
+            if (mShadeHeaderExpansion != shadeHeaderExpansion) {
+                mShadeHeaderExpansion = shadeHeaderExpansion;
+                mQsHeaderImageView.setImageAlpha( (int)
+                    (mShadeHeaderExpansion * (255 - mHeaderImageShadow)));
+                startHeaderAnimIfPossible();
+            }
+        } else {
+            mQsHeaderLayout.setVisibility(View.GONE);
+            stopHeaderAnimIfRunning();
+        }
+    }
+
+    private void startHeaderAnimIfPossible() {
+        Drawable drawable = mQsHeaderImageView.getDrawable();
+        if (drawable == null) return;
+
+        // Only animate when we are actually showing it
+        if (mQsHeaderLayout.getVisibility() != View.VISIBLE || mQsHeaderImageView.getVisibility() != View.VISIBLE) {
+            return;
+        }
+
+        drawable.setVisible(true, true);
+        if (drawable instanceof Animatable anim && !anim.isRunning()) {
+            anim.start();
+        }
+    }
+
+    private void stopHeaderAnimIfRunning() {
+        Drawable drawable = mQsHeaderImageView.getDrawable();
+        if (drawable instanceof Animatable anim && anim.isRunning()) {
+            anim.stop();
+        }
+        if (drawable != null) {
+            drawable.setVisible(false, false);
+        }
+    }
+
+    private void setNotificationPanelHeaderBackground(Drawable dw, boolean force) {
+        // Stop previous anim, if any, before swapping
+        stopHeaderAnimIfRunning();
+
+        if (dw instanceof Animatable) {
+            mQsHeaderImageView.setImageDrawable(dw);
+            return;
+        }
+
+        Drawable current = mQsHeaderImageView.getDrawable();
+        if (current != null && !force && !(current instanceof Animatable)) {
+            Drawable[] layers = new Drawable[]{current, dw};
+            TransitionDrawable transitionDrawable = new TransitionDrawable(layers);
+            transitionDrawable.setCrossFadeEnabled(true);
+            mQsHeaderImageView.setImageDrawable(transitionDrawable);
+            transitionDrawable.startTransition(1000);
+        } else {
+            mQsHeaderImageView.setImageDrawable(dw);
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
index 2809fb76ff480..59c31e6df602a 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
@@ -121,6 +121,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
     private final long mLockScreenDisplayTimeout;
     private final float mKeyguardPreferredRefreshRate; // takes precedence over max
     private final float mKeyguardMaxRefreshRate;
+    private final float mAODMaxRefreshRate;
     private final KeyguardViewMediator mKeyguardViewMediator;
     private final KeyguardBypassController mKeyguardBypassController;
     private final Executor mBackgroundExecutor;
@@ -230,6 +231,11 @@ public NotificationShadeWindowControllerImpl(
         mKeyguardMaxRefreshRate = context.getResources()
                 .getInteger(R.integer.config_keyguardMaxRefreshRate);
         mTopUiController = topUiController;
+
+        // Same as described above but limited to AOD
+        // Allows using a different rate for each
+        mAODMaxRefreshRate = context.getResources()
+                .getInteger(R.integer.config_aodMaxRefreshRate);
     }
 
     /**
@@ -421,6 +427,7 @@ private void setKeyguardDark(boolean dark) {
     private void applyKeyguardFlags(NotificationShadeWindowState state) {
         final boolean keyguardOrAod = state.keyguardShowing
                 || (state.dozing && mDozeParameters.getAlwaysOn());
+        boolean wasKeyguardRateSet = false;
         if ((keyguardOrAod && !state.mediaBackdropShowing && !state.lightRevealScrimOpaque)
                 || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehind()
                 || (EnsureWallpaperDrawnOnDisplaySwitch.isEnabled() && state.pendingDisplayChange)
@@ -453,6 +460,7 @@ private void applyKeyguardFlags(NotificationShadeWindowState state) {
                 // Both max and min display refresh rate must be set to take effect:
                 mLpChanged.preferredMaxDisplayRefreshRate = mKeyguardPreferredRefreshRate;
                 mLpChanged.preferredMinDisplayRefreshRate = mKeyguardPreferredRefreshRate;
+                wasKeyguardRateSet = true;
             } else {
                 mLpChanged.preferredMaxDisplayRefreshRate = 0;
                 mLpChanged.preferredMinDisplayRefreshRate = 0;
@@ -465,6 +473,7 @@ private void applyKeyguardFlags(NotificationShadeWindowState state) {
                     && !state.keyguardFadingAway && !state.keyguardGoingAway;
             if (state.dozing || bypassOnKeyguard) {
                 mLpChanged.preferredMaxDisplayRefreshRate = mKeyguardMaxRefreshRate;
+                wasKeyguardRateSet = true;
             } else {
                 mLpChanged.preferredMaxDisplayRefreshRate = 0;
             }
@@ -483,6 +492,19 @@ private void applyKeyguardFlags(NotificationShadeWindowState state) {
         } else {
             mLpChanged.inputFeatures &= ~LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_PRIVACY;
         }
+
+        if (mAODMaxRefreshRate > 0) {
+            if (state.dozing) {
+                // limit on AOD & ambient if we have that set
+                // overrides set max keyguard rate
+                mLpChanged.preferredMaxDisplayRefreshRate = mAODMaxRefreshRate;
+            } else if (!wasKeyguardRateSet) {
+                // un-limit when out, but only if max keyguard rate wasn't set
+                mLpChanged.preferredMaxDisplayRefreshRate = 0;
+            }
+            Trace.setCounter("display_max_refresh_rate",
+                        (long) mLpChanged.preferredMaxDisplayRefreshRate);
+        }
     }
 
     private void adjustScreenOrientation(NotificationShadeWindowState state) {
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java
index d2d9f8eac91a3..77a9a08b5334d 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java
@@ -35,6 +35,12 @@
 import android.media.permission.SafeCloseable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Debug;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.MessageQueue;
+import android.os.Process;
 import android.os.Trace;
 import android.util.AttributeSet;
 import android.view.ActionMode;
@@ -45,6 +51,7 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -81,6 +88,13 @@ public class NotificationShadeWindowView extends WindowRootView {
 
     private boolean mAnimatingContentLaunch = false;
 
+    private static final long GC_DELAY_MS = 5000;
+    private static final long GC_PSS_THRESHOLD_KB = 350 * 1024;
+    private boolean mIsFirstPendingGcOnBoot = true;
+    private boolean mGcScheduled = false;
+    private Handler mGcHandler;
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+    private final Runnable mGcTask = this::scheduleGcOnIdle;
     public NotificationShadeWindowView(Context context, AttributeSet attrs) {
         super(context, attrs);
         setMotionEventSplittingEnabled(false);
@@ -94,16 +108,63 @@ protected void onAttachedToWindow() {
             mViewCaptureCloseable = ViewCaptureFactory.getInstance(getContext())
                 .startCapture(getRootView(), ".NotificationShadeWindowView");
         }
+        android.view.Choreographer.getInstance().setEnableTraversalLast(true);
+        if (getViewRootImpl() != null) {
+            getViewRootImpl().setIsNeedDrawLast(true);
+        }
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
+        android.view.Choreographer.getInstance().setEnableTraversalLast(false);
+        if (getViewRootImpl() != null) {
+            getViewRootImpl().setIsNeedDrawLast(false);
+        }
         if (mViewCaptureCloseable != null) {
             mViewCaptureCloseable.close();
         }
     }
 
+    @Override
+    protected void onWindowVisibilityChanged(int visibility) {
+        super.onWindowVisibilityChanged(visibility);
+        if (visibility == VISIBLE) {
+            mMainHandler.removeCallbacks(mGcTask);
+            mGcScheduled = false;
+        } else if (!mGcScheduled) {
+            mGcScheduled = true;
+            mMainHandler.removeCallbacks(mGcTask);
+            mMainHandler.postDelayed(mGcTask, GC_DELAY_MS);
+        }
+    }
+    private void scheduleGcOnIdle() {
+        mGcScheduled = false;
+        Looper.getMainLooper().getQueue().addIdleHandler(() -> {
+            if (isShown()) {
+                return false;
+            }
+            ensureGcHandler();
+            mGcHandler.post(this::performGcIfNeeded);
+            return false;
+        });
+    }
+    private void performGcIfNeeded() {
+        long pssKb = Debug.getPss();
+        if (mIsFirstPendingGcOnBoot || pssKb > GC_PSS_THRESHOLD_KB) {
+            Runtime.getRuntime().gc();
+            mIsFirstPendingGcOnBoot = false;
+            Log.d(TAG, "GC after shade gone, pss was: " + (pssKb / 1024) + "M");
+        }
+    }
+    private void ensureGcHandler() {
+        if (mGcHandler == null) {
+            HandlerThread thread = new HandlerThread("ShadeGC",
+                    Process.THREAD_PRIORITY_BACKGROUND);
+            thread.start();
+            mGcHandler = new Handler(thread.getLooper());
+        }
+    }
     protected void setInteractionEventHandler(InteractionEventHandler listener) {
         mInteractionEventHandler = listener;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt b/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt
index fc53866cef7de..04f6965f71410 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt
@@ -16,9 +16,14 @@
 
 package com.android.systemui.shade
 
+import android.content.Context
 import android.graphics.Point
 import android.hardware.display.AmbientDisplayConfiguration
 import android.os.PowerManager
+import android.os.SystemClock
+import android.os.VibrationAttributes
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.provider.Settings
 import android.view.GestureDetector
 import android.view.MotionEvent
@@ -50,6 +55,7 @@ import javax.inject.Inject
 class PulsingGestureListener
 @Inject
 constructor(
+    private val notificationShadeWindowView: NotificationShadeWindowView,
     private val falsingManager: FalsingManager,
     private val dockManager: DockManager,
     private val powerInteractor: PowerInteractor,
@@ -61,11 +67,17 @@ constructor(
     tunerService: TunerService,
     dumpManager: DumpManager
 ) : GestureDetector.SimpleOnGestureListener(), Dumpable {
+    private val vibrator: Vibrator
     private var doubleTapEnabled = false
     private var singleTapEnabled = false
     private var doubleTapEnabledNative = false
+    private var doubleTapVibrate = false
+    private var singleTapVibrate = false
 
     init {
+	vibrator = notificationShadeWindowView.getContext().getSystemService(
+                Context.VIBRATOR_SERVICE) as Vibrator
+
         val tunable = Tunable { key: String?, value: String? ->
             when (key) {
                 Settings.Secure.DOUBLE_TAP_TO_WAKE ->
@@ -76,6 +88,12 @@ constructor(
                 Settings.Secure.DOZE_TAP_SCREEN_GESTURE ->
                     singleTapEnabled =
                         ambientDisplayConfiguration.tapGestureEnabled(userTracker.userId)
+                Settings.Secure.DOZE_TAP_GESTURE_VIBRATE ->
+                    singleTapVibrate = ambientDisplayConfiguration.tapGestureVibrate(
+                            userTracker.userId)
+                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE_VIBRATE ->
+                    doubleTapVibrate = ambientDisplayConfiguration.doubleTapGestureVibrate(
+                            userTracker.userId)
             }
         }
         tunerService.addTunable(
@@ -101,6 +119,7 @@ constructor(
             shadeLogger.logSingleTapUpFalsingState(proximityIsNotNear, isNotAFalseTap)
             if (proximityIsNotNear && isNotAFalseTap) {
                 shadeLogger.d("Single tap handled, requesting centralSurfaces.wakeUpIfDozing")
+                if (singleTapVibrate) wakeVibrate()
                 dozeInteractor.setLastTapToWakePosition(Point(x.toInt(), y.toInt()))
                 powerInteractor.wakeUpIfDozing("PULSING_SINGLE_TAP", PowerManager.WAKE_REASON_TAP)
             }
@@ -121,10 +140,10 @@ constructor(
             return false
         }
 
-        return onDoubleTapEvent()
+        return onDoubleTapEvent(e.x, e.y)
     }
 
-    fun onDoubleTapEvent(): Boolean {
+    fun onDoubleTapEvent(x: Float = 0f, y: Float = 0f): Boolean {
         // React to the [MotionEvent.ACTION_UP] event after double tap is detected. Falsing
         // checks MUST be on the ACTION_UP event.
         if (
@@ -133,6 +152,8 @@ constructor(
                 !falsingManager.isProximityNear &&
                 !falsingManager.isFalseDoubleTap
         ) {
+            if (doubleTapVibrate) wakeVibrate()
+            dozeInteractor.setLastTapToWakePosition(Point(x.toInt(), y.toInt()))
             powerInteractor.wakeUpIfDozing("PULSING_DOUBLE_TAP", PowerManager.WAKE_REASON_TAP)
             return true
         }
@@ -147,4 +168,15 @@ constructor(
         pw.println("isDocked=${dockManager.isDocked}")
         pw.println("isProxCovered=${falsingManager.isProximityNear}")
     }
+
+    private fun wakeVibrate() {
+        if (vibrator == null || !vibrator.hasVibrator()) return
+        var effect = VibrationEffect.createWaveform(longArrayOf(0, 100), -1)
+        if (vibrator.areAllEffectsSupported(VibrationEffect.EFFECT_CLICK) ==
+                Vibrator.VIBRATION_EFFECT_SUPPORT_YES) {
+            effect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK)
+        }
+        vibrator.vibrate(effect,
+                VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK))
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt b/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
index 1d241dec4f713..a948777ad7867 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/QQSGestureListener.kt
@@ -19,11 +19,15 @@ package com.android.systemui.shade
 import android.content.Context
 import android.database.ContentObserver
 import android.os.PowerManager
+import android.os.UserHandle
+import android.provider.Settings
 import android.view.GestureDetector
 import android.view.MotionEvent
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.user.domain.interactor.SelectedUserInteractor
+import com.android.systemui.power.domain.interactor.PowerInteractor
 import com.android.systemui.statusbar.StatusBarState
 import com.android.systemui.statusbar.phone.CentralSurfaces
 import lineageos.providers.LineageSettings
@@ -35,24 +39,36 @@ class QQSGestureListener @Inject constructor(
         private val falsingManager: FalsingManager,
         private val powerManager: PowerManager,
         private val statusBarStateController: StatusBarStateController,
+        private val selectedUserInteractor: SelectedUserInteractor,
         private val centralSurfaces: CentralSurfaces,
+        private val powerInteractor: PowerInteractor,
 ) : GestureDetector.SimpleOnGestureListener() {
 
     private var doubleTapToSleepEnabled = false
+    private var lockscreenDT2SEnabled = false
     private val quickQsOffsetHeight: Int
 
     init {
         val contentObserver = object : ContentObserver(null) {
             override fun onChange(selfChange: Boolean) {
-                doubleTapToSleepEnabled = LineageSettings.System.getInt(
+                doubleTapToSleepEnabled = LineageSettings.System.getIntForUser(
                         context.contentResolver, LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE,
                         if (context.resources.getBoolean(org.lineageos.platform.internal.
-                                R.bool.config_dt2sGestureEnabledByDefault)) 1 else 0) != 0
+                                R.bool.config_dt2sGestureEnabledByDefault)) 1 else 0,
+                    selectedUserInteractor.getSelectedUserId()) != 0
+                lockscreenDT2SEnabled = Settings.System.getIntForUser(
+                        context.contentResolver, Settings.System.DOUBLE_TAP_SLEEP_LOCKSCREEN,
+                        if (context.resources.getBoolean(org.lineageos.platform.internal.
+                                R.bool.config_dt2sGestureEnabledByDefault)) 1 else 0,
+                    selectedUserInteractor.getSelectedUserId()) != 0
             }
         }
         context.contentResolver.registerContentObserver(
                 LineageSettings.System.getUriFor(LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE),
-                false, contentObserver)
+                false, contentObserver, UserHandle.USER_ALL)
+        context.contentResolver.registerContentObserver(
+                Settings.System.getUriFor(Settings.System.DOUBLE_TAP_SLEEP_LOCKSCREEN),
+                false, contentObserver, UserHandle.USER_ALL)
         contentObserver.onChange(true)
 
         quickQsOffsetHeight = context.resources.getDimensionPixelSize(
@@ -70,6 +86,15 @@ class QQSGestureListener @Inject constructor(
                     statusBarStateController.getState() == StatusBarState.KEYGUARD &&
                         !centralSurfaces.isBouncerShowing()) &&
                 !falsingManager.isFalseDoubleTap
+        ) {
+            powerInteractor.setLastTouchToSleepPosition(e.x, e.y)
+            powerManager.goToSleep(e.eventTime,
+                PowerManager.GO_TO_SLEEP_REASON_TOUCH, 0)
+            return true
+        } else if (!statusBarStateController.isDozing &&
+            lockscreenDT2SEnabled &&
+            statusBarStateController.getState() == StatusBarState.KEYGUARD &&
+            !centralSurfaces.isBouncerShowing()            
         ) {
             powerManager.goToSleep(e.getEventTime())
             return true
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
index e6082cd881035..6c89e52736be0 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java
@@ -36,17 +36,16 @@
 import android.animation.ValueAnimator;
 import android.app.Fragment;
 import android.content.res.Resources;
-import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.Rect;
 import android.graphics.Region;
-import android.os.Handler;
-import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.IndentingPrintWriter;
 import android.util.Log;
 import android.util.MathUtils;
 import android.view.Display;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
@@ -93,10 +92,12 @@
 import com.android.systemui.statusbar.QsFrameTranslateController;
 import com.android.systemui.statusbar.StatusBarState;
 import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor;
+import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
 import com.android.systemui.statusbar.notification.stack.AmbientState;
 import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
 import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
 import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController;
 import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.phone.KeyguardStatusBarView;
 import com.android.systemui.statusbar.phone.LightBarController;
@@ -107,11 +108,18 @@
 import com.android.systemui.statusbar.policy.CastController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.SplitShadeStateController;
-import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.LargeScreenUtils;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.kotlin.JavaAdapter;
 import com.android.systemui.utils.windowmanager.WindowManagerProvider;
 
+import com.android.systemui.applocker.AxAppLockerHelper;
+import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
+import com.android.systemui.statusbar.notification.collection.NotificationEntry;
+import android.service.notification.StatusBarNotification;
+import android.view.View;
+
 import lineageos.providers.LineageSettings;
 
 import dalvik.annotation.optimization.NeverCompile;
@@ -132,6 +140,13 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
 
     public static final int SHADE_BACK_ANIM_SCALE_MULTIPLIER = 100;
 
+    private static final String STATUS_BAR_QUICK_QS_PULLDOWN =
+            "lineagesystem:" + LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN;
+    private static final String NOTIFICATION_ROW_TRANSPARENCY =
+            Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY;
+    private static final String NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN =
+            Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN;
+
     private QS mQs;
     private final Lazy<NotificationPanelViewController> mPanelViewControllerLazy;
 
@@ -174,6 +189,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
     private final AccessibilityManager mAccessibilityManager;
     private final MetricsLogger mMetricsLogger;
     private final Resources mResources;
+    private final TunerService mTunerService;
 
     /** Whether the notifications are displayed full width (no margins on the side). */
     private boolean mIsFullWidth;
@@ -292,7 +308,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
     private long mNotificationBoundsAnimationDuration;
 
     private int mOneFingerQuickSettingsIntercept;
-    private final ContentObserver mOneFingerQuickSettingsInterceptObserver;
 
     private final Region mInterceptRegion = new Region();
     /** The end bounds of a clipping animation. */
@@ -362,7 +377,7 @@ public QuickSettingsControllerImpl(
             Lazy<CommunalTransitionViewModel> communalTransitionViewModelLazy,
             Lazy<LargeScreenHeaderHelper> largeScreenHeaderHelperLazy,
             WindowManagerProvider windowManagerProvider,
-            SelectedUserInteractor selectedUserInteractor
+            TunerService tunerService
     ) {
         SceneContainerFlag.assertInLegacyMode();
         mPanelViewControllerLazy = panelViewControllerLazy;
@@ -410,19 +425,10 @@ public QuickSettingsControllerImpl(
         mActiveNotificationsInteractor = activeNotificationsInteractor;
         mCommunalTransitionViewModelLazy = communalTransitionViewModelLazy;
         mJavaAdapter = javaAdapter;
+        mTunerService = tunerService;
 
         mLockscreenShadeTransitionController.addCallback(new LockscreenShadeTransitionCallback());
 
-        mOneFingerQuickSettingsInterceptObserver = new ContentObserver(null) {
-            @Override
-            public void onChange(boolean selfChange) {
-                mOneFingerQuickSettingsIntercept = LineageSettings.System.getIntForUser(
-                        mPanelView.getContext().getContentResolver(),
-                        LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0,
-                        selectedUserInteractor.getSelectedUserId());
-            }
-        };
-
         dumpManager.registerDumpable(this);
 
         mWindowManagerProvider = windowManagerProvider;
@@ -547,7 +553,8 @@ private boolean isRemoteInputActiveWithKeyboardUp() {
 
     boolean isExpansionEnabled() {
         return mExpansionEnabledPolicy && mExpansionEnabledAmbient
-            && !isRemoteInputActiveWithKeyboardUp();
+            && !isRemoteInputActiveWithKeyboardUp()
+            && !NTForbiddenSwipeDownQSController.get(mPanelView.getContext()).getForbiddenSwipeDownQS();
     }
 
     /** */
@@ -635,6 +642,9 @@ boolean isOpenQsEvent(MotionEvent event) {
             case 2: // Left side pulldown
                 showQsOverride = mQs.getView().isLayoutRtl() ? w - region < x : x < region;
                 break;
+            case 3: // pull down anywhere
+                showQsOverride = true;
+                break;
         }
         showQsOverride &= mBarState == StatusBarState.SHADE;
 
@@ -1129,6 +1139,7 @@ void updateExpansion() {
         mDepthController.setQsPanelExpansion(qsExpansionFraction);
         mStatusBarKeyguardViewManager.setQsExpansion(qsExpansionFraction);
         mShadeRepository.setQsExpansion(qsExpansionFraction);
+        com.android.systemui.util.ScrimUtils.get().setQsExpansion(qsExpansionFraction);
 
         // TODO (b/265193930): remove dependency on NPVC
         float shadeExpandedFraction = mBarState == KEYGUARD
@@ -1141,6 +1152,10 @@ void updateExpansion() {
         // Update the light bar
         mLightBarController.setQsExpanded(mFullyExpanded);
 
+        if (adjustedExpansionFraction == 1.0f || adjustedExpansionFraction == 0.0f) {
+            updateTransparencyIfNeeded();
+        }
+
         // Update full screen state
         setQsFullScreen(/* qsFullScreen = */ mFullyExpanded && !mSplitShadeEnabled);
     }
@@ -1354,6 +1369,7 @@ private void applyClippingImmediately(int left, int top, int right, int bottom,
             int clipTop = (int) (top - currentTranslation - mQsFrame.getTop());
             int clipBottom = (int) (bottom - currentTranslation - mQsFrame.getTop());
             mVisible = qsVisible;
+            ScrimUtils.get().setQsVisible(mVisible);
             mQs.setQsVisible(qsVisible);
             if (mEnableClipping) {
                 mQs.setFancyClipping(
@@ -1682,12 +1698,14 @@ boolean isConflictingExpansionGesture() {
     /** handles touches in Qs panel area */
     boolean handleTouch(MotionEvent event, boolean isFullyCollapsed,
             boolean isShadeOrQsHeightAnimationRunning) {
+        boolean isSwipeDisabled = NTForbiddenSwipeDownQSController.get(mPanelView.getContext()).getForbiddenSwipeDownQS();
         if (isSplitShadeAndTouchXOutsideQs(event.getX())) {
             mShadeLog.logMotionEvent(event, "handleQsTouch: touch outside QS");
             return false;
         }
         boolean isInStatusBar = event.getY(event.getActionIndex()) < mStatusBarMinHeight;
-        if (ShadeExpandsOnStatusBarLongPress.isEnabled() && isInStatusBar) {
+        if (ShadeExpandsOnStatusBarLongPress.isEnabled() && isInStatusBar 
+                && !isSwipeDisabled) {
             mStatusBarLongPressGestureDetector.get().handleTouch(event);
         }
         final int action = event.getActionMasked();
@@ -1719,6 +1737,9 @@ boolean handleTouch(MotionEvent event, boolean isFullyCollapsed,
                 && computeExpansionFraction() <= 0.01 && mShadeExpandedFraction < 1.0) {
             setTracking(false);
         }
+        if (isSwipeDisabled) {
+            setTracking(false);
+        }
         if (!isExpandImmediate() && isTracking()) {
             onTouch(event);
             if (!mConflictingExpansionGesture && !mSplitShadeEnabled) {
@@ -1979,6 +2000,11 @@ void flingQs(float vel, int type) {
      */
     private void flingQs(float vel, int type, final Runnable onFinishRunnable,
             boolean isClick) {
+        if (type == 0 && NTForbiddenSwipeDownQSController.get(mPanelView.getContext()).getForbiddenSwipeDownQS()) {
+            Log.i(TAG, " can't expand qs since forbidden wipe down QS:" + isExpansionEnabled());
+            traceQsJank(false, false);
+            return;
+        }
         mShadeLog.flingQs(type, isClick);
         float target;
         switch (type) {
@@ -2251,7 +2277,8 @@ FragmentHostManager.FragmentListener getQsFragmentListener() {
     }
 
     /** */
-    public final class QsFragmentListener implements FragmentHostManager.FragmentListener {
+    public final class QsFragmentListener implements FragmentHostManager.FragmentListener,
+            TunerService.Tunable {
 
         private int mLastDisplayIdWithMediaVisibilityChange = Display.DEFAULT_DISPLAY;
 
@@ -2316,12 +2343,9 @@ public void onFragmentViewCreated(String tag, Fragment fragment) {
                 mNotificationStackScrollLayoutController.setQsHeader((ViewGroup) mQs.getHeader());
             }
             mQs.setScrollListener(mQsScrollListener);
-            mPanelView.getContext().getContentResolver().registerContentObserver(
-                    LineageSettings.System.getUriFor(
-                            LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN),
-                    false, mOneFingerQuickSettingsInterceptObserver,
-                    UserHandle.USER_ALL);
-            mOneFingerQuickSettingsInterceptObserver.onChange(true);
+            mTunerService.addTunable(this, STATUS_BAR_QUICK_QS_PULLDOWN);
+            mTunerService.addTunable(this, NOTIFICATION_ROW_TRANSPARENCY);
+            mTunerService.addTunable(this, NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN);
             updateExpansion();
         }
 
@@ -2332,8 +2356,7 @@ private int getDisplayId() {
         /** */
         @Override
         public void onFragmentViewDestroyed(String tag, Fragment fragment) {
-            mPanelView.getContext().getContentResolver().unregisterContentObserver(
-                    mOneFingerQuickSettingsInterceptObserver);
+            mTunerService.removeTunable(this);
             // Manual handling of fragment lifecycle is only required because this bridges
             // non-fragment and fragment code. Once we are using a fragment for the notification
             // panel, mQs will not need to be null cause it will be tied to the same lifecycle.
@@ -2347,6 +2370,25 @@ public void onFragmentViewDestroyed(String tag, Fragment fragment) {
                 mQs = null;
             }
         }
+
+        @Override
+        public void onTuningChanged(String key, String newValue) {
+            if (STATUS_BAR_QUICK_QS_PULLDOWN.equals(key)) {
+                mOneFingerQuickSettingsIntercept = TunerService.parseInteger(newValue, 0);
+            } else if (NOTIFICATION_ROW_TRANSPARENCY.equals(key) ||
+                    NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN.equals(key)) {
+                updateTransparencyIfNeeded();
+            }
+        }
+    }
+
+    private void updateTransparencyIfNeeded() {
+        NotificationStackScrollLayoutController controller = mNotificationStackScrollLayoutController;
+        if (controller == null || controller.getView() == null) {
+            return;
+        }
+        NotificationStackScrollLayout view = controller.getView();
+        view.post(view::updateIfNeeded);
     }
 
     private final class LockscreenShadeTransitionCallback
@@ -2520,4 +2562,14 @@ interface FlingQsWithoutClickListener {
         void onFlingQsWithoutClick(ValueAnimator animator, float qsExpansionHeight,
                 float target, float vel);
     }
+
+    public final void onAppLockerUpdated(String packageName) {
+        NotificationStackScrollLayoutController controller = mNotificationStackScrollLayoutController;
+        if (controller == null || controller.getView() == null) {
+            return;
+        }
+
+        NotificationStackScrollLayout view = controller.getView();
+        view.post(() -> view.onAppLockerUpdate(packageName));
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java
index 2ae98d3358f3f..de1958becf138 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java
@@ -17,6 +17,7 @@
 package com.android.systemui.shade;
 
 import android.content.ComponentCallbacks2;
+import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -69,10 +70,14 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl {
     private final Lazy<AssistManager> mAssistManagerLazy;
     private final Lazy<NotificationGutsManager> mGutsManager;
 
+    private static final long TRIM_MEMORY_DELAY_MS = 500;
+
     private boolean mExpandedVisible;
     private boolean mLockscreenOrShadeVisible;
 
     private ShadeVisibilityListener mShadeVisibilityListener;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Runnable mTrimMemoryRunnable = this::performDeferredTrimMemory;
 
     @Inject
     public ShadeControllerImpl(
@@ -287,6 +292,7 @@ public void makeExpandedVisible(boolean force) {
         }
 
         mExpandedVisible = true;
+        mHandler.removeCallbacks(mTrimMemoryRunnable);
 
         // Expand the window to encompass the full screen in anticipation of the drag.
         // It's only possible to do atomically because the status bar is at the top of the screen!
@@ -333,8 +339,14 @@ public void makeExpandedInvisible() {
 
         // Trimming will happen later if Keyguard is showing - doing it here might cause a jank in
         // the bouncer appear animation.
-        if (!mKeyguardStateController.isShowing()) {
-            WindowManagerGlobal.getInstance().trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN);
+        mHandler.removeCallbacks(mTrimMemoryRunnable);
+        mHandler.postDelayed(mTrimMemoryRunnable, TRIM_MEMORY_DELAY_MS);
+    }
+
+    private void performDeferredTrimMemory() {
+        if (!mExpandedVisible && !mKeyguardStateController.isShowing()) {
+            WindowManagerGlobal.getInstance().trimMemory(
+                    ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 5ab6a267de208..ed4d14eee19b8 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -184,7 +184,6 @@ constructor(
     private val systemIconsHoverContainer: View =
         header.requireViewById(R.id.hover_system_icons_container)
 
-    private var roundedCorners = 0
     private var cutout: DisplayCutout? = null
     private var lastInsets: WindowInsets? = null
     private var nextAlarmIntent: PendingIntent? = null
@@ -712,7 +711,6 @@ constructor(
     }
 
     private fun updateResources() {
-        roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
         val padding = resources.getDimensionPixelSize(R.dimen.qs_panel_padding)
         header.setPadding(padding, header.paddingTop, padding, header.paddingBottom)
         updateQQSPaddings()
diff --git a/packages/SystemUI/src/com/android/systemui/shade/StatusBarLongPressGestureDetector.kt b/packages/SystemUI/src/com/android/systemui/shade/StatusBarLongPressGestureDetector.kt
index 87861880199b9..b038deed65d96 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/StatusBarLongPressGestureDetector.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/StatusBarLongPressGestureDetector.kt
@@ -22,6 +22,7 @@ import android.view.GestureDetector.SimpleOnGestureListener
 import android.view.MotionEvent
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController
 import com.android.systemui.statusbar.policy.DeviceProvisionedController
 import javax.inject.Inject
 
@@ -35,6 +36,7 @@ constructor(
     val shadeViewController: ShadeViewController,
     val shadeController: ShadeController,
     val deviceProvisionedController: DeviceProvisionedController,
+    val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController,
 ) {
     val gestureDetector =
         GestureDetector(
@@ -43,6 +45,7 @@ constructor(
                 override fun onLongPress(event: MotionEvent) {
                     if (
                         shadeController.isShadeEnabled() &&
+                            !forbiddenSwipeDownQSController.getForbiddenSwipeDownQS() &&
                             deviceProvisionedController.isDeviceProvisioned()
                     ) {
                         shadeViewController.onStatusBarLongPress(event)
diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDialogContextInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDialogContextInteractor.kt
index 18854b9cdbb51..c7192d693c5e5 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDialogContextInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDialogContextInteractor.kt
@@ -84,6 +84,10 @@ constructor(
             }
 
     private fun getContextOrDefault(displayId: Int): Context {
+        if (displayId == Display.DEFAULT_DISPLAY) {
+            return defaultContext
+        }
+
         return try {
             traceSection({ "Getting dialog context for displayId=$displayId" }) {
                 val displayWindowProperties =
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/ShadeColors.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/ShadeColors.kt
index 8f06c55b6e94b..ed30baa314455 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ui/ShadeColors.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ui/ShadeColors.kt
@@ -73,7 +73,11 @@ object ShadeColors {
 
     @JvmStatic
     private fun shadePanelFallback(context: Context): Int {
-        return context.getColor(R.color.shade_panel_fallback)
+        return ColorUtils.blendARGB(
+            context.getColor(R.color.nt_scrim_behind_1), 
+            context.getColor(R.color.nt_scrim_behind_2), 
+            0.5f
+        )
     }
 
     @JvmStatic
@@ -86,6 +90,10 @@ object ShadeColors {
 
     @JvmStatic
     private fun notificationScrimFallback(context: Context): Int {
-        return context.getColor(R.color.notification_scrim_fallback)
+        return ColorUtils.blendARGB(
+            context.getColor(R.color.nt_notification_behind_1), 
+            context.getColor(R.color.nt_notification_behind_2), 
+            0.2f
+        )
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/domain/SmartPixelSettings.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/domain/SmartPixelSettings.kt
new file mode 100644
index 0000000000000..7e70977d99602
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/domain/SmartPixelSettings.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.domain
+
+import android.database.ContentObserver
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.util.settings.SecureSettings
+import java.util.concurrent.Executor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@SysUISingleton
+class SmartPixelSettings @Inject constructor(
+    private val secureSettings: SecureSettings,
+    @Main private val mainExecutor: Executor,
+) {
+    companion object {
+        const val KEY_ENABLED = Settings.Secure.SMART_PIXEL_FILTER_ENABLED
+        const val KEY_PERCENT = Settings.Secure.SMART_PIXEL_FILTER_PERCENT
+
+        const val DEFAULT_PERCENT = 25
+        const val MIN_PERCENT = 10
+        const val MAX_PERCENT = 75
+    }
+
+    private val _isEnabled = MutableStateFlow(false)
+    val isEnabled: StateFlow<Boolean> = _isEnabled.asStateFlow()
+
+    private val _percent = MutableStateFlow(DEFAULT_PERCENT)
+    val percent: StateFlow<Int> = _percent.asStateFlow()
+
+    private val settingsObserver =
+        object : ContentObserver(mainExecutor, 0) {
+            override fun onChange(selfChange: Boolean) {
+                refresh()
+            }
+        }
+
+    private var initialized = false
+
+    fun init() {
+        if (initialized) return
+        initialized = true
+        refresh()
+        secureSettings.registerContentObserverForUserSync(
+            KEY_ENABLED, false, settingsObserver, UserHandle.USER_ALL,
+        )
+        secureSettings.registerContentObserverForUserSync(
+            KEY_PERCENT, false, settingsObserver, UserHandle.USER_ALL,
+        )
+    }
+
+    fun setEnabled(enabled: Boolean) {
+        secureSettings.putIntForUser(KEY_ENABLED, if (enabled) 1 else 0, UserHandle.USER_CURRENT)
+    }
+
+    fun setPercent(value: Int) {
+        secureSettings.putIntForUser(
+            KEY_PERCENT, value.coerceIn(MIN_PERCENT, MAX_PERCENT), UserHandle.USER_CURRENT,
+        )
+    }
+
+    private fun refresh() {
+        _isEnabled.value =
+            secureSettings.getIntForUser(KEY_ENABLED, 0, UserHandle.USER_CURRENT) == 1
+        _percent.value =
+            secureSettings.getIntForUser(KEY_PERCENT, DEFAULT_PERCENT, UserHandle.USER_CURRENT)
+                .coerceIn(MIN_PERCENT, MAX_PERCENT)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelDialogDelegate.kt
new file mode 100644
index 0000000000000..e1f8c06bf5f9a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelDialogDelegate.kt
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.android.compose.PlatformButton
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.smartpixel.domain.SmartPixelSettings
+import com.android.systemui.smartpixel.domain.SmartPixelSettings.Companion.MAX_PERCENT
+import com.android.systemui.smartpixel.domain.SmartPixelSettings.Companion.MIN_PERCENT
+import com.android.systemui.dialog.ui.composable.AlertDialogContent
+import com.android.systemui.res.R
+import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import com.android.systemui.statusbar.phone.SystemUIDialogFactory
+import com.android.systemui.statusbar.phone.create
+import javax.inject.Inject
+
+class SmartPixelDialogDelegate @Inject constructor(
+    private val sysuiDialogFactory: SystemUIDialogFactory,
+    private val settings: SmartPixelSettings,
+    private val shadeDialogContextInteractor: ShadeDialogContextInteractor,
+) {
+
+    fun createDialog(): SystemUIDialog =
+        sysuiDialogFactory.create(context = shadeDialogContextInteractor.context) {
+            SmartPixelDialogContent(it)
+        }
+
+    @OptIn(ExperimentalMaterial3ExpressiveApi::class)
+    @Composable
+    private fun SmartPixelDialogContent(dialog: SystemUIDialog) {
+        val isCurrentlyInDarkTheme = isSystemInDarkTheme()
+        val cachedDarkTheme = remember { isCurrentlyInDarkTheme }
+        PlatformTheme(isDarkTheme = cachedDarkTheme) {
+            AlertDialogContent(
+                title = { Text(stringResource(R.string.quick_settings_smart_pixels_label)) },
+                content = { SmartPixelControls() },
+                positiveButton = {
+                    PlatformButton(onClick = { dialog.dismiss() }) {
+                        Text(stringResource(R.string.quick_settings_done))
+                    }
+                },
+                contentBottomPadding = 8.dp,
+            )
+        }
+    }
+
+    @OptIn(ExperimentalMaterial3ExpressiveApi::class)
+    @Composable
+    private fun SmartPixelControls() {
+        val isEnabled by settings.isEnabled.collectAsState()
+        val currentPercent by settings.percent.collectAsState()
+        var sliderValue by remember(currentPercent) { mutableFloatStateOf(currentPercent.toFloat()) }
+
+        Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = stringResource(
+                        if (isEnabled) R.string.quick_settings_smart_pixels_on
+                        else R.string.quick_settings_smart_pixels_off,
+                    ),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                Switch(
+                    checked = isEnabled,
+                    onCheckedChange = { settings.setEnabled(it) },
+                    thumbContent = {
+                        Icon(
+                            imageVector = if (isEnabled) Icons.Filled.Check else Icons.Filled.Clear,
+                            contentDescription = null,
+                            modifier = Modifier.size(SwitchDefaults.IconSize),
+                        )
+                    }
+                )
+            }
+
+            Column {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
+                    Text(
+                        text = stringResource(R.string.smart_pixels_percent_label),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                    Text(
+                        text = stringResource(
+                            R.string.smart_pixels_percent_format,
+                            sliderValue.toInt(),
+                        ),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+                Slider(
+                    value = sliderValue,
+                    onValueChange = { sliderValue = it },
+                    onValueChangeFinished = { settings.setPercent(sliderValue.toInt()) },
+                    valueRange = MIN_PERCENT.toFloat()..MAX_PERCENT.toFloat(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = 4.dp),
+                    enabled = isEnabled,
+                )
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelManager.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelManager.kt
new file mode 100644
index 0000000000000..0a23cd2b8406a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelManager.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import com.android.systemui.CoreStartable
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+@SysUISingleton
+class SmartPixelManager @Inject constructor(
+    private val overlay: SmartPixelOverlay,
+) : CoreStartable {
+
+    override fun start() {
+        overlay.init()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelOverlay.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelOverlay.kt
new file mode 100644
index 0000000000000..307966c0b1ced
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelOverlay.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import android.content.Context
+import android.graphics.PixelFormat
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams
+import com.android.systemui.smartpixel.domain.SmartPixelSettings
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+
+@SysUISingleton
+class SmartPixelOverlay @Inject constructor(
+    @Application private val context: Context,
+    private val windowManager: WindowManager,
+    @Application private val applicationScope: CoroutineScope,
+    private val settings: SmartPixelSettings,
+) {
+    private var filterView: SmartPixelView? = null
+    private var viewController: SmartPixelViewController? = null
+
+    fun init() {
+        settings.init()
+
+        combine(
+            settings.isEnabled,
+            settings.percent,
+        ) { enabled, percent ->
+            if (enabled) {
+                showOverlay()
+                viewController?.updateConfig(percent)
+            } else {
+                hideOverlay()
+            }
+        }.launchIn(applicationScope)
+    }
+
+    private fun showOverlay() {
+        if (filterView != null) return
+
+        val view = SmartPixelView(context)
+        val controller = SmartPixelViewController(view)
+
+        val params = WindowManager.LayoutParams(
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.MATCH_PARENT,
+            LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,
+            LayoutParams.FLAG_NOT_FOCUSABLE or
+                LayoutParams.FLAG_NOT_TOUCHABLE or
+                LayoutParams.FLAG_LAYOUT_IN_SCREEN or
+                LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+                LayoutParams.FLAG_HARDWARE_ACCELERATED or
+                LayoutParams.FLAG_SHOW_WHEN_LOCKED,
+            PixelFormat.TRANSLUCENT,
+        )
+        params.title = "SmartPixelFilter"
+        params.layoutInDisplayCutoutMode =
+            LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+        params.privateFlags = params.privateFlags or
+            LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
+
+        windowManager.addView(view, params)
+        controller.init()
+        controller.updateConfig(settings.percent.value)
+
+        filterView = view
+        viewController = controller
+    }
+
+    private fun hideOverlay() {
+        viewController?.destroy()
+        filterView?.let { view ->
+            windowManager.removeViewImmediate(view)
+        }
+        filterView = null
+        viewController = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelTile.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelTile.kt
new file mode 100644
index 0000000000000..a6055ff6368af
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelTile.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.service.quicksettings.Tile
+import com.google.android.material.materialswitch.MaterialSwitch
+import com.android.internal.jank.InteractionJankMonitor
+import com.android.internal.logging.MetricsLogger
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent
+import com.android.systemui.animation.DialogCuj
+import com.android.systemui.animation.DialogTransitionAnimator
+import com.android.systemui.animation.Expandable
+import com.android.systemui.smartpixel.domain.SmartPixelSettings
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.plugins.FalsingManager
+import com.android.systemui.plugins.qs.QSTile.BooleanState
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.qs.QSHost
+import com.android.systemui.qs.QsEventLogger
+import com.android.systemui.qs.logging.QSLogger
+import com.android.systemui.qs.tileimpl.QSTileImpl
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import com.android.systemui.statusbar.policy.KeyguardStateController
+import com.android.systemui.util.settings.SecureSettings
+import java.util.concurrent.Executor
+import javax.inject.Inject
+import javax.inject.Provider
+
+class SmartPixelTile @Inject constructor(
+    host: QSHost,
+    uiEventLogger: QsEventLogger,
+    @Background backgroundLooper: Looper,
+    @Main mainHandler: Handler,
+    falsingManager: FalsingManager,
+    metricsLogger: MetricsLogger,
+    statusBarStateController: StatusBarStateController,
+    activityStarter: ActivityStarter,
+    qsLogger: QSLogger,
+    private val secureSettings: SecureSettings,
+    private val keyguardStateController: KeyguardStateController,
+    private val dialogTransitionAnimator: DialogTransitionAnimator,
+    private val dialogDelegateProvider: Provider<SmartPixelDialogDelegate>,
+    @Main private val mainExecutor: Executor,
+) : QSTileImpl<BooleanState>(
+    host, uiEventLogger, backgroundLooper, mainHandler, falsingManager,
+    metricsLogger, statusBarStateController, activityStarter, qsLogger,
+) {
+    companion object {
+        const val TILE_SPEC = "smart_pixels"
+        private const val INTERACTION_JANK_TAG = "smart_pixels"
+    }
+
+    override fun newTileState(): BooleanState {
+        val state = BooleanState()
+        state.handlesLongClick = true
+        return state
+    }
+
+    override fun handleClick(expandable: Expandable?) {
+        val newState = !mState.value
+        secureSettings.putIntForUser(
+            SmartPixelSettings.KEY_ENABLED,
+            if (newState) 1 else 0,
+            UserHandle.USER_CURRENT,
+        )
+        refreshState(newState)
+    }
+
+    override fun handleLongClick(expandable: Expandable?) {
+        val animateFromExpandable = expandable != null && !keyguardStateController.isShowing
+
+        val runnable = Runnable {
+            val dialog: SystemUIDialog = dialogDelegateProvider.get().createDialog()
+            if (animateFromExpandable) {
+                val controller = expandable?.dialogTransitionController(
+                    DialogCuj(
+                        InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
+                        INTERACTION_JANK_TAG,
+                    )
+                )
+                controller?.let { dialogTransitionAnimator.show(dialog, it) } ?: dialog.show()
+            } else {
+                dialog.show()
+            }
+        }
+
+        mainExecutor.execute {
+            mActivityStarter.executeRunnableDismissingKeyguard(
+                runnable,
+                null,
+                true,
+                true,
+                false,
+            )
+        }
+    }
+
+    override fun getLongClickIntent(): Intent? = null
+
+    override fun getTileLabel(): CharSequence =
+        mContext.getString(R.string.quick_settings_smart_pixels_label)
+
+    override fun handleUpdateState(state: BooleanState, arg: Any?) {
+        val enabled = if (arg is Boolean) {
+            arg
+        } else {
+            secureSettings.getIntForUser(
+                SmartPixelSettings.KEY_ENABLED, 0, UserHandle.USER_CURRENT,
+            ) == 1
+        }
+        state.value = enabled
+        state.label = mContext.getString(R.string.quick_settings_smart_pixels_label)
+        state.secondaryLabel = mContext.getString(
+            if (enabled) R.string.quick_settings_smart_pixels_on
+            else R.string.quick_settings_smart_pixels_off,
+        )
+        state.contentDescription = state.label
+        state.expandedAccessibilityClassName = MaterialSwitch::class.java.name
+        state.state = if (enabled) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
+        state.icon = ResourceIcon.get(
+            if (enabled) R.drawable.qs_smart_pixels_icon_on
+            else R.drawable.qs_smart_pixels_icon_off
+        )
+    }
+
+    override fun isAvailable(): Boolean = true
+
+    override fun getMetricsCategory(): Int = MetricsEvent.QS_PANEL
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelView.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelView.kt
new file mode 100644
index 0000000000000..b208f2ecbe6c7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelView.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Shader
+import android.view.View
+
+class SmartPixelView(context: Context) : View(context) {
+
+    private val patternPaint = Paint()
+    private var patternBitmap: Bitmap? = null
+
+    init {
+        setLayerType(LAYER_TYPE_HARDWARE, null)
+    }
+
+    fun updatePattern(bitmap: Bitmap) {
+        patternBitmap?.recycle()
+        patternBitmap = bitmap
+        patternPaint.shader = BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT)
+        invalidate()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        if (patternBitmap == null) return
+        canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), patternPaint)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        patternBitmap?.recycle()
+        patternBitmap = null
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelViewController.kt b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelViewController.kt
new file mode 100644
index 0000000000000..e22b73f439f01
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/smartpixel/ui/SmartPixelViewController.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.smartpixel.ui
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import com.android.systemui.smartpixel.domain.SmartPixelSettings.Companion.MAX_PERCENT
+import com.android.systemui.smartpixel.domain.SmartPixelSettings.Companion.MIN_PERCENT
+import com.android.systemui.util.ViewController
+
+class SmartPixelViewController(
+    view: SmartPixelView,
+) : ViewController<SmartPixelView>(view) {
+
+    companion object {
+        private const val TILE_SIZE = 8
+        private const val TOTAL_PIXELS = TILE_SIZE * TILE_SIZE
+
+        private val BAYER_MATRIX = intArrayOf(
+             0, 32,  8, 40,  2, 34, 10, 42,
+            48, 16, 56, 24, 50, 18, 58, 26,
+            12, 44,  4, 36, 14, 46,  6, 38,
+            60, 28, 52, 20, 62, 30, 54, 22,
+             3, 35, 11, 43,  1, 33,  9, 41,
+            51, 19, 59, 27, 49, 17, 57, 25,
+            15, 47,  7, 39, 13, 45,  5, 37,
+            63, 31, 55, 23, 61, 29, 53, 21,
+        )
+    }
+
+    fun updateConfig(percent: Int) {
+        rebuildPattern(percent.coerceIn(MIN_PERCENT, MAX_PERCENT))
+    }
+
+    private fun rebuildPattern(percent: Int) {
+        val threshold = (TOTAL_PIXELS * percent / 100f).toInt().coerceIn(1, TOTAL_PIXELS - 1)
+        val bmp = Bitmap.createBitmap(TILE_SIZE, TILE_SIZE, Bitmap.Config.ARGB_8888)
+
+        for (y in 0 until TILE_SIZE) {
+            for (x in 0 until TILE_SIZE) {
+                if (BAYER_MATRIX[y * TILE_SIZE + x] < threshold) {
+                    bmp.setPixel(x, y, Color.BLACK)
+                }
+            }
+        }
+
+        mView.updatePattern(bmp)
+    }
+
+    override fun onViewAttached() {}
+
+    override fun onViewDetached() {}
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt
index bad2d77d2075a..fe16970fe9e14 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt
@@ -25,6 +25,7 @@ import android.os.Build
 import android.os.SystemProperties
 import android.os.Trace
 import android.os.Trace.TRACE_TAG_APP
+import android.os.UserHandle
 import android.util.IndentingPrintWriter
 import android.util.Log
 import android.util.MathUtils
@@ -41,8 +42,11 @@ import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.dump.DumpManager
 import com.android.systemui.keyguard.ui.transitions.BlurConfig
 import com.android.systemui.res.R
+import com.android.systemui.util.settings.SettingsProxyExt.observerFlow
+import com.android.systemui.util.settings.SecureSettings
 import java.io.PrintWriter
 import javax.inject.Inject
+import kotlinx.coroutines.flow.*
 
 @SysUISingleton
 open class BlurUtils
@@ -52,14 +56,17 @@ constructor(
     blurConfig: BlurConfig,
     private val crossWindowBlurListeners: CrossWindowBlurListeners,
     dumpManager: DumpManager,
+    private val secureSettings: SecureSettings,
 ) : Dumpable {
     val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius).toFloat()
-    val maxBlurRadius =
-        if (Flags.notificationShadeBlur()) {
-            blurConfig.maxBlurRadiusPx
-        } else {
-            resources.getDimensionPixelSize(R.dimen.max_window_blur_radius).toFloat()
-        }
+    val maxBlurRadius: Float 
+        get() = secureSettings.getFloatForUser("system_blur_radius", 34f, UserHandle.USER_CURRENT)
+
+    val maxBlurRadiusFlow: Flow<Float> = secureSettings
+        .observerFlow("system_blur_radius")
+        .onStart { emit(Unit) }
+        .map { maxBlurRadius }
+        .distinctUntilChanged()
 
     private var lastAppliedBlur = 0
     private var lastTargetViewRootImpl: ViewRootImpl? = null
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 1fbed919c05bc..24fc9b390de54 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -189,6 +189,7 @@ public class CommandQueue extends IStatusBar.Stub implements
     private static final int MSG_WALLET_ACTION_LAUNCH_GESTURE = 83 << MSG_SHIFT;
     private static final int MSG_DISPLAY_REMOVE_SYSTEM_DECORATIONS = 85 << MSG_SHIFT;
     private static final int MSG_DISABLE_ALL  = 86 << MSG_SHIFT;
+    private static final int MSG_RESTART_SYSTEMUI = 87 << MSG_SHIFT;
 
     public static final int FLAG_EXCLUDE_NONE = 0;
     public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -594,6 +595,8 @@ default void immersiveModeChanged(int rootDisplayAreaId, boolean isImmersiveMode
          * @see IStatusBar#moveFocusedTaskToDesktop(int)
          */
         default void moveFocusedTaskToDesktop(int displayId) {}
+
+        default void restartSystemUI() {}
     }
 
     @VisibleForTesting
@@ -1550,6 +1553,13 @@ public void moveFocusedTaskToDesktop(int displayId) {
         mHandler.obtainMessage(MSG_ENTER_DESKTOP, args).sendToTarget();
     }
 
+    @Override
+    public void restartSystemUI() {
+        synchronized (mLock) {
+            mHandler.removeMessages(MSG_RESTART_SYSTEMUI);
+            mHandler.obtainMessage(MSG_RESTART_SYSTEMUI).sendToTarget();
+        }
+    }
 
     private final class H extends Handler {
         private H(Looper l) {
@@ -2094,6 +2104,11 @@ public void handleMessage(Message msg) {
                     }
                     break;
                 }
+                case MSG_RESTART_SYSTEMUI:
+                    for (int i = 0; i < mCallbacks.size(); i++) {
+                        mCallbacks.get(i).restartSystemUI();
+                    }
+                    break;
             }
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 7f0926a44e014..5b0ddfcc9af9e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -25,6 +25,7 @@
 import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT;
 import static android.security.Flags.secureLockDevice;
 import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
 import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_AVAILABLE;
@@ -62,6 +63,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.hardware.biometrics.BiometricSourceType;
 import android.os.BatteryManager;
 import android.os.Handler;
@@ -70,8 +72,11 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.text.style.ImageSpan;
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
@@ -116,6 +121,7 @@
 import com.android.systemui.res.R;
 import com.android.systemui.securelockdevice.domain.interactor.SecureLockDeviceInteractor;
 import com.android.systemui.settings.UserTracker;
+import com.android.systemui.statusbar.phone.FaceUnlockImageView;
 import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;
 import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -130,6 +136,9 @@
 
 import java.io.PrintWriter;
 import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -155,6 +164,8 @@ public class KeyguardIndicationController {
 
     private static final int MSG_SHOW_ACTION_TO_UNLOCK = 1;
     private static final int MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON = 2;
+    private static final int MSG_SHOW_RECOGNIZING_FACE = 3;
+    private static final int MSG_HIDE_RECOGNIZING_FACE = 4;
     private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300;
     public static final long DEFAULT_MESSAGE_TIME = 3500;
     public static final long DEFAULT_HIDE_DELAY_MS =
@@ -172,6 +183,7 @@ public class KeyguardIndicationController {
     private final Lazy<SecureLockDeviceInteractor> mSecureLockDeviceInteractor;
 
     private ViewGroup mIndicationArea;
+    private FaceUnlockImageView mFaceIconView;
     private KeyguardIndicationTextView mTopIndicationView;
     private KeyguardIndicationTextView mLockScreenIndicationView;
     private final IBatteryStats mBatteryInfo;
@@ -208,6 +220,7 @@ public class KeyguardIndicationController {
     private BiometricSourceType mBiometricMessageSource;
     private ColorStateList mInitialTextColorState;
     private boolean mVisible;
+    private boolean mSuppressIndication;
     private boolean mOrganizationOwnedDevice;
 
     // these all assume the device is plugged in (wired/wireless/docked) AND chargingOrFull:
@@ -225,15 +238,26 @@ public class KeyguardIndicationController {
     private boolean mEnableBatteryDefender;
     private boolean mBatteryDead;
     private boolean mIncompatibleCharger;
-    private int mChargingWattage;
+    private float mChargingWattage;
     private int mBatteryLevel = -1;
     private boolean mBatteryPresent = true;
     protected long mChargingTimeRemaining;
+    private float mChargingCurrent;
+    private float mChargingVoltage;
+    private float mTemperature;
     private Pair<String, BiometricSourceType> mBiometricErrorMessageToShowOnScreenOn;
     private Set<Integer> mCoExFaceAcquisitionMsgIdsToShow;
     private final FaceHelpMessageDeferral mFaceAcquiredMessageDeferral;
     private boolean mInited;
 
+    private boolean mFaceDetectionRunning;
+
+    private int mCurrentDivider;
+
+    private boolean mHasDashCharger;
+    private boolean mHasWarpCharger;
+    private boolean mHasVoocCharger;
+
     private KeyguardUpdateMonitorCallback mUpdateMonitorCallback;
 
     private boolean mDozing;
@@ -277,6 +301,15 @@ public void onScreenTurnedOn() {
                 mBiometricErrorMessageToShowOnScreenOn = null;
             }
         }
+
+        @Override
+        public void onScreenTurnedOff() {
+            if (mFaceDetectionRunning) {
+                mFaceDetectionRunning = false;
+                mBiometricErrorMessageToShowOnScreenOn = null;
+                hideFaceUnlockRecognizingMessage();
+            }
+        }
     };
     private boolean mFaceLockedOutThisAuthSession;
 
@@ -289,6 +322,29 @@ public void onScreenTurnedOn() {
     private final DeviceEntryBiometricSettingsInteractor mDeviceEntryBiometricSettingsInteractor;
     private AuthenticationFlags mAuthenticationFlags;
 
+    public interface IndicationListener {
+        void onIndicationUpdated(int type, @Nullable CharSequence text);
+    }
+    public static final int AX_TYPE_BIOMETRIC = 0;
+    public static final int AX_TYPE_TRANSIENT = 1;
+    public static final int AX_TYPE_TRUST = 2;
+    public static final int AX_TYPE_DISCLOSURE = 3;
+    public static final int AX_TYPE_OWNER_INFO = 4;
+    public static final int AX_TYPE_ALIGNMENT = 5;
+    public static final int AX_TYPE_PERSISTENT_UNLOCK = 6;
+    private final java.util.List<IndicationListener> mIndicationListeners =
+            new java.util.ArrayList<>();
+    public void addIndicationListener(IndicationListener listener) {
+        mIndicationListeners.add(listener);
+    }
+    public void removeIndicationListener(IndicationListener listener) {
+        mIndicationListeners.remove(listener);
+    }
+    private void notifyIndicationListeners(int type, @Nullable CharSequence text) {
+        for (IndicationListener listener : mIndicationListeners) {
+            listener.onIndicationUpdated(type, text);
+        }
+    }
     /**
      * Creates a new KeyguardIndicationController and registers callbacks.
      */
@@ -370,6 +426,11 @@ public void handleMessage(Message msg) {
                     showActionToUnlock();
                 } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) {
                     mBiometricErrorMessageToShowOnScreenOn = null;
+                } else if (msg.what == MSG_SHOW_RECOGNIZING_FACE) {
+                    mBiometricErrorMessageToShowOnScreenOn = null;
+                    showFaceUnlockRecognizingMessage();
+                } else if (msg.what == MSG_HIDE_RECOGNIZING_FACE) {
+                    hideFaceUnlockRecognizingMessage();
                 }
             }
         };
@@ -386,6 +447,13 @@ public void handleMessage(Message msg) {
                 TAG,
                 mHandler
         );
+
+        mHasDashCharger = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_hasDashCharger);
+        mHasWarpCharger = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_hasWarpCharger);
+        mHasVoocCharger = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_hasVoocCharger);
     }
 
     /** Call this after construction to finish setting up the instance. */
@@ -402,6 +470,8 @@ public void init() {
         mKeyguardStateController.addCallback(mKeyguardStateCallback);
 
         mStatusBarStateListener.onDozingChanged(mStatusBarStateController.isDozing());
+
+        mCurrentDivider = mContext.getResources().getInteger(R.integer.config_currentInfoDivider);
     }
 
     @Nullable
@@ -419,6 +489,13 @@ public void onConfigurationChanged() {
         }
     }
 
+    public void setIndicationAreaTop(ViewGroup indicationAreaTop) {
+        mFaceIconView = indicationAreaTop.findViewById(R.id.face_unlock_icon);
+        if (mFaceIconView != null) {
+            mFaceIconView.updateColor();
+        }
+    }
+
     public void setIndicationArea(ViewGroup indicationArea) {
         mIndicationArea = indicationArea;
         mTopIndicationView = indicationArea.findViewById(R.id.keyguard_indication_text);
@@ -582,11 +659,13 @@ private void updateLockScreenDisclosureMsg() {
                                       .setTextColor(getInitialTextColorState())
                                       .build(),
                               /* updateImmediately */ false);
+                        notifyIndicationListeners(AX_TYPE_DISCLOSURE, disclosure);
                     }
                 });
             });
         } else {
             mRotateTextViewController.hideIndication(INDICATION_TYPE_DISCLOSURE);
+            notifyIndicationListeners(AX_TYPE_DISCLOSURE, null);
         }
     }
 
@@ -638,8 +717,10 @@ private void updateLockScreenOwnerInfo() {
                                     .setTextColor(getInitialTextColorState())
                                     .build(),
                             false);
+                    notifyIndicationListeners(AX_TYPE_OWNER_INFO, finalInfo);
                 } else {
                     mRotateTextViewController.hideIndication(INDICATION_TYPE_OWNER_INFO);
+                    notifyIndicationListeners(AX_TYPE_OWNER_INFO, null);
                 }
             });
         });
@@ -649,7 +730,7 @@ private void updateLockScreenBatteryMsg(boolean animate) {
         if (mBatteryPresent && (mPowerPluggedIn || mEnableBatteryDefender)) {
             String powerIndication = computePowerIndication();
             if (DEBUG_CHARGING_SPEED) {
-                powerIndication += ",  " + (mChargingWattage / 1000) + " mW";
+                powerIndication += ",  " + (mChargingWattage / mCurrentDivider) + " mW";
             }
 
             mKeyguardLogger.logUpdateBatteryIndication(powerIndication, mPowerPluggedIn);
@@ -703,9 +784,11 @@ private void updateBiometricMessage() {
                             .build(),
                     true
             );
+            notifyIndicationListeners(AX_TYPE_BIOMETRIC, mBiometricMessage);
         } else {
             mRotateTextViewController.hideIndication(
                     INDICATION_TYPE_BIOMETRIC_MESSAGE);
+            notifyIndicationListeners(AX_TYPE_BIOMETRIC, null);
         }
         if (!TextUtils.isEmpty(mBiometricMessageFollowUp)) {
             mRotateTextViewController.updateIndication(
@@ -731,8 +814,10 @@ private void updateTransient() {
 
         if (!TextUtils.isEmpty(mTransientIndication)) {
             mRotateTextViewController.showTransient(mTransientIndication);
+            notifyIndicationListeners(AX_TYPE_TRANSIENT, mTransientIndication);
         } else {
             mRotateTextViewController.hideTransient();
+            notifyIndicationListeners(AX_TYPE_TRANSIENT, null);
         }
     }
 
@@ -747,6 +832,7 @@ private void updateLockScreenTrustMsg(int userId, CharSequence trustGrantedIndic
                             .setTextColor(getInitialTextColorState())
                             .build(),
                     true);
+            notifyIndicationListeners(AX_TYPE_TRUST, trustGrantedIndication);
             hideBiometricMessage();
         } else if (!TextUtils.isEmpty(trustManagedIndication)
                 && mKeyguardUpdateMonitor.getUserTrustIsManaged(userId)
@@ -758,8 +844,10 @@ private void updateLockScreenTrustMsg(int userId, CharSequence trustGrantedIndic
                             .setTextColor(getInitialTextColorState())
                             .build(),
                     false);
+            notifyIndicationListeners(AX_TYPE_TRUST, trustManagedIndication);
         } else {
             mRotateTextViewController.hideIndication(INDICATION_TYPE_TRUST);
+            notifyIndicationListeners(AX_TYPE_TRUST, null);
         }
     }
 
@@ -773,8 +861,10 @@ private void updateLockScreenAlignmentMsg() {
                                     mContext.getColor(R.color.misalignment_text_color)))
                             .build(),
                     true);
+            notifyIndicationListeners(AX_TYPE_ALIGNMENT, mAlignmentIndication);
         } else {
             mRotateTextViewController.hideIndication(INDICATION_TYPE_ALIGNMENT);
+            notifyIndicationListeners(AX_TYPE_ALIGNMENT, null);
         }
     }
 
@@ -787,8 +877,10 @@ private void updateLockScreenPersistentUnlockMsg() {
                             .setTextColor(getInitialTextColorState())
                             .build(),
                     true);
+            notifyIndicationListeners(AX_TYPE_PERSISTENT_UNLOCK, mPersistentUnlockMessage);
         } else {
             mRotateTextViewController.hideIndication(INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE);
+            notifyIndicationListeners(AX_TYPE_PERSISTENT_UNLOCK, null);
         }
     }
 
@@ -899,6 +991,19 @@ private int getWorkProfileUserId(int userId) {
         return UserHandle.USER_NULL;
     }
 
+    public void setSuppressIndication(boolean suppress) {
+        mSuppressIndication = suppress;
+        if (mTopIndicationView != null) {
+            mTopIndicationView.setSuppressVisibility(suppress);
+        }
+        if (mLockScreenIndicationView != null) {
+            mLockScreenIndicationView.setSuppressVisibility(suppress);
+        }
+        if (!suppress && mVisible) {
+            updateDeviceEntryIndication(false);
+        }
+    }
+
     /**
      * Sets the visibility of keyguard bottom area, and if the indications are updatable.
      *
@@ -1045,6 +1150,14 @@ private void showBiometricMessage(
             return;
         }
 
+        if (TextUtils.equals(biometricMessage, mContext.getString(R.string.keyguard_face_successful_unlock))) {
+            updateFaceIconViewState(FaceUnlockImageView.State.SUCCESS);
+        } else if (TextUtils.equals(biometricMessage, mContext.getString(R.string.keyguard_face_failed))) {
+            updateFaceIconViewState(FaceUnlockImageView.State.NOT_VERIFIED);
+        } else if (TextUtils.equals(biometricMessage, mContext.getString(R.string.face_unlock_recognizing))) {
+           updateFaceIconViewState(FaceUnlockImageView.State.SCANNING);
+        }
+
         if (mBiometricMessageSource != null && biometricSourceType == null) {
             // If there's a current biometric message showing and a non-biometric message
             // arrives, update the followup message with the non-biometric message.
@@ -1077,6 +1190,25 @@ private void hideBiometricMessage() {
         }
     }
 
+    private void showFaceUnlockRecognizingMessage() {
+        String faceUnlockMessage = mContext.getResources().getString(
+            R.string.face_unlock_recognizing);
+        showBiometricMessage(faceUnlockMessage, FACE);
+    }
+
+    private void hideFaceUnlockRecognizingMessage() {
+        if (mFaceIconView != null) {
+            mFaceIconView.setVisibility(View.GONE);
+        }
+        String faceUnlockMessage = mContext.getResources().getString(
+            R.string.face_unlock_recognizing);
+        if (mBiometricMessage != null && mBiometricMessage.equals(faceUnlockMessage)) {
+            mBiometricMessage = null;
+            hideBiometricMessage();
+            updateFaceIconViewState(FaceUnlockImageView.State.HIDDEN);
+        }
+    }
+
     /**
      * Hides transient indication.
      */
@@ -1108,7 +1240,7 @@ protected final void updateDeviceEntryIndication(boolean animate) {
             boolean useMisalignmentColor = false;
             mLockScreenIndicationView.setVisibility(View.GONE);
             mTopIndicationView.setVisibility(VISIBLE);
-            CharSequence newIndication;
+            CharSequence newIndication = "";
             if (!TextUtils.isEmpty(mBiometricMessage)) {
                 newIndication = mBiometricMessage; // note: doesn't show mBiometricMessageFollowUp
             } else if (!TextUtils.isEmpty(mTransientIndication)) {
@@ -1127,25 +1259,93 @@ protected final void updateDeviceEntryIndication(boolean animate) {
             } else if (mPowerPluggedIn || mEnableBatteryDefender) {
                 newIndication = computePowerIndication();
             } else {
-                newIndication = NumberFormat.getPercentInstance()
-                        .format(mBatteryLevel / 100f);
+                String batteryLevel = NumberFormat.getPercentInstance().format(mBatteryLevel / 100f);
+                String batteryTemp = com.android.internal.util.matrixx.ThemeUtils.batteryTemperature(mContext, false);
+                String cpuTemp = com.android.internal.util.matrixx.ThemeUtils.getCPUTemp(mContext);
+
+                Drawable batteryIcon = mContext.getDrawable(R.drawable.ic_ambient_battery);
+                Drawable cpuIcon = mContext.getDrawable(R.drawable.ic_ambient_cpu);
+                Drawable temperatureIcon = mContext.getDrawable(R.drawable.ic_ambient_temperature);
+
+                if (batteryIcon != null) {
+                    batteryIcon.setBounds(0, 0, batteryIcon.getIntrinsicWidth(), batteryIcon.getIntrinsicHeight());
+                }
+
+                if (cpuIcon != null) {
+                    cpuIcon.setBounds(0, 0, cpuIcon.getIntrinsicWidth(), cpuIcon.getIntrinsicHeight());
+                }
+
+                if (temperatureIcon != null) {
+                    temperatureIcon.setBounds(0, 0, temperatureIcon.getIntrinsicWidth(), temperatureIcon.getIntrinsicHeight());
+                }
+
+                UserManager userManager = mContext.getSystemService(UserManager.class);
+                String userName = null;
+                if (userManager != null) {
+                    UserHandle currentUser = android.os.Process.myUserHandle();
+                    UserInfo userInfo = userManager.getUserInfo(currentUser.getIdentifier());
+                    if (userInfo != null) {
+                        userName = userInfo.name;
+                    }
+                }
+                if (TextUtils.isEmpty(userName)) {
+                    userName = mContext.getString(R.string.default_user_name);
+                }
+
+                SpannableStringBuilder indicationBuilder = new SpannableStringBuilder();
+
+                switch (getAmbientShowSettings()) {
+                    case 2: // Battery level & battery temperature
+                        appendIcons(indicationBuilder, batteryLevel, batteryIcon, ambientShowSettingsIcon());
+                        appendWithSeparator(indicationBuilder, " | ");
+                        appendIcons(indicationBuilder, batteryTemp, temperatureIcon, ambientShowSettingsIcon());
+                        newIndication = indicationBuilder;
+                        break;
+
+                    case 3: // Battery level, battery temperature & CPU temperature
+                        appendIcons(indicationBuilder, batteryLevel, batteryIcon, ambientShowSettingsIcon());
+                        appendWithSeparator(indicationBuilder, " | ");
+                        appendIcons(indicationBuilder, batteryTemp, temperatureIcon, ambientShowSettingsIcon());
+                        appendWithSeparator(indicationBuilder, " | ");
+                        appendIcons(indicationBuilder, cpuTemp, cpuIcon, ambientShowSettingsIcon());
+                        newIndication = indicationBuilder;
+                        break;
+
+                    case 4: // Hidden → show current user name
+                        newIndication = userName;
+                        break;
+
+                    case 0: // Hidden (safe)
+                        SpannableStringBuilder hiddenIndication = new SpannableStringBuilder(""); 
+                        newIndication = hiddenIndication;
+                        break;
+                        
+                    case 1: // Show battery level
+                    default:
+                        appendIcons(indicationBuilder, batteryLevel, batteryIcon, ambientShowSettingsIcon());
+                        newIndication = indicationBuilder;
+                        break;
+                }
             }
 
             if (!TextUtils.equals(mTopIndicationView.getText(), newIndication)) {
                 mWakeLock.setAcquired(true);
-                final KeyguardIndication.Builder builder = new KeyguardIndication.Builder()
-                        .setMessage(newIndication)
-                        .setTextColor(ColorStateList.valueOf(
-                                useMisalignmentColor
-                                        ? mContext.getColor(R.color.misalignment_text_color)
-                                        : Color.WHITE));
-                if (mBiometricMessage != null && newIndication == mBiometricMessage) {
-                    builder.setForceAccessibilityLiveRegionAssertive();
+                KeyguardIndication indication = null;
+                if (!TextUtils.isEmpty(newIndication)) {
+                    final KeyguardIndication.Builder builder = new KeyguardIndication.Builder()
+                            .setMessage(newIndication)
+                            .setTextColor(ColorStateList.valueOf(
+                                    useMisalignmentColor
+                                            ? mContext.getColor(R.color.misalignment_text_color)
+                                            : Color.WHITE));
+                    if (mBiometricMessage != null && newIndication == mBiometricMessage) {
+                        builder.setForceAccessibilityLiveRegionAssertive();
+                    }
+                    indication = builder.build();
                 }
 
-                mTopIndicationView.switchIndication(newIndication,
-                        builder.build(),
-                        true, () -> mWakeLock.setAcquired(false));
+                mTopIndicationView.switchIndication(newIndication, indication, animate,
+                        () -> mWakeLock.setAcquired(false));
             }
             return;
         }
@@ -1157,6 +1357,28 @@ protected final void updateDeviceEntryIndication(boolean animate) {
         updateLockScreenIndications(animate, getCurrentUser());
     }
 
+    private int getAmbientShowSettings() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.AMBIENT_SHOW_SETTINGS, 0, UserHandle.USER_CURRENT);
+    }
+
+    private boolean ambientShowSettingsIcon() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.AMBIENT_SHOW_SETTINGS_ICONS, 0, UserHandle.USER_CURRENT) != 0;
+    }
+
+    private void appendIcons(SpannableStringBuilder builder, String text, Drawable icon, boolean showIcon) {
+        if (showIcon && icon != null) {
+            builder.append(" ");
+            builder.setSpan(new ImageSpan(icon), builder.length() - 1, builder.length(), builder.SPAN_INCLUSIVE_EXCLUSIVE);
+        }
+        builder.append(text);
+    }
+
+    private void appendWithSeparator(SpannableStringBuilder builder, String separator) {
+        builder.append(separator);
+    }
+
     /**
      * Assumption: device is charging
      */
@@ -1188,6 +1410,25 @@ protected String computePowerChargingStringIndication() {
         int chargingId;
         if (mPowerPluggedInWired) {
             switch (mChargingSpeed) {
+                case BatteryStatus.CHARGING_OEM:
+                    if (mHasDashCharger) {
+                        chargingId = hasChargingTime
+                                ? R.string.keyguard_indication_dash_charging_time
+                                : R.string.keyguard_plugged_in_dash_charging;
+                    } else if (mHasWarpCharger) {
+                        chargingId = hasChargingTime
+                                ? R.string.keyguard_indication_warp_charging_time
+                                : R.string.keyguard_plugged_in_warp_charging;
+                    } else if (mHasVoocCharger) {
+                        chargingId = hasChargingTime
+                                ? R.string.keyguard_indication_vooc_charging_time
+                                : R.string.keyguard_plugged_in_vooc_charging;
+                    } else {
+                        chargingId = hasChargingTime
+                                ? R.string.keyguard_indication_turbo_power_time
+                                : R.string.keyguard_plugged_in_turbo_charging;
+                    }
+                    break;
                 case BatteryStatus.CHARGING_FAST:
                     chargingId = hasChargingTime
                             ? R.string.keyguard_indication_charging_time_fast
@@ -1218,14 +1459,51 @@ protected String computePowerChargingStringIndication() {
                     : R.string.keyguard_plugged_in;
         }
 
+        String batteryInfo = "";
+        boolean showbatteryInfo = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            Settings.Secure.LOCKSCREEN_BATTERY_INFO, 1, UserHandle.USER_CURRENT) == 1;
+
+         if (showbatteryInfo) {
+            boolean showDetails = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.LOCKSCREEN_CHARGING_INFO_DETAILS, 1, UserHandle.USER_CURRENT) == 1;
+
+            List<String> chargingDetails = new ArrayList<>();
+            if (showDetails) {
+                if (mChargingCurrent >= mCurrentDivider * 1000) {
+                    chargingDetails.add(String.format(Locale.US, "%.1f",
+                            (mChargingCurrent / (float) mCurrentDivider / 1000f)) + "A");
+                } else if (mChargingCurrent > 0) {
+                    chargingDetails.add(String.format(Locale.US, "%.0f",
+                            (mChargingCurrent / (float) mCurrentDivider)) + "mA");
+                }
+                if (mChargingWattage > 0) {
+                    chargingDetails.add(String.format(Locale.US, "%.1f",
+                            (mChargingWattage / (float) mCurrentDivider / 1000f)) + "W");
+                }
+                if (mChargingVoltage > 0) {
+                    chargingDetails.add(String.format(Locale.US, "%.1f",
+                            (mChargingVoltage / 1000000f)) + "V");
+                }
+                if (mTemperature > 0) {
+                    chargingDetails.add(String.format(Locale.US, "%.1f",
+                            (mTemperature / 10f)) + "°C");
+                }
+            }
+            if (!chargingDetails.isEmpty()) {
+                batteryInfo = "\n" + TextUtils.join(" · ", chargingDetails);
+            }
+        }
+
+        String chargingText;
         if (hasChargingTime) {
             String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes(
-                    mContext, mChargingTimeRemaining);
-            return mContext.getResources().getString(chargingId, chargingTimeFormatted,
-                    percentage);
+                mContext, mChargingTimeRemaining);
+            chargingText = mContext.getResources().getString(chargingId, chargingTimeFormatted, percentage);
         } else {
-            return mContext.getResources().getString(chargingId, percentage);
+            chargingText =  mContext.getResources().getString(chargingId, percentage);
         }
+
+        return batteryInfo.isEmpty() ? chargingText : chargingText + "\n" + batteryInfo;
     }
 
     public void setStatusBarKeyguardViewManager(
@@ -1371,12 +1649,15 @@ public void onRefreshBatteryInfo(BatteryStatus status) {
             mPowerPluggedInDock = status.isPluggedInDock() && isChargingOrFull;
             mPowerPluggedIn = isPowerPluggedIn(status, isChargingOrFull);
             mPowerCharged = status.isCharged();
+            mChargingCurrent = status.maxChargingCurrent;
+            mChargingVoltage = status.maxChargingVoltage;
             mChargingWattage = status.maxChargingWattage;
             mChargingSpeed = status.getChargingSpeed(mContext);
             mChargingStatus = status.chargingStatus;
             mBatteryLevel = status.level;
             mBatteryPresent = status.present;
-            mBatteryDefender = isBatteryDefender(status);
+            mTemperature = status.temperature;
+            mBatteryDefender = isBatteryDefender(status) && mBatteryLevel >= 80;
             mBatteryDead = status.isDead();
             // when the battery is overheated, device doesn't charge so only guard on pluggedIn:
             mEnableBatteryDefender = mBatteryDefender && status.isPluggedIn();
@@ -1592,8 +1873,17 @@ public void onTrustAgentErrorMessage(CharSequence message) {
         @Override
         public void onBiometricRunningStateChanged(boolean running,
                 BiometricSourceType biometricSourceType) {
-            if (!running && biometricSourceType == FACE) {
-                showTrustAgentErrorMessage(mTrustAgentErrorMessage);
+            if (biometricSourceType == BiometricSourceType.FACE) {
+                mFaceDetectionRunning = running;
+                if (running) {
+                    mHandler.removeMessages(MSG_HIDE_RECOGNIZING_FACE);
+                    mHandler.removeMessages(MSG_SHOW_RECOGNIZING_FACE);
+                    mHandler.sendEmptyMessageDelayed(MSG_SHOW_RECOGNIZING_FACE, 100);
+                } else {
+                    mHandler.removeMessages(MSG_SHOW_RECOGNIZING_FACE);
+                    mHandler.removeMessages(MSG_HIDE_RECOGNIZING_FACE);
+                    mHandler.sendEmptyMessageDelayed(MSG_HIDE_RECOGNIZING_FACE, 100);
+                }
             }
         }
 
@@ -1771,11 +2061,18 @@ public void onDozingChanged(boolean dozing) {
 
             if (mDozing) {
                 hideBiometricMessage();
+                hideFaceUnlockRecognizingMessage();
             }
             updateDeviceEntryIndication(false);
         }
     };
 
+    private void updateFaceIconViewState(FaceUnlockImageView.State state) {
+        if (mFaceIconView != null) {
+            mFaceIconView.setState(state);
+        }
+    }
+
     private final KeyguardStateController.Callback mKeyguardStateCallback =
             new KeyguardStateController.Callback() {
         @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
index 864bb708400b2..f290d65ae006a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
@@ -39,6 +39,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableView
 import com.android.systemui.statusbar.notification.shared.NotificationBundleUi
 import com.android.systemui.statusbar.notification.stack.AmbientState
 import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController
 import com.android.systemui.statusbar.phone.CentralSurfaces
 import com.android.systemui.statusbar.phone.KeyguardBypassController
 import com.android.systemui.statusbar.phone.LSShadeTransitionLogger
@@ -83,6 +84,7 @@ constructor(
     private val splitShadeStateController: SplitShadeStateController,
     private val shadeLockscreenInteractorLazy: Lazy<ShadeLockscreenInteractor>,
     naturalScrollingSettingObserver: NaturalScrollingSettingObserver,
+    private val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController
 ) : Dumpable {
     private var pulseHeight: Float = 0f
 
@@ -169,6 +171,7 @@ constructor(
             naturalScrollingSettingObserver,
             shadeRepository,
             context,
+            forbiddenSwipeDownQSController,
         )
 
     private val splitShadeOverScroller: SplitShadeLockScreenOverScroller by lazy {
@@ -288,6 +291,16 @@ constructor(
     internal fun canDragDown(): Boolean {
         return (statusBarStateController.state == StatusBarState.KEYGUARD ||
             nsslController.isInLockedDownShade()) && (isQsFullyCollapsed || useSplitShade)
+            && !forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()
+    }
+
+    internal fun onDraggedDownWhenForbiddenSwipeDownQS(startingChild: View?) {
+        if ((startingChild is NotificationShelf) || (startingChild is ExpandableNotificationRow)) {
+            statusBarStateController.setLeaveOpenOnKeyguardHide(true)
+            activityStarter.dismissKeyguardThenExecute(
+                { false }, null, /* afterKeyguardGone= */ false,
+            )
+        }
     }
 
     /** Called by the touch helper when when a gesture has completed all the way and released. */
@@ -757,6 +770,7 @@ class DragDownHelper(
     private val naturalScrollingSettingObserver: NaturalScrollingSettingObserver,
     private val shadeRepository: ShadeRepository,
     context: Context,
+    private val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController
 ) : Gefingerpoken {
 
     private var dragDownAmountOnStart = 0.0f
@@ -823,12 +837,14 @@ class DragDownHelper(
                     captureStartingChild(initialTouchX, initialTouchY)
                     initialTouchY = y
                     initialTouchX = x
-                    dragDownCallback.onDragDownStarted(startingChild)
-                    dragDownAmountOnStart = dragDownCallback.dragDownAmount
                     val intercepted =
                         startingChild != null || dragDownCallback.isDragDownAnywhereEnabled
-                    if (intercepted) {
-                        shadeRepository.setLegacyLockscreenShadeTracking(true)
+                    if (!forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                        dragDownCallback.onDragDownStarted(startingChild)
+                        dragDownAmountOnStart = dragDownCallback.dragDownAmount
+                        if (intercepted) {
+                            shadeRepository.setLegacyLockscreenShadeTracking(true)
+                        }
                     }
                     return intercepted
                 }
@@ -844,28 +860,37 @@ class DragDownHelper(
         val y = event.y
         when (event.actionMasked) {
             MotionEvent.ACTION_MOVE -> {
-                lastHeight = y - initialTouchY
-                captureStartingChild(initialTouchX, initialTouchY)
-                dragDownCallback.dragDownAmount = lastHeight + dragDownAmountOnStart
-                if (startingChild != null) {
-                    handleExpansion(lastHeight, startingChild!!)
-                }
-                if (lastHeight > minDragDistance) {
-                    if (!draggedFarEnough) {
-                        draggedFarEnough = true
-                        dragDownCallback.onCrossedThreshold(true)
+                if (!forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                    lastHeight = y - initialTouchY
+                    captureStartingChild(initialTouchX, initialTouchY)
+                    dragDownCallback.dragDownAmount = lastHeight + dragDownAmountOnStart
+                    if (startingChild != null) {
+                        handleExpansion(lastHeight, startingChild!!)
                     }
-                } else {
-                    if (draggedFarEnough) {
-                        draggedFarEnough = false
-                        dragDownCallback.onCrossedThreshold(false)
+                    if (lastHeight > minDragDistance) {
+                        if (!draggedFarEnough) {
+                            draggedFarEnough = true
+                            dragDownCallback.onCrossedThreshold(true)
+                        }
+                    } else {
+                        if (draggedFarEnough) {
+                            draggedFarEnough = false
+                            dragDownCallback.onCrossedThreshold(false)
+                        }
                     }
                 }
                 return true
             }
 
             MotionEvent.ACTION_UP ->
-                if (
+                if (forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()
+                    && !falsingManager.isUnlockingDisabled) {
+                    dragDownCallback.onDraggedDownWhenForbiddenSwipeDownQS(startingChild)
+                    if (startingChild != null) {
+                        startingChild = null
+                    }
+                    isDraggingDown = false
+                } else if (
                     !falsingManager.isUnlockingDisabled &&
                         !isFalseTouch &&
                         dragDownCallback.canDragDown()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NTForbiddenSwipeDownQSController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NTForbiddenSwipeDownQSController.kt
new file mode 100644
index 0000000000000..053a348d089f0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NTForbiddenSwipeDownQSController.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar
+
+import android.content.Context
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.util.ScrimUtils
+import javax.inject.Inject
+
+@SysUISingleton
+class NTForbiddenSwipeDownQSController @Inject constructor(
+    private val context: Context
+) : ScrimUtils.ScrimEventListener {
+
+    private val enableSwipeDownQS 
+        get() = Settings.Secure.getIntForUser(
+            context.contentResolver, 
+            Settings.Secure.ENABLE_LOCKSCREEN_QUICK_SETTINGS, 1,
+            UserHandle.USER_CURRENT) == 1
+
+    init {
+        INSTANCE = this
+    }
+    private val keyguardShowing get() = ScrimUtils.get().isKeyguardShowing()
+    private val dozing get() = ScrimUtils.get().isDozing()
+
+    fun getForbiddenSwipeDownQS(): Boolean = (keyguardShowing || dozing) && !enableSwipeDownQS
+
+    companion object {
+        @Volatile
+        private var INSTANCE: NTForbiddenSwipeDownQSController? = null
+
+        @JvmStatic
+        fun get(context: Context): NTForbiddenSwipeDownQSController {
+            return INSTANCE ?: throw IllegalStateException(
+                "NTForbiddenSwipeDownQSController not initialized"
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
index 4c6fa4839e5c4..0913a356790fa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java
@@ -37,6 +37,7 @@
 import com.android.systemui.statusbar.notification.collection.PipelineDumper;
 import com.android.systemui.statusbar.phone.CentralSurfaces;
 import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.time.SystemClock;
 
 import java.util.ArrayList;
@@ -91,10 +92,13 @@ public NotificationListener(
 
     /** Registers a listener that's notified when notifications are added/removed/etc. */
     public void addNotificationHandler(NotificationHandler handler) {
-        if (mNotificationHandlers.contains(handler)) {
-            throw new IllegalArgumentException("Listener is already added");
+        if (!mNotificationHandlers.contains(handler)) {
+            mNotificationHandlers.add(handler);
         }
-        mNotificationHandlers.add(handler);
+    }
+
+    public void removeNotificationHandler(NotificationHandler handler) {
+        mNotificationHandlers.remove(handler);
     }
 
     @Override
@@ -141,6 +145,7 @@ public void onNotificationPosted(final StatusBarNotification sbn,
                 for (NotificationHandler handler : mNotificationHandlers) {
                     handler.onNotificationPosted(sbn, rankingMap);
                 }
+                ScrimUtils.get().onNotificationPosted(sbn);
             });
         }
     }
@@ -154,6 +159,7 @@ public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingM
                 for (NotificationHandler handler : mNotificationHandlers) {
                     handler.onNotificationRemoved(sbn, rankingMap, reason);
                 }
+                 ScrimUtils.get().onNotificationRemoved(sbn);
             });
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java
index fdcd39d1d616c..54f80e8657b3a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java
@@ -130,6 +130,8 @@ default boolean needsSeparateWorkChallenge(int userId) {
      */
     void removeNotificationStateChangedListener(NotificationStateChangedListener listener);
 
+    default void onAppLockRefresh() {}
+
     /** Notified when the current user changes. */
     interface UserChangedListener {
         default void onUserChanged(int userId) {}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
index 34a26cbbececd..5f200644c238a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
@@ -33,6 +33,7 @@
 import android.annotation.SuppressLint;
 import android.annotation.UserIdInt;
 import android.app.ActivityOptions;
+import android.app.AxSandboxManager;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
@@ -100,6 +101,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import javax.inject.Inject;
+import com.android.systemui.applocker.AxAppLockerHelper;
 
 /**
  * Handles keeping track of the current user, profiles, and various things related to hiding
@@ -317,6 +319,7 @@ public void onUserChanging(int newUser, @NonNull Context userContext) {
     protected ContentObserver mSettingsObserver;
 
     private final Lazy<DeviceUnlockedInteractor> mDeviceUnlockedInteractorLazy;
+    private final AxAppLockerHelper mAxAppLockerHelper;
 
     @Inject
     public NotificationLockscreenUserManagerImpl(Context context,
@@ -341,7 +344,8 @@ public NotificationLockscreenUserManagerImpl(Context context,
             Lazy<DeviceUnlockedInteractor> deviceUnlockedInteractorLazy,
             Lazy<KeyguardInteractor> keyguardInteractor,
             Lazy<WifiRepository> wifiRepository,
-            @Background CoroutineScope coroutineScope
+            @Background CoroutineScope coroutineScope,
+            AxAppLockerHelper axAppLockerHelper
     ) {
         mContext = context;
         mMainExecutor = mainExecutor;
@@ -363,6 +367,8 @@ public NotificationLockscreenUserManagerImpl(Context context,
         mKeyguardStateController = keyguardStateController;
         mFeatureFlags = featureFlags;
         mDeviceUnlockedInteractorLazy = deviceUnlockedInteractorLazy;
+        mAxAppLockerHelper = axAppLockerHelper;
+        mAxAppLockerHelper.addRefreshListener(this::notifyNotificationStateChanged);
 
         mLockScreenUris.add(SHOW_LOCKSCREEN);
         mLockScreenUris.add(SHOW_PRIVATE_LOCKSCREEN);
@@ -729,6 +735,13 @@ public boolean userAllowsNotificationsInPublic(int userHandle) {
     public @RedactionType int getRedactionType(NotificationEntry ent) {
         int userId = ent.getSbn().getUserId();
 
+        if (ent.getSbn().getNotification().extras
+                        .getBoolean(AxSandboxManager.EXTRA_NOTIFICATION_APP_LOCKED, false)
+                && mAxAppLockerHelper.needsAuth(
+                        ent.getSbn().getPackageName(), ent.getSbn().getUserId())) {
+            return REDACTION_TYPE_PUBLIC;
+        }
+
         boolean isCurrentUserRedactingNotifs =
                 !userAllowsPrivateNotificationsInPublic(mCurrentUserId);
         boolean isNotifForManagedProfile = mCurrentManagedProfiles.contains(userId);
@@ -959,6 +972,11 @@ public void removeNotificationStateChangedListener(NotificationStateChangedListe
         mNotifStateChangedListeners.remove(listener);
     }
 
+    @Override
+    public void onAppLockRefresh() {
+        notifyNotificationStateChanged();
+    }
+
     private void notifyNotificationStateChanged() {
         if (!Looper.getMainLooper().isCurrentThread()) {
             for (NotificationStateChangedListener listener : mNotifStateChangedListeners) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
index a3cab4ed4d3e6..1f0699958e714 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
@@ -138,7 +138,7 @@ constructor(
 
     private var isHomeFocused = true
 
-    val maxBlurRadiusPx = blurUtils.maxBlurRadius
+    val maxBlurRadiusPx get() = blurUtils.maxBlurRadius
 
     // Shade expansion offset that happens when pulling down on a HUN.
     var panelPullDownMinFraction = 0f
@@ -268,7 +268,7 @@ constructor(
             MathUtils.constrain(
                 shadeAnimation.radius,
                 blurUtils.minBlurRadius,
-                blurUtils.maxBlurRadius,
+                maxBlurRadiusPx,
             )
         val expansionRadius =
             blurUtils.blurRadiusOfRatio(
@@ -513,6 +513,11 @@ constructor(
                 }
             }
         }
+        applicationScope.launch {
+            blurUtils.maxBlurRadiusFlow.collect {
+                scheduleUpdate()
+            }
+        }
         initBlurListeners()
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index fd20a01b7e2b7..39a95756b66cb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -17,7 +17,6 @@
 package com.android.systemui.statusbar;
 
 import static com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerProgress;
-import static com.android.systemui.Flags.notificationRowTransparency;
 import static com.android.systemui.Flags.physicalNotificationMovement;
 import static com.android.systemui.util.ColorUtilKt.hexColorString;
 
@@ -171,6 +170,7 @@ private void updateResources() {
         if (!mShowNotificationShelf) {
             setVisibility(GONE);
         }
+        updateIfNeeded();
     }
 
     @Override
@@ -282,6 +282,7 @@ public void updateState(StackScrollAlgorithm.StackScrollAlgorithmState algorithm
         } else {
             viewState.setYTranslation(stackBottom - viewState.height);
         }
+        updateIfNeeded();
     }
 
     /**
@@ -539,7 +540,7 @@ public void updateAppearance() {
             }
         }
 
-        if (notificationRowTransparency() && needsToResetOverrideTint) {
+        if (mIsBlurSupported && needsToResetOverrideTint) {
             setTintColor(NO_COLOR);
             setOverrideTintColor(NO_COLOR, 0 /* overrideAmount */);
         }
@@ -582,6 +583,7 @@ public void updateAppearance() {
         if (mNotGoneIndex == -1) {
             mNotGoneIndex = notGoneIndex;
         }
+        updateIfNeeded();
     }
 
     private ExpandableView getHostLayoutChildAt(int index) {
@@ -1140,4 +1142,11 @@ public void animateTo(View view, AnimationProperties properties) {
             mShelfIcons.setAnimationsEnabled(mAnimationsEnabled);
         }
     }
+
+    @Override
+    protected boolean usesTransparentBackground() {
+        return super.usesTransparentBackground()
+                && mAmbientState != null
+                && !mAmbientState.isOnKeyguard();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
index 3be7682fe250f..cea935f9d6316 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
@@ -34,10 +34,12 @@ import com.android.systemui.Gefingerpoken
 import com.android.systemui.classifier.Classifier.NOTIFICATION_DRAG_DOWN
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dump.DumpManager
+import com.android.systemui.plugins.ActivityStarter
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.plugins.statusbar.StatusBarStateController
 import com.android.systemui.res.R
 import com.android.systemui.shade.domain.interactor.ShadeInteractor
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController
 import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator
 import com.android.systemui.statusbar.notification.headsup.HeadsUpManager
 import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
@@ -68,6 +70,9 @@ constructor(
     private val shadeInteractor: ShadeInteractor,
     private val lockscreenShadeTransitionController: LockscreenShadeTransitionController,
     dumpManager: DumpManager,
+    private val sysuiStatusBarStateController: SysuiStatusBarStateController,
+    private val activityStarter: ActivityStarter,
+    private val forbiddenSwipeDownQSController: NTForbiddenSwipeDownQSController,
 ) : Gefingerpoken, Dumpable {
     companion object {
         private val SPRING_BACK_ANIMATION_LENGTH_MS = 375
@@ -113,6 +118,7 @@ constructor(
 
     var pulseExpandAbortListener: Runnable? = null
     var bouncerShowing: Boolean = false
+    private var swipeDownWhenForbidden = false
 
     init {
         initResources(context)
@@ -165,10 +171,14 @@ constructor(
             MotionEvent.ACTION_MOVE -> {
                 val h = y - mInitialTouchY
                 if (h > touchSlop && h > Math.abs(x - mInitialTouchX)) {
-                    isExpanding = true
-                    captureStartingChild(mInitialTouchX, mInitialTouchY)
-                    mInitialTouchY = y
-                    mInitialTouchX = x
+                    if (!forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                        isExpanding = true
+                        captureStartingChild(mInitialTouchX, mInitialTouchY)
+                        mInitialTouchY = y
+                        mInitialTouchX = x
+                    } else {
+                        swipeDownWhenForbidden = true
+                    }
                     return true
                 }
             }
@@ -176,11 +186,13 @@ constructor(
             MotionEvent.ACTION_UP -> {
                 recycleVelocityTracker()
                 isExpanding = false
+                swipeDownWhenForbidden = false
             }
 
             MotionEvent.ACTION_CANCEL -> {
                 recycleVelocityTracker()
                 isExpanding = false
+                swipeDownWhenForbidden = false
             }
         }
         return false
@@ -194,7 +206,7 @@ constructor(
     override fun onTouchEvent(event: MotionEvent): Boolean {
         val finishExpanding =
             (event.action == MotionEvent.ACTION_CANCEL || event.action == MotionEvent.ACTION_UP) &&
-                    isExpanding
+                    (isExpanding || swipeDownWhenForbidden)
 
         val isDraggingNotificationOrCanBypass =
             mStartingChild?.showingPulsing() == true || bypassController.canBypass()
@@ -204,7 +216,7 @@ constructor(
         }
 
         if (
-            velocityTracker == null || !isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN
+            velocityTracker == null || ((!isExpanding && !swipeDownWhenForbidden) || event.actionMasked == MotionEvent.ACTION_DOWN)
         ) {
             return startExpansion(event)
         }
@@ -221,7 +233,21 @@ constructor(
                             velocityTracker!!.getYVelocity() > -1000 &&
                             statusBarStateController.state != StatusBarState.SHADE
                 if (!falsingManager.isUnlockingDisabled && !isFalseTouch && canExpand) {
-                    finishExpansion()
+                    if (forbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                        swipeDownWhenForbidden = false
+                        if (statusBarStateController.isDozing) {
+                            wakeUpCoordinator.willWakeUp = true
+                            mPowerManager!!.wakeUp(
+                                SystemClock.uptimeMillis(),
+                                PowerManager.WAKE_REASON_GESTURE,
+                                "com.android.systemui:PULSEDRAG",
+                            )
+                        }
+                        sysuiStatusBarStateController.setLeaveOpenOnKeyguardHide(true)
+                        activityStarter.dismissKeyguardThenExecute({ false }, null, /* afterKeyguardGone= */ false)
+                    } else {
+                        finishExpansion()
+                    }
                 } else {
                     cancelExpansion()
                 }
@@ -355,6 +381,10 @@ constructor(
         mPulsing = pulsing
     }
 
+    fun getSwipeDownWhenForbidden(): Boolean {
+        return swipeDownWhenForbidden
+    }
+
     override fun dump(pw: PrintWriter, args: Array<out String>) {
         IndentingPrintWriter(pw, "  ").let {
             it.println("PulseExpansionHandler:")
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index bdf215c7f85ba..67b2be30214eb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -35,10 +35,12 @@
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Trace;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.service.notification.StatusBarNotification;
 import android.text.TextUtils;
 import android.util.FloatProperty;
@@ -69,6 +71,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -97,6 +100,8 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
 
     public static final float APP_ICON_SCALE = .75f;
 
+    private static final String SYSUI_PKG = "com.android.systemui";
+
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({STATE_ICON, STATE_DOT, STATE_HIDDEN})
     public @interface VisibleState { }
@@ -148,6 +153,11 @@ public Float get(StatusBarIconView object) {
     private StatusBarIcon mIcon;
     private int mLayoutDirectionForLoadedDrawable = LayoutDirection.UNDEFINED;
     @ViewDebug.ExportedProperty private String mSlot;
+    private Drawable mNumberBackground;
+    private Paint mNumberPain;
+    private int mNumberX;
+    private int mNumberY;
+    private String mNumberText;
     @Nullable private StatusBarNotification mNotification;
     @Nullable private BundleEntry mBundleEntry;
     private final boolean mBlocked;
@@ -184,6 +194,8 @@ public Float get(StatusBarIconView object) {
     private boolean mShowsConversation;
     private float mDozeAmount;
     private final NotificationDozeHelper mDozer;
+    private boolean mNewIconStyle;
+    private boolean mShowNotificationCount;
 
     public StatusBarIconView(Context context, String slot, StatusBarNotification sbn) {
         this(context, slot, sbn, false);
@@ -201,6 +213,16 @@ public StatusBarIconView(Context context, String slot, StatusBarNotification sbn
         mDozer = new NotificationDozeHelper();
         mBlocked = blocked;
         mSlot = slot;
+        mNewIconStyle = Settings.System.getIntForUser(context.getContentResolver(),
+            Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1;
+        mShowNotificationCount = Settings.System.getIntForUser(context.getContentResolver(),
+            Settings.System.STATUSBAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1;
+        mNumberPain = new Paint();
+        mNumberPain.setTextAlign(Paint.Align.CENTER);
+        mNumberPain.setColor(context.getColor(R.color.notification_number_text_color));
+        mNumberPain.setAntiAlias(true);
+        mNumberPain.setTypeface(Typeface.DEFAULT_BOLD);
+        mNumberPain.setTextSize(8 * getResources().getDisplayMetrics().density);
         setNotification(sbn);
         setScaleType(ScaleType.CENTER);
         mConfiguration = new Configuration(context.getResources().getConfiguration());
@@ -402,31 +424,69 @@ public boolean equalIcons(Icon a, Icon b) {
                 return false;
         }
     }
+
+    public void setIconStyle(boolean iconStyle) {
+        if (mNewIconStyle == iconStyle) return;
+        mNewIconStyle = iconStyle;
+        updateDrawable(true);
+        updateIconColor();
+    }
+
+    public void setShowCount(boolean showCount) {
+        mShowNotificationCount = showCount;
+    }
+
     /**
      * Returns whether the set succeeded.
      */
     public boolean set(StatusBarIcon icon) {
+        return set(icon, false);
+    }
+
+    public boolean updateIconForced() {
+        return set(mIcon, true);
+    }
+
+    private boolean set(StatusBarIcon icon, boolean force) {
         final boolean iconEquals = mIcon != null && equalIcons(mIcon.icon, icon.icon);
         final boolean levelEquals = iconEquals
                 && mIcon.iconLevel == icon.iconLevel;
         final boolean visibilityEquals = mIcon != null
                 && mIcon.visible == icon.visible;
+        final boolean numberEquals = mIcon != null
+                && mIcon.number == icon.number;
+        if (icon == null) {
+            return false;
+        }
         mIcon = icon.clone();
         setContentDescription(icon.contentDescription);
-        if (!iconEquals) {
+        if (!iconEquals || force) {
             if (!updateDrawable(false /* no clear */)) return false;
             // we have to clear the grayscale tag since it may have changed
             setTag(R.id.icon_is_grayscale, null);
             // Maybe set scale based on icon height
             maybeUpdateIconScaleDimens();
         }
-        if (!levelEquals) {
+        if (!levelEquals || force) {
             setImageLevel(icon.iconLevel);
         }
         if (icon.shape == Shape.FIXED_SPACE) {
             setScaleType(ScaleType.FIT_CENTER);
         }
-        if (!visibilityEquals) {
+        if (!numberEquals || force) {
+            if (icon.number > 0 && mShowNotificationCount) {
+                if (mNumberBackground == null) {
+                    mNumberBackground = getContext().getResources().getDrawable(
+                            R.drawable.ic_notification_overlay);
+                }
+                placeNumber();
+            } else {
+                mNumberBackground = null;
+                mNumberText = null;
+            }
+            invalidate();
+        }
+        if (!visibilityEquals || force) {
             setVisibility(icon.visible && !mBlocked ? VISIBLE : GONE);
         }
         return true;
@@ -497,7 +557,7 @@ private Drawable getIcon(Context sysuiContext,
             // We downscale the loaded drawable to reasonable size to protect against applications
             // using too much memory. The size can be tweaked in config.xml. Drawables that are
             // already sized properly won't be touched.
-            boolean isLowRamDevice = ActivityManager.isLowRamDeviceStatic();
+            boolean isLowRamDevice = true;
             Resources res = sysuiContext.getResources();
             int maxIconSize = res.getDimensionPixelSize(isLowRamDevice
                     ? com.android.internal.R.dimen.notification_small_icon_size_low_ram
@@ -515,6 +575,21 @@ private Drawable getIcon(Context sysuiContext,
 
     @Nullable
     private Drawable loadDrawable(Context context, StatusBarIcon statusBarIcon) {
+        Drawable icon;
+        String pkgName = statusBarIcon.pkg;
+        try {
+            if (mNewIconStyle && !TextUtils.equals(pkgName, SYSUI_PKG)) {
+                icon = context.getPackageManager().getApplicationIcon(pkgName);
+            } else {
+                icon = getIcon(context, statusBarIcon);
+            }
+        } catch (android.content.pm.PackageManager.NameNotFoundException e) {
+            icon = getIcon(context, statusBarIcon);
+        }
+        return icon;
+    }
+
+    private Drawable getIcon(Context context, StatusBarIcon statusBarIcon) {
         if (statusBarIcon.preloadedIcon != null) {
             Drawable.ConstantState cached = statusBarIcon.preloadedIcon.getConstantState();
             if (cached != null) {
@@ -544,6 +619,14 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         }
     }
 
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        if (mNumberBackground != null) {
+            placeNumber();
+        }
+    }
+
     @Override
     public void onRtlPropertiesChanged(int layoutDirection) {
         super.onRtlPropertiesChanged(layoutDirection);
@@ -581,6 +664,11 @@ protected void onDraw(Canvas canvas) {
             canvas.restore();
         }
 
+        if (mNumberBackground != null) {
+            mNumberBackground.draw(canvas);
+            canvas.drawText(mNumberText, mNumberX, mNumberY, mNumberPain);
+        }
+
         if (mDotAppearAmount != 0.0f) {
             float radius;
             float alpha = Color.alpha(mDecorColor) / 255.f;
@@ -608,6 +696,38 @@ protected void debug(int depth) {
         Log.d("View", debugIndent(depth) + "icon=" + mIcon);
     }
 
+    void placeNumber() {
+        final String str;
+        final int tooBig = getContext().getResources().getInteger(
+                R.integer.status_bar_notification_info_maxnum);
+        if (mIcon.number > tooBig) {
+            str = getContext().getResources().getString(
+                        R.string.status_bar_notification_info_overflow);
+        } else {
+            NumberFormat f = NumberFormat.getIntegerInstance();
+            str = f.format(mIcon.number);
+        }
+        mNumberText = str;
+        final int w = getWidth();
+        final int h = getHeight();
+        final Rect r = new Rect();
+        mNumberPain.getTextBounds(str, 0, str.length(), r);
+        final int tw = r.right - r.left;
+        final int th = r.bottom - r.top;
+        mNumberBackground.getPadding(r);
+        int dw = r.left + tw + r.right;
+        if (dw < mNumberBackground.getMinimumWidth()) {
+            dw = mNumberBackground.getMinimumWidth();
+        }
+        mNumberX = w-r.right-((dw-r.right-r.left)/2);
+        int dh = r.top + th + r.bottom;
+        if (dh < mNumberBackground.getMinimumWidth()) {
+            dh = mNumberBackground.getMinimumWidth();
+        }
+        mNumberY = h-r.bottom-((dh-r.top-th-r.bottom)/2);
+        mNumberBackground.setBounds(w-dw, h-dh, w, h);
+    }
+
     @Override
     public String toString() {
         return "StatusBarIconView("
@@ -662,6 +782,10 @@ private void updateDecorColor() {
      * transitioning this also immediately sets the color.
      */
     public void setStaticDrawableColor(int color) {
+        if (mNewIconStyle && isNotification() &&
+                (mIcon != null && !TextUtils.equals(mIcon.pkg, SYSUI_PKG))) {
+            color = NO_COLOR;
+        }
         mDrawableColor = color;
         setColorInternal(color);
         updateContrastedStaticColor();
@@ -679,6 +803,13 @@ private void updateIconColor() {
             return;
         }
 
+        if (mNewIconStyle && isNotification()
+                && mIcon != null && !TextUtils.equals(mIcon.pkg, SYSUI_PKG)) {
+            setColorFilter(null);
+            setImageTintList(null);
+            return;
+        }
+
         if (mCurrentSetColor != NO_COLOR) {
             if (mMatrixColorFilter == null) {
                 mMatrix = new float[4 * 5];
@@ -972,6 +1103,15 @@ public void executeOnLayout(Runnable runnable) {
     @Override
     public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {
         int areaTint = getTint(areas, this, tint);
+
+        if (mNewIconStyle && isNotification()
+                && mIcon != null && !TextUtils.equals(mIcon.pkg, SYSUI_PKG)) {
+            setImageTintList(null);
+            setColorFilter(null);
+            setDecorColor(areaTint);
+            return;
+        }
+
         ColorStateList color = ColorStateList.valueOf(areaTint);
         setImageTintList(color);
         setDecorColor(areaTint);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java
index 67b472135845a..99e28d1a0d900 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java
@@ -59,6 +59,7 @@
 import com.android.systemui.statusbar.policy.CallbackController;
 import com.android.systemui.util.Compile;
 import com.android.systemui.util.kotlin.JavaAdapter;
+import com.android.systemui.util.ScrimUtils;
 
 import dagger.Lazy;
 
@@ -290,6 +291,7 @@ private void updateStateAndNotifyListeners(int state) {
             for (RankedListener rl : new ArrayList<>(mListeners)) {
                 rl.mListener.onStateChanged(mState);
             }
+            ScrimUtils.get().setBarState(mState);
 
             for (RankedListener rl : new ArrayList<>(mListeners)) {
                 rl.mListener.onStatePostChange();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardController.kt
new file mode 100644
index 0000000000000..74872bdfa2891
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardController.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.systemui.statusbar
+
+import android.content.Context
+import android.database.ContentObserver
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.wifi.WifiManager
+import android.os.UserHandle
+import android.provider.Settings
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.*
+
+object WifiStandardController {
+
+    private var view: WifiStandardImageView? = null
+    private var context: Context? = null
+    private var coroutineScope: CoroutineScope? = null
+
+    fun INSTANCE(context: Context): WifiStandardController {
+        this.context = context.applicationContext
+        return this
+    }
+
+    fun attachView(view: WifiStandardImageView) {
+        this.view = view
+        coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+        startCollecting()
+    }
+
+    fun detachView() {
+        coroutineScope?.cancel()
+        coroutineScope = null
+        view = null
+    }
+
+    private fun startCollecting() {
+        coroutineScope?.launch {
+            combine(wifiStandardFlow(), wifiStandardEnabledFlow()) { standard, enabled ->
+                Pair(standard, enabled)
+            }.collect { (standard, enabled) ->
+                view?.updateWifiStatus(standard, enabled)
+            }
+        }
+    }
+
+    private fun wifiStandardFlow(): Flow<Int> = flow {
+        val connectivityManager = context!!.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val wifiManager = context!!.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+        while (true) {
+            val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+            val wifiStandard = if (networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true) {
+                wifiManager.connectionInfo.wifiStandard
+            } else {
+                -1
+            }
+            emit(wifiStandard)
+            delay(1000)
+        }
+    }.distinctUntilChanged()
+
+    private fun wifiStandardEnabledFlow(): Flow<Boolean> = callbackFlow {
+        val contentResolver = context!!.contentResolver
+        val settingUri = Settings.System.getUriFor(Settings.System.WIFI_STANDARD_ICON)
+
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                trySend(isWifiStandardEnabled())
+            }
+        }
+
+        contentResolver.registerContentObserver(settingUri, false, observer)
+        send(isWifiStandardEnabled())
+
+        awaitClose { contentResolver.unregisterContentObserver(observer) }
+    }.distinctUntilChanged()
+
+    private fun isWifiStandardEnabled(): Boolean {
+        return Settings.System.getIntForUser(
+            context!!.contentResolver,
+            Settings.System.WIFI_STANDARD_ICON,
+            0,
+            UserHandle.USER_CURRENT
+        ) == 1
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardImageView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardImageView.kt
new file mode 100644
index 0000000000000..86c8dec53d376
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/WifiStandardImageView.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2023-2024 The risingOS Android Project
+ * Copyright (C) 2025 The AxionAOSP Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.systemui.statusbar
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ViewGroup.MarginLayoutParams
+import android.widget.ImageView
+
+import com.android.systemui.res.R
+
+class WifiStandardImageView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : ImageView(context, attrs, defStyleAttr) {
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        WifiStandardController.INSTANCE(context).attachView(this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        WifiStandardController.INSTANCE(context).detachView()
+    }
+
+    fun updateWifiStatus(wifiStandard: Int, wifiStandardEnabled: Boolean) {
+        post {
+            if (!wifiStandardEnabled || wifiStandard < 4) {
+                visibility = GONE
+                layoutParams = (layoutParams as MarginLayoutParams).apply { marginEnd = 0 }
+            } else {
+                val drawableId = when (wifiStandard) {
+                    4 -> R.drawable.ic_wifi_standard_4
+                    5 -> R.drawable.ic_wifi_standard_5
+                    6 -> R.drawable.ic_wifi_standard_6
+                    7 -> R.drawable.ic_wifi_standard_7
+                    else -> 0
+                }
+
+                if (drawableId > 0) {
+                    setImageResource(drawableId)
+                    visibility = VISIBLE
+                    layoutParams = (layoutParams as MarginLayoutParams).apply {
+                        marginEnd = resources.getDimensionPixelSize(R.dimen.status_bar_airplane_spacer_width)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java
index 03d6494e9de73..da1f0125d30a0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java
@@ -26,7 +26,6 @@
 import com.android.systemui.statusbar.connectivity.NetworkController.EmergencyListener;
 
 import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,7 +47,6 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa
     private static final int MSG_ADD_REMOVE_EMERGENCY        = 6;
     private static final int MSG_ADD_REMOVE_SIGNAL           = 7;
     private static final int HISTORY_SIZE = 64;
-    private static final SimpleDateFormat SSDF = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
 
     // All the callbacks.
     private final ArrayList<EmergencyListener> mEmergencyListeners = new ArrayList<>();
@@ -120,7 +118,7 @@ public void handleMessage(Message msg) {
     @Override
     public void setWifiIndicators(final WifiIndicators indicators) {
         String log = new StringBuilder()
-                .append(SSDF.format(System.currentTimeMillis())).append(",")
+                .append(System.currentTimeMillis()).append(",")
                 .append(indicators)
                 .toString();
         recordLastCallback(log);
@@ -134,7 +132,7 @@ public void setWifiIndicators(final WifiIndicators indicators) {
     @Override
     public void setMobileDataIndicators(final MobileDataIndicators indicators) {
         String log = new StringBuilder()
-                .append(SSDF.format(System.currentTimeMillis())).append(",")
+                .append(System.currentTimeMillis()).append(",")
                 .append(indicators)
                 .toString();
         recordLastCallback(log);
@@ -157,7 +155,7 @@ public void setConnectivityStatus(boolean noDefaultNetwork, boolean noValidatedN
         if (!currentCallback.equals(mLastCallback)) {
             mLastCallback = currentCallback;
             String log = new StringBuilder()
-                    .append(SSDF.format(System.currentTimeMillis())).append(",")
+                    .append(System.currentTimeMillis()).append(",")
                     .append(currentCallback).append(",")
                     .toString();
             recordLastCallback(log);
@@ -179,7 +177,7 @@ public void setSubs(List<SubscriptionInfo> subs) {
         if (!currentCallback.equals(mLastCallback)) {
             mLastCallback = currentCallback;
             String log = new StringBuilder()
-                    .append(SSDF.format(System.currentTimeMillis())).append(",")
+                    .append(System.currentTimeMillis()).append(",")
                     .append(currentCallback).append(",")
                     .toString();
             recordLastCallback(log);
@@ -205,7 +203,7 @@ public void setEmergencyCallsOnly(boolean emergencyOnly) {
     @Override
     public void setEthernetIndicators(IconState icon) {
         String log = new StringBuilder()
-                .append(SSDF.format(System.currentTimeMillis())).append(",")
+                .append(System.currentTimeMillis()).append(",")
                 .append("setEthernetIndicators: ")
                 .append("icon=").append(icon)
                 .toString();
@@ -222,7 +220,7 @@ public void setIsAirplaneMode(IconState icon) {
         if (!currentCallback.equals(mLastCallback)) {
             mLastCallback = currentCallback;
             String log = new StringBuilder()
-                    .append(SSDF.format(System.currentTimeMillis())).append(",")
+                    .append(System.currentTimeMillis()).append(",")
                     .append(currentCallback).append(",")
                     .toString();
             recordLastCallback(log);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/ConnectivityModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/ConnectivityModule.kt
index 6a4853434169c..f166c893ccb35 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/ConnectivityModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/ConnectivityModule.kt
@@ -27,6 +27,8 @@ import com.android.systemui.qs.tiles.AirplaneModeTile
 import com.android.systemui.qs.tiles.BluetoothTile
 import com.android.systemui.qs.tiles.CastTile
 import com.android.systemui.qs.tiles.DataSaverTile
+import com.android.systemui.qs.tiles.FiveGCoreStartable
+import com.android.systemui.qs.tiles.FiveGTile
 import com.android.systemui.qs.tiles.HotspotTile
 import com.android.systemui.qs.tiles.InternetTileNewImpl
 import com.android.systemui.qs.tiles.MobileDataTile
@@ -60,9 +62,11 @@ import com.android.systemui.qs.tiles.impl.wifi.domain.interactor.WifiTileUserAct
 import com.android.systemui.qs.tiles.impl.wifi.domain.model.WifiTileModel
 import com.android.systemui.qs.tiles.impl.wifi.ui.mapper.WifiTileMapper
 import com.android.systemui.res.R
+import com.android.systemui.CoreStartable
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
+import dagger.multibindings.ClassKey
 import dagger.multibindings.IntoMap
 import dagger.multibindings.StringKey
 
@@ -111,6 +115,12 @@ interface ConnectivityModule {
     /** Inject NfcTile into tileMap in QSModule */
     @Binds @IntoMap @StringKey(NfcTile.TILE_SPEC) fun bindNfcTile(nfcTile: NfcTile): QSTileImpl<*>
 
+    /** Inject FiveGTile into tileMap in QSModule */
+    @Binds
+    @IntoMap
+    @StringKey(FiveGTile.TILE_SPEC)
+    fun bindFiveGTile(fiveGTile: FiveGTile): QSTileImpl<*>
+
     /** Inject InternetTileNewImpl into tileMap in QSModule */
     @Binds
     @IntoMap
@@ -375,6 +385,26 @@ interface ConnectivityModule {
                 category = TileCategory.CONNECTIVITY,
             )
 
+        @Provides
+        @IntoMap
+        @StringKey(FiveGTile.TILE_SPEC)
+        fun provideFiveGTileConfig(uiEventLogger: QsEventLogger): QSTileConfig =
+            QSTileConfig(
+                tileSpec = TileSpec.create(FiveGTile.TILE_SPEC),
+                uiConfig =
+                    QSTileUIConfig.Resource(
+                        iconRes = R.drawable.ic_5g_toggle,
+                        labelRes = R.string.quick_settings_5g_editor_label,
+                    ),
+                instanceId = uiEventLogger.getNewInstanceId(),
+                category = TileCategory.CONNECTIVITY,
+            )
+
+        @Provides
+        @IntoMap
+        @ClassKey(FiveGCoreStartable::class)
+        fun provideFiveGCoreStartable(impl: FiveGCoreStartable): CoreStartable = impl
+
         @Provides
         @IntoMap
         @StringKey(NFC_TILE_SPEC)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java
index a6ac372023e45..4e14d221bfeac 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java
@@ -23,6 +23,7 @@
 import android.net.NetworkCapabilities;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.telephony.CellSignalStrength;
 import android.telephony.CellSignalStrengthCdma;
@@ -43,9 +44,11 @@
 import com.android.settingslib.mobile.MobileStatusTracker.SubscriptionDefaults;
 import com.android.settingslib.mobile.TelephonyIcons;
 import com.android.settingslib.net.SignalStrengthUtil;
+import com.android.systemui.Dependency;
 import com.android.systemui.res.R;
 import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor;
 import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.CarrierConfigTracker;
 
 import java.io.PrintWriter;
@@ -60,7 +63,8 @@
  * @deprecated Use {@link MobileIconsInteractor} instead.
  */
 @Deprecated
-public class MobileSignalController extends SignalController<MobileState, MobileIconGroup> {
+public class MobileSignalController extends SignalController<MobileState, MobileIconGroup> 
+        implements TunerService.Tunable {
     private static final SimpleDateFormat SSDF = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
     private static final int STATUS_HISTORY_SIZE = 64;
     private final TelephonyManager mPhone;
@@ -74,6 +78,16 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
     final SubscriptionInfo mSubscriptionInfo;
     private Map<String, MobileIconGroup> mNetworkToIconLookup;
 
+    private static final String DATA_DISABLED_ICON =
+            "system:" + Settings.System.DATA_DISABLED_ICON;
+    private static final String SHOW_FOURG_ICON =
+            "system:" + Settings.System.SHOW_FOURG_ICON;
+    private static final String DISABLE_STACKED_MOBILE_ICONS =
+        "system:" + Settings.System.DISABLE_STACKED_MOBILE_ICONS;
+
+    private boolean mDataDisabledIcon;
+    private boolean mDisableStackedMobileIcons;
+
     private MobileIconGroup mDefaultIcons;
     private Config mConfig;
     @VisibleForTesting
@@ -162,6 +176,33 @@ public void onChange(boolean selfChange) {
             }
         };
         mMobileStatusTracker = mobileStatusTrackerFactory.createTracker(mMobileCallback);
+
+        Dependency.get(TunerService.class).addTunable(this, DATA_DISABLED_ICON);
+        Dependency.get(TunerService.class).addTunable(this, SHOW_FOURG_ICON);
+        Dependency.get(TunerService.class).addTunable(this, DISABLE_STACKED_MOBILE_ICONS);
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case DATA_DISABLED_ICON:
+                mDataDisabledIcon =
+                    TunerService.parseIntegerSwitch(newValue, true);
+                updateTelephony();
+                break;
+            case SHOW_FOURG_ICON:
+                mConfig = Config.readConfig(mContext);
+                setConfiguration(mConfig);
+                notifyListeners();
+                break;
+            case DISABLE_STACKED_MOBILE_ICONS:
+                mDisableStackedMobileIcons =
+                    TunerService.parseIntegerSwitch(newValue, false);
+                notifyListeners();
+                break;
+            default:
+                break;
+        }
     }
 
     void setConfiguration(Config config) {
@@ -293,7 +334,9 @@ public void notifyListeners(SignalCallback callback) {
                 qsInfo.description,
                 mSubscriptionInfo.getSubscriptionId(),
                 mCurrentState.roaming,
-                sbInfo.showTriangle);
+                sbInfo.showTriangle,
+                mCurrentState.isDefault,
+                mCurrentState.level);
         callback.setMobileDataIndicators(mobileDataIndicators);
     }
 
@@ -419,7 +462,7 @@ void updateNetworkName(boolean showSpn, String spn, String dataSpn,
             str.append(plmn);
             strData.append(plmn);
         }
-        if (showSpn && spn != null) {
+        if (showSpn && spn != null && !str.toString().toLowerCase().contains(spn.toLowerCase())) {
             if (str.length() != 0) {
                 str.append(mNetworkNameSeparator);
             }
@@ -430,7 +473,8 @@ void updateNetworkName(boolean showSpn, String spn, String dataSpn,
         } else {
             mCurrentState.networkName = mNetworkNameDefault;
         }
-        if (showSpn && dataSpn != null) {
+        if (showSpn && dataSpn != null &&
+                !strData.toString().toLowerCase().contains(dataSpn.toLowerCase())) {
             if (strData.length() != 0) {
                 strData.append(mNetworkNameSeparator);
             }
@@ -500,7 +544,7 @@ private void updateTelephony() {
         mCurrentState.roaming = isRoaming();
         if (isCarrierNetworkChangeActive()) {
             mCurrentState.iconGroup = TelephonyIcons.CARRIER_NETWORK_CHANGE;
-        } else if (isDataDisabled() && !mConfig.alwaysShowDataRatIcon) {
+        } else if (isDataDisabled() && mDataDisabledIcon) {
             if (mSubscriptionInfo.getSubscriptionId() != mDefaults.getDefaultDataSubId()) {
                 mCurrentState.iconGroup = TelephonyIcons.NOT_DEFAULT_DATA;
             } else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
index 271ec10cb0319..62ad2026c4137 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
@@ -1349,6 +1349,7 @@ public void dispatchDemoCommand(String command, Bundle args) {
                         datatype.equals("4g") ? TelephonyIcons.FOUR_G :
                         datatype.equals("4g+") ? TelephonyIcons.FOUR_G_PLUS :
                         datatype.equals("5g") ? TelephonyIcons.NR_5G :
+                        datatype.equals("5gsa") ? TelephonyIcons.NR_5G_SA :
                         datatype.equals("5ge") ? TelephonyIcons.LTE_CA_5G_E :
                         datatype.equals("5g+") ? TelephonyIcons.NR_5G_PLUS :
                         datatype.equals("e") ? TelephonyIcons.E :
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt
index cf8240dc16269..2129723b3992b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt
@@ -151,6 +151,8 @@ data class MobileDataIndicators(
     @JvmField val subId: Int,
     @JvmField val roaming: Boolean,
     @JvmField val showTriangle: Boolean,
+    @JvmField val isDefault: Boolean,
+    @JvmField val level: Int,
 ) {
     override fun toString(): String {
         return java.lang
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java
index 9854e27e9d58f..0ebf8e6d6f60c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java
@@ -158,7 +158,9 @@ private void notifyListenersForCarrierWifi(SignalCallback callback) {
                 statusIcon, qsIcon, typeIcon, qsTypeIcon,
                 mCurrentState.activityIn, mCurrentState.activityOut, dataContentDescription,
                 dataContentDescriptionHtml, description,
-                mCurrentState.subId, /* roaming= */ false, /* showTriangle= */ true
+                mCurrentState.subId, /* roaming= */ false, /* showTriangle= */ true,
+                /* isDefault= */ qsIcon != null,
+                mCurrentState.level
         );
         callback.setMobileDataIndicators(mobileDataIndicators);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
index a7929ecbd801a..505c8668bbe11 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
@@ -56,11 +56,13 @@
 import com.android.systemui.statusbar.phone.CentralSurfacesImpl;
 import com.android.systemui.statusbar.phone.ManagedProfileController;
 import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
+import com.android.systemui.statusbar.phone.ScrimController;
 import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback;
 import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
 import com.android.systemui.statusbar.phone.ui.StatusBarIconControllerImpl;
 import com.android.systemui.statusbar.phone.ui.StatusBarIconList;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
+import com.android.systemui.util.WallpaperDepthUtils;
 import com.android.wm.shell.shared.ShellTransitions;
 
 import dagger.Binds;
@@ -248,4 +250,12 @@ public boolean isShowingAlternateAuthOnUnlock() {
         };
         return new DialogTransitionAnimator(mainExecutor, callback, interactionJankMonitor);
     }
+        /** Depth Wallpaper */
+        @Provides
+        @SysUISingleton
+        static WallpaperDepthUtils provideWallpaperDepthUtils(
+            Context context,
+            Lazy<ScrimController> scrimControllerLazy) {
+        return WallpaperDepthUtils.getInstance(context, scrimControllerLazy.get());
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt
index 7f0e1655ecd3e..dedbed4f7b296 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt
@@ -20,7 +20,8 @@ import android.annotation.UiThread
 import android.graphics.Point
 import android.graphics.Rect
 import android.graphics.drawable.GradientDrawable
-import android.location.flags.Flags.locationIndicatorsEnabled
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.Log
 import android.view.Display
 import android.view.View
@@ -192,6 +193,12 @@ constructor(
             }
         }
 
+    private val locationIndicatorsEnabled
+        get() = if (!this::tl.isInitialized) false else 
+            Settings.Secure.getIntForUser(tl.context.contentResolver,
+            Settings.Secure.ENABLE_LOCATION_PRIVACY_INDICATOR, 1,
+            UserHandle.USER_CURRENT) == 1
+
     init {
         contentInsetsProvider.addCallback(insetsChangedListener)
         configurationController.addCallback(configurationListener)
@@ -589,7 +596,7 @@ constructor(
     @UiThread
     override fun updateDotView(state: ViewState) {
         val shouldShow = state.shouldShowDot()
-        if (locationIndicatorsEnabled()) {
+        if (locationIndicatorsEnabled) {
             if (shouldShow && state.designatedCorner != null) {
                 val dot = state.designatedCorner
                 val privacyDotView = dot.findViewById<ImageView>(R.id.privacy_dot)
@@ -621,7 +628,7 @@ constructor(
                 privacyItems: List<PrivacyItem>?,
             ): Animator? {
                 synchronized(lock) {
-                    if (locationIndicatorsEnabled()) {
+                    if (locationIndicatorsEnabled) {
                         nextViewState =
                             nextViewState.copy(
                                 systemPrivacyEventIsActive = true,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt
index 6e95ef74bac7d..c7e47d5427434 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.events
 
 import android.annotation.IntRange
 import android.content.Context
-import android.location.flags.Flags.locationIndicatorsEnabled
 import android.provider.DeviceConfig
 import android.provider.DeviceConfig.NAMESPACE_PRIVACY
 import com.android.internal.annotations.VisibleForTesting
@@ -192,7 +191,7 @@ constructor(
                             // For location-only, we show an animation if the flag is enabled. The
                             // 10-minute debounce is handled in filterOutExemptItems.
                             val shouldAnimateLocation =
-                                hasOnlyLocationItems && locationIndicatorsEnabled()
+                                hasOnlyLocationItems && privacyController.locationAvailable
 
                             isChipAnimationEnabled() &&
                                 (shouldAnimateCameraMic || shouldAnimateLocation)
@@ -204,7 +203,7 @@ constructor(
                     currentPrivacyItems.forEach {
                         if (
                             it.privacyType == PrivacyType.TYPE_LOCATION &&
-                                locationIndicatorsEnabled()
+                                privacyController.locationAvailable
                         ) {
                             appLastLocationUseTime[it.application.packageName] = now
                         }
@@ -222,7 +221,7 @@ constructor(
                 val now = systemClock.elapsedRealtime()
 
                 val cameraMicExemption = Flags.statusBarPrivacyChipAnimationExemption()
-                val locationFlagEnabled = locationIndicatorsEnabled()
+                val locationFlagEnabled = privacyController.locationAvailable
 
                 if (!cameraMicExemption && !locationFlagEnabled) {
                     return items
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt
index c71aed0c3a78a..0f7e1b7edb6a7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt
@@ -16,7 +16,6 @@
 
 package com.android.systemui.statusbar.events
 
-import android.location.flags.Flags.locationIndicatorsEnabled
 import android.os.Process
 import android.provider.DeviceConfig
 import androidx.core.animation.Animator
@@ -144,8 +143,7 @@ constructor(
         }
 
         if (
-            locationIndicatorsEnabled() &&
-                event is PrivacyEvent &&
+            event is PrivacyEvent &&
                 event.privacyItems.isNotEmpty() &&
                 hasPersistentDot
         ) {
@@ -381,7 +379,7 @@ constructor(
         val anims: List<Animator> =
             listeners.mapNotNull {
                 var privacyItems: List<PrivacyItem>? = null
-                if (locationIndicatorsEnabled() && event is PrivacyEvent) {
+                if (event is PrivacyEvent) {
                     privacyItems = event.privacyItems
                 }
                 it.onSystemStatusAnimationTransitionToPersistentDot(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/ui/view/BatteryStatusEventComposeChip.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/ui/view/BatteryStatusEventComposeChip.kt
index 584498eba13c1..9708028c4874d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/ui/view/BatteryStatusEventComposeChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/ui/view/BatteryStatusEventComposeChip.kt
@@ -165,5 +165,12 @@ private fun BatteryAndPercentChip(
                 style = MaterialTheme.typography.labelLargeEmphasized,
             )
         }
+        if (isText) {
+            Text(
+                text = "\u26A1",
+                color = BatteryColors.DarkTheme.Default.fill,
+                style = MaterialTheme.typography.labelLargeEmphasized,
+            )
+        }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
index 6b4a630df57db..f97777e4fd791 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
@@ -33,7 +33,8 @@ import android.os.Handler
 import android.os.UserHandle
 import android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS
 import android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS
-import android.provider.Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED
+import android.provider.Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED
+import android.provider.Settings.System.LOCKSCREEN_WEATHER_ENABLED
 import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.View
@@ -72,6 +73,7 @@ import com.android.systemui.util.asIndenting
 import com.android.systemui.util.concurrency.Execution
 import com.android.systemui.util.printCollection
 import com.android.systemui.util.settings.SecureSettings
+import com.android.systemui.util.settings.SystemSettings
 import com.android.systemui.util.time.SystemClock
 import java.io.PrintWriter
 import java.time.Instant
@@ -93,6 +95,7 @@ constructor(
     private val falsingManager: FalsingManager,
     private val systemClock: SystemClock,
     private val secureSettings: SecureSettings,
+    private val systemSettings: SystemSettings,
     private val userTracker: UserTracker,
     private val contentResolver: ContentResolver,
     @ShadeDisplayAware private val configurationController: ConfigurationController,
@@ -124,6 +127,15 @@ constructor(
     private val weatherPlugin: BcSmartspaceDataPlugin? = optionalWeatherPlugin.orElse(null)
     private val plugin: BcSmartspaceDataPlugin? = optionalPlugin.orElse(null)
     private val configPlugin: BcSmartspaceConfigPlugin? = optionalConfigPlugin.orElse(null)
+    private val smartspaceConfigPlugin =
+        object : BcSmartspaceConfigPlugin {
+            override val isDefaultDateWeatherDisabled: Boolean
+                get() = isDateWeatherDecoupled || (configPlugin?.isDefaultDateWeatherDisabled ?: false)
+            override val isViewPager2Enabled: Boolean
+                get() = configPlugin?.isViewPager2Enabled ?: false
+            override val isSwipeEventLoggingEnabled: Boolean
+                get() = configPlugin?.isSwipeEventLoggingEnabled ?: false
+        }
 
     // This stores recently received Smartspace pushes to be included in dumpsys.
     private val recentSmartspaceData: Deque<List<SmartspaceTarget>> = LinkedList()
@@ -299,18 +311,31 @@ constructor(
         dumpManager.registerDumpable(this)
     }
 
-    val isEnabled: Boolean = plugin != null
-
-    val isDateWeatherDecoupled: Boolean = datePlugin != null && weatherPlugin != null
+    val isDateWeatherDecoupled: Boolean
+        get() = datePlugin != null && weatherPlugin != null
 
     val isWeatherEnabled: Boolean
         get() {
             val showWeather =
-                secureSettings.getIntForUser(LOCK_SCREEN_WEATHER_ENABLED, 1, userTracker.userId) ==
+                secureSettings.getIntForUser(LOCKSCREEN_SMARTSPACE_ENABLED, 1, userTracker.userId) ==
                     1
             return showWeather
         }
 
+    val isOmniWeatherEnabled: Boolean
+        get() {
+            val showCustomWeather =
+                systemSettings.getIntForUser(
+                    LOCKSCREEN_WEATHER_ENABLED,
+                    0,
+                    userTracker.userId,
+                ) == 1
+            return showCustomWeather && !isWeatherEnabled
+        }
+
+    val isEnabled: Boolean
+        get() = plugin != null && isWeatherEnabled
+
     private fun updateBypassEnabled() {
         val bypassEnabled = bypassController.bypassEnabled
         smartspaceViews.forEach { it.setKeyguardBypassEnabled(bypassEnabled) }
@@ -370,14 +395,14 @@ constructor(
             throw RuntimeException("Cannot build view when not enabled")
         }
 
-        configPlugin?.let { plugin?.registerConfigProvider(it) }
+        plugin?.registerConfigProvider(smartspaceConfigPlugin)
 
         val view =
             buildView(
                 surfaceName = SmartspaceViewModel.SURFACE_GENERAL_VIEW,
                 context = context,
                 plugin = plugin,
-                configPlugin = configPlugin,
+                configPlugin = smartspaceConfigPlugin,
                 isLargeClock = false,
             )
         connectSession()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
index fb2e6413c11c9..a6b608d1c5597 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
@@ -976,7 +976,7 @@ private static boolean userIdMatches(NotificationEntry entry, int userId) {
 
     @Override
     public void dump(PrintWriter pw, @NonNull String[] args) {
-        final List<NotificationEntry> entries = new ArrayList<>(getAllNotifs());
+        final List<NotificationEntry> entries = new ArrayList<>(mReadOnlyNotificationSet);
         entries.sort(Comparator.comparing(NotificationEntry::getKey));
 
         pw.println("\t" + TAG + " unsorted/unfiltered notifications: " + entries.size());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
index 55085271a8d28..3d172554fbe04 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
@@ -48,6 +48,8 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.service.notification.NotificationListenerService.Ranking;
 import android.service.notification.SnoozeCriterion;
 import android.service.notification.StatusBarNotification;
@@ -886,6 +888,14 @@ private void updateIsBlockable() {
     }
 
     private boolean shouldSuppressVisualEffect(int effect) {
+        if (effect == SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
+                && row != null
+                && Settings.Secure.getIntForUser(
+                        row.getContext().getContentResolver(),
+                        "ax_gaming_mode_active", 0,
+                        UserHandle.USER_CURRENT) == 1) {
+            return true;
+        }
         if (isExemptFromDndVisualSuppression()) {
             return false;
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java
index 6050a2a5d824f..0d0ba304b6c59 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java
@@ -345,7 +345,6 @@ void setComparators(List<NotifComparator> comparators) {
     }
 
     List<PipelineEntry> getShadeList() {
-        Assert.isMainThread();
         // NOTE: Accessing this method when the pipeline is running is generally going to provide
         //  incorrect results, and indicates a poorly behaved component of the pipeline.
         mPipelineState.requireState(STATE_IDLE);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java
index 82ce31bfee2d2..84d75273de968 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java
@@ -72,7 +72,7 @@ public boolean shouldFilterOut(@NonNull NotificationEntry entry, long now) {
                     break;
                 case STATE_ICONS_INFLATED:
                     try {
-                        mIconManager.updateIcons(entry, /* usingCache = */ false);
+                        mIconManager.updateIcons(entry, /* usingCache = */ false, /* forceUpdate = */ false);
                     } catch (InflationException e) {
                         reportInflationError(entry, e);
                         mIconsState.put(entry, STATE_ICONS_ERROR);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt
index c44ecce218086..2703160425574 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.notification.collection.coordinator
 
+import android.app.AxSandboxManager
 import android.app.Notification
 import android.os.UserHandle
 import com.android.app.tracing.coroutines.launchTraced as launch
@@ -44,6 +45,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga
 import com.android.systemui.statusbar.policy.KeyguardStateController
 import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController
 import com.android.systemui.user.domain.interactor.SelectedUserInteractor
+import com.android.systemui.applocker.AxAppLockerHelper
 import dagger.Binds
 import dagger.Module
 import javax.inject.Inject
@@ -76,6 +78,7 @@ constructor(
         SensitiveNotificationProtectionController,
     private val deviceEntryInteractor: DeviceEntryInteractor,
     private val sceneInteractor: SceneInteractor,
+    private val axAppLockerHelper: AxAppLockerHelper,
     @Application private val scope: CoroutineScope,
 ) :
     Invalidator("SensitiveContentInvalidator"),
@@ -211,10 +214,19 @@ constructor(
                 screenshareNotificationHiding() &&
                     sensitiveNotificationProtectionController.shouldProtectNotification(entry)
 
+            val isAppLocked =
+                entry.sbn.notification.extras.getBoolean(
+                    AxSandboxManager.EXTRA_NOTIFICATION_APP_LOCKED,
+                    false,
+                ) && axAppLockerHelper.needsAuth(entry.sbn.packageName, entry.sbn.user.identifier)
             val needsRedaction =
-                lockscreenUserManager.getRedactionType(entry) != REDACTION_TYPE_NONE
+                isAppLocked ||
+                    lockscreenUserManager.getRedactionType(entry) != REDACTION_TYPE_NONE
             val isSensitive = userPublic && needsRedaction
-            entry.setSensitive(isSensitive || shouldProtectNotification, deviceSensitive)
+            entry.setSensitive(
+                isSensitive || shouldProtectNotification,
+                isAppLocked || deviceSensitive,
+            )
             if (screenshareNotificationHiding()) {
                 entry.row?.setPublicExpanderVisible(!shouldProtectNotification)
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java
index 69942de051c92..6750053d03b6c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java
@@ -137,7 +137,7 @@ public void inflateViews(
 
         if (entry.rowExists()) {
             mLogger.logUpdatingRow(entry, params);
-            mIconManager.updateIcons(entry, /* usingCache = */ false);
+            mIconManager.updateIcons(entry, /* usingCache = */ false, /* forceUpdate = */ false);
             ExpandableNotificationRow row = entry.getRow();
             row.reset();
             updateRow(entry, row);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
index 3caaf542e787b..b1c8de102dee1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
@@ -34,6 +34,8 @@
 import android.graphics.ColorFilter;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.util.AttributeSet;
 import android.util.IndentingPrintWriter;
 import android.view.View;
@@ -81,8 +83,14 @@ public class FooterView extends StackScrollerDecorView {
 
     private OnClickListener mClearAllButtonClickListener;
 
+    private static final VibrationEffect EFFECT_CLICK =
+            VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK);
+
+    private final Vibrator mVibrator;
+
     public FooterView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
     }
 
     @Override
@@ -312,7 +320,7 @@ public void setSettingsButtonClickListener(OnClickListener listener) {
         if (NotifRedesignFooter.isUnexpectedlyInLegacyMode()) {
             return;
         }
-        mSettingsButton.setOnClickListener(listener);
+        mSettingsButton.setOnClickListener(withHaptics(listener));
     }
 
     /** Set onClickListener for the notification history button. */
@@ -320,7 +328,7 @@ public void setHistoryButtonClickListener(OnClickListener listener) {
         if (NotifRedesignFooter.isUnexpectedlyInLegacyMode()) {
             return;
         }
-        mHistoryButton.setOnClickListener(listener);
+        mHistoryButton.setOnClickListener(withHaptics(listener));
     }
 
     /**
@@ -329,14 +337,21 @@ public void setHistoryButtonClickListener(OnClickListener listener) {
      */
     public void setManageButtonClickListener(OnClickListener listener) {
         NotifRedesignFooter.assertInLegacyMode();
-        mManageOrHistoryButton.setOnClickListener(listener);
+        mManageOrHistoryButton.setOnClickListener(withHaptics(listener));
     }
 
     /** Set onClickListener for the clear all (end) button. */
     public void setClearAllButtonClickListener(OnClickListener listener) {
         if (mClearAllButtonClickListener == listener) return;
         mClearAllButtonClickListener = listener;
-        mClearAllButton.setOnClickListener(listener);
+        mClearAllButton.setOnClickListener(withHaptics(listener));
+    }
+
+    private OnClickListener withHaptics(OnClickListener listener) {
+        return v -> {
+            mVibrator.vibrate(EFFECT_CLICK);
+            if (listener != null) listener.onClick(v);
+        };
     }
 
     /**
@@ -404,11 +419,11 @@ public void updateColors() {
                     }
                 } else {
                     scHigh = mContext.getColor(
-                            com.android.internal.R.color.materialColorSurfaceContainer);
+                            com.android.internal.R.color.materialColorSurfaceBright);
                 }
             } else {
                 scHigh = mContext.getColor(
-                        com.android.internal.R.color.materialColorSurfaceContainerHigh);
+                        com.android.internal.R.color.materialColorSurfaceBright);
             }
             if (scHigh != 0) {
                 final ColorFilter bgColorFilter = new PorterDuffColorFilter(scHigh, SRC_ATOP);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java
index 28b5874acf5a4..79e79798c62a2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java
@@ -24,6 +24,8 @@
 import android.database.ContentObserver;
 import android.graphics.Region;
 import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
@@ -122,8 +124,10 @@ public class HeadsUpManagerImpl
     private final int mMinimumDisplayTimeDefault;
     private final int mMinimumDisplayTimeForUserInitiated;
     private final int mStickyForSomeTimeAutoDismissTime;
-    private final int mAutoDismissTime;
+    private int mAutoDismissTime;
     private final DelayableExecutor mExecutor;
+    private final int mDecayDefault;
+    private boolean mDozing;
 
     private final int mExtensionTime;
 
@@ -225,7 +229,10 @@ public HeadsUpManagerImpl(
                 R.integer.heads_up_notification_minimum_time_for_user_initiated);
         mStickyForSomeTimeAutoDismissTime = resources.getInteger(
                 R.integer.sticky_heads_up_notification_time);
-        mAutoDismissTime = resources.getInteger(R.integer.heads_up_notification_decay);
+        mDecayDefault = resources.getInteger(R.integer.heads_up_notification_decay) / 1000;
+        mAutoDismissTime = Settings.System.getIntForUser(context.getContentResolver(),
+                Settings.System.HEADS_UP_TIMEOUT,
+                mDecayDefault, UserHandle.USER_CURRENT) * 1000;
         mExtensionTime = resources.getInteger(R.integer.ambient_notification_extension_time);
         mTouchAcceptanceDelay = resources.getInteger(R.integer.touch_acceptance_delay);
         mSnoozedPackages = new ArrayMap<>();
@@ -243,12 +250,18 @@ public void onChange(boolean selfChange) {
                     mSnoozeLengthMs = packageSnoozeLengthMs;
                     mLogger.logSnoozeLengthChange(packageSnoozeLengthMs);
                 }
+                mAutoDismissTime = Settings.System.getIntForUser(
+                    context.getContentResolver(), Settings.System.HEADS_UP_TIMEOUT,
+                    mDecayDefault, UserHandle.USER_CURRENT) * 1000;
             }
         };
         globalSettings.registerContentObserverAsync(
                 globalSettings.getUriFor(SETTING_HEADS_UP_SNOOZE_LENGTH_MS),
                 /* notifyForDescendants= */ false,
                 settingsObserver);
+        context.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.HEADS_UP_TIMEOUT), false,
+                settingsObserver);
 
         statusBarStateController.addCallback(mStatusBarStateListener);
         updateResources();
@@ -1249,6 +1262,7 @@ public void onStateChanged(int newState) {
 
         @Override
         public void onDozingChanged(boolean isDozing) {
+            mDozing = isDozing;
             if (!isDozing) {
                 // Let's make sure all huns we got while dozing time out within the normal timeout
                 // duration. Otherwise they could get stuck for a very long time
@@ -1437,7 +1451,8 @@ public void updateEntry(
 
             FinishTimeUpdater finishTimeCalculator = () -> {
                 RemainingDuration remainingDuration =
-                        mAvalancheController.getDuration(this, mAutoDismissTime);
+                        mAvalancheController.getDuration(this,
+                        mDozing ? mDecayDefault * 1000 : mAutoDismissTime);
 
                 if (remainingDuration instanceof RemainingDuration.HideImmediately) {
                     if (AvalancheReplaceHunWhenCritical.isEnabled()) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
index b08e2ce71afbf..863703a3046f9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt
@@ -21,9 +21,13 @@ import android.app.Notification.MessagingStyle
 import android.app.Person
 import android.content.Context
 import android.content.pm.LauncherApps
+import android.database.ContentObserver
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.UserHandle
+import android.provider.Settings
 import android.util.Log
 import android.view.View
 import android.widget.ImageView
@@ -45,6 +49,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry
 import com.android.systemui.statusbar.notification.collection.PipelineEntry
 import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
 import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
+import com.android.systemui.util.settings.SystemSettings
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
@@ -73,6 +78,7 @@ constructor(
     @Background private val bgCoroutineContext: CoroutineContext,
     @Main private val mainCoroutineContext: CoroutineContext,
     @ShadeDisplayAware private val shadeContext: Context,
+    @Main handler: Handler,
 ) : ConversationIconManager {
 
     /**
@@ -93,6 +99,8 @@ constructor(
     private var launcherPeopleAvatarIconJobs: ConcurrentHashMap<String, Job> =
         ConcurrentHashMap<String, Job>()
 
+    private var attached = false
+
     fun addIconsUpdateListener(listener: OnIconUpdateRequiredListener) {
         StatusBarConnectedDisplays.unsafeAssertInNewMode()
         onIconUpdateRequiredListeners += listener
@@ -104,7 +112,26 @@ constructor(
     }
 
     fun attach() {
+        if (attached) return
+        attached = true
+
         notifCollection.addCollectionListener(entryListener)
+        shadeContext.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.STATUSBAR_COLORED_ICONS),
+            false, settingsObserver, UserHandle.USER_ALL
+        )
+         shadeContext.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.STATUSBAR_NOTIF_COUNT),
+            false, settingsObserver, UserHandle.USER_ALL
+        )
+    }
+
+    private val settingsObserver = object : ContentObserver(handler) {
+        override fun onChange(selfChange: Boolean) {
+            for (entry in notifCollection.allNotifs) {
+                updateIconsSafe(entry, true)
+            }
+        }
     }
 
     private val entryListener =
@@ -146,10 +173,14 @@ constructor(
         traceSection("IconManager.createSbIconView") {
             StatusBarConnectedDisplays.unsafeAssertInNewMode()
 
+            val iconStyle = Settings.System.getIntForUser(context.contentResolver,
+                Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1
+            val showCount = Settings.System.getIntForUser(context.contentResolver,
+                Settings.System.STATUSBAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1
             val sbIcon = iconBuilder.createIconView(entry, context)
             sbIcon.scaleType = ImageView.ScaleType.CENTER_INSIDE
             val (normalIconDescriptor, _) = getIconDescriptors(entry)
-            setIcon(entry, normalIconDescriptor, sbIcon)
+            setIcon(entry, normalIconDescriptor, sbIcon, iconStyle, showCount, true)
             return sbIcon
         }
 
@@ -191,8 +222,12 @@ constructor(
             // Set the icon views' icons
             val (normalIconDescriptor, sensitiveIconDescriptor) = getIconDescriptors(entry)
 
+            val iconStyle = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1
+            val showCount = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1
+
             try {
-                setIcon(entry, normalIconDescriptor, sbIcon)
 
                 if (
                     android.app.Flags.hideStatusBarNotification() &&
@@ -205,10 +240,11 @@ constructor(
                 }
 
                 if (sbChipIcon != null) {
-                    setIcon(entry, normalIconDescriptor, sbChipIcon)
+                    setIcon(entry, normalIconDescriptor, sbChipIcon, false, false, false)
                 }
-                setIcon(entry, sensitiveIconDescriptor, shelfIcon)
-                setIcon(entry, sensitiveIconDescriptor, aodIcon)
+                setIcon(entry, normalIconDescriptor, sbIcon, iconStyle, showCount, false)
+                setIcon(entry, sensitiveIconDescriptor, shelfIcon, iconStyle, false, false)
+                setIcon(entry, sensitiveIconDescriptor, aodIcon, false, false, false)
                 entry.icons =
                     IconPack.buildPack(sbIcon, sbChipIcon, shelfIcon, aodIcon, entry.icons)
             } catch (e: InflationException) {
@@ -222,11 +258,15 @@ constructor(
         traceSection("IconManager.updateSbIcon") {
             StatusBarConnectedDisplays.unsafeAssertInNewMode()
 
+            val iconStyle = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1
+            val showCount = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1
             val (normalIconDescriptor, _) = getIconDescriptors(entry)
             val notificationContentDescription =
                 entry.sbn.notification?.let { iconBuilder.getIconContentDescription(it) }
             iconView.setNotification(entry.sbn, notificationContentDescription)
-            setIcon(entry, normalIconDescriptor, iconView)
+            setIcon(entry, normalIconDescriptor, iconView, iconStyle, showCount, true)
         }
 
     /**
@@ -237,7 +277,7 @@ constructor(
      * @throws InflationException Exception if required icons are not valid or specified
      */
     @Throws(InflationException::class)
-    fun updateIcons(entry: NotificationEntry, usingCache: Boolean = false) =
+    fun updateIcons(entry: NotificationEntry, usingCache: Boolean = false, forceUpdate: Boolean = false) =
         traceSection("IconManager.updateIcons") {
             if (!entry.icons.areIconsAvailable) {
                 return@traceSection
@@ -256,24 +296,29 @@ constructor(
             val notificationContentDescription =
                 entry.sbn.notification?.let { iconBuilder.getIconContentDescription(it) }
 
+            val iconStyle = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1
+            val showCount = Settings.System.getIntForUser(shadeContext.contentResolver,
+                Settings.System.STATUSBAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1
+
             entry.icons.statusBarIcon?.let {
                 it.setNotification(entry.sbn, notificationContentDescription)
-                setIcon(entry, normalIconDescriptor, it)
+                setIcon(entry, normalIconDescriptor, it, iconStyle, showCount, forceUpdate)
             }
 
             entry.icons.statusBarChipIcon?.let {
                 it.setNotification(entry.sbn, notificationContentDescription)
-                setIcon(entry, normalIconDescriptor, it)
+                setIcon(entry, normalIconDescriptor, it, false, false, false)
             }
 
             entry.icons.shelfIcon?.let {
                 it.setNotification(entry.sbn, notificationContentDescription)
-                setIcon(entry, sensitiveIconDescriptor, it)
+                setIcon(entry, sensitiveIconDescriptor, it, iconStyle, false, forceUpdate)
             }
 
             entry.icons.aodIcon?.let {
                 it.setNotification(entry.sbn, notificationContentDescription)
-                setIcon(entry, sensitiveIconDescriptor, it)
+                setIcon(entry, sensitiveIconDescriptor, it, false, false, false)
             }
         }
 
@@ -331,9 +376,9 @@ constructor(
             }
         }
 
-    private fun updateIconsSafe(entry: NotificationEntry) {
+    private fun updateIconsSafe(entry: NotificationEntry, forceUpdate: Boolean = false) {
         try {
-            updateIcons(entry)
+            updateIcons(entry, false, forceUpdate)
         } catch (e: InflationException) {
             // TODO This should mark the entire row as involved in an inflation error
             Log.e(TAG, "Unable to update icon", e)
@@ -445,9 +490,18 @@ constructor(
         entry: NotificationEntry,
         iconDescriptor: StatusBarIcon,
         iconView: StatusBarIconView,
+        iconStyle: Boolean,
+        showCount: Boolean,
+        forceUpdate: Boolean,
     ) {
         iconView.setShowsConversation(showsConversation(entry, iconView, iconDescriptor))
         iconView.setTag(R.id.icon_is_pre_L, entry.targetSdk < Build.VERSION_CODES.LOLLIPOP)
+        iconView.setIconStyle(iconStyle)
+        iconView.setShowCount(showCount)
+        if (forceUpdate) {
+            iconView.updateDrawable();
+            iconView.updateIconForced();
+        }
         if (!iconView.set(iconDescriptor)) {
             throw InflationException("Couldn't create icon $iconDescriptor")
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/domain/interactor/NotificationIconsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/domain/interactor/NotificationIconsInteractor.kt
index 2ebde5c25cbfb..6cfaeaf345bba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/domain/interactor/NotificationIconsInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/domain/interactor/NotificationIconsInteractor.kt
@@ -42,6 +42,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 
 /** Domain logic related to notification icons. */
 class NotificationIconsInteractor
@@ -253,5 +254,11 @@ constructor(
                     showRepliedMessages = false,
                 )
             }
+            .map { notifs ->
+                notifs
+                    .filter { it.statusBarIcon != null }
+                    .distinctBy { it.statusBarIcon!!.toString() }
+                    .toSet()
+            }
             .flowOn(bgContext)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt
index 5e087f16bae5b..7ebdc16d1478c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/CommonVisualInterruptionSuppressors.kt
@@ -42,6 +42,7 @@ import android.os.SystemProperties
 import android.provider.Settings
 import android.provider.Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED
 import android.provider.Settings.Global.HEADS_UP_OFF
+import android.provider.Settings.Global.HEADS_UP_ON
 import android.service.notification.Flags
 import com.android.internal.logging.UiEvent
 import com.android.internal.logging.UiEventLogger
@@ -87,7 +88,7 @@ class PeekDisabledSuppressor(
                     val wasEnabled = isEnabled
 
                     isEnabled =
-                        globalSettings.getInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_OFF) !=
+                        globalSettings.getInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_ON) !=
                             HEADS_UP_OFF
 
                     // QQQ: Do we want to log this even if it hasn't changed?
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
index 76dd6ebe0a0d1..bd7681b2adf2f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
@@ -18,6 +18,7 @@
 
 import static android.provider.Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED;
 import static android.provider.Settings.Global.HEADS_UP_OFF;
+import static android.provider.Settings.Global.HEADS_UP_ON;
 
 import static com.android.systemui.statusbar.StatusBarState.SHADE;
 import static com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl.NotificationInterruptEvent.FSI_SUPPRESSED_NO_HUN_OR_KEYGUARD;
@@ -158,7 +159,7 @@ public NotificationInterruptStateProviderImpl(
             public void onChange(boolean selfChange) {
                 final boolean wasUsing = mUseHeadsUp;
                 final boolean settingEnabled = HEADS_UP_OFF
-                        != mGlobalSettings.getInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_OFF);
+                        != mGlobalSettings.getInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_ON);
                 mUseHeadsUp = ENABLE_HEADS_UP && settingEnabled;
                 mLogger.logHeadsUpFeatureChanged(mUseHeadsUp);
                 if (wasUsing != mUseHeadsUp) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index 43c09d4e806e4..b70d76166bdfb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -18,7 +18,6 @@
 
 import static com.android.systemui.Flags.notificationAppearNonlinear;
 import static com.android.systemui.Flags.notificationBackgroundTintOptimization;
-import static com.android.systemui.Flags.notificationRowTransparency;
 import static com.android.systemui.Flags.physicalNotificationMovement;
 import static com.android.systemui.statusbar.notification.row.ExpandableView.ClipSide.BOTTOM;
 import static com.android.systemui.statusbar.notification.row.ExpandableView.ClipSide.TOP;
@@ -130,6 +129,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
      */
     protected boolean mOnKeyguard;
     protected boolean mIsBlurSupported;
+    protected boolean mIsLockscreenBlurSupported;
+    protected boolean mUseTransparent;
 
     public ActivatableNotificationView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -151,22 +152,19 @@ public void setAppearAnimationFraction(float fraction) {
     }
 
     protected void updateColors() {
-        if (notificationRowTransparency()) {
+        if (usesTransparentBackground()) {
             mNormalColor = SurfaceEffectColors.surfaceEffect1(getContext());
             mOpaqueColor = mContext.getColor(
-                    com.android.internal.R.color.materialColorSurfaceContainer);
+                    com.android.internal.R.color.materialColorSurfaceBright);
         } else {
-            mNormalColor = mContext.getColor(
-                    com.android.internal.R.color.materialColorSurfaceContainerHigh);
+            mNormalColor = SurfaceEffectColors.surfaceEffect2(getContext());
+            mOpaqueColor = mContext.getColor(
+                    com.android.internal.R.color.materialColorSurfaceBright);
         }
         mTintedRippleColor = mContext.getColor(
                 R.color.notification_ripple_tinted_color);
         mNormalRippleColor = mContext.getColor(
                 R.color.notification_ripple_untinted_color);
-        // Reset background color tint and override tint, as they are from an old theme
-        mBgTint = NO_COLOR;
-        mOverrideTint = NO_COLOR;
-        mOverrideAmount = 0.0f;
     }
 
     /**
@@ -303,8 +301,7 @@ void setTintColor(int color, boolean animated) {
     public void setOverrideTintColor(int color, float overrideAmount) {
         mOverrideTint = color;
         mOverrideAmount = overrideAmount;
-        int newColor = calculateBgColor();
-        setBackgroundTintColor(newColor);
+        updateBackgroundTint(false /* animated */);
     }
 
     protected void updateBackgroundTint() {
@@ -357,18 +354,29 @@ protected void updateBackgroundClipping() {
     }
 
     public void setIsBlurSupported(boolean isBlurSupported) {
-        if (!notificationRowTransparency()) {
-            return;
-        }
-        boolean usedTransparentBackground = usesTransparentBackground();
         mIsBlurSupported = isBlurSupported;
-        if (usedTransparentBackground != usesTransparentBackground()) {
-            updateBackgroundTint();
+        updateIfNeeded();
+    }
+
+    public void setIsLockscreenBlurSupported(boolean isBlurSupported) {
+        mIsLockscreenBlurSupported = isBlurSupported;
+        updateIfNeeded();
+    }
+
+    /** Updates background blur/transparency when transparent state changes. */
+    public void updateIfNeeded() {
+        boolean transparent = usesTransparentBackground();
+        if (mUseTransparent != transparent) {
+            mUseTransparent = transparent;
+            if (mBackgroundNormal != null) {
+                mBackgroundNormal.setIsBlurSupported(transparent);
+            }
+            updateBackgroundColors();
         }
     }
 
     protected boolean usesTransparentBackground() {
-        return mIsBlurSupported && notificationRowTransparency() && !mOnKeyguard;
+        return mIsBlurSupported && !mOnKeyguard;
     }
 
     @Override
@@ -758,20 +766,16 @@ private int calculateBgColor(boolean withTint, boolean withOverride) {
         if (withTint && mBgTint != NO_COLOR) {
             return mBgTint;
         } else {
-            if (Flags.notificationRowTransparency()) {
-                return usesTransparentBackground() ? mNormalColor : mOpaqueColor;
-            } else {
-                return mNormalColor;
-            }
+            return usesTransparentBackground() ? mNormalColor : mOpaqueColor;
         }
     }
 
     private int getRippleColor() {
-        if (mBgTint != 0) {
-            return mTintedRippleColor;
-        } else {
-            return mNormalRippleColor;
-        }
+        final boolean hasExplicitTint =
+                mBgTint != NO_COLOR
+                || (mOverrideTint != NO_COLOR && mOverrideAmount > 0f);
+
+        return hasExplicitTint ? mTintedRippleColor : mNormalRippleColor;
     }
 
     /**
@@ -874,7 +878,7 @@ public void setOnKeyguard(boolean onKeyguard) {
         }
 
         mOnKeyguard = onKeyguard;
-        if (notificationRowTransparency()) {
+        if (mIsBlurSupported) {
             updateBackgroundTint();
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/BigPictureIconManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/BigPictureIconManager.kt
index 916414548fbd4..deb8042cb2269 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/BigPictureIconManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/BigPictureIconManager.kt
@@ -208,7 +208,7 @@ constructor(
     }
 
     private fun isLowRam(): Boolean {
-        return ActivityManager.isLowRamDeviceStatic()
+        return true
     }
 
     private fun getMaxWidth() =
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 8a539747fa479..c0b9fd94b92df 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -22,7 +22,6 @@
 import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_EXPANDED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
 
-import static com.android.systemui.Flags.notificationRowTransparency;
 import static com.android.systemui.flags.Flags.ENABLE_NOTIFICATIONS_SIMULATE_SLOW_MEASURE;
 import static com.android.systemui.statusbar.NotificationLockscreenUserManager.REDACTION_TYPE_NONE;
 import static com.android.systemui.statusbar.notification.NotificationUtils.logKey;
@@ -35,6 +34,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
+import android.app.AxSandboxManager;
 import android.app.Notification;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -50,6 +50,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.service.notification.StatusBarNotification;
 import android.os.SystemProperties;
 import android.os.Trace;
 import android.os.UserHandle;
@@ -145,6 +146,7 @@
 import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainerLogger;
 import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
 import com.android.systemui.statusbar.notification.stack.SwipeableView;
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController;
 import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.policy.InflatedSmartReplyState;
 import com.android.systemui.statusbar.policy.RemoteInputView;
@@ -155,6 +157,8 @@
 import com.android.systemui.util.ListenerSet;
 import com.android.wm.shell.shared.animation.PhysicsAnimator;
 
+import com.android.systemui.applocker.AxAppLockerHelper;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -214,6 +218,7 @@ public interface OnExpansionChangedListener {
     private RowContentBindStage mRowContentBindStage;
     private PeopleNotificationIdentifier mPeopleNotificationIdentifier;
     private NotificationActivityStarter mNotificationActivityStarter;
+    private AxAppLockerHelper mAxAppLockerHelper;
     private MetricsLogger mMetricsLogger;
     private NotificationChildrenContainerLogger mChildrenContainerLogger;
     private ColorUpdateLogger mColorUpdateLogger;
@@ -410,8 +415,12 @@ public void toggleExpansionState() {
     }
 
     private void toggleExpansionState(View v, boolean shouldLogExpandClickMetric) {
+        if (doesNotificationNeedAuth()) {
+            promptAppUnlock();
+            return;
+        }
         if (isBundle()
-                || (!shouldShowPublic() && (!mIsMinimized || isExpanded()) && isGroupRoot())) {
+                || (!shouldShowPublic() && (!mIsMinimized || isExpanded()) && isGroupRoot() && !NTForbiddenSwipeDownQSController.get(mContext).getForbiddenSwipeDownQS())) {
             mGroupExpansionChanging = true;
 
             if (NotificationBundleUi.isEnabled()) {
@@ -469,6 +478,35 @@ private void toggleExpansionState(View v, boolean shouldLogExpandClickMetric) {
         }
     }
 
+    private StatusBarNotification getAppLockSbn() {
+        if (NotificationBundleUi.isEnabled()) {
+            return mEntryAdapter != null ? mEntryAdapter.getSbn() : null;
+        }
+        return mEntry != null ? mEntry.getSbn() : null;
+    }
+
+    private boolean isNotificationAppLocked() {
+        StatusBarNotification sbn = getAppLockSbn();
+        if (sbn == null) return false;
+        if (!sbn.getNotification().extras
+                .getBoolean(AxSandboxManager.EXTRA_NOTIFICATION_APP_LOCKED, false)) {
+            return false;
+        }
+        return mAxAppLockerHelper.needsAuth(sbn.getPackageName(), sbn.getUserId());
+    }
+
+    private boolean doesNotificationNeedAuth() {
+        StatusBarNotification sbn = getAppLockSbn();
+        if (sbn == null) return false;
+        return mAxAppLockerHelper.getState(sbn.getPackageName()).needsAuth();
+    }
+
+    private void promptAppUnlock() {
+        StatusBarNotification sbn = getAppLockSbn();
+        if (sbn == null) return;
+        mAxAppLockerHelper.promptUnlock(sbn.getPackageName(), sbn.getUserId());
+    }
+
     private boolean mKeepInParentForDismissAnimation;
     private boolean mRemoved;
     public static final FloatProperty<ExpandableNotificationRow> TRANSLATE_CONTENT =
@@ -1014,9 +1052,7 @@ public void setHeadsUp(boolean isHeadsUp) {
         } else if (isAboveShelf() != wasAboveShelf) {
             mAboveShelfChangedListener.onAboveShelfStateChanged(!wasAboveShelf);
         }
-        if (notificationRowTransparency()) {
-            updateBackgroundTint();
-        }
+        updateIfNeeded();
     }
 
     /**
@@ -1098,8 +1134,8 @@ public float getHeaderVisibleAmount() {
     public void markHeadsUpSeen() {
         super.markHeadsUpSeen();
         mMustStayOnScreen = false;
-        if (notificationRowTransparency()) {
-            updateBackgroundTint();
+        if (mIsBlurSupported) {
+            updateColors();
         }
     }
 
@@ -1359,8 +1395,8 @@ public void setPinnedStatus(PinnedStatus pinnedStatus) {
             setUserExpanded(true);
         }
 
-        if (notificationRowTransparency()) {
-            updateBackgroundTint();
+        if (mIsBlurSupported) {
+            updateColors();
         }
         setChronometerRunning(mLastChronometerRunning);
         if (isAboveShelf() != wasAboveShelf) {
@@ -1754,7 +1790,7 @@ public void setContentBackground(int customBackgroundColor, boolean animate,
 
     @Override
     protected void setBackgroundTintColor(int color) {
-        if (notificationRowTransparency()) {
+        if (usesTransparentBackground()) {
             boolean isColorized = false;
             if (NotificationBundleUi.isEnabled()) {
                 if (mEntryAdapter != null) {
@@ -1951,8 +1987,8 @@ public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) {
         if (isAboveShelf() != wasAboveShelf) {
             mAboveShelfChangedListener.onAboveShelfStateChanged(!wasAboveShelf);
         }
-        if (notificationRowTransparency()) {
-            updateBackgroundTint();
+        if (mIsBlurSupported) {
+            updateColors();
         }
     }
 
@@ -2277,7 +2313,8 @@ public void initialize(
             UiEventLogger uiEventLogger,
             NotificationRebindingTracker notificationRebindingTracker,
             BundleInteractionLogger bundleInteractionLogger,
-            NotificationActivityStarter notificationActivityStarter) {
+            NotificationActivityStarter notificationActivityStarter,
+            AxAppLockerHelper axAppLockerHelper) {
 
         if (NotificationBundleUi.isEnabled()) {
             mEntryAdapter = entryAdapter;
@@ -2293,6 +2330,7 @@ public void initialize(
         mAppName = appName;
         mRebindingTracker = notificationRebindingTracker;
         mNotificationActivityStarter = notificationActivityStarter;
+        mAxAppLockerHelper = axAppLockerHelper;
         if (mMenuRow == null) {
             mMenuRow = new NotificationMenuRow(
                     mContext, peopleNotificationIdentifier, mNotificationActivityStarter);
@@ -3293,6 +3331,7 @@ public void setOnKeyguard(boolean onKeyguard) {
                 mChildrenContainer.setOnKeyguard(onKeyguard);
             }
         }
+        updateIfNeeded();
     }
 
     @Override
@@ -3312,7 +3351,7 @@ public int getIntrinsicHeight() {
             return mGuts.getIntrinsicHeight();
         }
         if (NotificationBundleUi.isEnabled()) {
-            if (mSensitive && mHideSensitiveForIntrinsicHeight) {
+            if ((mSensitive && mHideSensitiveForIntrinsicHeight) || isNotificationAppLocked()) {
                 return getMinHeight();
             }
             if (mIsSummaryWithChildren) {
@@ -3324,6 +3363,10 @@ public int getIntrinsicHeight() {
         } else {
             if (isChildInGroup() && !isGroupExpanded()) {
                 return mPrivateLayout.getMinHeight();
+            } else if ((isChildInGroup() && !isGroupExpanded())) {
+                return mPrivateLayout.getMinHeight();
+            } else if (isNotificationAppLocked()) {
+                return getMinHeight();
             }
             if (mSensitive && mHideSensitiveForIntrinsicHeight) {
                 return getMinHeight();
@@ -3639,7 +3682,7 @@ public void setHideSensitive(boolean hideSensitive, boolean animated, long delay
             return;
         }
         boolean oldShowingPublic = mShowingPublic;
-        mShowingPublic = mSensitive && hideSensitive;
+        mShowingPublic = (mSensitive && hideSensitive) || isNotificationAppLocked();
         boolean isShowingLayoutNotChanged = mShowingPublic == oldShowingPublic;
         if (mShowingPublicInitialized && isShowingLayoutNotChanged) {
             return;
@@ -3761,6 +3804,9 @@ public boolean canViewBeCleared() {
     }
 
     private boolean shouldShowPublic() {
+        if (isNotificationAppLocked()) {
+            return true;
+        }
         return mSensitive && mHideSensitiveForIntrinsicHeight;
     }
 
@@ -3911,6 +3957,7 @@ public void resetAllContentAlphas() {
             mChildrenContainer.setAlpha(1f);
             mChildrenContainer.setLayerType(LAYER_TYPE_NONE, null);
         }
+        updateIfNeeded();
     }
 
     /**
@@ -4171,7 +4218,7 @@ protected void updateBackgroundTint() {
                     mChildrenContainer.getAttachedChildren();
             for (int i = 0; i < notificationChildren.size(); i++) {
                 ExpandableNotificationRow child = notificationChildren.get(i);
-                if (notificationRowTransparency()) {
+                if (mIsBlurSupported) {
                     child.updateBackgroundTint();
                 }
                 child.updateBackgroundForGroupState();
@@ -4195,7 +4242,7 @@ public void updateBackgroundForGroupState() {
             // For Bundles we let the BundleHeader show its background permanently. This is
             // possible because collapsed Bundles don't preview their children unlike summaries.
             // It is important that backgrounds don't overlap during expansion since
-            // notificationRowTransparency() introduced transparency.
+            // Translucency toggle enables transparent backgrounds.
             mShowNoBackground = true;
             mChildrenContainer.updateHeaderForExpansion(mShowNoBackground);
         } else if (mIsSummaryWithChildren) {
@@ -4208,7 +4255,7 @@ public void updateBackgroundForGroupState() {
             }
         } else if (isChildInGroup()) {
             final int childColor = getShowingLayout().getBackgroundColorForExpansionState();
-            if ((Flags.notificationRowTransparency() || notificationsRedesignTemplates())
+            if ((usesTransparentBackground() || notificationsRedesignTemplates())
                     && childColor == Color.TRANSPARENT) {
                 // If child is not customizing its background color, switch from the parent to
                 // the child background when the expansion finishes.
@@ -4918,6 +4965,7 @@ protected boolean usesTransparentBackground() {
         // Row background should be opaque when it's displayed as a heads-up notification or
         // displayed on keyguard.
         // Also, for an unpinned HUN on the unlocked shade, the row bg should be transparent.
+        if (mOnKeyguard) return mIsLockscreenBlurSupported;
         return super.usesTransparentBackground()
                 && !mustStayOnScreen()
                 && !(isChildInGroup() && !mNotificationParent.usesTransparentBackground())
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
index 4c168b9479346..b8c83d5bf454b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
@@ -41,6 +41,7 @@
 import com.android.internal.logging.UiEventLogger;
 import com.android.internal.statusbar.IStatusBarService;
 import com.android.systemui.Flags;
+import com.android.systemui.applocker.AxAppLockerHelper;
 import com.android.systemui.flags.FeatureFlagsClassic;
 import com.android.systemui.plugins.FalsingManager;
 import com.android.systemui.plugins.PluginManager;
@@ -71,6 +72,7 @@
 import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.policy.SmartReplyConstants;
 import com.android.systemui.statusbar.policy.dagger.RemoteInputViewSubcomponent;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.time.SystemClock;
 import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor;
 
@@ -130,6 +132,7 @@ public class ExpandableNotificationRowController implements NotifViewController
     private final EntryAdapterFactory mEntryAdapterFactory;
     private final WindowRootViewBlurInteractor mWindowRootViewBlurInteractor;
     private final NotificationActivityStarter mNotificationActivityStarter;
+    private final AxAppLockerHelper mAxAppLockerHelper;
     private final Context mContext;
 
     @VisibleForTesting
@@ -298,7 +301,8 @@ public ExpandableNotificationRowController(
             EntryAdapterFactory entryAdapterFactory,
             WindowRootViewBlurInteractor windowRootViewBlurInteractor,
             BundleInteractionLogger bundleInteractionLogger,
-            NotificationActivityStarter notificationActivityStarter) {
+            NotificationActivityStarter notificationActivityStarter,
+            AxAppLockerHelper axAppLockerHelper) {
         mView = view;
         mContext = context;
         mListContainer = listContainer;
@@ -338,6 +342,7 @@ public ExpandableNotificationRowController(
         mWindowRootViewBlurInteractor = windowRootViewBlurInteractor;
         mBundleInteractionLogger = bundleInteractionLogger;
         mNotificationActivityStarter = notificationActivityStarter;
+        mAxAppLockerHelper = axAppLockerHelper;
     }
 
     String loadsGutsAppName(Context context, PipelineEntry pipelineEntry) {
@@ -404,7 +409,8 @@ public void init(PipelineEntry entry) {
                 mUiEventLogger,
                 mNotificationRebindingTracker,
                 mBundleInteractionLogger,
-                mNotificationActivityStarter
+                mNotificationActivityStarter,
+                mAxAppLockerHelper
         );
         mView.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
         if (mAllowLongPress) {
@@ -447,7 +453,7 @@ public void onViewAttachedToWindow(View v) {
                     mView.setOnKeyguard(mStatusBarStateController.getState() == KEYGUARD);
                     mStatusBarStateController.addCallback(mStatusBarStateListener);
                 }
-
+                ScrimUtils.get().addListener(mScrimListener);
             }
 
             @Override
@@ -457,13 +463,18 @@ public void onViewDetachedFromWindow(View v) {
                     mStatusBarStateController.removeCallback(mStatusBarStateListener);
                 }
                 mSettingsController.removeCallback(BUBBLES_SETTING_URI, mSettingsListener);
+                ScrimUtils.get().removeListener(mScrimListener);
             }
         });
 
-        if (Flags.notificationRowTransparency()) {
-            collectFlow(mView, mWindowRootViewBlurInteractor.isBlurCurrentlySupported(),
-                    mView::setIsBlurSupported);
-        }
+        collectFlow(
+                mView,
+                mWindowRootViewBlurInteractor.isTranslucentSupported(),
+                mView::setIsBlurSupported);
+        collectFlow(
+                mView,
+                mWindowRootViewBlurInteractor.isLockscreenTranslucentSupported(),
+                mView::setIsLockscreenBlurSupported);
     }
 
     private final StatusBarStateController.StateListener mStatusBarStateListener =
@@ -474,6 +485,14 @@ public void onStateChanged(int newState) {
                 }
             };
 
+    private final ScrimUtils.ScrimEventListener mScrimListener =
+            new ScrimUtils.ScrimEventListener() {
+                @Override
+                public void onNotificationPosted(StatusBarNotification sbn) {
+                    mView.updateIfNeeded();
+                }
+            };
+
     @Override
     @NonNull
     public String getNodeLabel() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt
index d567a94a16411..efeccad65e52f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.notification.row
 
+import android.os.SystemProperties
 import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore
 import javax.inject.Inject
 
@@ -33,7 +34,8 @@ constructor(private val statusBarModeRepositoryStore: StatusBarModeRepositorySto
     HeadsUpStyleProvider {
 
     override fun shouldApplyCompactStyle(): Boolean {
-        return isInImmersiveMode()
+        return isInImmersiveMode() ||
+            SystemProperties.getBoolean("persist.sys.compact_heads_up_notification.always_show", false)
     }
 
     private fun isInImmersiveMode() =
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
index a1987581fab3f..2149cda8f79e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java
@@ -16,7 +16,6 @@
 
 package com.android.systemui.statusbar.notification.row;
 
-import static com.android.systemui.Flags.notificationRowTransparency;
 import static com.android.systemui.util.ColorUtilKt.hexColorString;
 
 import android.content.Context;
@@ -31,6 +30,7 @@
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.RippleDrawable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -80,6 +80,8 @@ public class NotificationBackgroundView extends View implements Dumpable,
     // True only if the dismiss button is visible.
     private boolean mDrawDismissButtonCutout = false;
 
+    private boolean mIsBlurSupported = false;
+
     public NotificationBackgroundView(Context context, AttributeSet attrs) {
         super(context, attrs);
         mDontModifyCorners = getResources().getBoolean(R.bool.config_clipNotificationsToOutline);
@@ -87,15 +89,24 @@ public NotificationBackgroundView(Context context, AttributeSet attrs) {
                 R.color.notification_state_color_light);
         mDarkColoredStatefulColors = getResources().getColorStateList(
                 R.color.notification_state_color_dark);
-        if (notificationRowTransparency()) {
+        if (mIsBlurSupported) {
             mNormalColor = SurfaceEffectColors.surfaceEffect1(getContext());
-        } else  {
+        } else {
             mNormalColor = mContext.getColor(
-                    com.android.internal.R.color.materialColorSurfaceContainerHigh);
+                    com.android.internal.R.color.materialColorSurfaceBright);
         }
         mFocusOverlayStroke = getResources().getDimension(R.dimen.notification_focus_stroke_width);
     }
 
+    /** Sets whether blur/translucency is supported for notification rows. */
+    public void setIsBlurSupported(boolean isBlurSupported) {
+        if (mIsBlurSupported != isBlurSupported) {
+            mIsBlurSupported = isBlurSupported;
+            setStatefulColors();
+            invalidate();
+        }
+    }
+
     @Override
     public void onTargetVisibilityChanged(boolean targetVisible) {
         if (NotificationAddXOnHoverToDismiss.isUnexpectedlyInLegacyMode()) {
@@ -301,9 +312,8 @@ private Drawable getStatefulBackgroundLayer() {
 
     public void setTint(int tintColor) {
         Drawable baseLayer = getBaseBackgroundLayer();
-        if (notificationRowTransparency()) {
+        if (mIsBlurSupported) {
             ((GradientDrawable) baseLayer.mutate()).setColor(tintColor);
-
         } else {
             baseLayer.mutate().setTintMode(PorterDuff.Mode.SRC_ATOP);
             baseLayer.setTint(tintColor);
@@ -450,6 +460,10 @@ private void updateFocusOverlayRadii(LayerDrawable background) {
         GradientDrawable overlay =
                 (GradientDrawable) background.findDrawableByLayerId(
                         R.id.notification_focus_overlay);
+        if (overlay == null) {
+            Log.w("NotificationBackgroundView", "Focus overlay not found in LayerDrawable");
+            return;
+        }
         for (int i = 0; i < mCornerRadii.length; i++) {
             // in theory subtracting mFocusOverlayStroke/2 should be enough but notification
             // background is still peeking a bit from below - probably due to antialiasing or
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
index 057d75d03c3bd..837d2adbc17cd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -35,14 +35,18 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.app.ActivityManager;
 import android.app.Flags;
 import android.app.INotificationManager;
+import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
@@ -52,6 +56,7 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
 import android.text.Annotation;
@@ -82,6 +87,8 @@
 import com.android.systemui.statusbar.notification.collection.NotificationEntry;
 import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;
 import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
+import com.android.systemui.statusbar.phone.CentralSurfaces;
+import com.android.systemui.statusbar.phone.SystemUIDialog;
 import com.android.systemui.wmshell.BubblesManager;
 
 import java.lang.annotation.Retention;
@@ -279,6 +286,28 @@ public void bindNotification(
         done.setAccessibilityDelegate(mGutsContainer.getAccessibilityDelegate());
     }
 
+    private boolean isForceStopAllowed() {
+        if (TextUtils.isEmpty(mPackageName)) return false;
+
+        if ("android".equals(mPackageName)) return false;
+        if ("com.android.systemui".equals(mPackageName)) return false;
+
+        try {
+            ApplicationInfo ai = mPm.getApplicationInfo(mPackageName, 0);
+            final boolean isSystem = (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+            if (isSystem) return false;
+        } catch (PackageManager.NameNotFoundException ignored) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean isKeyguardLocked() {
+        KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
+        return km != null && km.isKeyguardLocked();
+    }
+
     private void bindActions() {
         TextView defaultSummaryTextView = findViewById(R.id.default_summary);
         if (mAppBubble == BUBBLE_PREFERENCE_ALL
@@ -298,12 +327,55 @@ private void bindActions() {
         settingsButton.setOnClickListener(getSettingsOnClickListener());
         settingsButton.setVisibility(settingsButton.hasOnClickListeners() ? VISIBLE : GONE);
 
+        // Force stop button
+        final View killButton = findViewById(R.id.force_stop);
+        if (killButton != null) {
+            boolean killButtonEnabled = Settings.System.getIntForUser(
+                    mContext.getContentResolver(),
+                    Settings.System.NOTIFICATION_GUTS_KILL_APP_BUTTON, 0,
+                    UserHandle.USER_CURRENT) != 0;
+            killButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    if (isKeyguardLocked()) {
+                        return;
+                    }
+                    final SystemUIDialog killDialog = new SystemUIDialog(mContext);
+                    killDialog.setTitle(mContext.getText(R.string.force_stop_dlg_title));
+                    killDialog.setMessage(mContext.getText(R.string.force_stop_dlg_text));
+                    killDialog.setPositiveButton(
+                            android.R.string.ok, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            final int userId = mSbn != null ?
+                                mSbn.getUser().getIdentifier() : UserHandle.myUserId();
+                            try {
+                                ActivityManager.getService().forceStopPackage(mPackageName, userId);
+                            } catch (Exception re) {
+                                Log.w(TAG, "Force stop failed for " + mPackageName, re);
+                            } finally {
+                                closeGutsIfOpen();
+                            }
+                        }
+                    });
+                    killDialog.setNegativeButton(android.R.string.cancel, null);
+                    killDialog.show();
+                }
+            });
+            killButton.setVisibility(killButtonEnabled
+                && isForceStopAllowed() ? View.VISIBLE : View.GONE);
+        }
+
         bindFeedback();
 
         updateToggleActions(mSelectedAction == -1 ? getPriority() : mSelectedAction,
                 false);
     }
 
+    private void closeGutsIfOpen() {
+        if (mGutsContainer != null) {
+            mGutsContainer.closeControls(this, true);
+        }
+    }
+
     private void bindHeader() {
         bindConversationDetails();
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
index b2ff012792687..a34ee1b895430 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
@@ -34,16 +34,20 @@
 import android.annotation.IntDef;
 import android.annotation.Nullable;
 import android.annotation.SuppressLint;
+import android.app.ActivityManager;
 import android.app.Flags;
 import android.app.INotificationManager;
+import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
@@ -51,6 +55,7 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.service.notification.NotificationAssistantService;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
@@ -84,6 +89,8 @@
 import com.android.systemui.statusbar.notification.row.icon.AppIconProvider;
 import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider;
 import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;
+import com.android.systemui.statusbar.phone.CentralSurfaces;
+import com.android.systemui.statusbar.phone.SystemUIDialog;
 
 import java.lang.annotation.Retention;
 import java.util.ArrayList;
@@ -389,6 +396,49 @@ private void bindHeader() {
         final View settingsButton = findViewById(R.id.info);
         settingsButton.setOnClickListener(getSettingsOnClickListener());
         settingsButton.setVisibility(settingsButton.hasOnClickListeners() ? VISIBLE : GONE);
+
+        // Force stop button
+        final View killButton = findViewById(R.id.force_stop);
+        if (killButton != null) {
+            boolean killButtonEnabled = Settings.System.getIntForUser(
+                    mContext.getContentResolver(),
+                    Settings.System.NOTIFICATION_GUTS_KILL_APP_BUTTON, 0,
+                    UserHandle.USER_CURRENT) != 0;
+            killButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    if (isKeyguardLocked()) {
+                        return;
+                    }
+                    final SystemUIDialog killDialog = new SystemUIDialog(mContext);
+                    killDialog.setTitle(mContext.getText(R.string.force_stop_dlg_title));
+                    killDialog.setMessage(mContext.getText(R.string.force_stop_dlg_text));
+                    killDialog.setPositiveButton(
+                            android.R.string.ok, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            final int userId = mSbn != null ?
+                                mSbn.getUser().getIdentifier() : UserHandle.myUserId();
+                            try {
+                                ActivityManager.getService().forceStopPackage(mPackageName, userId);
+                            } catch (Exception re) {
+                                Log.w(TAG, "Force stop failed for " + mPackageName, re);
+                            } finally {
+                                closeGutsIfOpen();
+                            }
+                        }
+                    });
+                    killDialog.setNegativeButton(android.R.string.cancel, null);
+                    killDialog.show();
+                }
+            });
+            killButton.setVisibility(killButtonEnabled
+                && isForceStopAllowed() ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void closeGutsIfOpen() {
+        if (mGutsContainer != null) {
+            mGutsContainer.closeControls(this, true);
+        }
     }
 
     private void bindFeedback() {
@@ -575,6 +625,28 @@ private void bindGroup() throws RemoteException {
         }
     }
 
+    private boolean isForceStopAllowed() {
+        if (TextUtils.isEmpty(mPackageName)) return false;
+
+        if ("android".equals(mPackageName)) return false;
+        if ("com.android.systemui".equals(mPackageName)) return false;
+
+        try {
+            ApplicationInfo ai = mPm.getApplicationInfo(mPackageName, 0);
+            final boolean isSystem = (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+            if (isSystem) return false;
+        } catch (PackageManager.NameNotFoundException ignored) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean isKeyguardLocked() {
+        KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
+        return km != null && km.isKeyguardLocked();
+    }
+
     private void saveImportance() {
         if (!mIsNonblockable) {
             if (mChosenImportance == null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
index 3e932aa616b89..b780702d0e74b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
@@ -103,16 +103,14 @@ public void updateMaxImageSizes() {
 
     @VisibleForTesting
     protected int getMaxImageWidth() {
-        return mContext.getResources().getDimensionPixelSize(isLowRam()
-                ? R.dimen.notification_custom_view_max_image_width_low_ram
-                : R.dimen.notification_custom_view_max_image_width);
+        return mContext.getResources().getDimensionPixelSize(
+            R.dimen.notification_custom_view_max_image_width_low_ram);
     }
 
     @VisibleForTesting
     protected int getMaxImageHeight() {
-        return mContext.getResources().getDimensionPixelSize(isLowRam()
-                ? R.dimen.notification_custom_view_max_image_height_low_ram
-                : R.dimen.notification_custom_view_max_image_height);
+        return mContext.getResources().getDimensionPixelSize(
+            R.dimen.notification_custom_view_max_image_height_low_ram);
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java
index 1b2e65c5dcabb..ab42a7d662be8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java
@@ -205,6 +205,7 @@ public void setMenuClickListener(OnMenuEventListener listener) {
     @Override
     public void createMenu(ViewGroup parent) {
         mParent = (ExpandableNotificationRow) parent;
+        mContext = mParent.getContext();
         createMenuViews(true /* resetState */);
     }
 
@@ -249,11 +250,17 @@ public void onNotificationUpdated() {
             // Menu hasn't been created yet, no need to do anything.
             return;
         }
+        if (mParent != null) {
+            mContext = mParent.getContext();
+        }
         createMenuViews(!isMenuVisible() /* resetState */);
     }
 
     @Override
     public void onConfigurationChanged() {
+        if (mParent != null) {
+            mContext = mParent.getContext();
+        }
         mParent.setLayoutListener(this);
     }
 
@@ -961,7 +968,7 @@ public NotificationMenuItem(Context context, String contentDescription, GutsCont
             if (iconResId >= 0) {
                 AlphaOptimizedImageView iv = new AlphaOptimizedImageView(context);
                 iv.setPadding(padding, padding, padding, padding);
-                Drawable icon = context.getResources().getDrawable(iconResId);
+                Drawable icon = context.getDrawable(iconResId);
                 iv.setImageDrawable(icon);
                 iv.setColorFilter(tint);
                 iv.setAlpha(1f);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/AppIconProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/AppIconProvider.kt
index 39871d1382340..6622d56eb5787 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/AppIconProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/icon/AppIconProvider.kt
@@ -101,11 +101,7 @@ constructor(
     private val iconSize: Int
         get() =
             sysuiContext.resources.getDimensionPixelSize(
-                if (ActivityManager.isLowRamDeviceStatic()) {
-                    R.dimen.notification_small_icon_size_low_ram
-                } else {
-                    R.dimen.notification_small_icon_size
-                }
+                R.dimen.notification_small_icon_size_low_ram
             )
 
     private val densityDpi: Int
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewbinder/NotificationShelfViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewbinder/NotificationShelfViewBinder.kt
index a75330b329d39..5eb95e9f3d5b7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewbinder/NotificationShelfViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewbinder/NotificationShelfViewBinder.kt
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.shelf.ui.viewbinder
 
 import com.android.app.tracing.coroutines.launchTraced as launch
 import com.android.app.tracing.traceSection
-import com.android.systemui.Flags
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.statusbar.NotificationShelf
@@ -48,9 +47,7 @@ object NotificationShelfViewBinder {
                 launch { viewModel.isAlignedToEnd.collect(::setAlignedToEnd) }
             }
 
-            if (Flags.notificationRowTransparency()) {
-                launch { viewModel.isBlurSupported.collect(shelf::setIsBlurSupported) }
-            }
+            launch { viewModel.isBlurSupported.collect(shelf::setIsBlurSupported) }
 
             registerViewListenersWhileAttached(shelf, viewModel)
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewmodel/NotificationShelfViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewmodel/NotificationShelfViewModel.kt
index 9eb1ece638461..14e77a6dfedbe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewmodel/NotificationShelfViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/ui/viewmodel/NotificationShelfViewModel.kt
@@ -53,7 +53,7 @@ constructor(
         }
     }
 
-    val isBlurSupported: Flow<Boolean> = windowRootViewBlurInteractor.isBlurCurrentlySupported
+    val isBlurSupported: Flow<Boolean> = windowRootViewBlurInteractor.isTranslucentSupported
 
     /** Notifies that the user has clicked the shelf. */
     fun onShelfClicked() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MediaContainerView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MediaContainerView.kt
index 3876378bca401..18b2e9eb5a594 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MediaContainerView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/MediaContainerView.kt
@@ -46,7 +46,7 @@ class MediaContainerView(context: Context, attrs: AttributeSet?) : ExpandableVie
 
     private fun updateResources() {
         cornerRadius =
-            context.resources.getDimensionPixelSize(R.dimen.notification_corner_radius).toFloat()
+            context.resources.getDimensionPixelSize(R.dimen.media_notification_corner_radius).toFloat()
     }
 
     public override fun updateClipping() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 8ce2b5f637a18..17c555a8ff3d2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -58,7 +58,9 @@
 import android.graphics.RenderEffect;
 import android.graphics.RenderNode;
 import android.graphics.Shader;
+import android.hardware.power.Boost;
 import android.os.Bundle;
+import android.os.PowerManagerInternal;
 import android.os.SystemClock;
 import android.os.Trace;
 import android.util.AttributeSet;
@@ -90,6 +92,7 @@
 import com.android.internal.policy.SystemBarUtils;
 import com.android.keyguard.BouncerPanelExpansionCalculator;
 import com.android.keyguard.KeyguardSliceView;
+import com.android.server.LocalServices;
 import com.android.systemui.Dependency;
 import com.android.systemui.Dumpable;
 import com.android.systemui.ExpandHelper;
@@ -144,6 +147,9 @@
 import com.android.systemui.util.state.DownstreamObservableState;
 import com.android.systemui.util.state.ObservableState;
 
+import com.android.systemui.applocker.AxAppLockerHelper;
+import android.service.notification.StatusBarNotification;
+
 import com.google.errorprone.annotations.CompileTimeConstant;
 
 import kotlin.Unit;
@@ -813,6 +819,16 @@ void updateBgColor() {
         }
     }
 
+    /** Refreshes translucency state of all notification rows (e.g. after shade expand/collapse). */
+    public void updateIfNeeded() {
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            if (child instanceof ActivatableNotificationView activatableView) {
+                activatableView.updateIfNeeded();
+            }
+        }
+    }
+
     private void onJustBeforeDraw() {
         if (SceneContainerFlag.isEnabled()) {
             if (mChildrenUpdateRequested) {
@@ -1040,7 +1056,7 @@ void updateSidePadding(int viewWidth) {
 
         final int innerWidth = viewWidth - mMinimumPaddings * 2;
         final int qsTileWidth = (innerWidth - mQsTilePadding * 3) / 4;
-        mSidePaddings = mMinimumPaddings + qsTileWidth + mQsTilePadding;
+        mSidePaddings = mMinimumPaddings;
     }
 
     void updateCornerRadius() {
@@ -1944,6 +1960,13 @@ private void updateExpandedHeight(float expandFraction) {
         }
     }
 
+    private void boostInteraction(int durationMs) {
+        PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
+        if (pmi != null) {
+            pmi.setPowerBoost(Boost.INTERACTION, durationMs);
+        }
+    }
+
     @Override
     public void setQsExpandFraction(float expandFraction) {
         if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;
@@ -3084,6 +3107,7 @@ protected void fling(int velocityY) {
                     mExpandedInThisMotion && getOwnScrollY() >= 0 ? 0 : Integer.MAX_VALUE / 2);
 
             animateScroll();
+            boostInteraction(700);
         }
     }
 
@@ -4842,6 +4866,7 @@ void onPanelTrackingStarted() {
         mPanelTracking = true;
         mAmbientState.setPanelTracking(true);
         resetExposedMenuView(true /* animate */, true /* force */);
+        boostInteraction(700);
     }
 
     void onPanelTrackingStopped() {
@@ -6520,7 +6545,7 @@ public void setBlurRadius(float blurRadius) {
     private void updateBlurEffect() {
         if (mBlurRadius > 0) {
             mBlurEffect =
-                    RenderEffect.createBlurEffect(mBlurRadius, mBlurRadius, Shader.TileMode.CLAMP);
+                    RenderEffect.createBlurEffect(mBlurRadius, mBlurRadius, Shader.TileMode.MIRROR);
             spewLog("Setting up blur RenderEffect for NotificationStackScrollLayout");
         } else {
             spewLog("Clearing the blur RenderEffect setup for NotificationStackScrollLayout");
@@ -7456,4 +7481,23 @@ private void spewLog(String logMsg) {
             Log.v(TAG, logMsg);
         }
     }
+
+    public void onAppLockerUpdate(String packageName) {
+        boolean hideSensitive = mAmbientState.isHideSensitive();
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            ExpandableView child = getChildAtIndex(i);
+            if (child instanceof ExpandableNotificationRow row) {
+                NotificationEntry entry = row.getEntry();
+                if (entry == null) continue;
+                StatusBarNotification sbn = entry.getSbn();
+                if (packageName != null && !packageName.equals(sbn.getPackageName())) {
+                    continue;
+                }
+                row.setHideSensitive(hideSensitive, false, 0, 0);
+                onChildHeightChanged(child, true);
+            }
+        }
+        updateContentHeight();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index ff5ad1d32abea..4fdf8eabd759c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
@@ -238,6 +238,7 @@ public void onViewDetachedFromWindow(View v) {
                     mColorUpdateLogger.logTriggerEvent("NSSLC.onViewDetachedFromWindow()");
                     mConfigurationController.removeCallback(mConfigurationListener);
                     mStatusBarStateController.removeCallback(mStateListener);
+                    mTunerService.removeTunable(mTunable);
                 }
             };
 
@@ -996,16 +997,7 @@ public void onEntryUpdated(NotificationEntry entry) {
         mVisibilityLocationProviderDelegator.setDelegate(this::isInVisibleLocation);
 
         mTunerService.addTunable(
-                (key, newValue) -> {
-                    switch (key) {
-                        case Settings.Secure.NOTIFICATION_HISTORY_ENABLED:
-                            mHistoryEnabled = null;  // invalidate
-                            break;
-                        case HIGH_PRIORITY:
-                            mView.setHighPriorityBeforeSpeedBump("1".equals(newValue));
-                            break;
-                    }
-                },
+                mTunable,
                 HIGH_PRIORITY,
                 Settings.Secure.NOTIFICATION_HISTORY_ENABLED);
 
@@ -1037,6 +1029,17 @@ public void onEntryUpdated(NotificationEntry entry) {
         mViewBinder.bindWhileAttached(mView, this);
     }
 
+    private TunerService.Tunable mTunable = (key, newValue) -> {
+        switch (key) {
+            case Settings.Secure.NOTIFICATION_HISTORY_ENABLED:
+                mHistoryEnabled = null;  // Invalidate
+                break;
+            case HIGH_PRIORITY:
+                mView.setHighPriorityBeforeSpeedBump("1".equals(newValue));
+                break;
+        }
+    };
+
     public void setApplyHunTranslation(boolean apply) {
         mView.setApplyHunTranslation(apply);
     }
@@ -1488,7 +1491,7 @@ public void setBlurRadius(float blurRadius) {
             mView.setRenderEffect(RenderEffect.createBlurEffect(
                     blurRadius,
                     blurRadius,
-                    Shader.TileMode.CLAMP));
+                    Shader.TileMode.MIRROR));
         } else {
             debugLog("Resetting blur RenderEffect for NotificationStackScrollLayoutController");
             mView.setRenderEffect(null);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java
index 1e04d947f762f..8006657eb9e67 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ViewState.java
@@ -25,6 +25,8 @@
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.util.Property;
 import android.view.View;
@@ -48,6 +50,8 @@
 import kotlin.jvm.functions.Function1;
 
 import java.io.PrintWriter;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
@@ -58,6 +62,19 @@
  */
 public class ViewState implements Dumpable {
 
+    private static final Handler sLayerHandler = new Handler(Looper.getMainLooper());
+    private static final long LAYER_DEBOUNCE_MS = 150;
+    private static final Map<View, Runnable> sPendingLayerChanges = new WeakHashMap<>();
+
+    private static void debouncedSetFaded(View view, Runnable action) {
+        Runnable prev = sPendingLayerChanges.get(view);
+        if (prev != null) {
+            sLayerHandler.removeCallbacks(prev);
+        }
+        sPendingLayerChanges.put(view, action);
+        sLayerHandler.postDelayed(action, LAYER_DEBOUNCE_MS);
+    }
+
     public ViewState() {
         this(physicalNotificationMovement());
     }
@@ -337,7 +354,7 @@ public void applyToView(View view) {
                 FadeOptimizedNotification fadeOptimizedView = (FadeOptimizedNotification) view;
                 boolean isFaded = fadeOptimizedView.isNotificationFaded();
                 if (isFaded != becomesFaded) {
-                    fadeOptimizedView.setNotificationFaded(becomesFaded);
+                    debouncedSetFaded(view, () -> fadeOptimizedView.setNotificationFaded(becomesFaded));
                 }
             } else {
                 boolean newLayerTypeIsHardware = becomesFaded && view.hasOverlappingRendering();
@@ -345,7 +362,7 @@ public void applyToView(View view) {
                 int newLayerType =
                         newLayerTypeIsHardware ? View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE;
                 if (layerType != newLayerType) {
-                    view.setLayerType(newLayerType, null);
+                    debouncedSetFaded(view, () -> view.setLayerType(newLayerType, null));
                 }
             }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
index 318d35ec3bd37..6c4a7b3a409af 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
@@ -686,7 +686,7 @@ private void logCalculateModeForFingerprint(boolean unlockingAllowed, boolean de
         final boolean unlockingAllowed =
                 mUpdateMonitor.isUnlockingWithBiometricAllowed(isStrongBiometric);
         final boolean deviceDreaming = mUpdateMonitor.isDreaming();
-        final boolean bypass = mKeyguardBypassController.getBypassEnabled()
+        final boolean bypass = mKeyguardBypassController.getBypassEnabledBiometric()
                 || mAuthController.isUdfpsFingerDown();
         final boolean isBouncerShowing = mKeyguardViewController.primaryBouncerIsOrWillBeShowing()
                 || mKeyguardTransitionInteractor.getCurrentState()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java
index abc25b7a80bfd..927d68cbb7320 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java
@@ -110,7 +110,6 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba
     private final int mDisplayId;
     private final UserTracker mUserTracker;
     private final boolean mVibrateOnOpening;
-    private final VibrationEffect mCameraLaunchGestureVibrationEffect;
     private final ActivityStarter mActivityStarter;
     private final Lazy<CameraLauncher> mCameraLauncherLazy;
     private final QuickSettingsController mQsController;
@@ -192,8 +191,6 @@ enum PowerButtonLaunchGestureTarget {
         mQSHost = qsHost;
         mKeyguardInteractor = keyguardInteractor;
         mVibrateOnOpening = resources.getBoolean(R.bool.config_vibrateOnIconAnimation);
-        mCameraLaunchGestureVibrationEffect = getCameraGestureVibrationEffect(
-                mVibratorOptional, resources);
         mActivityStarter = activityStarter;
         mEmergencyGestureIntentFactory = emergencyGestureIntentFactory;
         mWalletController = walletController;
@@ -568,35 +565,7 @@ private boolean isWakingUpOrAwake() {
 
     private void vibrateForCameraGesture() {
         mVibratorOptional.ifPresent(
-                v -> v.vibrate(mCameraLaunchGestureVibrationEffect,
-                        HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES));
-    }
-
-    private static VibrationEffect getCameraGestureVibrationEffect(
-            Optional<Vibrator> vibratorOptional, Resources resources) {
-        if (vibratorOptional.isPresent() && vibratorOptional.get().areAllPrimitivesSupported(
-                VibrationEffect.Composition.PRIMITIVE_QUICK_RISE,
-                VibrationEffect.Composition.PRIMITIVE_CLICK)) {
-            return VibrationEffect.startComposition()
-                    .addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_RISE)
-                    .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 1, 50)
-                    .compose();
-        }
-        if (vibratorOptional.isPresent() && vibratorOptional.get().hasAmplitudeControl()) {
-            // Make sure to pass -1 for repeat so VibratorManagerService doesn't stop us when going
-            // to sleep.
-            return VibrationEffect.createWaveform(
-                    CentralSurfaces.CAMERA_LAUNCH_GESTURE_VIBRATION_TIMINGS,
-                    CentralSurfaces.CAMERA_LAUNCH_GESTURE_VIBRATION_AMPLITUDES,
-                    /* repeat= */ -1);
-        }
-
-        int[] pattern = resources.getIntArray(R.array.config_cameraLaunchGestureVibePattern);
-        long[] timings = new long[pattern.length];
-        for (int i = 0; i < pattern.length; i++) {
-            timings[i] = pattern[i];
-        }
-        return VibrationEffect.createWaveform(timings, /* repeat= */ -1);
+                v -> v.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK)));
     }
 
     @VisibleForTesting
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index 75f6112030a2a..e8cc75b1ef858 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -51,13 +51,17 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
 import android.graphics.Point;
 import android.hardware.devicestate.DeviceStateManager;
+import android.hardware.display.DisplayManager;
 import android.metrics.LogMaker;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -70,6 +74,7 @@
 import android.service.notification.StatusBarNotification;
 import android.util.ArraySet;
 import android.util.DisplayMetrics;
+import android.util.DisplayUtils;
 import android.util.EventLog;
 import android.util.IndentingPrintWriter;
 import android.util.Log;
@@ -79,11 +84,15 @@
 import android.view.MotionEvent;
 import android.view.ThreadedRenderer;
 import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.DateTimeView;
+import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
@@ -104,6 +113,7 @@
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.keyguard.ViewMediatorCallback;
 import com.android.systemui.ActivityIntentHelper;
+import com.android.systemui.matrixx.LunarisIdleManager;
 import com.android.systemui.AutoReinflateContainer;
 import com.android.systemui.CoreStartable;
 import com.android.systemui.DejankUtils;
@@ -130,16 +140,20 @@
 import com.android.systemui.demomode.DemoMode;
 import com.android.systemui.demomode.DemoModeController;
 import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent;
+import com.android.systemui.edgelight.EdgeLightViewController;
+import com.android.systemui.nowplaying.NowPlayingViewController;
 import com.android.systemui.emergency.EmergencyGesture;
 import com.android.systemui.emergency.EmergencyGestureModule.EmergencyGestureIntentFactory;
 import com.android.systemui.flags.FeatureFlags;
 import com.android.systemui.fragments.ExtensionFragmentListener;
 import com.android.systemui.fragments.FragmentHostManager;
 import com.android.systemui.fragments.FragmentService;
+import com.android.systemui.keyguard.KeyguardSliceProvider;
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
 import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.keyguard.ScreenLifecycle;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
+import com.android.systemui.media.MediaViewController;
 import com.android.systemui.media.NotificationMediaManager;
 import com.android.systemui.navigationbar.NavigationBarController;
 import com.android.systemui.navigationbar.views.NavigationBarView;
@@ -155,6 +169,7 @@
 import com.android.systemui.plugins.qs.QS;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.power.domain.interactor.PowerInteractor;
+import com.android.systemui.pulse.PulseViewController;
 import com.android.systemui.qs.QSFragmentLegacy;
 import com.android.systemui.qs.QSPanelController;
 import com.android.systemui.qs.composefragment.QSFragmentCompose;
@@ -191,6 +206,7 @@
 import com.android.systemui.statusbar.LiftReveal;
 import com.android.systemui.statusbar.LightRevealScrim;
 import com.android.systemui.statusbar.LockscreenShadeTransitionController;
+import com.android.systemui.statusbar.NotificationListener;
 import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationPresenter;
 import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -218,6 +234,7 @@
 import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule;
 import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.BrightnessMirrorController;
+import com.android.systemui.statusbar.policy.BurnInProtectionController;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
 import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -229,8 +246,11 @@
 import com.android.systemui.statusbar.window.StatusBarWindowStateController;
 import com.android.systemui.surfaceeffects.ripple.RippleShader.RippleShape;
 import com.android.systemui.topui.TopUiController;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.DumpUtilsKt;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.WallpaperController;
+import com.android.systemui.util.WallpaperDepthUtils;
 import com.android.systemui.util.concurrency.DelayableExecutor;
 import com.android.systemui.util.concurrency.MessageRouter;
 import com.android.systemui.util.kotlin.JavaAdapter;
@@ -272,7 +292,11 @@
  * {@link ActivityStarterImpl}
  */
 @SysUISingleton
-public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
+public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces,
+        TunerService.Tunable {
+
+    private static final String PULSE_ON_NEW_TRACKS =
+            Settings.Secure.PULSE_ON_NEW_TRACKS;
 
     private static final int MSG_LAUNCH_TRANSITION_TIMEOUT = 1003;
     // 1020-1040 reserved for BaseStatusBar
@@ -436,6 +460,8 @@ public QSPanelController getQSPanelController() {
     private final StatusBarSignalPolicy mStatusBarSignalPolicy;
     private final StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager;
 
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
     /** Controller for the Shade. */
     private final ShadeSurface mShadeSurface;
     private final ShadeLogger mShadeLogger;
@@ -460,10 +486,20 @@ public QSPanelController getQSPanelController() {
     private final MessageRouter mMessageRouter;
     private final WallpaperManager mWallpaperManager;
     private final UserTracker mUserTracker;
+    private final TunerService mTunerService;
     private final ActivityStarter mActivityStarter;
+    private final MediaViewController mMediaViewController;
+    private final PulseViewController mPulseViewController;
+    private final EdgeLightViewController mEdgeLightViewController;
+    private final NowPlayingViewController mNowPlayingViewController;
+
+    private WallpaperDepthUtils mWallpaperDepthUtils;
 
     private final DisplayMetrics mDisplayMetrics;
 
+    private static final long GC_INTERVAL_MS = 10 * 60 * 1000L; // 10 minutes
+    private long lastGcTime = 0L;
+
     // XXX: gesture research
     private final GestureRecorder mGestureRec = DEBUG_GESTURES
         ? new GestureRecorder("/sdcard/statusbar_gestures.dat")
@@ -575,6 +611,10 @@ public int getId() {
         // Trigger an update for the scrim state when we enter or exit glanceable hub, so that we
         // can transition to/from ScrimState.GLANCEABLE_HUB if needed.
         updateScrimController();
+
+        if (mWallpaperDepthUtils != null) {
+            mWallpaperDepthUtils.onGlanceableHubShowingChanged(idleOnCommunal);
+        }
     };
 
     private boolean mNoAnimationOnNextBarModeChange;
@@ -604,6 +644,8 @@ public int getId() {
 
     private final QuickAccessWalletController mWalletController;
 
+    private final BurnInProtectionController mBurnInProtectionController;
+
     /**
      * Public constructor for CentralSurfaces.
      *
@@ -714,13 +756,20 @@ public CentralSurfacesImpl(
             LightRevealScrim lightRevealScrim,
             AlternateBouncerInteractor alternateBouncerInteractor,
             UserTracker userTracker,
+            TunerService tunerService,
             ActivityStarter activityStarter,
             BrightnessMirrorShowingRepository brightnessMirrorShowingRepository,
             GlanceableHubContainerController glanceableHubContainerController,
             EmergencyGestureIntentFactory emergencyGestureIntentFactory,
             QuickAccessWalletController walletController,
             WindowManager windowManager,
-            WindowManagerProvider windowManagerProvider
+            WindowManagerProvider windowManagerProvider,
+            MediaViewController mediaViewController,
+            PulseViewController pulseViewController,
+            EdgeLightViewController edgeLightViewController,
+            NowPlayingViewController nowPlayingViewController,
+            WallpaperDepthUtils wallpaperDepthUtils,
+            BurnInProtectionController burnInProtectionController
     ) {
         mContext = context;
         mNotificationsController = notificationsController;
@@ -812,6 +861,7 @@ public CentralSurfacesImpl(
         mCameraLauncherLazy = cameraLauncherLazy;
         mAlternateBouncerInteractor = alternateBouncerInteractor;
         mUserTracker = userTracker;
+        mTunerService = tunerService;
         mActivityStarter = activityStarter;
         mBrightnessMirrorShowingRepository = brightnessMirrorShowingRepository;
         if (!SceneContainerFlag.isEnabled()) {
@@ -834,6 +884,7 @@ public CentralSurfacesImpl(
             statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);
         }
         mScreenOffAnimationController = screenOffAnimationController;
+        mBurnInProtectionController = burnInProtectionController;
 
         ShadeExpansionListener shadeExpansionListener = this::onPanelExpansionChanged;
         ShadeExpansionChangeEvent currentState =
@@ -865,6 +916,11 @@ public CentralSurfacesImpl(
 
         mWindowManager = windowManager;
         mWindowManagerProvider = windowManagerProvider;
+        mMediaViewController = mediaViewController;
+        mPulseViewController = pulseViewController;
+        mEdgeLightViewController = edgeLightViewController;
+        mNowPlayingViewController = nowPlayingViewController;
+        mWallpaperDepthUtils = wallpaperDepthUtils;
     }
 
     private void initBubbles(Bubbles bubbles) {
@@ -919,6 +975,8 @@ public void start() {
 
         createAndAddWindows(result);
 
+        mTunerService.addTunable(this, PULSE_ON_NEW_TRACKS);
+
         // Set up the initial notification state. This needs to happen before CommandQueue.disable()
         setUpPresenter();
 
@@ -1103,6 +1161,67 @@ public void onHoldStatusBarOpenChange() {
                 (requestTopUi, componentTag) -> mMainExecutor.execute(
                         () -> mTopUiController.setRequestTopUi(requestTopUi, componentTag)
                 )));
+
+        attachCustomOverlays();
+    }
+
+     private ViewGroup getScrimOverlayContainer() {
+        ViewGroup root = (ViewGroup) getNotificationShadeWindowView();
+
+        FrameLayout container = root.findViewById(R.id.custom_overlay_container);
+        if (container != null) {
+            return container;
+        }
+
+        container = new FrameLayout(mContext);
+        container.setId(R.id.custom_overlay_container);
+        container.setLayoutParams(new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+
+        View scrimInFront = root.findViewById(R.id.scrim_in_front);
+        int scrimIndex = Math.max(root.indexOfChild(scrimInFront) - 3, 0);
+        root.addView(container, scrimIndex);
+
+        return container;
+    }
+
+    private void attachCustomOverlays() {
+        ViewGroup overlay = getScrimOverlayContainer();
+        ViewGroup root = (ViewGroup) getNotificationShadeWindowView();
+
+        detachFromParent(mMediaViewController.getMediaArtScrim());
+        detachFromParent(mPulseViewController.getPulseView());
+        detachFromParent(mEdgeLightViewController.getEdgeLightView());
+        detachFromParent(mNowPlayingViewController.getNowPlayingView());
+
+        // Place Media Art in the true background (behind the lock screen scrim and clock)
+        View scrimBehind = root.findViewById(R.id.scrim_behind);
+        int scrimBehindIndex = Math.max(root.indexOfChild(scrimBehind), 0);
+        root.addView(mMediaViewController.getMediaArtScrim(), scrimBehindIndex,
+                new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+        root.addView(mPulseViewController.getPulseView(), scrimBehindIndex + 1,
+                new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+        overlay.addView(mEdgeLightViewController.getEdgeLightView(),
+                new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+        overlay.addView(mNowPlayingViewController.getNowPlayingView(),
+                new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+    }
+
+    private static void detachFromParent(View v) {
+        if (v == null) return;
+        final ViewParent p = v.getParent();
+        if (p instanceof ViewGroup) {
+            ((ViewGroup) p).removeView(v);
+        }
     }
 
     @VisibleForTesting
@@ -1234,6 +1353,7 @@ protected void makeStatusBarView(@Nullable RegisterStatusBarResult result) {
                         mShadeSurface.updateExpansionAndVisibility();
                         setBouncerShowingForStatusBarComponents(mBouncerShowing);
                         checkBarModes();
+                        mBurnInProtectionController.setPhoneStatusBarView(mPhoneStatusBarViewController.getPhoneStatusBarView());
                     });
         }
         if (!StatusBarRootModernization.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) {
@@ -1289,6 +1409,25 @@ public void hide() {
             mScrimController.attachViews(scrimBehind, notificationsScrim, scrimInFront);
         }
 
+        // Setup depth wallpaper view - insert between clock and notifications
+        // Z-order: wallpaper -> clock -> depth image -> notifications
+        ViewGroup root = getNotificationShadeWindowView();
+        View depthWallpaperView = mWallpaperDepthUtils.getDepthWallpaperView();
+        if (depthWallpaperView.getParent() == null) {
+            root.setClipChildren(false);
+            root.setClipToPadding(false);
+            // Insert after KeyguardRootView (clock) but before SharedNotificationContainer
+            View keyguardRootView = root.findViewById(R.id.keyguard_root_view);
+            int insertIndex = root.indexOfChild(keyguardRootView) + 1;
+            root.addView(depthWallpaperView, insertIndex);
+        }
+        ScrimUtils.get(mContext).setWallpaperDepthUtils(mWallpaperDepthUtils);
+        mWallpaperDepthUtils.updateDepthWallpaper();
+        mWallpaperDepthUtils.updateDepthWallpaperVisibility();
+        depthWallpaperView.postDelayed(() -> {
+            mWallpaperDepthUtils.updateDepthWallpaperVisibility();
+        }, 500);
+
         mLightRevealScrim.setScrimOpaqueChangedListener((opaque) -> {
             Runnable updateOpaqueness = () -> {
                 mNotificationShadeWindowController.setLightRevealScrimOpaque(
@@ -2018,8 +2157,11 @@ void updateResources() {
             mStatusBarKeyguardViewManager.updateResources();
         }
 
-        mPowerButtonReveal = new PowerButtonReveal(mContext.getResources().getDimensionPixelSize(
-                com.android.systemui.res.R.dimen.physical_power_button_center_screen_location_y));
+        final float scaleFactor = DisplayUtils.getScaleFactor(mContext);
+        int positionY = (int) (scaleFactor * mContext.getResources().getDimensionPixelSize(
+                R.dimen.physical_power_button_center_screen_location_y));
+
+        mPowerButtonReveal = new PowerButtonReveal(positionY);
     }
 
     private void logStateToEventlog() {
@@ -2552,6 +2694,8 @@ public void onFinishedGoingToSleep() {
 
             updateNotificationPanelTouchState();
             getNotificationShadeWindowViewController().cancelCurrentTouch();
+
+            mBurnInProtectionController.stopShiftTimer();
             if (mLaunchCameraOnFinishedGoingToSleep) {
                 mLaunchCameraOnFinishedGoingToSleep = false;
 
@@ -2579,6 +2723,8 @@ && launchWalletViaSysuiCallbacks()) {
                         () -> mCommandQueueCallbacks.onEmergencyActionLaunchGestureDetected());
             }
             updateIsKeyguard();
+            // make sure we do garbage collection at screen off but delay it to avoid black wallpaper
+            mHandler.postDelayed(mSystemUiGcOpt, 5000);
         }
 
         @Override
@@ -2604,6 +2750,14 @@ public void onStartedGoingToSleep() {
             }
 
             DejankUtils.stopDetectingBlockingIpcs(tag);
+            if (Settings.Secure.getInt(mContext.getContentResolver(),
+                    Settings.Secure.IDLE_MANAGER, 1) == 1) {
+                LunarisIdleManager.initManager(mContext);
+                LunarisIdleManager mgr = LunarisIdleManager.getInstance();
+                if (mgr != null && !mgr.isRunning()) {
+                    mgr.executeManager();
+                }
+            }
         }
 
         @Override
@@ -2627,6 +2781,11 @@ public void onStartedWakingUp() {
                 }
             });
             DejankUtils.stopDetectingBlockingIpcs(tag);
+            mHandler.removeCallbacks(mSystemUiGcOpt);
+            LunarisIdleManager mgr = LunarisIdleManager.getInstance();
+            if (mgr != null) {
+                mgr.haltManager();
+            }
         }
 
         /**
@@ -2691,6 +2850,21 @@ && launchWalletViaSysuiCallbacks()) {
                 }
             }
             updateScrimController();
+            mBurnInProtectionController.startShiftTimer();
+        }
+    };
+
+    private final Runnable mSystemUiGcOpt = new Runnable() {
+        @Override
+        public void run() {
+            long currentTime = System.currentTimeMillis();
+            if (lastGcTime == 0L || currentTime - lastGcTime > GC_INTERVAL_MS) {
+                Log.v("GcOpt", "performing garbage collection for SystemUI");
+                System.gc();
+                System.runFinalization();
+                System.gc();
+                lastGcTime = currentTime;
+            }
         }
     };
 
@@ -2726,12 +2900,14 @@ public void onScreenTurnedOn() {
             }
 
             mScrimController.onScreenTurnedOn();
+            ScrimUtils.get(mContext).onScreenStateChange();
         }
 
         @Override
         public void onScreenTurnedOff() {
             Trace.beginSection("CentralSurfaces#onScreenTurnedOff");
             mFalsingCollector.onScreenOff();
+            ScrimUtils.get(mContext).onScreenStateChange();
             if (!SceneContainerFlag.isEnabled()) {
                 mScrimController.onScreenTurnedOff();
             }
@@ -2887,6 +3063,21 @@ public boolean shouldIgnoreTouch() {
                 || mScreenOffAnimationController.shouldIgnoreKeyguardTouches();
     }
 
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case PULSE_ON_NEW_TRACKS:
+                boolean showPulseOnNewTracks =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                KeyguardSliceProvider sliceProvider = KeyguardSliceProvider.getAttachedInstance();
+                if (sliceProvider != null)
+                    sliceProvider.setPulseOnNewTracks(showPulseOnNewTracks);
+                break;
+            default:
+                break;
+         }
+    }
+
     // Begin Extra BaseStatusBar methods.
 
     protected final CommandQueue mCommandQueue;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt
index a941b3a4d8b9b..e348f1f2590a5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt
@@ -61,24 +61,25 @@ constructor(@Assisted private val context: Context) :
         fontWeightAdjustment = currentConfig.fontWeightAdjustment
     }
 
-    override fun notifyThemeChanged() {
+    private inline fun forEachListener(block: (ConfigurationListener) -> Unit) {
         // Avoid concurrent modification exception
-        val listeners = synchronized(this.listeners) { ArrayList(this.listeners) }
+        val snapshot = synchronized(listeners) { listeners.toList() }
+        snapshot.filterNotNull().forEach(block)
+    }
 
-        listeners.filterForEach({ this.listeners.contains(it) }) { it.onThemeChanged() }
+    override fun notifyThemeChanged() {
+        forEachListener { it.onThemeChanged() }
     }
 
     override fun dispatchOnMovedToDisplay(newDisplayId: Int, newConfiguration: Configuration) {
-        val listeners = synchronized(this.listeners) { ArrayList(this.listeners) }
-        listeners.filterForEach({ this.listeners.contains(it) }) {
+        forEachListener {
             it.onMovedToDisplay(newDisplayId, newConfiguration)
         }
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         // Avoid concurrent modification exception
-        val listeners = synchronized(this.listeners) { ArrayList(this.listeners) }
-        listeners.filterForEach({ this.listeners.contains(it) }) { it.onConfigChanged(newConfig) }
+        forEachListener { it.onConfigChanged(newConfig) }
         val fontScale = newConfig.fontScale
         val density = newConfig.densityDpi
         val uiMode = newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK
@@ -86,7 +87,7 @@ constructor(@Assisted private val context: Context) :
         val uiModeChanged = uiMode != this.uiMode
         if (density != this.density || fontScale != this.fontScale || inCarMode && uiModeChanged
             || fontWeightAdjustment != this.fontWeightAdjustment) {
-            listeners.filterForEach({ this.listeners.contains(it) }) {
+            forEachListener {
                 it.onDensityOrFontScaleChanged()
             }
             this.density = density
@@ -97,7 +98,7 @@ constructor(@Assisted private val context: Context) :
         val smallestScreenWidth = newConfig.smallestScreenWidthDp
         if (smallestScreenWidth != this.smallestScreenWidth) {
             this.smallestScreenWidth = smallestScreenWidth
-            listeners.filterForEach({ this.listeners.contains(it) }) {
+            forEachListener {
                 it.onSmallestScreenWidthChanged()
             }
         }
@@ -109,13 +110,13 @@ constructor(@Assisted private val context: Context) :
             // would be a direct reference to windowConfiguration.maxBounds, so the if statement
             // above would always fail. See b/245799099 for more information.
             this.maxBounds.set(maxBounds)
-            listeners.filterForEach({ this.listeners.contains(it) }) { it.onMaxBoundsChanged() }
+            forEachListener { it.onMaxBoundsChanged() }
         }
 
         val localeList = newConfig.locales
         if (localeList != this.localeList) {
             this.localeList = localeList
-            listeners.filterForEach({ this.listeners.contains(it) }) { it.onLocaleListChanged() }
+            forEachListener { it.onLocaleListChanged() }
         }
 
         if (uiModeChanged) {
@@ -124,35 +125,37 @@ constructor(@Assisted private val context: Context) :
             context.theme.applyStyle(context.themeResId, true)
 
             this.uiMode = uiMode
-            listeners.filterForEach({ this.listeners.contains(it) }) { it.onUiModeChanged() }
+            forEachListener { it.onUiModeChanged() }
         }
 
         if (layoutDirection != newConfig.layoutDirection) {
             layoutDirection = newConfig.layoutDirection
-            listeners.filterForEach({ this.listeners.contains(it) }) {
+            forEachListener {
                 it.onLayoutDirectionChanged(layoutDirection == LAYOUT_DIRECTION_RTL)
             }
         }
 
         if (lastConfig.updateFrom(newConfig) and ActivityInfo.CONFIG_ASSETS_PATHS != 0) {
-            listeners.filterForEach({ this.listeners.contains(it) }) { it.onThemeChanged() }
+            forEachListener { it.onThemeChanged() }
         }
 
         val newOrientation = newConfig.orientation
         if (orientation != newOrientation) {
             orientation = newOrientation
-            listeners.filterForEach({ this.listeners.contains(it) }) {
+            forEachListener {
                 it.onOrientationChanged(orientation)
             }
         }
     }
 
     override fun addCallback(listener: ConfigurationListener) {
+        if (listener == null) return
         synchronized(listeners) { listeners.add(listener) }
         listener.onDensityOrFontScaleChanged()
     }
 
     override fun removeCallback(listener: ConfigurationListener) {
+        if (listener == null) return
         synchronized(listeners) { listeners.remove(listener) }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java
index 09cf935df8935..3aefc20b7e2c2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DarkIconDispatcherImpl.java
@@ -18,10 +18,15 @@
 import static com.android.systemui.plugins.DarkIconDispatcher.getTint;
 
 import android.animation.ArgbEvaluator;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.database.ContentObserver;
 import android.graphics.Color;
 import android.graphics.Rect;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.ArrayMap;
 import android.view.Display;
 import android.widget.ImageView;
@@ -30,6 +35,8 @@
 import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.LifecycleListener;
 import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDisplaySingleton;
 import com.android.systemui.dump.DumpManager;
+import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.settingslib.Utils;
 
 import kotlinx.coroutines.flow.FlowKt;
 import kotlinx.coroutines.flow.MutableStateFlow;
@@ -45,12 +52,16 @@
  */
 @PerDisplaySingleton
 public class DarkIconDispatcherImpl implements SysuiDarkIconDispatcher,
-        LightBarTransitionsController.DarkIntensityApplier, LifecycleListener {
+        LightBarTransitionsController.DarkIntensityApplier, LifecycleListener,
+        ConfigurationController.ConfigurationListener {
 
     private final LightBarTransitionsController mTransitionsController;
     private final ArrayList<Rect> mTintAreas = new ArrayList<>();
     private final ArrayMap<Object, DarkReceiver> mReceivers = new ArrayMap<>();
     private final DumpManager mDumpManager;
+    private final Context mContext;
+    private final ContentObserver mSettingsObserver;
+    private final ConfigurationController mConfigurationController;
 
     private int mIconTint = DEFAULT_ICON_TINT;
     private int mContrastTint = DEFAULT_INVERSE_ICON_TINT;
@@ -72,8 +83,20 @@ public DarkIconDispatcherImpl(
             @DisplayAware int displayId,
             @DisplayAware Context context,
             LightBarTransitionsController.Factory lightBarTransitionsControllerFactory,
-            DumpManager dumpManager) {
+            DumpManager dumpManager,
+            ConfigurationController configurationController) {
+        mContext = context;
         mDumpManager = dumpManager;
+        mConfigurationController = configurationController;
+        
+        // Create ContentObserver to watch for setting changes
+        mSettingsObserver = new ContentObserver(new Handler()) {
+            @Override
+            public void onChange(boolean selfChange) {
+                // Re-apply dark intensity when setting changes
+                applyDarkIntensity(mDarkIntensity);
+            }
+        };
         if (newStatusBarIcons()) {
             mDarkModeIconColorSingleTone = Color.BLACK;
             mLightModeIconColorSingleTone = Color.WHITE;
@@ -88,11 +111,27 @@ public DarkIconDispatcherImpl(
 
         mDumpableName = getDumpableName(displayId);
         dumpManager.registerNormalDumpable(mDumpableName, this);
+        
+        // Register ContentObserver to watch for setting changes
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT),
+                false, mSettingsObserver, UserHandle.USER_ALL);
+        
+        // Register ConfigurationListener to watch for theme changes
+        mConfigurationController.addCallback(this);
+        
+        // Apply initial tinting to ensure persistence after reboot
+        // Use a post to ensure ContentResolver is fully initialized
+        new Handler().post(() -> applyDarkIntensity(0.0f));
     }
 
     @Override
     public void stop() {
         mDumpManager.unregisterDumpable(mDumpableName);
+        // Unregister ContentObserver
+        mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
+        // Unregister ConfigurationListener
+        mConfigurationController.removeCallback(this);
     }
 
     private String getDumpableName(int displayId) {
@@ -160,10 +199,25 @@ public void applyDarkIntensity(float darkIntensity) {
         mDarkIntensity = darkIntensity;
         ArgbEvaluator evaluator = ArgbEvaluator.getInstance();
 
-        mIconTint = (int) evaluator.evaluate(darkIntensity,
-                mLightModeIconColorSingleTone, mDarkModeIconColorSingleTone);
-        mContrastTint = (int) evaluator
-                .evaluate(darkIntensity, mLightModeContrastColor, mDarkModeContrastColor);
+        // Check if accent color tinting is enabled
+        boolean useAccentColor = Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT,
+                0,
+                UserHandle.USER_CURRENT) == 1;
+
+        if (useAccentColor) {
+            // Use system accent color for tinting
+            int accentColor = Utils.getColorAccentDefaultColor(mContext);
+            mIconTint = accentColor;
+            mContrastTint = accentColor;
+        } else {
+            // Use default behavior
+            mIconTint = (int) evaluator.evaluate(darkIntensity,
+                    mLightModeIconColorSingleTone, mDarkModeIconColorSingleTone);
+            mContrastTint = (int) evaluator
+                    .evaluate(darkIntensity, mLightModeContrastColor, mDarkModeContrastColor);
+        }
 
         applyIconTint();
     }
@@ -181,6 +235,12 @@ private void applyIconTint() {
         }
     }
 
+    @Override
+    public void onThemeChanged() {
+        // Re-apply dark intensity when theme changes to update accent color
+        applyDarkIntensity(mDarkIntensity);
+    }
+
     @Override
     public void dump(PrintWriter pw, String[] args) {
         pw.println("DarkIconDispatcher: ");
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
index 13c6204017c0d..9f7268c4bad4f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java
@@ -176,12 +176,6 @@ public void dispatchDemoCommand(String command, Bundle args) {
                     ? R.drawable.stat_sys_data_bluetooth_connected : 0;
             updateSlot("bluetooth", null, iconId);
         }
-        String location = args.getString("location");
-        if (location != null) {
-            int iconId = location.equals("show") ? PhoneStatusBarPolicy.LOCATION_STATUS_ICON_ID
-                    : 0;
-            updateSlot("location", null, iconId);
-        }
         String alarm = args.getString("alarm");
         if (alarm != null) {
             int iconId = alarm.equals("show") ? R.drawable.stat_sys_alarm
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index 2b5813eca47d0..b4d3aacccc213 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -96,9 +96,9 @@ public class DozeParameters implements
     private final SecureSettings mSecureSettings;
     private final Optional<MinModeManager> mMinModeManager;
 
-    private boolean mDozeAlwaysOn;
     private boolean mControlScreenOffAnimation;
     private boolean mIsQuickPickupEnabled;
+    private boolean mScreenOffPeekActive;
 
     private boolean mKeyguardVisible;
     @VisibleForTesting
@@ -164,6 +164,7 @@ protected DozeParameters(
         tunerService.addTunable(
                 this,
                 Settings.Secure.DOZE_ALWAYS_ON,
+                Settings.Secure.DOZE_PEEK,
                 Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);
         configurationController.addCallback(this);
         statusBarStateController.addCallback(this);
@@ -261,6 +262,10 @@ public int getQuickPickupAodDuration() {
      * @return duration in millis.
      */
     public long getWallpaperAodDuration() {
+        if (mScreenOffPeekActive) {
+            return mAmbientDisplayConfiguration.getScreenOffPeekDurationMillis(
+                    mUserTracker.getUserId());
+        }
         if (shouldControlScreenOff()) {
             return DozeScreenState.ENTER_DOZE_HIDE_WALLPAPER_DELAY;
         }
@@ -289,7 +294,30 @@ public boolean isMinModeActive() {
      * @return {@code true} if enabled and available.
      */
     public boolean getAlwaysOn() {
-        return (mDozeAlwaysOn && !mBatteryController.isAodPowerSave()) || isMinModeActive();
+        return ((mAmbientDisplayConfiguration.alwaysOnEnabled(mUserTracker.getUserId())
+                || mScreenOffPeekActive)
+                && !mBatteryController.isAodPowerSave())
+                || isMinModeActive();
+    }
+
+    public boolean shouldShowAodUi() {
+        return getAlwaysOn()
+                || mAmbientDisplayConfiguration.screenOffPeekEnabled(mUserTracker.getUserId());
+    }
+
+    public void setScreenOffPeekActive(boolean active) {
+        if (mScreenOffPeekActive == active) {
+            return;
+        }
+        mScreenOffPeekActive = active;
+        updateControlScreenOff();
+        dispatchAlwaysOnEvent();
+    }
+
+    private boolean shouldUseScreenOffAnimationAod() {
+        return (mAmbientDisplayConfiguration.alwaysOnEnabled(mUserTracker.getUserId())
+                && !mBatteryController.isAodPowerSave())
+                || isMinModeActive();
     }
 
     /**
@@ -325,7 +353,8 @@ public void setControlScreenOffAnimation(boolean controlScreenOffAnimation) {
     public void updateControlScreenOff() {
         if (!getDisplayNeedsBlanking()) {
             final boolean controlScreenOff =
-                    getAlwaysOn() && (mKeyguardVisible || shouldControlUnlockedScreenOff());
+                    shouldUseScreenOffAnimationAod()
+                            && (mKeyguardVisible || shouldControlUnlockedScreenOff());
             setControlScreenOffAnimation(controlScreenOff);
         }
     }
@@ -335,7 +364,7 @@ public void updateControlScreenOff() {
      * possible if AOD isn't even enabled or if the display needs blanking.
      */
     public boolean canControlUnlockedScreenOff() {
-        return getAlwaysOn() && !getDisplayNeedsBlanking();
+        return shouldUseScreenOffAnimationAod() && !getDisplayNeedsBlanking();
     }
 
     /**
@@ -376,6 +405,9 @@ public boolean shouldAnimateDozingChange() {
      * delayed for a few seconds. This might be useful to play animations without reducing FPS.
      */
     public boolean shouldDelayDisplayDozeTransition() {
+        if (!shouldUseScreenOffAnimationAod()) {
+            return false;
+        }
         if (mTransitionInteractor.getTransitionState().getValue().getTo() == KeyguardState.AOD) {
             return true;
         }
@@ -448,9 +480,8 @@ public String[] brightnessNames() {
 
     @Override
     public void onTuningChanged(String key, String newValue) {
-        mDozeAlwaysOn = mAmbientDisplayConfiguration.alwaysOnEnabled(mUserTracker.getUserId());
-
-        if (key.equals(Settings.Secure.DOZE_ALWAYS_ON)) {
+        if (key.equals(Settings.Secure.DOZE_ALWAYS_ON)
+                || key.equals(Settings.Secure.DOZE_PEEK)) {
             updateControlScreenOff();
         }
 
@@ -518,6 +549,8 @@ private final class SettingsObserver extends ContentObserver {
                 Settings.Secure.getUriFor(Settings.Secure.DOZE_PICK_UP_GESTURE);
         private final Uri mAlwaysOnEnabled =
                 Settings.Secure.getUriFor(Settings.Secure.DOZE_ALWAYS_ON);
+        private final Uri mDozePeekEnabled =
+                Settings.Secure.getUriFor(Settings.Secure.DOZE_PEEK);
         private final Context mContext;
 
         private final Handler mHandler;
@@ -536,6 +569,8 @@ void observe() {
             mSecureSettings.registerContentObserverForUserAsync(mPickupGesture,
                     this, UserHandle.USER_ALL);
             mSecureSettings.registerContentObserverForUserAsync(mAlwaysOnEnabled,
+                    this, UserHandle.USER_ALL);
+            mSecureSettings.registerContentObserverForUserAsync(mDozePeekEnabled,
                     this, UserHandle.USER_ALL,
                     // The register calls are called in order, so this ensures that update()
                     // is called after them all and value retrieval isn't racy.
@@ -551,7 +586,8 @@ public void update(Uri uri) {
             if (uri == null
                     || mQuickPickupGesture.equals(uri)
                     || mPickupGesture.equals(uri)
-                    || mAlwaysOnEnabled.equals(uri)) {
+                    || mAlwaysOnEnabled.equals(uri)
+                    || mDozePeekEnabled.equals(uri)) {
                 // the quick pickup gesture is dependent on alwaysOn being disabled and
                 // the pickup gesture being enabled
                 updateQuickPickupEnabled();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
index fd706f052e12b..e6e66ac30ac19 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
@@ -64,6 +64,7 @@
 import com.android.systemui.util.Assert;
 import com.android.systemui.util.CopyOnLoopListenerSet;
 import com.android.systemui.util.IListenerSet;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.kotlin.JavaAdapterKt;
 
 import dagger.Lazy;
@@ -297,6 +298,7 @@ void updateDozing() {
         for (Callback callback : mCallbacks) {
             callback.onDozingChanged(dozing);
         }
+        ScrimUtils.get().onDozingChanged(dozing);
         mDozeInteractor.setIsDozing(dozing);
         mStatusBarStateController.setIsDozing(dozing);
     }
@@ -340,6 +342,7 @@ public void onPulseFinished() {
             }
 
             private void setPulsing(boolean pulsing) {
+                ScrimUtils.get().setPulsing(pulsing);
                 mStatusBarKeyguardViewManager.setPulsing(pulsing);
                 mShadeLockscreenInteractor.setPulsing(pulsing);
                 mStatusBarStateController.setPulsing(pulsing);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockController.kt
new file mode 100644
index 0000000000000..077b218877c2d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockController.kt
@@ -0,0 +1,27 @@
+package com.android.systemui.statusbar.phone
+
+class FaceUnlockController private constructor() {
+
+    private var faceUnlockImageView: FaceUnlockImageView? = null
+
+    fun setFaceUnlockView(view: FaceUnlockImageView) {
+        faceUnlockImageView = view
+    }
+
+    fun setBouncerState(state: FaceUnlockImageView.State) {
+        faceUnlockImageView?.postDelayed({
+            faceUnlockImageView?.setState(state)
+        }, 100)
+    }
+
+    companion object {
+        @Volatile
+        private var instance: FaceUnlockController? = null
+
+        fun getInstance(): FaceUnlockController {
+            return instance ?: synchronized(this) {
+                instance ?: FaceUnlockController().also { instance = it }
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockImageView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockImageView.kt
new file mode 100644
index 0000000000000..cfb9e822a334d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockImageView.kt
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2023 the risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.phone
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.animation.PropertyValuesHolder
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.Configuration
+import android.graphics.Color
+import android.os.AsyncTask
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.LinearInterpolator
+import android.view.animation.OvershootInterpolator
+
+import androidx.core.animation.doOnEnd
+import androidx.core.animation.doOnCancel
+
+import com.android.systemui.Dependency
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+
+import com.android.systemui.res.R
+
+class FaceUnlockImageView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : ImageView(context, attrs, defStyleAttr) {
+
+    enum class State {
+        SCANNING, NOT_VERIFIED, SUCCESS, HIDDEN
+    }
+
+    private val DELAY_HIDE_DURATION = 1500
+    private var currentState: State = State.HIDDEN
+    private var colorState: ColorStateList? = null
+    private val startAnimation: ObjectAnimator = createScaleAnimation(start = true)
+    private val dismissAnimation: ObjectAnimator = createScaleAnimation(start = false)
+    private val scanningAnimation: ObjectAnimator = createScanningAnimation()
+    private val successAnimation: ObjectAnimator = createSuccessRotationAnimation()
+    private val failureShakeAnimation: ObjectAnimator = createShakeAnimation(10f)
+    private val vibrator: Vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+    private val animations = listOf(failureShakeAnimation, dismissAnimation, scanningAnimation, successAnimation, startAnimation)
+    private var mDozing = false
+    private val statusBarStateController: StatusBarStateController = Dependency.get(StatusBarStateController::class.java)
+
+    private val statusBarStateListener = object : StatusBarStateController.StateListener {
+        override fun onStateChanged(newState: Int) {}
+
+        override fun onDozingChanged(dozing: Boolean) {
+            if (mDozing == dozing) {
+                return
+            }
+            mDozing = dozing
+            if (mDozing) {
+                visibility = View.GONE
+            }
+        }
+    }
+
+    init {
+        visibility = View.GONE
+        updateFaceIconState()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        FaceUnlockProxy.INSTANCE().setFaceUnlockView(this)
+        updateColor()
+        statusBarStateController.addCallback(statusBarStateListener)
+        statusBarStateListener.onDozingChanged(statusBarStateController.isDozing())
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        statusBarStateController.removeCallback(statusBarStateListener)
+    }
+
+    fun updateColor() {
+        imageTintList = ColorStateList.valueOf(Color.WHITE)
+        backgroundTintList = ColorStateList.valueOf(Color.parseColor("#99000000"))
+    }
+
+    fun setState(state: State) {
+        if (currentState != state) {
+            currentState = state
+            updateFaceIconState()
+            handleAnimationForState(state)
+        }
+    }
+
+    fun updateFaceIconState() {
+        if (mDozing) {
+            visibility = View.GONE
+            return
+        }
+        setImageResource(when (currentState) {
+            State.SCANNING -> R.drawable.face_scanning
+            State.NOT_VERIFIED -> R.drawable.face_not_verified
+            State.SUCCESS -> R.drawable.face_success
+            State.HIDDEN -> R.drawable.face_scanning
+        })
+    }
+
+    private fun createScanningAnimation(): ObjectAnimator {
+        val scaleX = PropertyValuesHolder.ofFloat(View.SCALE_X, 1f, 1.2f, 1f)
+        val scaleY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1f, 1.2f, 1f)
+        return ObjectAnimator.ofPropertyValuesHolder(this, scaleX, scaleY).apply {
+            duration = 1000
+            repeatCount = ObjectAnimator.INFINITE
+            interpolator = LinearInterpolator()
+        }
+    }
+
+    private fun createSuccessRotationAnimation(): ObjectAnimator {
+        return ObjectAnimator.ofFloat(this, View.ROTATION_Y, 0f, 360f).apply {
+            duration = 800
+            interpolator = AccelerateDecelerateInterpolator()
+        }
+    }
+
+    private fun createShakeAnimation(amplitude: Float): ObjectAnimator {
+        return ObjectAnimator.ofFloat(this, View.TRANSLATION_X, 0f, amplitude, -amplitude, amplitude, -amplitude, 0f).apply {
+            duration = 500
+            interpolator = AccelerateDecelerateInterpolator()
+        }
+    }
+
+    private fun createScaleAnimation(start: Boolean): ObjectAnimator {
+        val startScale = if (start) 0f else 1f
+        val endScale = if (start) 1f else 0f
+        val scaleX = PropertyValuesHolder.ofFloat(View.SCALE_X, startScale, endScale)
+        val scaleY = PropertyValuesHolder.ofFloat(View.SCALE_Y, startScale, endScale)
+        return ObjectAnimator.ofPropertyValuesHolder(this, scaleX, scaleY).apply {
+            duration = 500
+            interpolator = AccelerateDecelerateInterpolator()
+            if (!start) {
+                doOnEnd { visibility = View.GONE }
+            }
+        }
+    }
+
+    private fun vibrate(effect: Int) {
+        if (mDozing) {
+            return
+        }
+        post {
+            val vibrationEffect = VibrationEffect.createPredefined(effect)
+            vibrator.vibrate(vibrationEffect)
+        }
+    }
+
+    private fun cancelAllAnimations() {
+        animations.forEach { it.cancel() }
+    }
+
+    private fun handleAnimationForState(state: State) {
+        if (mDozing) {
+            visibility = View.GONE
+            return
+        }
+        cancelAllAnimations()
+        if (state == State.SCANNING) {
+            visibility = View.VISIBLE
+        }
+        when (state) {
+            State.SCANNING -> startAnimationChain(startAnimation, scanningAnimation)
+            State.NOT_VERIFIED -> {
+                startAnimationChain(failureShakeAnimation, dismissAnimation)
+                vibrate(VibrationEffect.EFFECT_DOUBLE_CLICK)
+            }
+            State.SUCCESS -> {
+                startAnimationChain(successAnimation, dismissAnimation)
+                vibrate(VibrationEffect.EFFECT_CLICK)
+            }
+            State.HIDDEN -> dismissAnimation.start()
+        }
+    }
+
+    private fun startAnimationChain(first: ObjectAnimator, next: ObjectAnimator) {
+        first.startWithEndAction { next.start() }
+    }
+
+    private fun ObjectAnimator.startWithEndAction(endAction: () -> Unit) {
+        addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                endAction()
+            }
+        })
+        start()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockProxy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockProxy.java
new file mode 100644
index 0000000000000..c4ac749f852b2
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FaceUnlockProxy.java
@@ -0,0 +1,8 @@
+package com.android.systemui.statusbar.phone;
+
+public class FaceUnlockProxy {
+    public static FaceUnlockController INSTANCE() {
+        return FaceUnlockController.Companion.getInstance();
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
index cd8977b26e2aa..3deb4f90ed471 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
@@ -118,6 +118,8 @@ constructor(
             notifyListeners()
         }
 
+    var bypassEnabledBiometric: Boolean = false
+
     var bouncerShowing: Boolean = false
     var launchingAffordance: Boolean = false
     var qsExpanded = false
@@ -155,7 +157,7 @@ constructor(
                     1
                 else 0
             tunerService.addTunable(
-                { key, _ -> bypassEnabled = tunerService.getValue(key, dismissByDefault) != 0 },
+                { key, _ -> bypassEnabledBiometric = tunerService.getValue(key, dismissByDefault) != 0 },
                 Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD,
             )
             lockscreenUserManager.addUserChangedListener(
@@ -198,8 +200,8 @@ constructor(
         biometricSourceType: BiometricSourceType,
         isStrongBiometric: Boolean,
     ): Boolean {
-        if (biometricSourceType == BiometricSourceType.FACE && bypassEnabled) {
-            val can = canBypass()
+        if (bypassEnabledBiometric) {
+            val can = biometricSourceType != BiometricSourceType.FACE || canBypass()
             if (!can && (isPulseExpanding || qsExpanded)) {
                 pendingUnlock = PendingUnlock(biometricSourceType, isStrongBiometric)
             }
@@ -227,7 +229,7 @@ constructor(
 
     /** If keyguard can be dismissed because of bypass. */
     fun canBypass(): Boolean {
-        if (bypassEnabled) {
+        if (bypassEnabledBiometric) {
             return when {
                 bouncerShowing -> true
                 keyguardTransitionInteractor.getCurrentState() == KeyguardState.ALTERNATE_BOUNCER ->
@@ -261,6 +263,7 @@ constructor(
             pw.println("  mPendingUnlock: $pendingUnlock")
         }
         pw.println("  bypassEnabled: $bypassEnabled")
+        pw.println("  bypassEnabledBiometric: $bypassEnabledBiometric")
         pw.println("  canBypass: ${canBypass()}")
         pw.println("  bouncerShowing: $bouncerShowing")
         pw.println(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
index e169364c7fe40..74b0bb9dab349 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
@@ -54,11 +54,27 @@ public class KeyguardIndicationTextView extends DoubleShadowTextView {
     private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button;
 
     private boolean mAnimationsEnabled = true;
+    private boolean mSuppressVisibility = false;
     private CharSequence mMessage;
     private KeyguardIndication mKeyguardIndicationInfo;
 
     private Animator mLastAnimator;
 
+    public void setSuppressVisibility(boolean suppress) {
+        mSuppressVisibility = suppress;
+        if (suppress) {
+            super.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        if (mSuppressVisibility && visibility == View.VISIBLE) {
+            super.setVisibility(View.INVISIBLE);
+            return;
+        }
+        super.setVisibility(visibility);
+    }
     public KeyguardIndicationTextView(Context context) {
         super(context);
     }
@@ -85,6 +101,7 @@ public void clearMessages() {
         }
         mMessage = "";
         setText("");
+        clearBackgroundAndIcon();
     }
 
     /**
@@ -103,6 +120,11 @@ public void switchIndication(KeyguardIndication indication) {
         switchIndication(indication == null ? null : indication.getMessage(), indication);
     }
 
+    public void switchIndication(KeyguardIndication indication, boolean animate) {
+        switchIndication(indication == null ? null : indication.getMessage(), indication,
+            animate, null);
+    }
+
     /**
      * Changes the text with an animation.
      */
@@ -242,6 +264,12 @@ private void setNextIndication() {
             setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null);
             forceAssertiveAccessibilityLiveRegion =
                 mKeyguardIndicationInfo.getForceAssertiveAccessibilityLiveRegion();
+        } else {
+            // null mKeyguardIndicationInfo indicates a hideIndication call or INDICATION_TYPE_NONE
+            // being used. When this happens, upstream currently only removes the text via the
+            // setText(mMessage) call below (mMessage will be null whenever mKeyguardIndicationInfo
+            // is null), but they don't remove the background.
+            clearBackgroundAndIcon();
         }
         if (!forceAssertiveAccessibilityLiveRegion) {
             setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_NONE);
@@ -252,6 +280,15 @@ private void setNextIndication() {
         }
     }
 
+    private void clearBackgroundAndIcon() {
+        // setNextIndication will set everything again on a new mKeyguardIndicationInfo, so it
+        // should be fine to do this. Note that AOSP doesn't use an icon anywhere yet
+        setBackground(null);
+        setOnClickListener(null);
+        setClickable(false);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, null);
+    }
+
     private AnimatorSet getInAnimator() {
         AnimatorSet animatorSet = new AnimatorSet();
         ObjectAnimator fadeIn = ObjectAnimator.ofFloat(this, View.ALPHA, 1f);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 83e5db4db6fed..c3b8c28dfccaf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -28,6 +28,8 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Trace;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.DisplayCutout;
@@ -75,7 +77,6 @@ public class KeyguardStatusBarView extends RelativeLayout {
 
     private final ArrayList<Rect> mEmptyTintRect = new ArrayList<>();
 
-    private boolean mShowPercentAvailable;
     private boolean mBatteryCharging;
 
     private TextView mCarrierLabel;
@@ -109,7 +110,6 @@ public class KeyguardStatusBarView extends RelativeLayout {
     private WindowInsets mPreviousInsets = null;
 
     private DisplayCutout mDisplayCutout;
-    private int mRoundedCornerPadding = 0;
     // right and left padding applied to this view to account for cutouts and rounded corners
     private Insets mPadding = Insets.of(0, 0, 0, 0);
 
@@ -120,6 +120,10 @@ public class KeyguardStatusBarView extends RelativeLayout {
     private final Rect mClipRect = new Rect(0, 0, 0, 0);
     private boolean mIsUserSwitcherEnabled;
 
+    private int mStatusBarExtraPaddingStart = 0;
+    private int mStatusBarExtraPaddingTop = 0;
+    private int mStatusBarExtraPaddingEnd = 0;
+
     public KeyguardStatusBarView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -166,13 +170,7 @@ protected void onConfigurationChanged(Configuration newConfig) {
         // System icons
         updateSystemIconsLayoutParams();
 
-        // mStatusIconArea
-        mStatusIconArea.setPaddingRelative(
-                mStatusIconArea.getPaddingStart(),
-                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top),
-                mStatusIconArea.getPaddingEnd(),
-                mStatusIconArea.getPaddingBottom()
-        );
+        updatePaddings();
 
         // mStatusIconContainer
         mStatusIconContainer.setPaddingRelative(
@@ -217,8 +215,27 @@ private void updateCarrierLabelMargin() {
         mCarrierLabel.setLayoutParams(lp);
     }
 
+    private int convertToDip(int padding) {
+        return Math.round(TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                padding,
+                mContext.getResources().getDisplayMetrics()));
+    }
+
     void loadDimens() {
         Resources res = getResources();
+        mStatusBarExtraPaddingStart = convertToDip(Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.System.STATUSBAR_EXTRA_PADDING_START, 0,
+                UserHandle.USER_CURRENT));
+        mStatusBarExtraPaddingTop = convertToDip(Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.System.STATUSBAR_EXTRA_PADDING_TOP, 0,
+                UserHandle.USER_CURRENT));
+        mStatusBarExtraPaddingEnd = convertToDip(Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.System.STATUSBAR_EXTRA_PADDING_END, 0,
+                UserHandle.USER_CURRENT));
         mSystemIconsSwitcherHiddenExpandedMargin = res.getDimensionPixelSize(
                 R.dimen.system_icons_switcher_hidden_expanded_margin);
         mStatusBarPaddingEnd = res.getDimensionPixelSize(
@@ -227,10 +244,24 @@ void loadDimens() {
                 R.dimen.ongoing_appops_dot_min_padding);
         mCutoutSideNudge = getResources().getDimensionPixelSize(
                 R.dimen.display_cutout_margin_consumption);
-        mShowPercentAvailable = getContext().getResources().getBoolean(
-                com.android.internal.R.bool.config_battery_percentage_setting_available);
-        mRoundedCornerPadding = res.getDimensionPixelSize(
-                R.dimen.rounded_corner_content_padding);
+    }
+
+    void updatePaddings() {
+        // mStatusIconArea
+        mStatusIconArea.setPaddingRelative(
+                mStatusIconArea.getPaddingStart(),
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top) + mStatusBarExtraPaddingTop,
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end) + mStatusBarExtraPaddingEnd,
+                mStatusIconArea.getPaddingBottom()
+        );
+
+        // mCarrierLabel
+        mCarrierLabel.setPaddingRelative(
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start) + mStatusBarExtraPaddingStart,
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top) + mStatusBarExtraPaddingTop,
+                mCarrierLabel.getPaddingEnd(),
+                mCarrierLabel.getPaddingBottom()
+        );
     }
 
     private void updateVisibilities() {
@@ -267,7 +298,7 @@ private void updateVisibilities() {
         }
 
         if (mBatteryView != null) {
-            mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable);
+            mBatteryView.setForceShowPercent(mBatteryCharging);
         }
     }
 
@@ -275,18 +306,12 @@ private void updateSystemIconsLayoutParams() {
         LinearLayout.LayoutParams lp =
                 (LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();
 
-        // Use status_bar_padding_end to replace original
-        // system_icons_super_container_avatarless_margin_end to prevent different end alignment
-        // between PhoneStatusBarView and KeyguardStatusBarView
-        int baseMarginEnd = mStatusBarPaddingEnd;
+        // Don't use status_bar_padding_end here after all, since this is the nested system icon container,
+        // and we're going to be applying extra padding to the outer status_icon_area view instead.
         int marginEnd =
-                mKeyguardUserSwitcherEnabled ? mSystemIconsSwitcherHiddenExpandedMargin
-                        : baseMarginEnd;
-
-        // Align PhoneStatusBar right margin/padding, only use
-        // 1. status bar layout: mPadding(consider round_corner + privacy dot)
-        // 2. icon container: R.dimen.status_bar_padding_end
+                mKeyguardUserSwitcherEnabled ? mSystemIconsSwitcherHiddenExpandedMargin : 0;
 
+        // Align PhoneStatusBar right margin/padding
         if (marginEnd != lp.getMarginEnd()) {
             lp.setMarginEnd(marginEnd);
             mSystemIconsContainer.setLayoutParams(lp);
@@ -476,13 +501,32 @@ private void updateIconsAndTextColors(TintedIconManager iconManager) {
         @ColorInt int textColor = Utils.getColorAttrDefaultColor(mContext,
                 R.attr.wallpaperTextColor);
         float luminance = Color.luminance(textColor);
-        @ColorInt int iconColor = Utils.getColorStateListDefaultColor(mContext,
-                    luminance < 0.5
-                        ? com.android.settingslib.R.color.dark_mode_icon_color_single_tone
-                        : com.android.settingslib.R.color.light_mode_icon_color_single_tone);
-        @ColorInt int contrastColor = luminance < 0.5
-                ? DarkIconDispatcherImpl.DEFAULT_ICON_TINT
-                : DarkIconDispatcherImpl.DEFAULT_INVERSE_ICON_TINT;
+        
+        // Check if accent color tinting is enabled
+        boolean useAccentColor = android.provider.Settings.System.getIntForUser(
+                mContext.getContentResolver(),
+                android.provider.Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT,
+                0,
+                android.os.UserHandle.USER_CURRENT) == 1;
+
+        @ColorInt int iconColor;
+        @ColorInt int contrastColor;
+        
+        if (useAccentColor) {
+            // Use system accent color for tinting
+            iconColor = Utils.getColorAccentDefaultColor(mContext);
+            contrastColor = iconColor;
+        } else {
+            // Use default behavior
+            iconColor = Utils.getColorStateListDefaultColor(mContext,
+                        luminance < 0.5
+                            ? com.android.settingslib.R.color.dark_mode_icon_color_single_tone
+                            : com.android.settingslib.R.color.light_mode_icon_color_single_tone);
+            contrastColor = luminance < 0.5
+                    ? DarkIconDispatcherImpl.DEFAULT_ICON_TINT
+                    : DarkIconDispatcherImpl.DEFAULT_INVERSE_ICON_TINT;
+        }
+        
         float intensity = textColor == Color.WHITE ? 0 : 1;
         mCarrierLabel.setTextColor(iconColor);
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
index b3bf60b3c6ccf..2addbd98f93b9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
@@ -35,6 +35,7 @@
 import android.view.DisplayCutout;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -98,6 +99,8 @@
 import com.android.systemui.statusbar.policy.UserInfoController;
 import com.android.systemui.statusbar.ui.binder.KeyguardStatusBarViewBinder;
 import com.android.systemui.statusbar.ui.viewmodel.KeyguardStatusBarViewModel;
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.user.ui.viewmodel.StatusBarUserChipViewModel;
 import com.android.systemui.util.ViewController;
 import com.android.systemui.util.settings.SecureSettings;
@@ -115,7 +118,16 @@
 import javax.inject.Inject;
 
 /** View Controller for {@link com.android.systemui.statusbar.phone.KeyguardStatusBarView}. */
-public class KeyguardStatusBarViewController extends ViewController<KeyguardStatusBarView> {
+public class KeyguardStatusBarViewController extends ViewController<KeyguardStatusBarView>
+        implements TunerService.Tunable {
+
+    private static final String STATUSBAR_EXTRA_PADDING_START =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_START;
+    private static final String STATUSBAR_EXTRA_PADDING_TOP =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_TOP;
+    private static final String STATUSBAR_EXTRA_PADDING_END =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_END;
+
     private static final String TAG = "KeyguardStatusBarViewController";
     private static final AnimationProperties KEYGUARD_HUN_PROPERTIES =
             new AnimationProperties().setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
@@ -167,6 +179,8 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
     private final OccludedToLockscreenTransitionViewModel mOccludedToLockscreenTransitionViewModel;
     private final DreamViewModel mDreamViewModel;
     private final KeyguardInteractor mKeyguardInteractor;
+    private final TunerService mTunerService;
+    private final AxDynamicBarChipViewModel mAxDynamicBarChipViewModel;
 
     @Nullable private ComposeView mBatteryComposeView;
     private ViewGroup mSystemIconsContainer;
@@ -391,7 +405,9 @@ public KeyguardStatusBarViewController(
             GoneToGlanceableHubTransitionViewModel goneToGlanceableHubTransitionViewModel,
             OccludedToLockscreenTransitionViewModel occludedToLockscreenTransitionViewModel,
             DreamViewModel dreamViewModel,
-            KeyguardInteractor keyguardInteractor
+            KeyguardInteractor keyguardInteractor,
+            TunerService tunerService,
+            AxDynamicBarChipViewModel axDynamicBarChipViewModel
     ) {
         super(view);
         mCoroutineDispatcher = dispatcher;
@@ -428,6 +444,8 @@ public KeyguardStatusBarViewController(
         mOccludedToLockscreenTransitionViewModel = occludedToLockscreenTransitionViewModel;
         mDreamViewModel = dreamViewModel;
         mKeyguardInteractor = keyguardInteractor;
+        mTunerService = tunerService;
+        mAxDynamicBarChipViewModel = axDynamicBarChipViewModel;
 
         mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled();
         if (!SceneContainerFlag.isEnabled()) {
@@ -513,6 +531,14 @@ protected void onViewAttached() {
                 false,
                 mVolumeSettingObserver,
                 UserHandle.USER_ALL);
+        mSecureSettings.registerContentObserverForUserSync(
+                Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT,
+                false,
+                mAccentColorSettingObserver,
+                UserHandle.USER_ALL);
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_START);
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_TOP);
+        mTunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_END);
         updateUserSwitcher();
         onThemeChanged();
         if (!Flags.glanceableHubV2()) {
@@ -532,6 +558,18 @@ protected void onViewAttached() {
         if (Flags.bouncerUiRevamp()) {
             collectFlow(mView, mKeyguardInteractor.primaryBouncerShowing, x -> updateViewState());
         }
+        TextView carrierLabel = mView.findViewById(R.id.keyguard_carrier_text);
+        if (carrierLabel != null) {
+            carrierLabel.addTextChangedListener(new android.text.TextWatcher() {
+                @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+                @Override public void onTextChanged(CharSequence s, int start, int before, int count) {}
+                @Override public void afterTextChanged(android.text.Editable s) {
+                    mAxDynamicBarChipViewModel.updateKeyguardCarrierText(s.toString());
+                }
+            });
+            mAxDynamicBarChipViewModel.updateKeyguardCarrierText(
+                    carrierLabel.getText().toString());
+        }
         if (NewStatusBarIcons.isEnabled()) {
             if (!SceneContainerFlag.isEnabled()) {
                 mBatteryComposeView = createAndBindComposeBattery();
@@ -573,6 +611,7 @@ protected void onViewDetached() {
         mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback);
         mDisableStateTracker.stopTracking(mCommandQueue);
         mSecureSettings.unregisterContentObserverSync(mVolumeSettingObserver);
+        mSecureSettings.unregisterContentObserverSync(mAccentColorSettingObserver);
         if (mTintedIconManager != null) {
             mStatusBarIconController.removeIconGroup(mTintedIconManager);
         }
@@ -582,6 +621,21 @@ protected void onViewDetached() {
                 mSystemIconsContainer.removeView(mBatteryComposeView);
             }
         }
+        mTunerService.removeTunable(this);
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case STATUSBAR_EXTRA_PADDING_START:
+            case STATUSBAR_EXTRA_PADDING_TOP:
+            case STATUSBAR_EXTRA_PADDING_END:
+                mView.loadDimens();
+                mView.updatePaddings();
+                break;
+            default:
+                break;
+         }
     }
 
     /** Should be called when the theme changes. */
@@ -904,6 +958,14 @@ public void onChange(boolean selfChange) {
         }
     };
 
+    private final ContentObserver mAccentColorSettingObserver = new ContentObserver(null) {
+        @Override
+        public void onChange(boolean selfChange) {
+            // Re-apply icon colors when accent color setting changes
+            onThemeChanged();
+        }
+    };
+
     private StatusBarSystemEventDefaultAnimator getSystemEventAnimator(boolean isAnimationRunning) {
         return new StatusBarSystemEventDefaultAnimator(getResources(), (alpha) -> {
             mSystemEventAnimatorAlpha = alpha;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NetworkSpeedIconHolder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NetworkSpeedIconHolder.kt
new file mode 100644
index 0000000000000..bcb7aa6d33c3d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NetworkSpeedIconHolder.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.phone
+
+import com.android.systemui.statusbar.phone.StatusBarIconHolder
+import com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedIconState
+
+class NetworkSpeedIconHolder : StatusBarIconHolder() {
+
+    companion object {
+        const val TYPE_NETWORK_SPEED = 6
+
+        fun fromNetworkIconState(state: NetworkSpeedIconState): NetworkSpeedIconHolder {
+            val holder = NetworkSpeedIconHolder()
+            holder.mNetworkSpeedIconState = state
+            holder.type = TYPE_NETWORK_SPEED
+            return holder
+        }
+    }
+
+    private var mNetworkSpeedIconState: NetworkSpeedIconState? = null
+
+    fun setNetworkSpeedIconState(state: NetworkSpeedIconState) {
+        mNetworkSpeedIconState = state
+    }
+
+    fun getNetworkSpeedIconState(): NetworkSpeedIconState? {
+        return mNetworkSpeedIconState
+    }
+
+    override var isVisible: Boolean
+        get() = mNetworkSpeedIconState?.isVisible() ?: false
+        set(value) {
+            if (mNetworkSpeedIconState == null || isVisible == value) return
+            mNetworkSpeedIconState?.setVisible(value)
+        }
+
+    override fun toString(): String {
+        return mNetworkSpeedIconState?.toString() ?: "null"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
index 56da799ee9521..ba926835b9ffe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
@@ -26,6 +26,8 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Icon;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.util.Property;
 import android.view.ContextThemeWrapper;
@@ -294,7 +296,7 @@ public void setIconSize(int size) {
         mIconSize = size;
     }
 
-    private void updateState() {
+    public void updateState() {
         resetViewStates();
         calculateIconXTranslations();
         applyIconStates();
@@ -832,11 +834,15 @@ && indexOfChild(view) > mCannedAnimationStartIndex
                     }
                 }
                 icon.setVisibleState(visibleState, animationsAllowed);
-                if (mOverrideIconColor) {
-                    int overrideIconColor = mUseInverseOverrideIconColor
-                            ? mThemedTextColorPrimaryInverse : mThemedTextColorPrimary;
-                    icon.setIconColor(overrideIconColor,
-                            /* animate= */ needsCannedAnimation && animationsAllowed);
+                boolean newIconStyle = Settings.System.getIntForUser(getContext().getContentResolver(),
+                            Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1;
+                if (icon.getStatusBarIcon().pkg.contains("systemui") || !newIconStyle) {
+                    if (mOverrideIconColor) {
+                        int overrideIconColor = mUseInverseOverrideIconColor
+                                ? mThemedTextColorPrimaryInverse : mThemedTextColorPrimary;
+                        icon.setIconColor(overrideIconColor,
+                                /* animate= */ needsCannedAnimation && animationsAllowed);
+                    }
                 }
                 if (animate) {
                     animateTo(icon, animationProperties);
@@ -879,7 +885,14 @@ private Consumer<Property> getEndAction() {
         public void initFrom(View view) {
             super.initFrom(view);
             if (view instanceof StatusBarIconView) {
-                iconColor = ((StatusBarIconView) view).getStaticDrawableColor();
+                StatusBarIconView icon = (StatusBarIconView) view;
+                boolean newIconStyle = Settings.System.getIntForUser(getContext().getContentResolver(),
+                            Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1;
+                if (icon.getStatusBarIcon().pkg.contains("systemui") || !newIconStyle) {
+                    iconColor = ((StatusBarIconView) view).getStaticDrawableColor();
+                } else {
+                    iconColor = StatusBarIconView.NO_COLOR;
+                }
             }
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index 5ced9243cb10e..d373159445aae 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -36,12 +36,14 @@
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
+import android.nfc.NfcAdapter;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.service.notification.ZenModeConfig;
 import android.telecom.TelecomManager;
@@ -58,10 +60,6 @@
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dagger.qualifiers.UiBackground;
 import com.android.systemui.display.domain.interactor.ConnectedDisplayInteractor;
-import com.android.systemui.privacy.PrivacyItem;
-import com.android.systemui.privacy.PrivacyItemController;
-import com.android.systemui.privacy.PrivacyType;
-import com.android.systemui.privacy.logging.PrivacyLogger;
 import com.android.systemui.qs.tiles.RotationLockTile;
 import com.android.systemui.res.R;
 import com.android.systemui.screenrecord.ScreenRecordUxController;
@@ -75,7 +73,6 @@
 import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
 import com.android.systemui.statusbar.policy.HotspotController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
-import com.android.systemui.statusbar.policy.LocationController;
 import com.android.systemui.statusbar.policy.NextAlarmController;
 import com.android.systemui.statusbar.policy.RotationLockController;
 import com.android.systemui.statusbar.policy.RotationLockController.RotationLockControllerCallback;
@@ -84,6 +81,7 @@
 import com.android.systemui.statusbar.policy.ZenModeController;
 import com.android.systemui.statusbar.policy.domain.interactor.ZenModeInteractor;
 import com.android.systemui.statusbar.policy.domain.model.ZenModeInfo;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.RingerModeTracker;
 import com.android.systemui.util.kotlin.JavaAdapter;
 import com.android.systemui.util.time.DateFormatUtil;
@@ -107,13 +105,13 @@ public class PhoneStatusBarPolicy
                 Listener,
                 DeviceProvisionedListener,
                 KeyguardStateController.Callback,
-                PrivacyItemController.Callback,
-                LocationController.LocationChangeCallback,
-                ScreenRecordUxController.StateChangeCallback {
+                ScreenRecordUxController.StateChangeCallback,
+                TunerService.Tunable {
     private static final String TAG = "PhoneStatusBarPolicy";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    static final int LOCATION_STATUS_ICON_ID = PrivacyType.TYPE_LOCATION.getIconId();
+    private static final String BLUETOOTH_SHOW_BATTERY =
+            "system:" + Settings.System.BLUETOOTH_SHOW_BATTERY;
 
     private final String mSlotHotspot;
     private final String mSlotBluetooth;
@@ -126,13 +124,11 @@ public class PhoneStatusBarPolicy
     private final String mSlotRotate;
     private final String mSlotHeadset;
     private final String mSlotDataSaver;
-    private final String mSlotLocation;
-    private final String mSlotMicrophone;
-    private final String mSlotCamera;
     private final String mSlotSensorsOff;
     private final String mSlotScreenRecord;
     private final String mSlotConnectedDisplay;
     private final String mSlotFirewall;
+    private final String mSlotNfc;
     private final int mDisplayId;
     private final SharedPreferences mSharedPreferences;
     private final DateFormatUtil mDateFormatUtil;
@@ -158,13 +154,10 @@ public class PhoneStatusBarPolicy
     private final ZenModeController mZenController;
     private final DeviceProvisionedController mProvisionedController;
     private final KeyguardStateController mKeyguardStateController;
-    private final LocationController mLocationController;
-    private final PrivacyItemController mPrivacyItemController;
     private final Executor mMainExecutor;
     private final Executor mUiBgExecutor;
     private final SensorPrivacyController mSensorPrivacyController;
     private final RingerModeTracker mRingerModeTracker;
-    private final PrivacyLogger mPrivacyLogger;
     private final ZenModeInteractor mZenModeInteractor;
     private final ConnectivityManager mConnectivityManager;
 
@@ -181,6 +174,12 @@ public class PhoneStatusBarPolicy
     private BluetoothController mBluetooth;
     private AlarmClockInfo mNextAlarm;
 
+    private NfcAdapter mAdapter;
+
+    private TunerService mTunerService;
+
+    private boolean mShowBluetoothBattery;
+
     @Inject
     public PhoneStatusBarPolicy(Context context, StatusBarIconController iconController,
             CommandQueue commandQueue, BroadcastDispatcher broadcastDispatcher,
@@ -192,18 +191,16 @@ public PhoneStatusBarPolicy(Context context, StatusBarIconController iconControl
             ZenModeController zenModeController,
             DeviceProvisionedController deviceProvisionedController,
             KeyguardStateController keyguardStateController,
-            LocationController locationController,
             SensorPrivacyController sensorPrivacyController, AlarmManager alarmManager,
             UserManager userManager, UserTracker userTracker,
             DevicePolicyManager devicePolicyManager,
             @Nullable TelecomManager telecomManager, @DisplayId int displayId,
             @Main SharedPreferences sharedPreferences, DateFormatUtil dateFormatUtil,
             RingerModeTracker ringerModeTracker,
-            PrivacyItemController privacyItemController,
-            PrivacyLogger privacyLogger,
             ConnectedDisplayInteractor connectedDisplayInteractor,
             ZenModeInteractor zenModeInteractor,
-            JavaAdapter javaAdapter
+            JavaAdapter javaAdapter,
+            TunerService tunerService
     ) {
         mContext = context;
         mIconController = iconController;
@@ -225,14 +222,11 @@ public PhoneStatusBarPolicy(Context context, StatusBarIconController iconControl
         mZenController = zenModeController;
         mProvisionedController = deviceProvisionedController;
         mKeyguardStateController = keyguardStateController;
-        mLocationController = locationController;
-        mPrivacyItemController = privacyItemController;
         mSensorPrivacyController = sensorPrivacyController;
         mMainExecutor = mainExecutor;
         mUiBgExecutor = uiBgExecutor;
         mTelecomManager = telecomManager;
         mRingerModeTracker = ringerModeTracker;
-        mPrivacyLogger = privacyLogger;
         mZenModeInteractor = zenModeInteractor;
         mJavaAdapter = javaAdapter;
         mConnectivityManager = context.getSystemService(ConnectivityManager.class);
@@ -251,17 +245,17 @@ public PhoneStatusBarPolicy(Context context, StatusBarIconController iconControl
         mSlotRotate = resources.getString(com.android.internal.R.string.status_bar_rotate);
         mSlotHeadset = resources.getString(com.android.internal.R.string.status_bar_headset);
         mSlotDataSaver = resources.getString(com.android.internal.R.string.status_bar_data_saver);
-        mSlotLocation = resources.getString(com.android.internal.R.string.status_bar_location);
-        mSlotMicrophone = resources.getString(com.android.internal.R.string.status_bar_microphone);
-        mSlotCamera = resources.getString(com.android.internal.R.string.status_bar_camera);
         mSlotSensorsOff = resources.getString(com.android.internal.R.string.status_bar_sensors_off);
         mSlotScreenRecord = resources.getString(
                 com.android.internal.R.string.status_bar_screen_record);
         mSlotFirewall = resources.getString(R.string.status_bar_firewall_slot);
+        mSlotNfc = resources.getString(com.android.internal.R.string.status_bar_nfc);
 
         mDisplayId = displayId;
         mSharedPreferences = sharedPreferences;
         mDateFormatUtil = dateFormatUtil;
+
+        mTunerService = tunerService;
     }
 
     /** Initialize the object after construction. */
@@ -277,6 +271,7 @@ public void init() {
         filter.addAction(Intent.ACTION_PROFILE_REMOVED);
         filter.addAction(Intent.ACTION_PROFILE_ACCESSIBLE);
         filter.addAction(Intent.ACTION_PROFILE_INACCESSIBLE);
+        filter.addAction(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
         mBroadcastDispatcher.registerReceiverWithHandler(mIntentReceiver, filter, mHandler);
         Observer<Integer> observer = ringer -> mHandler.post(this::updateVolumeZen);
 
@@ -290,6 +285,8 @@ public void init() {
         updateTTY();
 
         // bluetooth status
+        mShowBluetoothBattery = Settings.System.getIntForUser(mContext.getContentResolver(),
+            BLUETOOTH_SHOW_BATTERY, 1, UserHandle.USER_CURRENT) != 0;
         updateBluetooth();
 
         // Alarm clock
@@ -329,25 +326,6 @@ public void init() {
         mIconController.setIconVisibility(mSlotDataSaver, false);
 
 
-        // privacy items
-        String microphoneString = mResources.getString(PrivacyType.TYPE_MICROPHONE.getNameId());
-        String microphoneDesc = mResources.getString(
-                R.string.ongoing_privacy_chip_content_multiple_apps, microphoneString);
-        mIconController.setIcon(mSlotMicrophone, PrivacyType.TYPE_MICROPHONE.getIconId(),
-                microphoneDesc);
-        mIconController.setIconVisibility(mSlotMicrophone, false);
-
-        String cameraString = mResources.getString(PrivacyType.TYPE_CAMERA.getNameId());
-        String cameraDesc = mResources.getString(
-                R.string.ongoing_privacy_chip_content_multiple_apps, cameraString);
-        mIconController.setIcon(mSlotCamera, PrivacyType.TYPE_CAMERA.getIconId(),
-                cameraDesc);
-        mIconController.setIconVisibility(mSlotCamera, false);
-
-        mIconController.setIcon(mSlotLocation, LOCATION_STATUS_ICON_ID,
-                mResources.getString(R.string.accessibility_location_active));
-        mIconController.setIconVisibility(mSlotLocation, false);
-
         // sensors off
         mIconController.setIcon(mSlotSensorsOff, R.drawable.stat_sys_sensors_off,
                 mResources.getString(R.string.accessibility_sensors_off_active));
@@ -362,6 +340,12 @@ public void init() {
         mIconController.setIcon(mSlotFirewall, R.drawable.stat_sys_firewall, null);
         mIconController.setIconVisibility(mSlotFirewall, mFirewallVisible);
 
+        mIconController.setIcon(mSlotNfc, R.drawable.stat_sys_nfc,
+                mResources.getString(R.string.status_bar_nfc));
+
+        mIconController.setIconVisibility(mSlotNfc, false);
+        updateNfc();
+
         mRotationLockController.addCallback(this);
         mBluetooth.addCallback(this);
         mProvisionedController.addCallback(this);
@@ -375,13 +359,13 @@ public void init() {
         mNextAlarmController.addCallback(mNextAlarmCallback);
         mDataSaver.addCallback(this);
         mKeyguardStateController.addCallback(this);
-        mPrivacyItemController.addCallback(this);
         mSensorPrivacyController.addCallback(mSensorPrivacyListener);
-        mLocationController.addCallback(this);
         mJavaAdapter.alwaysCollectFlow(mConnectedDisplayInteractor.getConnectedDisplayState(),
                 this::onConnectedDisplayAvailabilityChanged);
 
         mCommandQueue.addCallback(this);
+
+        mTunerService.addTunable(this, BLUETOOTH_SHOW_BATTERY);
     }
 
     private String getManagedProfileAccessibilityString() {
@@ -425,6 +409,19 @@ public void onConsolidatedPolicyChanged(NotificationManager.Policy policy) {
                 }
             };
 
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case BLUETOOTH_SHOW_BATTERY:
+                mShowBluetoothBattery =
+                        TunerService.parseIntegerSwitch(newValue, true);
+                updateBluetooth();
+                break;
+            default:
+                break;
+        }
+    }
+
     private void updateAlarm() {
         final AlarmClockInfo alarm = mAlarmManager.getNextAlarmClock(mUserTracker.getUserId());
         final boolean hasAlarm = alarm != null && alarm.getTriggerTime() > 0;
@@ -447,6 +444,17 @@ private String buildAlarmContentDescription() {
         return mResources.getString(R.string.accessibility_quick_settings_alarm, dateString);
     }
 
+    private NfcAdapter getAdapter() {
+        if (mAdapter == null) {
+            mAdapter = NfcAdapter.getDefaultAdapter(mContext);
+        }
+        return mAdapter;
+    }
+
+    private final void updateNfc() {
+        mIconController.setIconVisibility(mSlotNfc, getAdapter() != null && getAdapter().isEnabled());
+    }
+
     private void updateVolumeZen() {
         int zen = mZenController.getZen();
         updateRingerAndAlarmIcons(zen);
@@ -501,7 +509,7 @@ private final void updateBluetooth() {
             if (mBluetooth.isBluetoothConnected()
                     && (mBluetooth.isBluetoothAudioActive()
                     || !mBluetooth.isBluetoothAudioProfileOnly())) {
-                int batteryLevel = mBluetooth.getBatteryLevel();
+                int batteryLevel = mShowBluetoothBattery ? mBluetooth.getBatteryLevel() : -1;
                 if (batteryLevel == 100) {
                     iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_9;
                 } else if (batteryLevel >= 90) {
@@ -773,6 +781,11 @@ public void onRotationLockStateChanged(boolean rotationLocked, boolean affordanc
         }
     }
 
+    @Override
+    public void restartSystemUI() {
+        Process.killProcess(Process.myPid());
+    }
+
     private void updateHeadsetPlug(Intent intent) {
         boolean connected = intent.getIntExtra("state", 0) != 0;
         boolean hasMic = intent.getIntExtra("microphone", 0) != 0;
@@ -793,63 +806,6 @@ public void onDataSaverChanged(boolean isDataSaving) {
         mIconController.setIconVisibility(mSlotDataSaver, isDataSaving);
     }
 
-    @Override  // PrivacyItemController.Callback
-    public void onPrivacyItemsChanged(List<PrivacyItem> privacyItems) {
-        updatePrivacyItems(privacyItems);
-    }
-
-    private void updatePrivacyItems(List<PrivacyItem> items) {
-        boolean showCamera = false;
-        boolean showMicrophone = false;
-        boolean showLocation = false;
-        for (PrivacyItem item : items) {
-            if (item == null /* b/124234367 */) {
-                Log.e(TAG, "updatePrivacyItems - null item found");
-                StringWriter out = new StringWriter();
-                mPrivacyItemController.dump(new PrintWriter(out), null);
-                // Throw so we can look into this
-                throw new NullPointerException(out.toString());
-            }
-            switch (item.getPrivacyType()) {
-                case TYPE_CAMERA:
-                    showCamera = true;
-                    break;
-                case TYPE_LOCATION:
-                    showLocation = true;
-                    break;
-                case TYPE_MICROPHONE:
-                    showMicrophone = true;
-                    break;
-            }
-        }
-
-        // Disabling for now, but keeping the log
-        /*
-        mIconController.setIconVisibility(mSlotCamera, showCamera);
-        mIconController.setIconVisibility(mSlotMicrophone, showMicrophone);
-        if (mPrivacyItemController.getLocationAvailable()) {
-            mIconController.setIconVisibility(mSlotLocation, showLocation);
-        }
-         */
-        mPrivacyLogger.logStatusBarIconsVisible(showCamera, showMicrophone,  showLocation);
-    }
-
-    @Override
-    public void onLocationActiveChanged(boolean active) {
-        if (!mPrivacyItemController.getLocationAvailable()) {
-            updateLocationFromController();
-        }
-    }
-
-    // Updates the status view based on the current state of location requests.
-    private void updateLocationFromController() {
-        if (mLocationController.isLocationActive()) {
-            mIconController.setIconVisibility(mSlotLocation, true);
-        } else {
-            mIconController.setIconVisibility(mSlotLocation, false);
-        }
-    }
-
     private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -875,6 +831,9 @@ public void onReceive(Context context, Intent intent) {
                 case AudioManager.ACTION_HEADSET_PLUG:
                     updateHeadsetPlug(intent);
                     break;
+                case NfcAdapter.ACTION_ADAPTER_STATE_CHANGED:
+                    updateNfc();
+                    break;
             }
         }
     };
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index fa015debd4421..caae7fe62d383 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -19,18 +19,25 @@
 import android.annotation.Nullable;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Insets;
 import android.graphics.Rect;
 import android.graphics.Region;
+import android.inputmethodservice.InputMethodService;
+import android.os.RemoteException;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.TypedValue;
+import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.DisplayCutout;
+import android.view.IWindowManager;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.WindowManagerGlobal;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -39,26 +46,36 @@
 import androidx.annotation.NonNull;
 
 import com.android.internal.policy.SystemBarUtils;
+import com.android.settingslib.Utils;
 import com.android.systemui.Gefingerpoken;
 import com.android.systemui.res.R;
 import com.android.systemui.shade.ShadeExpandsOnStatusBarLongPress;
 import com.android.systemui.shade.StatusBarLongPressGestureDetector;
+import com.android.systemui.shared.rotation.FloatingRotationButton;
+import com.android.systemui.shared.rotation.RotationButtonController;
+import com.android.systemui.statusbar.CommandQueue;
+import com.android.systemui.statusbar.CommandQueue.Callbacks;
 import com.android.systemui.statusbar.core.StatusBarConnectedDisplays;
 import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer;
+import com.android.systemui.statusbar.policy.Offset;
 import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;
 import com.android.systemui.user.ui.binder.StatusBarUserChipViewBinder;
 import com.android.systemui.user.ui.viewmodel.StatusBarUserChipViewModel;
 import com.android.systemui.util.leak.RotationUtils;
+import com.android.systemui.Dependency;
+import com.android.systemui.rotation.RotationPolicyWrapper;
 
 import java.util.Objects;
 import java.util.function.BooleanSupplier;
 
-public class PhoneStatusBarView extends FrameLayout {
+public class PhoneStatusBarView extends FrameLayout implements Callbacks {
     private static final String TAG = "PhoneStatusBarView";
 
+    private final CommandQueue mCommandQueue;
     private StatusBarWindowControllerStore mStatusBarWindowControllerStore;
     private boolean mShouldUpdateStatusBarHeightWhenControllerSet = false;
     private int mRotationOrientation = -1;
+    private RotationButtonController mRotationButtonController;
     @Nullable
     private View mCutoutSpace;
     @Nullable
@@ -79,6 +96,13 @@ public class PhoneStatusBarView extends FrameLayout {
     private StatusBarLongPressGestureDetector mStatusBarLongPressGestureDetector;
     private final Region mTouchableRegion = Region.obtain();
 
+    private int mStatusBarPaddingStart = 0;
+    private int mStatusBarPaddingTop = 0;
+    private int mStatusBarPaddingEnd = 0;
+
+    @Nullable
+    private ViewGroup mStatusBarContents = null;
+
     /**
      * Draw this many pixels into the left/right side of the cutout to optimally use the space
      */
@@ -86,6 +110,54 @@ public class PhoneStatusBarView extends FrameLayout {
 
     public PhoneStatusBarView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mCommandQueue = Dependency.get(CommandQueue.class);
+
+        // Only create FRB here if there is no navbar
+        if (!hasNavigationBar()) {
+            final Context lightContext = new ContextThemeWrapper(context,
+                    Utils.getThemeAttr(context, R.attr.lightIconTheme));
+            final Context darkContext = new ContextThemeWrapper(context,
+                    Utils.getThemeAttr(context, R.attr.darkIconTheme));
+            final int lightIconColor =
+                    Utils.getColorAttrDefaultColor(lightContext, R.attr.singleToneColor);
+            final int darkIconColor =
+                    Utils.getColorAttrDefaultColor(darkContext, R.attr.singleToneColor);
+            final FloatingRotationButton floatingRotationButton = new FloatingRotationButton(
+                    context,
+                    R.string.accessibility_rotate_button, R.layout.rotate_suggestion,
+                    R.id.rotate_suggestion, R.dimen.floating_rotation_button_min_margin,
+                    R.dimen.rounded_corner_content_padding,
+                    R.dimen.floating_rotation_button_taskbar_left_margin,
+                    R.dimen.floating_rotation_button_taskbar_bottom_margin,
+                    R.dimen.floating_rotation_button_diameter, R.dimen.key_button_ripple_max_width,
+                    R.bool.floating_rotation_button_position_left);
+
+            final RotationPolicyWrapper rotationPolicyWrapper =
+                    Dependency.get(RotationPolicyWrapper.class);
+            mRotationButtonController = new RotationButtonController(rotationPolicyWrapper,
+                    lightContext, lightIconColor, darkIconColor,
+                    R.drawable.ic_sysbar_rotate_button_ccw_start_0,
+                    R.drawable.ic_sysbar_rotate_button_ccw_start_90,
+                    R.drawable.ic_sysbar_rotate_button_cw_start_0,
+                    R.drawable.ic_sysbar_rotate_button_cw_start_90,
+                    () -> getDisplay().getRotation());
+            mRotationButtonController.setRotationButton(floatingRotationButton, null);
+        }
+    }
+
+    @Override
+    public void onRotationProposal(final int rotation, boolean isValid) {
+        if (mRotationButtonController != null && !hasNavigationBar()) {
+            mRotationButtonController.onRotationProposal(rotation, isValid);
+        }
+    }
+
+    private boolean hasNavigationBar() {
+        try {
+            IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();
+            return windowManager.hasNavigationBar(Display.DEFAULT_DISPLAY);
+        } catch (RemoteException ex) { }
+        return false;
     }
 
     void setLongPressGestureDetector(
@@ -124,10 +196,20 @@ public void updateTouchableRegion(Region touchableRegion) {
         getViewRootImpl().setTouchableRegion(touchableRegion);
     }
 
+    public void offsetStatusBar(Offset offset) {
+        if (mStatusBarContents == null) {
+            return;
+        }
+        mStatusBarContents.setTranslationX(offset.getX());
+        mStatusBarContents.setTranslationY(offset.getY());
+        invalidate();
+    }
+
     @Override
     public void onFinishInflate() {
         super.onFinishInflate();
         mCutoutSpace = findViewById(R.id.cutout_space_view);
+        mStatusBarContents = (ViewGroup) findViewById(R.id.status_bar_contents);
 
         updateResources();
     }
@@ -139,12 +221,20 @@ protected void onAttachedToWindow() {
             updateLayoutForCutout();
             updateWindowHeight();
         }
+
+        if (mRotationButtonController != null && !hasNavigationBar()) {
+            mCommandQueue.addCallback(this);
+        }
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mDisplayCutout = null;
+
+        if (mRotationButtonController != null) {
+            mCommandQueue.removeCallback(this);
+        }
     }
 
     // Per b/300629388, we let the PhoneStatusBarView detect onConfigurationChanged to
@@ -172,6 +262,33 @@ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
         return super.onApplyWindowInsets(insets);
     }
 
+
+    void setExtraStatusBarPaddingDp(int startDp, int topDp, int endDp) {
+        int startPx = convertToDip(startDp);
+        int topPx = convertToDip(topDp);
+        int endPx = convertToDip(endDp);
+
+        if (mStatusBarPaddingStart == startPx
+                && mStatusBarPaddingTop == topPx
+                && mStatusBarPaddingEnd == endPx) {
+            return;
+        }
+
+        mStatusBarPaddingStart = startPx;
+        mStatusBarPaddingTop = topPx;
+        mStatusBarPaddingEnd = endPx;
+
+        updateResources();
+        requestLayout();
+    }
+
+    private int convertToDip(int padding) {
+        return Math.round(TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                padding,
+                mContext.getResources().getDisplayMetrics()));
+    }
+
     /**
      * @return boolean indicating if we need to update the cutout location / margins
      */
@@ -283,6 +400,15 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
         return mTouchEventHandler.onInterceptTouchEvent(event);
     }
 
+    @Override
+    public void setImeWindowStatus(int displayId, int vis, int backDisposition,
+            boolean showImeSwitcher) {
+        if (mRotationButtonController != null) {
+            final boolean imeShown = (vis & InputMethodService.IME_VISIBLE) != 0;
+            mRotationButtonController.getRotationButton().setCanShowRotationButton(!imeShown);
+        }
+    }
+
     public void updateResources() {
         mCutoutSideNudge = getResources().getDimensionPixelSize(
                 R.dimen.display_cutout_margin_consumption);
@@ -335,14 +461,14 @@ private void updatePaddings() {
         int statusBarPaddingStart = getResources().getDimensionPixelSize(
                 R.dimen.status_bar_padding_start);
 
-        findViewById(R.id.status_bar_contents).setPaddingRelative(
-                statusBarPaddingStart,
-                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top),
-                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end),
+        mStatusBarContents.setPaddingRelative(
+                statusBarPaddingStart + mStatusBarPaddingStart,
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top) + mStatusBarPaddingTop,
+                getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end) + mStatusBarPaddingEnd,
                 0);
 
         findViewById(R.id.notification_lights_out)
-                .setPaddingRelative(0, statusBarPaddingStart, 0, 0);
+                .setPaddingRelative(0, statusBarPaddingStart + mStatusBarPaddingStart, 0, 0);
 
         findViewById(R.id.system_icons).setPaddingRelative(
                 getResources().getDimensionPixelSize(R.dimen.status_bar_icons_padding_start),
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt
index 881875a1985ed..63be7d4d88e78 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt
@@ -16,6 +16,7 @@
 package com.android.systemui.statusbar.phone
 
 import android.app.StatusBarManager.WINDOW_STATUS_BAR
+import android.provider.Settings
 import android.util.Log
 import android.view.Display.DEFAULT_DISPLAY
 import android.view.GestureDetector
@@ -48,6 +49,7 @@ import com.android.systemui.statusbar.policy.Clock
 import com.android.systemui.statusbar.policy.ConfigurationController
 import com.android.systemui.statusbar.window.StatusBarWindowControllerStore
 import com.android.systemui.statusbar.window.StatusBarWindowStateController
+import com.android.systemui.tuner.TunerService
 import com.android.systemui.unfold.UNFOLD_STATUS_BAR
 import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider
 import com.android.systemui.user.ui.viewmodel.StatusBarUserChipViewModel
@@ -85,7 +87,8 @@ private constructor(
     private val lazyStatusBarShadeDisplayPolicy: Lazy<StatusBarTouchShadeDisplayPolicy>,
     private val lazyShadeDisplaysRepository: Lazy<ShadeDisplaysRepository>,
     private val statusBarWindowControllerStore: StatusBarWindowControllerStore,
-) : ViewController<PhoneStatusBarView>(view) {
+    private val tunerService: TunerService,
+) : ViewController<PhoneStatusBarView>(view), TunerService.Tunable {
 
     private lateinit var battery: BatteryMeterView
     private lateinit var clock: Clock
@@ -96,6 +99,10 @@ private constructor(
     private val statusBarContentInsetsProvider
         get() = statusBarContentInsetsProviderStore.forDisplay(context.displayId)
 
+    private var extraStartDp = 0
+    private var extraTopDp = 0
+    private var extraEndDp = 0
+
     // Creates a [View.OnTouchListener] that only handles mouse click events.
     private fun createMouseClickListener(onClick: () -> Unit): View.OnTouchListener =
         object : View.OnTouchListener {
@@ -205,6 +212,24 @@ private constructor(
         if (!StatusBarConnectedDisplays.isEnabled) {
             mView.setStatusBarWindowControllerStore(statusBarWindowControllerStore)
         }
+
+        tunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_START)
+        tunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_TOP)
+        tunerService.addTunable(this, STATUSBAR_EXTRA_PADDING_END)
+    }
+
+    override fun onTuningChanged(key: String?, newValue: String?) {
+        when (key) {
+            STATUSBAR_EXTRA_PADDING_START ->
+                extraStartDp = TunerService.parseInteger(newValue, 0)
+            STATUSBAR_EXTRA_PADDING_TOP ->
+                extraTopDp = TunerService.parseInteger(newValue, 0)
+            STATUSBAR_EXTRA_PADDING_END ->
+                extraEndDp = TunerService.parseInteger(newValue, 0)
+            else -> return
+        }
+
+        mView.setExtraStatusBarPaddingDp(extraStartDp, extraTopDp, extraEndDp)
     }
 
     private fun addCursorSupportToIconContainers() {
@@ -254,6 +279,7 @@ private constructor(
 
     @VisibleForTesting
     public override fun onViewDetached() {
+        tunerService.removeTunable(this)
         removeDarkReceivers()
         startSideContainer.setOnHoverListener(null)
         endSideContainer.setOnHoverListener(null)
@@ -324,6 +350,10 @@ private constructor(
         darkIconDispatcher.removeDarkReceiver(clockRight)
     }
 
+    fun getPhoneStatusBarView(): PhoneStatusBarView {
+        return mView
+    }
+
     inner class PhoneStatusBarViewTouchHandler : Gefingerpoken {
         private val touchSlop = ViewConfiguration.get(mView.context).scaledTouchSlop
         private var initialTouchX = 0f
@@ -432,6 +462,15 @@ private constructor(
         }
     }
 
+    private companion object {
+        private const val STATUSBAR_EXTRA_PADDING_START =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_START
+        private const val STATUSBAR_EXTRA_PADDING_TOP =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_TOP
+        private const val STATUSBAR_EXTRA_PADDING_END =
+            "system:" + Settings.System.STATUSBAR_EXTRA_PADDING_END
+    }
+
     class Factory
     @Inject
     constructor(
@@ -455,6 +494,7 @@ private constructor(
         private val lazyStatusBarShadeDisplayPolicy: Lazy<StatusBarTouchShadeDisplayPolicy>,
         private val lazyShadeDisplaysRepository: Lazy<ShadeDisplaysRepository>,
         private val statusBarWindowControllerStore: StatusBarWindowControllerStore,
+        private val tunerService: TunerService,
     ) {
         fun create(view: PhoneStatusBarView): PhoneStatusBarViewController {
             return PhoneStatusBarViewController(
@@ -478,6 +518,7 @@ private constructor(
                 lazyStatusBarShadeDisplayPolicy,
                 lazyShadeDisplaysRepository,
                 statusBarWindowControllerStore,
+                tunerService,
             )
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 0d953a3f5cac6..326469af38573 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -86,6 +86,7 @@
 import com.android.systemui.statusbar.notification.stack.ViewState;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.util.wakelock.DelayedWakeLock;
 import com.android.systemui.util.wakelock.WakeLock;
 import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor;
@@ -209,11 +210,6 @@ private float getDefaultScrimAlpha() {
     public @interface ScrimVisibility {
     }
 
-    /**
-     * Default alpha value for most scrims.
-     */
-    protected static final float KEYGUARD_SCRIM_ALPHA = 0.2f;
-
     /**
      * The default scrim under the shade and dialogs.
      * This should not be lower than 0.54, otherwise we won't pass GAR.
@@ -249,7 +245,7 @@ private float getDefaultScrimAlpha() {
 
     private float mAdditionalScrimBehindAlphaKeyguard = 0f;
     // Combined scrim behind keyguard alpha of default scrim + additional scrim
-    private float mScrimBehindAlphaKeyguard = KEYGUARD_SCRIM_ALPHA;
+    private float mScrimBehindAlphaKeyguard = 0f;
 
     private float mRawPanelExpansionFraction;
     private float mPanelScrimMinFraction;
@@ -509,7 +505,9 @@ private void hydrateStateInternally(ScrimView behindScrim) {
                             mStatusBarKeyguardViewManager.onKeyguardFadedAway();
                         }
                         dispatchScrimsVisible();
-                        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+                        if (mScrimBehind != null) {
+                            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+                        }
                     }
                 };
 
@@ -721,7 +719,9 @@ private void internalTransitionTo(ScrimState state, Callback callback) {
             scheduleUpdate();
         }
 
-        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        if (mScrimBehind != null) {
+            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        }
     }
 
     private static void debugLog(String state) {
@@ -750,11 +750,7 @@ protected void setAdditionalScrimBehindAlphaKeyguard(float additionalScrimAlpha)
      * This is used to apply additional keyguard dimming on top of the default scrim alpha value.
      */
     protected void applyCompositeAlphaOnScrimBehindKeyguard() {
-        int compositeAlpha = ColorUtils.compositeAlpha(
-                (int) (255 * mAdditionalScrimBehindAlphaKeyguard),
-                (int) (255 * KEYGUARD_SCRIM_ALPHA));
-        float keyguardScrimAlpha = (float) compositeAlpha / 255;
-        setScrimBehindValues(keyguardScrimAlpha);
+        setScrimBehindValues(mAdditionalScrimBehindAlphaKeyguard);
     }
 
     /**
@@ -781,6 +777,10 @@ public float getBackScaling() {
         return mNotificationsScrim.getScaleY();
     }
 
+    public float getScrimBehindAlpha() {
+        return mScrimBehindAlphaKeyguard;
+    }
+
     public void onTrackingStarted() {
         mDarkenWhileDragging = !mKeyguardStateController.canDismissLockScreen();
         if (!mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) {
@@ -1127,7 +1127,7 @@ private void applyState() {
                 mNotificationsAlpha = behindAlpha;
                 mNotificationsTint = behindTint;
                 mBehindAlpha = 1;
-                mBehindTint = Color.BLACK;
+                mBehindTint = Color.TRANSPARENT;
             } else {
                 mBehindAlpha = behindAlpha;
                 if (mState == ScrimState.KEYGUARD && mTransitionToFullShadeProgress > 0.0f) {
@@ -1238,7 +1238,10 @@ private void applyAndDispatchState() {
         setOrAdaptCurrentAnimation(mScrimBehind);
         setOrAdaptCurrentAnimation(mNotificationsScrim);
         setOrAdaptCurrentAnimation(mScrimInFront);
-        dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        if (mScrimBehind != null) {
+            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+        }
+        ScrimUtils.get(mScrimBehind.getContext()).onScrimDispatched();
     }
 
     /**
@@ -1306,7 +1309,7 @@ protected void updateScrims() {
             mNeedsDrawableColorUpdate = false;
             // Only animate scrim color if the scrim view is actually visible
             boolean animateScrimInFront = mScrimInFront.getViewAlpha() != 0 && !mBlankScreen;
-            boolean animateBehindScrim = mScrimBehind.getViewAlpha() != 0 && !mBlankScreen;
+            boolean animateBehindScrim = mScrimBehind != null && mScrimBehind.getViewAlpha() != 0 && !mBlankScreen;
             boolean animateScrimNotifications = mNotificationsScrim.getViewAlpha() != 0
                     && !mBlankScreen;
 
@@ -1314,7 +1317,9 @@ protected void updateScrims() {
             mScrimBehind.setColors(mColors, animateBehindScrim);
             mNotificationsScrim.setColors(mColors, animateScrimNotifications);
 
-            dispatchBackScrimState(mScrimBehind.getViewAlpha());
+            if (mScrimBehind != null) {
+                dispatchBackScrimState(mScrimBehind.getViewAlpha());
+            }
         }
         if (Flags.bouncerUiRevamp()) {
             // Blur the notification scrim as needed. The blur is needed only when we show the
@@ -1334,6 +1339,7 @@ protected void updateScrims() {
         // Prevent notification scrim flicker when transitioning away from keyguard.
         if (mKeyguardStateController.isKeyguardGoingAway()) {
             mNotificationsAlpha = 0;
+            mBehindAlpha = 0;
         }
 
         // Prevent flickering for activities above keyguard and quick settings in keyguard.
@@ -1364,6 +1370,7 @@ private void dispatchBackScrimState(float alpha) {
     private void dispatchScrimsVisible() {
         final ScrimView backScrim = mClipsQsScrim ? mNotificationsScrim : mScrimBehind;
         final int currentScrimVisibility;
+        if (mScrimInFront == null || backScrim == null) return;
         if (mScrimInFront.getViewAlpha() == 1 || backScrim.getViewAlpha() == 1) {
             currentScrimVisibility = OPAQUE;
         } else if (mScrimInFront.getViewAlpha() == 0 && backScrim.getViewAlpha() == 0) {
@@ -1443,17 +1450,18 @@ private void startScrimAnimation(final View scrim, float current) {
         if (mAnimatorListener != null) {
             anim.addListener(mAnimatorListener);
         }
-        final int initialScrimTint = scrim instanceof ScrimView ? ((ScrimView) scrim).getTint() :
-                Color.TRANSPARENT;
         anim.addUpdateListener(animation -> {
             final float startAlpha = (Float) scrim.getTag(TAG_START_ALPHA);
             final float animAmount = (float) animation.getAnimatedValue();
-            final int finalScrimTint = getCurrentScrimTint(scrim);
             final float finalScrimAlpha = getCurrentScrimAlpha(scrim);
             float alpha = MathUtils.lerp(startAlpha, finalScrimAlpha, animAmount);
             alpha = MathUtils.constrain(alpha, 0f, 1f);
-            int tint = ColorUtils.blendARGB(initialScrimTint, finalScrimTint, animAmount);
-            updateScrimColor(scrim, alpha, tint);
+            updateScrimColor(
+                scrim,
+                alpha,
+                (mState == ScrimState.KEYGUARD || mState == ScrimState.AOD || mState == ScrimState.PULSING)
+                ? Color.BLACK : Color.TRANSPARENT
+            );
             dispatchScrimsVisible();
         });
         anim.setInterpolator(mInterpolator);
@@ -1574,7 +1582,10 @@ void setAnimatorListener(Animator.AnimatorListener animatorListener) {
     }
 
     private void updateScrim(ScrimView scrim, float alpha) {
-        final float currentAlpha = scrim.getViewAlpha();
+        float currentAlpha;
+
+        if (scrim == null) return;
+        currentAlpha = scrim.getViewAlpha();
 
         ValueAnimator previousAnimator = ViewState.getChildTag(scrim, TAG_KEY_ANIM);
         if (previousAnimator != null) {
@@ -1700,8 +1711,12 @@ private int getShadePanelColor() {
     }
 
     private void onThemeChanged() {
+        if (mScrimBehind != null) cancelAnimator(ViewState.getChildTag(mScrimBehind, TAG_KEY_ANIM));
+        if (mNotificationsScrim != null) cancelAnimator(ViewState.getChildTag(mNotificationsScrim, TAG_KEY_ANIM));
+        if (mScrimInFront != null) cancelAnimator(ViewState.getChildTag(mScrimInFront, TAG_KEY_ANIM));
         updateThemeColors();
-        scheduleUpdate();
+        mState.prepare(mState);
+        applyAndDispatchState();
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index 6c20ebc232253..caaef9a7590d6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -256,7 +256,7 @@ public void prepare(ScrimState previousState) {
     AOD {
         @Override
         public void prepare(ScrimState previousState) {
-            final boolean alwaysOnEnabled = mDozeParameters.getAlwaysOn();
+            final boolean alwaysOnEnabled = mDozeParameters.shouldShowAodUi();
             final boolean quickPickupEnabled = mDozeParameters.isQuickPickupEnabled();
             final boolean isDocked = mDockManager.isDocked();
             mBlankScreen = mDisplayRequiresBlanking;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImplEx.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImplEx.kt
new file mode 100644
index 0000000000000..fc35892052614
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImplEx.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.phone
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.StatusIconDisplayable
+import com.android.systemui.statusbar.phone.ui.StatusBarIconControllerImpl
+import com.android.systemui.statusbar.phone.ui.StatusBarIconList
+import com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedIconState
+import com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedView
+
+class StatusBarIconControllerImplEx private constructor(
+    private val context: Context,
+    private val iconController: StatusBarIconControllerImpl,
+    private val iconList: StatusBarIconList
+) {
+
+    fun setNetworkSpeedIcon(slot: String, state: NetworkSpeedIconState?) {
+        if (state == null || !state.isVisible()) {
+            iconController.removeIcon(slot, 0)
+            return
+        }
+
+        val existingHolder = iconList.getIconHolder(slot, 0)
+
+        if (existingHolder == null) {
+            val newHolder = NetworkSpeedIconHolder.fromNetworkIconState(state)
+            iconController.setIcon(slot, newHolder)
+        } else if (existingHolder is NetworkSpeedIconHolder) {
+            existingHolder.setNetworkSpeedIconState(state)
+            iconController.handleSet(slot, existingHolder)
+        }
+    }
+
+    fun addHolder(
+        index: Int,
+        slot: String,
+        rootGroup: ViewGroup,
+        holder: StatusBarIconHolder,
+        blocked: Boolean
+    ): StatusIconDisplayable? {
+        return if (holder.type == 6 && holder is NetworkSpeedIconHolder) {
+            addNetworkSpeedIcon(index, slot, holder.getNetworkSpeedIconState(), rootGroup, blocked)
+        } else {
+            null
+        }
+    }
+
+    private fun addNetworkSpeedIcon(
+        index: Int,
+        slot: String,
+        state: NetworkSpeedIconState?,
+        rootGroup: ViewGroup,
+        blocked: Boolean
+    ): NetworkSpeedView {
+        val view = createNetworkSpeedView(slot, blocked)
+        view.applyNetworkState(state)
+        rootGroup.addView(view, index, createLayoutParams())
+        return view
+    }
+
+    private fun updateNetworkSpeedIcon(viewIndex: Int, state: NetworkSpeedIconState?, rootGroup: ViewGroup) {
+        val view = rootGroup.getChildAt(viewIndex) as? NetworkSpeedView ?: return
+        view.applyNetworkState(state)
+    }
+
+    private fun createNetworkSpeedView(slot: String, blocked: Boolean): NetworkSpeedView {
+        return NetworkSpeedView.fromContext(context, slot, blocked)
+    }
+
+    private fun createLayoutParams(): LinearLayout.LayoutParams {
+        val width = context.resources.getDimensionPixelSize(R.dimen.network_speed_view_width)
+        return LinearLayout.LayoutParams(width, LinearLayout.LayoutParams.MATCH_PARENT)
+    }
+
+    fun onSetIconHolder(viewIndex: Int, holder: StatusBarIconHolder, rootGroup: ViewGroup) {
+        if (holder.type == 6 && holder is NetworkSpeedIconHolder) {
+            updateNetworkSpeedIcon(viewIndex, holder.getNetworkSpeedIconState(), rootGroup)
+        }
+    }
+    
+    companion object {
+        @Volatile
+        private var instance: StatusBarIconControllerImplEx? = null
+
+        fun init(
+            context: Context,
+            iconController: StatusBarIconControllerImpl,
+            iconList: StatusBarIconList
+        ) {
+            if (instance == null) {
+                synchronized(this) {
+                    if (instance == null) {
+                        instance = StatusBarIconControllerImplEx(context, iconController, iconList)
+                    }
+                }
+            }
+        }
+
+        fun get(): StatusBarIconControllerImplEx {
+            return instance ?: throw IllegalStateException("init must be called first!!!")
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
index f2fd794975c95..21ef7a5b02435 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconHolder.kt
@@ -20,8 +20,8 @@ import com.android.internal.statusbar.StatusBarIcon
 import com.android.systemui.statusbar.pipeline.icons.shared.model.ModernStatusBarViewCreator
 
 /** Wraps [com.android.internal.statusbar.StatusBarIcon] so we can still have a uniform list */
-open class StatusBarIconHolder private constructor() {
-    @IntDef(TYPE_ICON, TYPE_MOBILE_NEW, TYPE_WIFI_NEW, TYPE_BINDABLE)
+open class StatusBarIconHolder protected constructor() {
+    @IntDef(TYPE_ICON, TYPE_MOBILE_NEW, TYPE_WIFI_NEW, TYPE_BINDABLE, TYPE_NETWORK_SPEED)
     @Retention(AnnotationRetention.SOURCE)
     internal annotation class IconType
 
@@ -42,6 +42,7 @@ open class StatusBarIconHolder private constructor() {
                 // The new pipeline controls visibilities via the view model and
                 // view binder, so
                 // this is effectively an unused return value.
+                TYPE_NETWORK_SPEED,
                 TYPE_BINDABLE,
                 TYPE_MOBILE_NEW,
                 TYPE_WIFI_NEW -> true
@@ -53,6 +54,7 @@ open class StatusBarIconHolder private constructor() {
             }
             when (type) {
                 TYPE_ICON -> icon!!.visible = visible
+                TYPE_NETWORK_SPEED,
                 TYPE_BINDABLE,
                 TYPE_MOBILE_NEW,
                 TYPE_WIFI_NEW -> {}
@@ -95,10 +97,13 @@ open class StatusBarIconHolder private constructor() {
 
         /** Only applicable to [BindableIconHolder] */
         const val TYPE_BINDABLE = 5
+        
+        const val TYPE_NETWORK_SPEED = 6
 
         /** Returns a human-readable string representing the given type. */
         fun getTypeString(@IconType type: Int): String {
             return when (type) {
+                TYPE_NETWORK_SPEED -> "NETWORK_SPEED"
                 TYPE_ICON -> "ICON"
                 TYPE_MOBILE_NEW -> "MOBILE_NEW"
                 TYPE_WIFI_NEW -> "WIFI_NEW"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 659efc3686a28..c65fb730906f5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -28,6 +28,7 @@
 import android.content.res.ColorStateList;
 import android.hardware.biometrics.BiometricSourceType;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.SystemClock;
 import android.os.Trace;
 import android.util.Log;
@@ -81,6 +82,7 @@
 import com.android.systemui.navigationbar.views.NavigationBarView;
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
+import com.android.systemui.res.R;
 import com.android.systemui.scene.domain.interactor.SceneInteractor;
 import com.android.systemui.scene.shared.flag.SceneContainerFlag;
 import com.android.systemui.scene.shared.model.Overlays;
@@ -99,6 +101,8 @@
 import com.android.systemui.statusbar.domain.interactor.StatusBarKeyguardViewManagerInteractor;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
+import com.android.systemui.statusbar.phone.FaceUnlockProxy;
+import com.android.systemui.statusbar.phone.FaceUnlockImageView;
 import com.android.systemui.unfold.FoldAodAnimationController;
 import com.android.systemui.unfold.SysUIUnfoldComponent;
 import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
@@ -191,6 +195,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
             public void onFullyShown() {
                 mPrimaryBouncerAnimating = false;
                 updateStates();
+                showFaceRecognizingMessage();
             }
 
             @Override
@@ -343,6 +348,8 @@ public void onEvent(int event) {
     @Nullable private OccludingAppBiometricUI mOccludingAppBiometricUI;
 
     @Nullable private TaskbarDelegate mTaskbarDelegate;
+    private Handler mFaceRecognizingHandler;
+    private boolean mFaceRecognitionRunning = false;
     private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
             new KeyguardUpdateMonitorCallback() {
                 @Override
@@ -363,6 +370,47 @@ public void onEmergencyCallAction() {
                 reset(true /* hideBouncerWhenShowing */);
             }
         }
+
+        @Override
+        public void onBiometricRunningStateChanged(boolean running,
+                BiometricSourceType biometricSourceType) {
+            if (biometricSourceType == BiometricSourceType.FACE &&
+                    mKeyguardUpdateManager.isUnlockWithFacePossible()){
+                mFaceRecognitionRunning = running;
+                if (!mFaceRecognitionRunning) {
+                    mFaceRecognizingHandler.removeCallbacksAndMessages(null);
+                }else{
+                    mFaceRecognizingHandler.postDelayed(() -> showFaceRecognizingMessage(), 100);
+                }
+            }
+        }
+
+        @Override
+        public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType,
+                boolean isStrongBiometric) {
+            super.onBiometricAuthenticated(userId, biometricSourceType, isStrongBiometric);
+            if (biometricSourceType == BiometricSourceType.FACE) {
+                FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SUCCESS);
+            }
+        }
+
+        @Override
+        public void onBiometricAcquired(BiometricSourceType biometricSourceType,
+                int acquireInfo) {
+            if (biometricSourceType == BiometricSourceType.FACE) {
+                mFaceRecognitionRunning = true;
+                mFaceRecognizingHandler.postDelayed(() -> showFaceRecognizingMessage(), 100);
+                FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SCANNING);
+            }
+        }
+
+        @Override
+        public void onBiometricHelp(int msgId, String helpString,
+                BiometricSourceType biometricSourceType) {
+            if (biometricSourceType == BiometricSourceType.FACE && mContext.getString(R.string.kg_face_not_recognized).equals(helpString)) {
+                FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.NOT_VERIFIED);
+            }
+        }
     };
     private Lazy<KeyguardDismissActionInteractor> mKeyguardDismissActionInteractor;
     private final JavaAdapter mJavaAdapter;
@@ -403,7 +451,8 @@ public StatusBarKeyguardViewManager(
             DismissCallbackRegistry dismissCallbackRegistry,
             Lazy<BouncerInteractor> bouncerInteractor,
             CommunalSceneInteractor communalSceneInteractor,
-            Lazy<SecureLockDeviceInteractor> secureLockDeviceInteractor
+            Lazy<SecureLockDeviceInteractor> secureLockDeviceInteractor,
+            @Main Handler faceRecognizingHandler
     ) {
         mContext = context;
         mExecutor = executor;
@@ -440,6 +489,7 @@ public StatusBarKeyguardViewManager(
         mDismissCallbackRegistry = dismissCallbackRegistry;
         mCommunalSceneInteractor = communalSceneInteractor;
         mSecureLockDeviceInteractor = secureLockDeviceInteractor;
+        mFaceRecognizingHandler = faceRecognizingHandler;
     }
 
     KeyguardTransitionInteractor mKeyguardTransitionInteractor;
@@ -1030,7 +1080,9 @@ public void reset(boolean hideBouncerWhenShowing, boolean isFalsingReset) {
         if (mKeyguardStateController.isShowing() && !bouncerIsAnimatingAway()) {
             final boolean isOccluded = mKeyguardStateController.isOccluded();
             // Hide quick settings.
-            mShadeLockscreenInteractor.resetViews(/* animate= */ !isOccluded);
+            if (mShadeLockscreenInteractor != null) {
+                mShadeLockscreenInteractor.resetViews(/* animate= */ !isOccluded);
+            }
             // Hide bouncer and quick-quick settings.
             if (isOccluded && !mDozing) {
                 mCentralSurfaces.hideKeyguard();
@@ -1099,6 +1151,7 @@ private void setRootViewAnimationDisabled(boolean disabled) {
     public void onStartedWakingUp() {
         mIsSleeping = false;
         setRootViewAnimationDisabled(false);
+        reset(false);
         NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();
         if (navBarView != null) {
             navBarView.forEachView(view ->
@@ -1118,6 +1171,7 @@ public void onStartedWakingUp() {
     public void onStartedGoingToSleep() {
         mIsSleeping = true;
         setRootViewAnimationDisabled(true);
+        reset(true);
         NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();
         if (navBarView != null) {
             navBarView.forEachView(view ->
@@ -1696,12 +1750,26 @@ public void notifyKeyguardAuthenticated(boolean strongAuth) {
         }
     }
 
+    private void showFaceRecognizingMessage(){
+        if (mFaceRecognitionRunning &&
+                mKeyguardUpdateManager.isUnlockWithFacePossible()) {
+            setKeyguardMessage(mContext.getString(R.string.face_unlock_recognizing), null, BiometricSourceType.FACE);
+        }
+    }
+
     /** Display security message to relevant KeyguardMessageArea. */
     public void setKeyguardMessage(String message, ColorStateList colorState,
             BiometricSourceType biometricSourceType) {
         if (!mAlternateBouncerInteractor.isVisibleState()) {
             mPrimaryBouncerInteractor.showMessage(message, colorState);
         }
+        if (mContext.getString(R.string.face_unlock_recognizing).equals(message)) {
+            FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SCANNING);
+        } else if (mContext.getString(R.string.kg_face_not_recognized).equals(message)) {
+            FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.NOT_VERIFIED);
+        } else if (mContext.getString(R.string.keyguard_face_successful_unlock).equals(message)) {
+            FaceUnlockProxy.INSTANCE().setBouncerState(FaceUnlockImageView.State.SUCCESS);
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
index 665681152cbdf..12ee69897636c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
@@ -86,6 +86,8 @@
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.wmshell.BubblesManager;
 
+import com.android.systemui.applocker.AxAppLockerHelper;
+
 import dagger.Lazy;
 
 import kotlinx.coroutines.CoroutineScope;
@@ -155,6 +157,7 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
     private final PowerInteractor mPowerInteractor;
     private final UserTracker mUserTracker;
     private final OnUserInteractionCallback mOnUserInteractionCallback;
+    private final AxAppLockerHelper mAxAppLockerHelper;
 
     private boolean mIsCollapsingToShowActivityOverLockscreen;
 
@@ -193,7 +196,8 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
             NotificationLaunchAnimatorControllerProvider notificationAnimationProvider,
             LaunchFullScreenIntentProvider launchFullScreenIntentProvider,
             PowerInteractor powerInteractor,
-            UserTracker userTracker) {
+            UserTracker userTracker,
+            AxAppLockerHelper axAppLockerHelper) {
         mContext = context;
         mContextInteractor = contextInteractor;
         mMainThreadHandler = mainThreadHandler;
@@ -227,6 +231,7 @@ boolean onDismiss(PendingIntent intent, boolean isActivityIntent, boolean animat
         mNotificationAnimationProvider = notificationAnimationProvider;
         mPowerInteractor = powerInteractor;
         mUserTracker = userTracker;
+        mAxAppLockerHelper = axAppLockerHelper;
 
         launchFullScreenIntentProvider.registerListener(entry -> launchFullScreenIntent(entry));
     }
@@ -265,6 +270,12 @@ public void onNotificationBubbleIconClicked(@NonNull NotificationEntry entry) {
     @Override
     public void onNotificationClicked(@NonNull NotificationEntry entry,
             @NonNull ExpandableNotificationRow row) {
+        String packageName = entry.getSbn().getPackageName();
+        if (mAxAppLockerHelper.getState(packageName).needsAuth()) {
+            int userId = entry.getSbn().getUserId();
+            mAxAppLockerHelper.promptUnlock(packageName, userId);
+            return;
+        }
         mLogger.logStartingActivityFromClick(entry, row.isHeadsUpState(),
                 mKeyguardStateController.isVisible(),
                 mNotificationShadeWindowController.getPanelExpanded());
@@ -691,6 +702,7 @@ private void removeHunAfterClick(ExpandableNotificationRow row) {
 
     @VisibleForTesting
     void launchFullScreenIntent(NotificationEntry entry) {
+        if (entry.shouldSuppressFullScreenIntent()) return;
         // Skip if device is in VR mode.
         if (mPresenter.isDeviceInVrMode()) {
             mLogger.logFullScreenIntentSuppressedByVR(entry);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
index 2dd3b283bd3c8..5b6fbee0a64db 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java
@@ -22,12 +22,17 @@
 
 import android.app.KeyguardManager;
 import android.content.Context;
+import android.database.ContentObserver;
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.provider.Telephony.Sms;
 import android.service.notification.StatusBarNotification;
 import android.service.vr.IVrManager;
 import android.service.vr.IVrStateCallbacks;
+import android.telecom.TelecomManager;
 import android.util.Log;
 import android.util.Slog;
 import android.view.View;
@@ -50,6 +55,7 @@
 import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.LockscreenShadeTransitionController;
+import com.android.systemui.statusbar.NTForbiddenSwipeDownQSController;
 import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationPresenter;
 import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -75,6 +81,9 @@
 import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -107,8 +116,12 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
     private final NotificationListContainer mNotifListContainer;
     private final DeviceUnlockedInteractor mDeviceUnlockedInteractor;
     private final QuickSettingsController mQsController;
+    private final NTForbiddenSwipeDownQSController mNTForbiddenSwipeDownQSController;
+    private final TelecomManager mTm;
+    private final List<String> mHeadsUpWhitelistPackages = new ArrayList<>();
 
     protected boolean mVrMode;
+    private boolean mLessBoringHeadsUp;
 
     @Inject
     StatusBarNotificationPresenter(
@@ -138,7 +151,8 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
             NotificationRemoteInputManager remoteInputManager,
             NotificationRemoteInputManager.Callback remoteInputManagerCallback,
             NotificationListContainer notificationListContainer,
-            DeviceUnlockedInteractor deviceUnlockedInteractor) {
+            DeviceUnlockedInteractor deviceUnlockedInteractor,
+            NTForbiddenSwipeDownQSController forbiddenSwipeDownQSController) {
         mActivityStarter = activityStarter;
         mKeyguardStateController = keyguardStateController;
         mNotificationPanel = panel;
@@ -166,6 +180,8 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
                 ServiceManager.getService(Context.STATUS_BAR_SERVICE));
         mNotifListContainer = notificationListContainer;
         mDeviceUnlockedInteractor = deviceUnlockedInteractor;
+        mNTForbiddenSwipeDownQSController = forbiddenSwipeDownQSController;
+        mTm = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
 
         IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(
                 Context.VR_SERVICE));
@@ -188,8 +204,10 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
                 visualInterruptionDecisionProvider.addCondition(mVrModeCondition);
                 visualInterruptionDecisionProvider.addFilter(mNeedsRedactionFilter);
                 visualInterruptionDecisionProvider.addCondition(mPanelsDisabledCondition);
+                visualInterruptionDecisionProvider.addLegacySuppressor(mLessBoringSuppressor);
             } else {
                 visualInterruptionDecisionProvider.addLegacySuppressor(mInterruptSuppressor);
+                visualInterruptionDecisionProvider.addLegacySuppressor(mLessBoringSuppressor);
             }
             mLockscreenUserManager.setUpWithPresenter(this);
             mGutsManager.setUpWithPresenter(
@@ -197,6 +215,47 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
 
             onUserSwitched(mLockscreenUserManager.getCurrentUserId());
         });
+
+        ContentObserver headsUpObserver = new ContentObserver(null) {
+            @Override
+            public void onChange(boolean selfChange) {
+                mLessBoringHeadsUp = Settings.System.getIntForUser(
+                        context.getContentResolver(),
+                        Settings.System.LESS_BORING_HEADS_UP,
+                        0, UserHandle.USER_CURRENT) == 1;
+            }
+        };
+        context.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.LESS_BORING_HEADS_UP),
+                true,
+                headsUpObserver);
+        headsUpObserver.onChange(true); // set up
+
+        String defaultDialerPackage = getDefaultDialerPackage(mTm);
+        if (defaultDialerPackage != null && !defaultDialerPackage.isEmpty()) {
+            mHeadsUpWhitelistPackages.add(defaultDialerPackage.toLowerCase());
+        }
+
+        String defaultSmsPackage = getDefaultSmsPackage(context);
+        if (defaultSmsPackage != null && !defaultSmsPackage.isEmpty()) {
+            mHeadsUpWhitelistPackages.add(defaultSmsPackage.toLowerCase());
+        }
+
+        mHeadsUpWhitelistPackages.addAll(Arrays.asList(
+            "dialer",
+            "messaging",
+            "messenger",
+            "clock"
+        ));
+    }
+
+    private static String getDefaultSmsPackage(Context ctx) {
+        // for reference, there's also a new RoleManager api with getDefaultSmsPackage(context, userid) 
+        return Sms.getDefaultSmsPackage(ctx);
+    }
+
+    private static String getDefaultDialerPackage(TelecomManager tm) {
+        return tm != null ? tm.getDefaultDialerPackage() : "";
     }
 
     /** Called when the shade has been emptied to attempt to close the shade */
@@ -253,7 +312,12 @@ public void onExpandClicked(NotificationEntry clickedEntry, View clickedView,
         mHeadsUpManager.setExpanded(clickedEntry, nowExpanded);
         mPowerInteractor.wakeUpIfDozing("NOTIFICATION_CLICK", PowerManager.WAKE_REASON_GESTURE);
         if (nowExpanded) {
-            if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
+            if (mNTForbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);
+                // launch the bouncer if the device is locked
+                mActivityStarter.dismissKeyguardThenExecute(() -> false /* dismissAction */
+                        , null /* cancelRunnable */, false /* afterKeyguardGone */);
+            } else if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
                 mShadeTransitionController.goToLockedShade(
                         clickedEntry.getRow(), /* needsQSAnimation = */ true);
             } else if (clickedEntry.isSensitive().getValue() && isInLockedDownShade()) {
@@ -271,7 +335,12 @@ public void onExpandClicked(ExpandableNotificationRow row, EntryAdapter clickedE
         mHeadsUpManager.setExpanded(clickedEntry.getKey(), row, nowExpanded);
         mPowerInteractor.wakeUpIfDozing("NOTIFICATION_CLICK", PowerManager.WAKE_REASON_GESTURE);
         if (nowExpanded) {
-            if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
+            if (mNTForbiddenSwipeDownQSController.getForbiddenSwipeDownQS()) {
+                mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);
+                // launch the bouncer if the device is locked
+                mActivityStarter.dismissKeyguardThenExecute(() -> false /* dismissAction */
+                        , null /* cancelRunnable */, false /* afterKeyguardGone */);
+            } else if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {
                 mShadeTransitionController.goToLockedShade(row, /* needsQSAnimation = */ true);
             } else if (clickedEntry.isSensitive().getValue() && isInLockedDownShade()) {
                 mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);
@@ -415,4 +484,18 @@ public boolean shouldSuppress() {
                     return !mCommandQueue.panelsEnabled();
                 }
             };
+
+    private final NotificationInterruptSuppressor mLessBoringSuppressor =
+            new NotificationInterruptSuppressor() {
+        @Override
+        public String getName() {
+            return TAG;
+        }
+
+        @Override
+        public boolean suppressAwakeHeadsUp(NotificationEntry entry) {
+            if (!mLessBoringHeadsUp) return false;
+            return !mHeadsUpWhitelistPackages.contains(entry.getSbn().getPackageName().toLowerCase());
+        }
+    };
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
index 75dc42ba4b4ee..f8425817ce7e8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
@@ -23,6 +23,7 @@ import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.display.domain.interactor.DisplayStateInteractor
 import com.android.systemui.keyguard.KeyguardViewMediator
 import com.android.systemui.keyguard.WakefulnessLifecycle
+import com.android.systemui.res.R
 import com.android.systemui.shade.ShadeViewController
 import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor
 import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor
@@ -31,6 +32,7 @@ import com.android.systemui.statusbar.CircleReveal
 import com.android.systemui.statusbar.LiftReveal
 import com.android.systemui.statusbar.LightRevealEffect
 import com.android.systemui.statusbar.LightRevealScrim
+import com.android.systemui.statusbar.PowerButtonReveal
 import com.android.systemui.statusbar.NotificationShadeWindowController
 import com.android.systemui.statusbar.StatusBarState
 import com.android.systemui.statusbar.StatusBarStateControllerImpl
@@ -132,10 +134,12 @@ constructor(
                     }
 
                     override fun onAnimationStart(animation: Animator) {
-                        if (dozeParameters.get().isMinModeActive()) {
-                            lightRevealScrim.revealEffect = LiftReveal
-                        } else {
-                            lightRevealScrim.revealEffect = revealEffect
+                        if (!ambientAod()) {
+                            if (dozeParameters.get().isMinModeActive()) {
+                                lightRevealScrim.revealEffect = LiftReveal
+                            } else {
+                                lightRevealScrim.revealEffect = revealEffect
+                            }
                         }
                         interactionJankMonitor.begin(
                             notifShadeWindowControllerLazy.get().windowRootView,
@@ -298,6 +302,15 @@ constructor(
                 lightRevealAnimator.setDuration(LIGHT_REVEAL_ANIMATION_DURATION_MINMODE)
             }
 
+            if (wakefulnessLifecycle.lastSleepReason == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) {
+                val powerButtonY = context.resources.getDimensionPixelSize(
+                    R.dimen.physical_power_button_center_screen_location_y
+                ).toFloat()
+                revealEffect = PowerButtonReveal(powerButtonY)
+            } else {
+                revealEffect = LiftReveal
+            }
+
             // Start the animation on the next frame. startAnimation() is called after
             // PhoneWindowManager makes a binder call to System UI on
             // IKeyguardService#onStartedGoingToSleep(). By the time we get here, system_server is
@@ -354,8 +367,8 @@ constructor(
             return false
         }
 
-        // If animations are disabled system-wide, don't play this one either.
-        if (globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f) {
+        // If animations are sped up, don't play this one either to avoid flickering.
+        if (globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) != 1f) {
             return false
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/IconManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/IconManager.java
index bd5979b8e8885..6fe22246a50e6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/IconManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/IconManager.java
@@ -20,10 +20,13 @@
 import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_ICON;
 import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_MOBILE_NEW;
 import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_WIFI_NEW;
+import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_NETWORK_SPEED;
 
 import android.annotation.Nullable;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -36,6 +39,7 @@
 import com.android.systemui.demomode.DemoModeCommandReceiver;
 import com.android.systemui.kairos.ExperimentalKairosApi;
 import com.android.systemui.kairos.KairosNetwork;
+import com.android.systemui.res.R;
 import com.android.systemui.statusbar.BaseStatusBarFrameLayout;
 import com.android.systemui.statusbar.StatusBarIconView;
 import com.android.systemui.statusbar.StatusIconDisplayable;
@@ -54,6 +58,7 @@
 import com.android.systemui.statusbar.pipeline.wifi.ui.WifiUiAdapter;
 import com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView;
 import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel;
+import com.android.systemui.statusbar.policy.NetworkSpeedController;
 import com.android.systemui.util.Assert;
 
 import dagger.Lazy;
@@ -102,6 +107,9 @@ public class IconManager implements DemoModeCommandReceiver {
 
     protected ArrayList<String> mBlockList = new ArrayList<>();
 
+    private final boolean mNewIconStyle;
+    private final boolean mShowNotificationCount;
+
     public IconManager(
             ViewGroup group,
             StatusBarLocation location,
@@ -119,6 +127,12 @@ public IconManager(
         mKairosNetwork = kairosNetwork;
         mAppScope = appScope;
 
+        mNewIconStyle = Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.STATUSBAR_COLORED_ICONS, 0, UserHandle.USER_CURRENT) == 1;
+        mShowNotificationCount = Settings.System.getIntForUser(mContext.getContentResolver(),
+            Settings.System.STATUSBAR_NOTIF_COUNT, 0,
+            UserHandle.USER_CURRENT) == 1;
+
         reloadDimens();
 
         // This starts the flow for the new pipeline, and will notify us of changes via
@@ -176,6 +190,8 @@ protected StatusIconDisplayable addHolder(int index, String slot, boolean blocke
             case TYPE_ICON -> addIcon(index, slot, blocked, holder.getIcon());
             case TYPE_WIFI_NEW -> addNewWifiIcon(index, slot);
             case TYPE_MOBILE_NEW -> addNewMobileIcon(index, slot, holder.getTag());
+            case TYPE_NETWORK_SPEED ->
+                    NetworkSpeedController.Companion.get().addHolder(index, slot, mGroup, holder, blocked);
             case TYPE_BINDABLE ->
                 // Safe cast, since only BindableIconHolders can set this tag on themselves
                     addBindableIcon((BindableIconHolder) holder, index);
@@ -186,6 +202,8 @@ protected StatusIconDisplayable addHolder(int index, String slot, boolean blocke
     protected StatusBarIconView addIcon(int index, String slot, boolean blocked,
             StatusBarIcon icon) {
         StatusBarIconView view = onCreateStatusBarIconView(slot, blocked);
+        view.setIconStyle(mNewIconStyle);
+        view.setShowCount(mShowNotificationCount);
         view.set(icon);
         mGroup.addView(view, index, onCreateLayoutParams(icon.shape));
         return view;
@@ -332,6 +350,9 @@ public void onSetIconHolder(int viewIndex, StatusBarIconHolder holder) {
             case TYPE_BINDABLE:
                 // Nothing, the new icons update themselves
                 return;
+            case TYPE_NETWORK_SPEED:
+                NetworkSpeedController.Companion.get().onSetIconHolder(viewIndex, holder, mGroup);
+                return;
             default:
                 break;
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconController.java
index 4def11b2711f3..1b4e4c7d044bc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconController.java
@@ -103,6 +103,8 @@ void setResourceIcon(String slot, @Nullable String resPackage, @DrawableRes int
     /** Reads the default hide list from config value unless hideListStr is provided. */
     static ArraySet<String> getIconHideList(Context context, String hideListStr) {
         ArraySet<String> ret = new ArraySet<>();
+        if (context == null)
+            return ret; // not ready yet
         String[] hideList = hideListStr == null
                 ? context.getResources().getStringArray(R.array.config_statusBarIconsToExclude)
                 : hideListStr.split(",");
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
index ea757a6d4d956..dc0f058af84a4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ui/StatusBarIconControllerImpl.java
@@ -47,11 +47,13 @@
 import com.android.systemui.statusbar.core.StatusBarConnectedDisplays;
 import com.android.systemui.statusbar.phone.StatusBarIconHolder;
 import com.android.systemui.statusbar.phone.StatusBarIconHolder.BindableIconHolder;
+import com.android.systemui.statusbar.phone.StatusBarIconControllerImplEx;
 import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags;
 import com.android.systemui.statusbar.pipeline.icons.shared.BindableIconsRegistry;
 import com.android.systemui.statusbar.pipeline.icons.shared.model.BindableIcon;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
+import com.android.systemui.statusbar.policy.NetworkSpeedController;
 import com.android.systemui.tuner.TunerService;
 import com.android.systemui.tuner.TunerService.Tunable;
 
@@ -111,6 +113,9 @@ public StatusBarIconControllerImpl(
         dumpManager.registerDumpable(getClass().getSimpleName(), this);
 
         addModernBindableIcons(modernIconsRegistry);
+        StatusBarIconControllerImplEx.Companion.init(context, this, statusBarIconList);
+        NetworkSpeedController.Companion.init(context);
+        NetworkSpeedController.Companion.get().init();
     }
 
     /**
@@ -136,12 +141,11 @@ private void addModernBindableIcons(BindableIconsRegistry registry) {
     /**  */
     @Override
     public void addIconGroup(IconManager group) {
-        for (IconManager existingIconManager : mIconGroups) {
-            if (existingIconManager.mGroup == group.mGroup) {
-                Log.e(TAG, "Adding new IconManager for the same ViewGroup. This could cause "
-                        + "unexpected results.");
-            }
-        }
+        // Remove existing icon group if present
+        mIconGroups.stream()
+                .filter(i -> i.mGroup == group.mGroup)
+                .findFirst()
+                .ifPresent(i -> removeIconGroup(i));
 
         group.setController(this);
         group.reloadDimens();
@@ -375,7 +379,7 @@ private void setExternalIcon(String slot, StatusBarIcon icon) {
         setIcon(slotName, holder);
     }
 
-    private void setIcon(String slot, @NonNull StatusBarIconHolder holder) {
+    public void setIcon(String slot, @NonNull StatusBarIconHolder holder) {
         boolean isNew = mStatusBarIconList.getIconHolder(slot, holder.getTag()) == null;
         mStatusBarIconList.setIcon(slot, holder);
 
@@ -447,7 +451,7 @@ private void removeAllIconsForSlot(String slotName, boolean fromNewPipeline) {
         }
     }
 
-    private void handleSet(String slotName, StatusBarIconHolder holder) {
+    public void handleSet(String slotName, StatusBarIconHolder holder) {
         int viewIndex = mStatusBarIconList.getViewIndex(slotName, holder.getTag());
         mIconGroups.forEach(l -> l.onSetIconHolder(viewIndex, holder));
     }
@@ -516,6 +520,11 @@ public void onDensityOrFontScaleChanged() {
         refreshIconGroups();
     }
 
+    @Override
+    public void onThemeChanged() {
+        refreshIconGroups();
+    }
+
     private String createExternalSlotName(String slot) {
         if (slot.endsWith(EXTERNAL_SLOT_SUFFIX)) {
             return slot;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/data/repository/BatteryRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/data/repository/BatteryRepository.kt
index 8baaa2983c101..9e161b3029520 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/data/repository/BatteryRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/data/repository/BatteryRepository.kt
@@ -21,6 +21,7 @@ import android.database.ContentObserver
 import android.os.Handler
 import android.os.Looper
 import android.os.UserHandle
+import android.provider.Settings
 import com.android.systemui.Flags
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Application
@@ -89,6 +90,12 @@ interface BatteryRepository {
      */
     val showBatteryPercentMode: StateFlow<Int>
 
+    /**
+     * [Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT]. A user setting to indicate whether
+     * status bar icons should be tinted with the system accent color
+     */
+    val tintStatusBarIconsWithAccent: StateFlow<Boolean>
+
     companion object {
         const val ICON_STYLE_DEFAULT = 0
         const val ICON_STYLE_CIRCLE = 1
@@ -386,6 +393,50 @@ constructor(
                 initialValue = BatteryRepository.SHOW_PERCENT_HIDDEN,
             )
 
+    override val tintStatusBarIconsWithAccent =
+        callbackFlow {
+                val resolver = context.contentResolver
+                val uri =
+                    Settings.System.getUriFor(
+                        Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT
+                    )
+
+                fun readSetting(): Boolean {
+                    return Settings.System.getIntForUser(
+                        resolver,
+                        Settings.System.TINT_STATUSBAR_ICONS_WITH_ACCENT,
+                        0,
+                        UserHandle.USER_CURRENT,
+                    ) == 1
+                }
+
+                val observer =
+                    object : ContentObserver(Handler(Looper.getMainLooper())) {
+                        override fun onChange(selfChange: Boolean) {
+                            trySend(readSetting())
+                        }
+                    }
+
+                resolver.registerContentObserver(
+                    uri,
+                    /* notifyForDescendants = */ false,
+                    observer,
+                    UserHandle.USER_ALL,
+                )
+
+                // Emit current value immediately
+                trySend(readSetting())
+
+                awaitClose { resolver.unregisterContentObserver(observer) }
+            }
+            .distinctUntilChanged()
+            .flowOn(bgDispatcher)
+            .stateIn(
+                scope = scope,
+                started = SharingStarted.Lazily,
+                initialValue = false,
+            )
+
     /** Get and re-fetch the estimate every 2 minutes while active */
     private val estimate: Flow<String?> = flow {
         while (true) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/domain/interactor/BatteryInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/domain/interactor/BatteryInteractor.kt
index 2391244829ee0..258cd026a26a8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/domain/interactor/BatteryInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/domain/interactor/BatteryInteractor.kt
@@ -18,10 +18,14 @@ package com.android.systemui.statusbar.pipeline.battery.domain.interactor
 
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepository
+import com.android.systemui.statusbar.policy.ConfigurationController
+import com.android.systemui.statusbar.policy.onThemeChanged
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -33,6 +37,7 @@ import kotlinx.coroutines.flow.stateIn
 class BatteryInteractor @Inject constructor(
     private val repo: BatteryRepository,
     @Background private val appScope: CoroutineScope,
+    @Main private val configurationController: ConfigurationController,
 ) {
     /** The current level in the range of [0-100], or null if we don't know the level yet */
     val level =
@@ -85,6 +90,12 @@ class BatteryInteractor @Inject constructor(
     /** @see [BatteryRepository.showBatteryPercentMode] */
     val showBatteryPercentMode: StateFlow<Int> = repo.showBatteryPercentMode
 
+    /** @see [BatteryRepository.tintStatusBarIconsWithAccent] */
+    val tintStatusBarIconsWithAccent: StateFlow<Boolean> = repo.tintStatusBarIconsWithAccent
+
+    /** Flow that emits whenever the theme changes */
+    val themeChanged: Flow<Unit> = configurationController.onThemeChanged
+
     // Mode == 1
     val showPercentInsideIcon: StateFlow<Boolean> =
         repo.showBatteryPercentMode
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/shared/ui/BatteryColors.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/shared/ui/BatteryColors.kt
index a1675766ba040..f25565d58940f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/shared/ui/BatteryColors.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/shared/ui/BatteryColors.kt
@@ -116,4 +116,30 @@ sealed interface BatteryColors {
             private val highAlphaBg = Color.White.copy(alpha = 0.55f)
         }
     }
+
+    /** Accent color theme for light mode */
+    class AccentLightTheme(private val accentColor: Color) : LightTheme() {
+        override val attribution = accentColor
+        override val glyph = accentColor.copy(alpha = 0.75f)
+        override val fill = accentColor
+        override val backgroundOnly = accentColor.copy(alpha = 0.20f)
+        override val backgroundWithGlyph = accentColor.copy(alpha = 0.55f)
+    }
+
+    /** Accent color theme for dark mode */
+    class AccentDarkTheme(private val accentColor: Color) : DarkTheme() {
+        override val attribution = accentColor
+        override val glyph = accentColor.copy(alpha = 0.75f)
+        override val fill = accentColor
+        override val backgroundOnly = accentColor.copy(alpha = 0.45f)
+        override val backgroundWithGlyph = accentColor.copy(alpha = 0.55f)
+    }
+
+    companion object {
+        /** Create accent color themes from Android color int */
+        fun createAccentThemes(accentColorInt: Int): Pair<LightTheme, DarkTheme> {
+            val accentColor = Color(accentColorInt)
+            return Pair(AccentLightTheme(accentColor), AccentDarkTheme(accentColor))
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/BatteryWithPercent.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/BatteryWithPercent.kt
index 36d3ba1e63d63..6a50697119c57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/BatteryWithPercent.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/composable/BatteryWithPercent.kt
@@ -95,6 +95,15 @@ fun BatteryWithPercent(
             }
         }
 
+        if (viewModel.shouldShowBoltInTextMode) {
+            BasicText(
+                text = "\u26A1",
+                color = colorProducer,
+                style = textStyle,
+                maxLines = 1,
+            )
+        }
+
         if (showEstimate) {
             viewModel.batteryTimeRemainingEstimate?.let {
                 BasicText(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/viewmodel/BatteryViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/viewmodel/BatteryViewModel.kt
index f29f08e1c298a..07015abff30e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/viewmodel/BatteryViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/battery/ui/viewmodel/BatteryViewModel.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
+import com.android.settingslib.Utils
 import com.android.systemui.Flags
 import com.android.systemui.common.shared.model.ContentDescription
 import com.android.systemui.dagger.qualifiers.Application
@@ -54,7 +55,7 @@ import kotlinx.coroutines.flow.map
 sealed class BatteryViewModel(
     val interactor: BatteryInteractor,
     shouldShowPercent: Flow<Boolean>,
-    @Application context: Context,
+    @Application private val context: Context,
 ) : ExclusiveActivatable() {
     protected val hydrator: Hydrator = Hydrator("BatteryViewModel.hydrator")
 
@@ -93,6 +94,18 @@ sealed class BatteryViewModel(
             source = interactor.showPercentInsideIcon,
         )
 
+    val shouldShowBoltInTextMode: Boolean by
+    hydrator.hydratedStateOf(
+        traceName = "shouldShowBoltInTextMode",
+        initialValue = false,
+        source = combine(
+            interactor.batteryIconStyle.map { it == BatteryRepository.ICON_STYLE_TEXT },
+            interactor.isCharging
+        ) { isTextMode, charging ->
+            isTextMode && charging
+        }
+    )
+
     /** A [List<BatteryGlyph>] representation of the current [level] */
     private val levelGlyphs: Flow<List<BatteryGlyph>> =
         interactor.level.map { it?.glyphRepresentation() ?: emptyList() }
@@ -141,8 +154,13 @@ sealed class BatteryViewModel(
         )
 
     private val _colorProfile: Flow<ColorProfile> =
-        combine(interactor.batteryAttributionType, interactor.isCritical) { attr, isCritical ->
-            when (attr) {
+        combine(
+            interactor.batteryAttributionType,
+            interactor.isCritical,
+            interactor.tintStatusBarIconsWithAccent,
+            interactor.themeChanged
+        ) { attr, isCritical, useAccentColor, _ ->
+            val baseProfile = when (attr) {
                 Charging,
                 Defend ->
                     ColorProfile(
@@ -169,6 +187,14 @@ sealed class BatteryViewModel(
                         )
                     }
             }
+            
+            if (useAccentColor) {
+                val accentColorInt = Utils.getColorAccentDefaultColor(context)
+                val (accentLight, accentDark) = BatteryColors.createAccentThemes(accentColorInt)
+                ColorProfile(dark = accentDark, light = accentLight)
+            } else {
+                baseProfile
+            }
         }
 
     /** For the current battery state, what is the relevant color profile to use */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
index 6225a6f7acbce..68defb10691c4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
@@ -35,6 +35,8 @@ import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRe
 import com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepositoryImpl
 import com.android.systemui.statusbar.pipeline.icons.shared.BindableIconsRegistry
 import com.android.systemui.statusbar.pipeline.icons.shared.BindableIconsRegistryImpl
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepository
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepositoryImpl
 import com.android.systemui.statusbar.pipeline.mobile.StatusBarMobileIconKairos
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigCoreStartable
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigRepository
@@ -165,6 +167,9 @@ abstract class StatusBarPipelineModule {
     @ClassKey(CarrierConfigCoreStartable::class)
     abstract fun bindCarrierConfigStartable(impl: CarrierConfigCoreStartable): CoreStartable
 
+    @Binds
+    abstract fun bindCommonImsRepository(impl: CommonImsRepositoryImpl): CommonImsRepository
+
     companion object {
 
         @Provides
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsIconModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsIconModel.kt
new file mode 100644
index 0000000000000..2caa96939d657
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsIconModel.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2024 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.pipeline.ims.data.model
+
+data class ImsIconModel(
+    val showHdIcon: Boolean = false,
+    val showVowifiIcon: Boolean = false
+)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsStateModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsStateModel.kt
new file mode 100644
index 0000000000000..c90021f0b5740
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/model/ImsStateModel.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 The LibreMobileOS Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.pipeline.ims.data.model
+
+import android.telephony.ims.feature.MmTelFeature
+import android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN
+import android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_NONE
+
+data class ImsStateModel(
+    val subId: Int = -1,
+    val slotIndex: Int = -1,
+    val activeSubCount: Int = 0,
+    val registered: Boolean = false,
+    val capabilities: MmTelFeature.MmTelCapabilities? = null,
+    val registrationTech: Int = REGISTRATION_TECH_NONE
+) {
+
+    fun isHdVoiceCapable(): Boolean =
+        registered && capabilities
+            ?.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE) ?: false
+
+    fun isVoWifiAvailable(): Boolean =
+        isHdVoiceCapable() && registrationTech == REGISTRATION_TECH_IWLAN
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/CommonImsRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/CommonImsRepository.kt
new file mode 100644
index 0000000000000..67329e0f63e74
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/CommonImsRepository.kt
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ * Copyright (C) 2024 The LibreMobileOS Foundation
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.pipeline.ims.data.repository
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsIconModel
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
+import com.android.systemui.tuner.TunerService
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+interface CommonImsRepository {
+    val imsStates: StateFlow<List<ImsStateModel>>
+    val imsIconState: StateFlow<ImsIconModel>
+    fun getRepoForSubId(subId: Int): ImsRepository
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@SysUISingleton
+class CommonImsRepositoryImpl
+@Inject
+constructor(
+    private val subscriptionManager: SubscriptionManager,
+    @Background private val bgDispatcher: CoroutineDispatcher,
+    @Application private val scope: CoroutineScope,
+    private val imsRepoFactory: ImsRepositoryImpl.Factory,
+    tunerService: TunerService,
+    @Application private val context: Context,
+) : CommonImsRepository {
+
+    private var subIdRepositoryCache: MutableMap<Int, ImsRepository> =
+        mutableMapOf()
+
+    private val mobileSubscriptionsChangeEvent: Flow<Unit> =
+        if (!hasTelephony()) {
+            flowOf(Unit)
+        } else conflatedCallbackFlow {
+            val callback = object : SubscriptionManager.OnSubscriptionsChangedListener() {
+                override fun onSubscriptionsChanged() { trySend(Unit) }
+            }
+            try {
+                subscriptionManager.addOnSubscriptionsChangedListener(bgDispatcher.asExecutor(), callback)
+            } catch (_: SecurityException) {
+                trySend(Unit)
+                close()
+                return@conflatedCallbackFlow
+            }
+            awaitClose { subscriptionManager.removeOnSubscriptionsChangedListener(callback) }
+        }
+
+    private val subscriptions: StateFlow<List<Int>> =
+        mobileSubscriptionsChangeEvent
+            .mapLatest { fetchSubscriptionsList().map { it.subscriptionId } }
+            .onEach { ids -> dropUnusedReposFromCache(ids) }
+            .distinctUntilChanged()
+            .stateIn(scope, started = SharingStarted.WhileSubscribed(), listOf())
+
+    private fun dropUnusedReposFromCache(newIds: List<Int>) {
+        // Remove any connection repository from the cache that isn't in the new set of IDs. They
+        // will get garbage collected once their subscribers go away
+        val keep = newIds.toSet()
+        subIdRepositoryCache = subIdRepositoryCache.filterKeys { it in keep }.toMutableMap()
+    }
+
+    private fun hasTelephony(): Boolean =
+        try {
+            context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+        } catch (_: Throwable) { false }
+
+    /**
+     * True if the checked subId is in the list of current subs
+     *
+     * @param checkedSubIds the list to validate [subId] against. To invalidate the cache, pass in the
+     *   new subscription list. Otherwise use [subscriptions.value] to validate a subId against the
+     *   current known subscriptions
+     */
+    private fun checkSub(subId: Int, checkedSubIds: List<Int>): Boolean {
+        checkedSubIds.forEach {
+            if (it == subId) {
+                return true
+            }
+        }
+        return false
+    }
+
+    private suspend fun fetchSubscriptionsList(): List<SubscriptionInfo> =
+        withContext(bgDispatcher) {
+            try {
+                subscriptionManager.completeActiveSubscriptionInfoList ?: emptyList()
+            } catch (_: SecurityException) {
+                emptyList()
+            } catch (_: Throwable) {
+                emptyList()
+            }
+        }
+
+    override val imsStates: StateFlow<List<ImsStateModel>> =
+        subscriptions
+            .map { ids -> ids.map { getRepoForSubId(it) } }
+            .flatMapLatest { repos ->
+                if (repos.isEmpty()) flowOf(emptyList())
+                else combine(repos.map { it.imsState }) { it.toList() }
+            }
+            .stateIn(scope, started = SharingStarted.WhileSubscribed(), listOf())
+
+    override val imsIconState: StateFlow<ImsIconModel> = conflatedCallbackFlow {
+        var showHdIcon = false
+        var showVowifiIcon = false
+        val callback =
+            object : TunerService.Tunable {
+                override fun onTuningChanged(key: String, newValue: String?) {
+                    when (key) {
+                        KEY_HD_ICON -> {
+                            showHdIcon =
+                                TunerService.parseIntegerSwitch(newValue, false)
+                        }
+
+                        KEY_VOWIFI_ICON -> {
+                            showVowifiIcon =
+                                TunerService.parseIntegerSwitch(newValue, false)
+                        }
+
+                        else -> return
+                    }
+                    trySend(
+                        ImsIconModel(
+                            showHdIcon = showHdIcon,
+                            showVowifiIcon = showVowifiIcon
+                        )
+                    )
+                }
+            }
+
+        tunerService.run {
+            addTunable(callback, KEY_HD_ICON)
+            addTunable(callback, KEY_VOWIFI_ICON)
+        }
+
+        awaitClose { tunerService.removeTunable(callback) }
+    }.stateIn(
+        scope,
+        started = SharingStarted.WhileSubscribed(),
+        initialValue = ImsIconModel()
+    )
+
+    override fun getRepoForSubId(subId: Int): ImsRepository =
+        getOrCreateRepoForSubId(subId)
+
+    private fun getOrCreateRepoForSubId(subId: Int) =
+        subIdRepositoryCache[subId]
+            ?: createRepositoryForSubId(subId).also { subIdRepositoryCache[subId] = it }
+
+    private fun createRepositoryForSubId(subId: Int): ImsRepository {
+        return imsRepoFactory.build(subId)
+    }
+
+    private companion object {
+        const val KEY_HD_ICON = "status_bar_show_hd_calling"
+        const val KEY_VOWIFI_ICON = "status_bar_show_vowifi"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/ImsRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/ImsRepository.kt
new file mode 100644
index 0000000000000..997fc34dd1e2b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/ims/data/repository/ImsRepository.kt
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2024 The LibreMobileOS Foundation
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.pipeline.ims.data.repository
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.telephony.SubscriptionManager
+import android.telephony.ims.ImsException
+import android.telephony.ims.ImsManager
+import android.telephony.ims.ImsMmTelManager
+import android.telephony.ims.ImsReasonInfo
+import android.telephony.ims.ImsRegistrationAttributes
+import android.telephony.ims.ImsStateCallback
+import android.telephony.ims.RegistrationManager.RegistrationCallback
+import android.telephony.ims.feature.MmTelFeature
+import android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_NONE
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.retryWhen
+import kotlinx.coroutines.flow.scan
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+
+interface ImsRepository {
+    val subId: Int
+    val imsState: StateFlow<ImsStateModel>
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class ImsRepositoryImpl(
+    override val subId: Int,
+    imsManager: ImsManager,
+    subscriptionManager: SubscriptionManager,
+    bgDispatcher: CoroutineDispatcher,
+    scope: CoroutineScope,
+) : ImsRepository {
+
+    private val imsCallback: StateFlow<ImsCallbackState> = run {
+        val initial = ImsCallbackState()
+
+        if (imsManager == null) {
+            return@run kotlinx.coroutines.flow.MutableStateFlow(initial)
+        }
+
+        if (!SubscriptionManager.isValidSubscriptionId(subId) ||
+            subscriptionManager == null ||
+            subscriptionManager.activeSubscriptionInfoCount == 0
+        ) {
+            return@run kotlinx.coroutines.flow.MutableStateFlow(initial)
+        }
+
+        val imsMmTelManager = runCatching { imsManager.getImsMmTelManager(subId) }.getOrNull()
+            ?: return@run kotlinx.coroutines.flow.MutableStateFlow(initial)
+
+        val imsEvents: Flow<CallbackEvent> = callbackFlow<CallbackEvent> {
+            val registrationCallback = object : RegistrationCallback() {
+                override fun onRegistered(attributes: ImsRegistrationAttributes) {
+                    trySend(CallbackEvent.OnImsRegistrationChanged(true, attributes))
+                }
+                override fun onUnregistered(info: ImsReasonInfo) {
+                    trySend(CallbackEvent.OnImsRegistrationChanged(false, null))
+                }
+            }
+
+            val capabilityCallback = object : ImsMmTelManager.CapabilityCallback() {
+                override fun onCapabilitiesStatusChanged(caps: MmTelFeature.MmTelCapabilities) {
+                    trySend(CallbackEvent.OnImsCapabilitiesStatusChanged(caps))
+                }
+            }
+
+            val stateCallback = object : ImsStateCallback() {
+                var registered = false
+                override fun onAvailable() {
+                    if (registered) return
+                    runCatching<Unit> {
+                        imsMmTelManager.registerImsRegistrationCallback(
+                            bgDispatcher.asExecutor(), registrationCallback
+                        )
+                        imsMmTelManager.registerMmTelCapabilityCallback(
+                            bgDispatcher.asExecutor(), capabilityCallback
+                        )
+                        registered = true
+                    }.onFailure { close(it) }
+                }
+                override fun onUnavailable(reason: Int) {
+                    if (!registered) return
+                    runCatching<Unit> {
+                        imsMmTelManager.unregisterImsRegistrationCallback(registrationCallback)
+                        imsMmTelManager.unregisterMmTelCapabilityCallback(capabilityCallback)
+                    }
+                    registered = false
+                }
+                override fun onError() {
+                    if (!registered) return
+                    runCatching<Unit> {
+                        imsMmTelManager.unregisterImsRegistrationCallback(registrationCallback)
+                        imsMmTelManager.unregisterMmTelCapabilityCallback(capabilityCallback)
+                    }
+                    registered = false
+                }
+            }
+
+            val regResult: Result<Unit> = runCatching<Unit> {
+                imsMmTelManager.registerImsStateCallback(bgDispatcher.asExecutor(), stateCallback)
+            }
+            if (regResult.isFailure) {
+                close(regResult.exceptionOrNull())
+                return@callbackFlow
+            }
+
+            awaitClose {
+                runCatching<Unit> {
+                    imsMmTelManager.unregisterImsStateCallback(stateCallback)
+                    imsMmTelManager.unregisterImsRegistrationCallback(registrationCallback)
+                    imsMmTelManager.unregisterMmTelCapabilityCallback(capabilityCallback)
+                }
+            }
+        }
+        imsEvents
+            .retryWhen { cause: Throwable, _: Long ->
+                // Retry the flow with 1 second delay
+                // only if service not available.
+                // This state is temporary and service may be available after sometime.
+                delay(1000)
+                cause is ImsException && cause.code == ImsException.CODE_ERROR_SERVICE_UNAVAILABLE
+            }
+            .catch { _: Throwable ->
+                // Nothing
+            }
+            .scan(initial = initial) { state: ImsCallbackState, event: CallbackEvent ->
+                state.applyEvent(event)
+            }
+            .stateIn(scope = scope, started = SharingStarted.WhileSubscribed(), initial)
+    }
+
+    override val imsState: StateFlow<ImsStateModel> =
+        imsCallback
+            .map { callbackState ->
+                val registrationChanged = callbackState.onImsRegistrationChanged
+                val capabilitiesChanged = callbackState.onImsCapabilitiesStatusChanged
+                val registered = registrationChanged?.registered ?: false
+                val capabilities = capabilitiesChanged?.capabilities
+                val slotIndex = if (SubscriptionManager.isValidSubscriptionId(subId)) {
+                    SubscriptionManager.getSlotIndex(subId)
+                } else {
+                    SubscriptionManager.INVALID_SIM_SLOT_INDEX
+                }
+                ImsStateModel(
+                    subId = subId,
+                    slotIndex = slotIndex,
+                    activeSubCount = subscriptionManager.activeSubscriptionInfoCount,
+                    registered = registered,
+                    capabilities = capabilities,
+                    registrationTech = registrationChanged?.attributes?.registrationTechnology
+                        ?: REGISTRATION_TECH_NONE
+                )
+            }
+            .catch { emit(ImsStateModel()) /* on exception, just return default value */ }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), ImsStateModel())
+
+    private class NoOpImsRepository(override val subId: Int) : ImsRepository {
+        override val imsState: StateFlow<ImsStateModel> =
+            kotlinx.coroutines.flow.MutableStateFlow(ImsStateModel())
+    }
+
+    class Factory
+    @Inject
+    constructor(
+        private val subscriptionManager: SubscriptionManager,
+        @Background private val bgDispatcher: CoroutineDispatcher,
+        @Application private val scope: CoroutineScope,
+        @Application private val context: Context,
+    ) {
+        fun build(subId: Int): ImsRepository {
+            val pm = context.packageManager
+            val hasTelephony =
+                pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+            val hasValidSub = SubscriptionManager.isValidSubscriptionId(subId)
+            val hasActiveSubs = subscriptionManager.activeSubscriptionInfoCount > 0
+
+            val imsManager: ImsManager? =
+                context.getSystemService(ImsManager::class.java)
+
+            if (!hasTelephony || imsManager == null || !hasValidSub || !hasActiveSubs) {
+                return NoOpImsRepository(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+            }
+
+            return ImsRepositoryImpl(
+                subId = subId,
+                imsManager = imsManager,
+                subscriptionManager = subscriptionManager,
+                bgDispatcher = bgDispatcher,
+                scope = scope,
+            )
+        }
+    }
+}
+
+sealed interface CallbackEvent {
+    data class OnImsRegistrationChanged(
+        val registered: Boolean,
+        val attributes: ImsRegistrationAttributes?
+    ) : CallbackEvent
+
+    data class OnImsCapabilitiesStatusChanged(
+        val capabilities: MmTelFeature.MmTelCapabilities
+    ) : CallbackEvent
+}
+
+data class ImsCallbackState(
+    val onImsRegistrationChanged: CallbackEvent.OnImsRegistrationChanged? = null,
+    val onImsCapabilitiesStatusChanged: CallbackEvent.OnImsCapabilitiesStatusChanged? = null
+) {
+    fun applyEvent(event: CallbackEvent): ImsCallbackState {
+        return when (event) {
+            is CallbackEvent.OnImsRegistrationChanged -> copy(onImsRegistrationChanged = event)
+            is CallbackEvent.OnImsCapabilitiesStatusChanged -> copy(onImsCapabilitiesStatusChanged = event)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/NetworkNameModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/NetworkNameModel.kt
index d6013192f55e4..e4964c3bfd262 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/NetworkNameModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/NetworkNameModel.kt
@@ -109,7 +109,7 @@ fun Intent.toNetworkNameModel(separator: String): NetworkNameModel? {
                 dataSpn
             }
         } else {
-            getStringExtra(EXTRA_DATA_SPN)
+            getStringExtra(EXTRA_DATA_SPN) ?: getStringExtra(EXTRA_SPN)
         }
 
     val showPlmn = getBooleanExtra(EXTRA_SHOW_PLMN, false)
@@ -119,7 +119,7 @@ fun Intent.toNetworkNameModel(separator: String): NetworkNameModel? {
     if (showPlmn && plmn != null) {
         str.append(plmn)
     }
-    if (showSpn && spn != null) {
+    if (showSpn && spn != null && !str.toString().lowercase().contains(spn.lowercase())) {
         if (str.isNotEmpty()) {
             str.append(separator)
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt
index 01e7c60f7ad98..bd62af11e3029 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt
@@ -23,6 +23,7 @@ import com.android.systemui.kairos.ExperimentalKairosApi
 import com.android.systemui.kairos.State
 import com.android.systemui.kairos.combine as kairosCombine
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
@@ -170,6 +171,11 @@ interface MobileConnectionRepository {
      */
     val isAllowedDuringAirplaneMode: StateFlow<Boolean>
 
+    /**
+     * The current state of the IMS with its capabilities
+     */
+    val imsState: StateFlow<ImsStateModel>
+
     /**
      * True if this network has NET_CAPABILITIY_PRIORITIZE_LATENCY, and can be considered to be a
      * network slice
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepositoryKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepositoryKairos.kt
index ec5744fa9ed40..82fce70cdeefb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepositoryKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepositoryKairos.kt
@@ -20,6 +20,7 @@ import android.telephony.CellSignalStrength
 import android.telephony.TelephonyManager
 import com.android.systemui.kairos.ExperimentalKairosApi
 import com.android.systemui.kairos.State
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.log.table.TableLogBuffer
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
@@ -167,6 +168,11 @@ interface MobileConnectionRepositoryKairos {
      */
     val hasPrioritizedNetworkCapabilities: State<Boolean>
 
+    /**
+     * The current state of the IMS with its capabilities
+     */
+    val imsState: State<ImsStateModel>
+
     /**
      * True if this connection is in emergency callback mode.
      *
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt
index 9a547430ed404..25d750c83cf48 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepository.kt
@@ -21,6 +21,7 @@ import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
 import android.telephony.TelephonyManager
 import com.android.systemui.log.table.TableLogBuffer
 import com.android.systemui.log.table.logDiffsForTable
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
@@ -218,6 +219,8 @@ class DemoMobileConnectionRepository(
 
     override val isAllowedDuringAirplaneMode = MutableStateFlow(false)
 
+    override val imsState = MutableStateFlow(ImsStateModel())
+
     override val hasPrioritizedNetworkCapabilities = MutableStateFlow(false)
 
     override suspend fun isInEcmMode(): Boolean = false
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepositoryKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepositoryKairos.kt
index 0acb4fa13a4ce..8d5f43107c94b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepositoryKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionRepositoryKairos.kt
@@ -35,6 +35,7 @@ import com.android.systemui.kairos.util.firstOrNull
 import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.kairosBuilder
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
@@ -426,6 +427,8 @@ class DemoMobileConnectionRepositoryKairos(
 
     override val isInEcmMode: State<Boolean> = stateOf(false)
 
+    override val imsState: State<ImsStateModel> = stateOf(ImsStateModel())
+
     private fun TransactionScope.resolvedNetworkTypeForIconGroup(
         iconGroup: SignalIcon.MobileIconGroup?
     ) = DefaultNetworkType(mobileMappingsReverseLookup.sample()[iconGroup] ?: "dis")
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSource.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSource.kt
index c8edb7166376a..a618a939df832 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSource.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSource.kt
@@ -99,6 +99,7 @@ private fun String.toDataType(): MobileIconGroup =
         "4g" -> TelephonyIcons.FOUR_G
         "4g+" -> TelephonyIcons.FOUR_G_PLUS
         "5g" -> TelephonyIcons.NR_5G
+        "5gsa" -> TelephonyIcons.NR_5G_SA
         "5ge" -> TelephonyIcons.LTE_CA_5G_E
         "5g+" -> TelephonyIcons.NR_5G_PLUS
         "e" -> TelephonyIcons.E
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSourceKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSourceKairos.kt
index f45780740946b..0ddc2b5f6e336 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSourceKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoModeMobileConnectionDataSourceKairos.kt
@@ -137,6 +137,7 @@ private fun String.toDataType(): MobileIconGroup =
         "4g" -> TelephonyIcons.FOUR_G
         "4g+" -> TelephonyIcons.FOUR_G_PLUS
         "5g" -> TelephonyIcons.NR_5G
+        "5gsa" -> TelephonyIcons.NR_5G_SA
         "5ge" -> TelephonyIcons.LTE_CA_5G_E
         "5g+" -> TelephonyIcons.NR_5G_PLUS
         "e" -> TelephonyIcons.E
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
index d1df877476e15..ea5c2c5a30796 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
@@ -181,6 +182,7 @@ class CarrierMergedConnectionRepository(
     override val isGsm = MutableStateFlow(false).asStateFlow()
     override val carrierNetworkChangeActive = MutableStateFlow(false).asStateFlow()
     override val satelliteLevel = MutableStateFlow(0)
+    override val imsState = MutableStateFlow(ImsStateModel()).asStateFlow()
 
     /**
      * Carrier merged connections happen over wifi but are displayed as a mobile triangle. Because
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryKairos.kt
index ef85dadfe21e5..74aca55347e15 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryKairos.kt
@@ -30,6 +30,7 @@ import com.android.systemui.kairos.stateOf
 import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.kairosBuilder
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
@@ -195,6 +196,8 @@ class CarrierMergedConnectionRepositoryKairos(
      */
     override val hasPrioritizedNetworkCapabilities: State<Boolean> = stateOf(false)
 
+    override val imsState: State<ImsStateModel> = stateOf(ImsStateModel())
+
     override val dataEnabled: State<Boolean>
         get() = isWifiEnabled
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt
index ecd0543119cd2..16f1c1de47878 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt
@@ -22,6 +22,7 @@ import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.log.table.TableLogBuffer
 import com.android.systemui.log.table.TableLogBufferFactory
 import com.android.systemui.log.table.logDiffsForTable
+import com.android.systemui.statusbar.pipeline.ims.data.repository.ImsRepositoryImpl
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
@@ -55,6 +56,7 @@ class FullMobileConnectionRepository(
     @Background scope: CoroutineScope,
     private val mobileRepoFactory: MobileConnectionRepositoryImpl.Factory,
     private val carrierMergedRepoFactory: CarrierMergedConnectionRepository.Factory,
+    private val imsRepoFactory: ImsRepositoryImpl.Factory,
 ) : MobileConnectionRepository {
     /**
      * Sets whether this connection is a typical mobile connection or a carrier merged connection.
@@ -85,6 +87,7 @@ class FullMobileConnectionRepository(
             subscriptionModel,
             defaultNetworkName,
             networkNameSeparator,
+            imsRepoFactory.build(subId)
         )
     }
 
@@ -353,6 +356,15 @@ class FullMobileConnectionRepository(
                 activeRepo.value.isAllowedDuringAirplaneMode.value,
             )
 
+    override val imsState =
+        activeRepo
+            .flatMapLatest { it.imsState }
+            .stateIn(
+                scope,
+                SharingStarted.WhileSubscribed(),
+                activeRepo.value.imsState.value,
+            )
+
     override val hasPrioritizedNetworkCapabilities =
         activeRepo
             .flatMapLatest { it.hasPrioritizedNetworkCapabilities }
@@ -392,6 +404,7 @@ class FullMobileConnectionRepository(
         private val logFactory: TableLogBufferFactory,
         private val mobileRepoFactory: MobileConnectionRepositoryImpl.Factory,
         private val carrierMergedRepoFactory: CarrierMergedConnectionRepository.Factory,
+        private val imsRepoFactory: ImsRepositoryImpl.Factory
     ) {
         fun build(
             subId: Int,
@@ -413,6 +426,7 @@ class FullMobileConnectionRepository(
                 scope,
                 mobileRepoFactory,
                 carrierMergedRepoFactory,
+                imsRepoFactory,
             )
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryKairos.kt
index 24e86f8da79ec..32292c8d57a3a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryKairos.kt
@@ -27,6 +27,7 @@ import com.android.systemui.kairos.flatMap
 import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.kairosBuilder
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
@@ -413,6 +414,8 @@ constructor(
 
     override val isInEcmMode: State<Boolean> = activeRepo.flatMap { it.isInEcmMode }
 
+    override val imsState: State<ImsStateModel> = activeRepo.flatMap { it.imsState }
+
     fun dump(pw: PrintWriter) {
         val cache = dumpCache ?: return
         val ipw = IndentingPrintWriter(pw, "  ")
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt
index 188a573eb892b..fd6a7686e0358 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt
@@ -48,6 +48,8 @@ import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.flags.FeatureFlagsClassic
 import com.android.systemui.flags.Flags.ROAMING_INDICATOR_VIA_DISPLAY_INFO
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
+import com.android.systemui.statusbar.pipeline.ims.data.repository.ImsRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.MobileInputLogger
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
@@ -76,6 +78,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -107,6 +110,7 @@ class MobileConnectionRepositoryImpl(
     override val tableLogBuffer: TableLogBuffer,
     flags: FeatureFlagsClassic,
     scope: CoroutineScope,
+    imsRepo: ImsRepository,
 ) : MobileConnectionRepository {
     init {
         if (telephonyManager.subscriptionId != subId) {
@@ -383,7 +387,7 @@ class MobileConnectionRepositoryImpl(
      * See b/322432056 for context.
      */
     @SuppressLint("RegisterReceiverViaContext")
-    override val networkName: StateFlow<NetworkNameModel> =
+    private val networkNameOrDefault: StateFlow<NetworkNameModel> =
         conflatedCallbackFlow {
                 val receiver =
                     object : BroadcastReceiver() {
@@ -413,6 +417,21 @@ class MobileConnectionRepositoryImpl(
             .flowOn(bgDispatcher)
             .stateIn(scope, SharingStarted.Eagerly, defaultNetworkName)
 
+    /**
+     * Filtered version of networkNameOrDefault that, when in service, uses the carrier name
+     * rather than default network name ("No service").
+     */
+    override val networkName: StateFlow<NetworkNameModel> =
+        combine(isInService, carrierName, networkNameOrDefault) {
+            isInServiceVal, carrierNameVal, networkNameOrDefaultVal ->
+            if (isInServiceVal && (networkNameOrDefaultVal === defaultNetworkName)) {
+                carrierNameVal
+            } else {
+                networkNameOrDefaultVal
+            }
+        }
+        .stateIn(scope, SharingStarted.Eagerly, defaultNetworkName)
+
     override val dataEnabled = run {
         val initial = telephonyManager.isDataConnectionAllowed
         callbackEvents
@@ -431,6 +450,8 @@ class MobileConnectionRepositoryImpl(
     /** Typical mobile connections aren't available during airplane mode. */
     override val isAllowedDuringAirplaneMode = MutableStateFlow(false).asStateFlow()
 
+    override val imsState: StateFlow<ImsStateModel> = imsRepo.imsState
+
     /**
      * Currently, a network with NET_CAPABILITY_PRIORITIZE_LATENCY is the only type of network that
      * we consider to be a "network slice". _PRIORITIZE_BANDWIDTH may be added in the future. Any of
@@ -489,6 +510,7 @@ class MobileConnectionRepositoryImpl(
             subscriptionModel: Flow<SubscriptionModel?>,
             defaultNetworkName: NetworkNameModel,
             networkNameSeparator: String,
+            imsRepository: ImsRepository,
         ): MobileConnectionRepository {
             return MobileConnectionRepositoryImpl(
                 subId,
@@ -506,6 +528,7 @@ class MobileConnectionRepositoryImpl(
                 mobileLogger,
                 flags,
                 scope,
+                imsRepository,
             )
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapter.kt
index df1a50abc045c..4c1bf76f1bc49 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapter.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapter.kt
@@ -20,6 +20,7 @@ import com.android.systemui.kairos.BuildScope
 import com.android.systemui.kairos.ExperimentalKairosApi
 import com.android.systemui.kairos.util.nameTag
 import com.android.systemui.log.table.TableLogBuffer
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
 import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
 import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
@@ -175,6 +176,12 @@ fun BuildScope.MobileConnectionRepositoryKairosAdapter(
                     "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).hasPrioritizedNetworkCapabilities"
                 }
             ),
+        imsState =
+            kairosRepo.imsState.toStateFlow(
+                nameTag {
+                    "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).imsState"
+                }
+            ),
         isInEcmMode = { kairosNetwork.transact { kairosRepo.isInEcmMode.sample() } },
     )
 
@@ -205,6 +212,7 @@ class MobileConnectionRepositoryKairosAdapter(
     override val networkName: StateFlow<NetworkNameModel>,
     override val carrierName: StateFlow<NetworkNameModel>,
     override val isAllowedDuringAirplaneMode: StateFlow<Boolean>,
+    override val imsState: StateFlow<ImsStateModel>,
     override val hasPrioritizedNetworkCapabilities: StateFlow<Boolean>,
     private val isInEcmMode: Producer<Boolean>,
 ) : MobileConnectionRepository {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosImpl.kt
index 0444ff48a4252..90e59923e307c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosImpl.kt
@@ -44,6 +44,8 @@ import android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID
 import android.telephony.satellite.NtnSignalStrength
 import com.android.settingslib.Utils
 import com.android.systemui.KairosBuilder
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
+import com.android.systemui.statusbar.pipeline.ims.data.repository.ImsRepository
 import com.android.systemui.broadcast.BroadcastDispatcher
 import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.flags.FeatureFlagsClassic
@@ -112,6 +114,7 @@ constructor(
     @Background private val bgDispatcher: CoroutineDispatcher,
     logger: MobileInputLogger,
     @Assisted override val tableLogBuffer: TableLogBuffer,
+    @Assisted private val imsRepo: ImsRepository,
     flags: FeatureFlagsClassic,
 ) : MobileConnectionRepositoryKairos, KairosBuilder by kairosBuilder() {
 
@@ -525,6 +528,8 @@ constructor(
             )
     }
 
+    override val imsState: State<ImsStateModel> = buildState { imsRepo.imsState.toState() }
+
     @AssistedFactory
     fun interface Factory {
         fun create(
@@ -535,6 +540,7 @@ constructor(
             networkNameSeparator: String,
             systemUiCarrierConfig: SystemUiCarrierConfig,
             telephonyManager: TelephonyManager,
+            imsRepo: ImsRepository,
         ): MobileConnectionRepositoryKairosImpl
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryKairosImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryKairosImpl.kt
index 844f4cafbabcd..cc5588e93ac86 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryKairosImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryKairosImpl.kt
@@ -84,6 +84,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionMod
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierConfigRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepositoryKairos
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepositoryKairos
+import com.android.systemui.statusbar.pipeline.ims.data.repository.ImsRepositoryImpl
 import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy
 import com.android.systemui.statusbar.pipeline.mobile.util.SubscriptionManagerProxy
 import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel
@@ -653,6 +654,7 @@ constructor(
     private val telephonyManager: TelephonyManager,
     private val mobileRepoFactory: MobileConnectionRepositoryKairosImpl.Factory,
     private val mergedRepoFactory: CarrierMergedConnectionRepositoryKairos.Factory,
+    private val imsRepoFactory: ImsRepositoryImpl.Factory,
 ) : MobileConnectionsRepositoryKairosImpl.ConnectionRepoFactory {
 
     private val networkNameSeparator: String =
@@ -676,6 +678,7 @@ constructor(
                     networkNameSeparator,
                     carrierConfigRepo.getOrCreateConfigForSubId(subId),
                     telephonyManager.createForSubscriptionId(subId),
+		    imsRepoFactory.build(subId),
                 )
             }
             FullMobileConnectionRepositoryKairos(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt
index a49214461d114..4461e12de0a41 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt
@@ -17,11 +17,14 @@
 package com.android.systemui.statusbar.pipeline.mobile.domain.interactor
 
 import android.content.Context
+import android.provider.Settings
 import com.android.settingslib.SignalIcon.MobileIconGroup
 import com.android.settingslib.graph.SignalDrawable
 import com.android.settingslib.mobile.MobileIconCarrierIdOverrides
 import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl
 import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
+import com.android.systemui.Dependency;
 import com.android.systemui.log.table.TableLogBuffer
 import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Connected
@@ -34,7 +37,9 @@ import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIc
 import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel
 import com.android.systemui.statusbar.pipeline.satellite.ui.model.SatelliteIconModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
+import com.android.systemui.tuner.TunerService
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -124,6 +129,9 @@ interface MobileIconInteractor {
      */
     val isRoaming: Flow<Boolean>
 
+    /** See [MobileIconsInteractor.isRoamingForceHidden]. */
+    val isRoamingForceHidden: Flow<Boolean>
+
     /** See [MobileIconsInteractor.isForceHidden]. */
     val isForceHidden: Flow<Boolean>
 
@@ -132,6 +140,22 @@ interface MobileIconInteractor {
 
     /** True when in carrier network change mode */
     val carrierNetworkChangeActive: Flow<Boolean>
+
+    /** True when VoLTE/VONR available */
+    val isMobileHd: Flow<Boolean>
+
+    /** See [MobileIconsInteractor.isMobileHdForceHidden]. */
+    val isMobileHdForceHidden: Flow<Boolean>
+
+    /** True when VoWifi available */
+    val isVoWifi: Flow<Boolean>
+
+    /** See [MobileIconsInteractor.isVoWifiForceHidden]. */
+    val isVoWifiForceHidden: Flow<Boolean>
+
+    val shouldShowFourgIcon: StateFlow<Boolean>
+
+    val disableStackedMobileIcons: Flow<Boolean>
 }
 
 /** Interactor for a single mobile connection. This connection _should_ have one subscription ID */
@@ -147,6 +171,9 @@ class MobileIconInteractorImpl(
     defaultMobileIconGroup: StateFlow<MobileIconGroup>,
     isDefaultConnectionFailed: StateFlow<Boolean>,
     override val isForceHidden: Flow<Boolean>,
+    override val isRoamingForceHidden: Flow<Boolean>,
+    override val isMobileHdForceHidden: Flow<Boolean>,
+    override val isVoWifiForceHidden: Flow<Boolean>,
     connectionRepository: MobileConnectionRepository,
     private val context: Context,
     val carrierIdOverrides: MobileIconCarrierIdOverrides = MobileIconCarrierIdOverridesImpl(),
@@ -162,6 +189,80 @@ class MobileIconInteractorImpl(
     override val carrierNetworkChangeActive: StateFlow<Boolean> =
         connectionRepository.carrierNetworkChangeActive
 
+    private final val DATA_DISABLED_ICON: String =
+            "system:" + Settings.System.DATA_DISABLED_ICON;
+
+    private val shouldShowExclamationMark: StateFlow<Boolean> =
+        conflatedCallbackFlow {
+                val callback =
+                    object : TunerService.Tunable {
+                        override fun onTuningChanged(key: String, newValue: String?) {
+                            when (key) {
+                                DATA_DISABLED_ICON -> 
+                                    trySend(TunerService.parseIntegerSwitch(newValue, true))
+                            }
+                        }
+                    }
+                Dependency.get(TunerService::class.java).addTunable(callback, DATA_DISABLED_ICON)
+
+                awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+            }
+            .stateIn(
+                scope,
+                started = SharingStarted.WhileSubscribed(),
+                true
+            )
+
+    private final val SHOW_FOURG_ICON: String =
+            "system:" + Settings.System.SHOW_FOURG_ICON;
+
+    private final val DISABLE_STACKED_MOBILE_ICONS: String =
+        "system:" + Settings.System.DISABLE_STACKED_MOBILE_ICONS
+
+    override val shouldShowFourgIcon: StateFlow<Boolean> =
+        conflatedCallbackFlow {
+                val callback =
+                    object : TunerService.Tunable {
+                        override fun onTuningChanged(key: String, newValue: String?) {
+                            when (key) {
+                                SHOW_FOURG_ICON -> 
+                                    trySend(TunerService.parseIntegerSwitch(newValue, false))
+                            }
+                        }
+                    }
+                Dependency.get(TunerService::class.java).addTunable(callback, SHOW_FOURG_ICON)
+
+                awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+            }
+            .stateIn(
+                scope,
+                started = SharingStarted.WhileSubscribed(),
+                true
+            )
+
+    private val _disableStackedMobileIcons: StateFlow<Boolean> =
+        conflatedCallbackFlow {
+                val callback =
+                    object : TunerService.Tunable {
+                        override fun onTuningChanged(key: String, newValue: String?) {
+                            when (key) {
+                                DISABLE_STACKED_MOBILE_ICONS -> 
+                                    trySend(TunerService.parseIntegerSwitch(newValue, false))
+                            }
+                        }
+                    }
+                Dependency.get(TunerService::class.java).addTunable(callback, DISABLE_STACKED_MOBILE_ICONS)
+
+                awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+            }
+            .stateIn(
+                scope,
+                started = SharingStarted.WhileSubscribed(),
+                false
+            )
+
+    override val disableStackedMobileIcons: Flow<Boolean> = _disableStackedMobileIcons
+
     // True if there exists _any_ icon override for this carrierId. Note that overrides can include
     // any or none of the icon groups defined in MobileMappings, so we still need to check on a
     // per-network-type basis whether or not the given icon group is overridden
@@ -309,11 +410,12 @@ class MobileIconInteractorImpl(
 
     /** Whether or not to show the error state of [SignalDrawable] */
     private val showExclamationMark: StateFlow<Boolean> =
-        combine(defaultSubscriptionHasDataEnabled, isDefaultConnectionFailed, isInService) {
+        combine(defaultSubscriptionHasDataEnabled, isDefaultConnectionFailed, isInService, shouldShowExclamationMark) {
                 isDefaultDataEnabled,
                 isDefaultConnectionFailed,
-                isInService ->
-                !isDefaultDataEnabled || isDefaultConnectionFailed || !isInService
+                isInService,
+		shouldShowExclamationMark ->
+                (!isDefaultDataEnabled || isDefaultConnectionFailed || !isInService) && shouldShowExclamationMark 
             }
             .stateIn(scope, SharingStarted.WhileSubscribed(), true)
 
@@ -328,6 +430,15 @@ class MobileIconInteractorImpl(
             }
             .stateIn(scope, SharingStarted.WhileSubscribed(), 0)
 
+    private val showRoaming: StateFlow<Boolean> =
+        combine(
+                isRoaming,
+                isRoamingForceHidden
+        ) { roaming, roamingForceHidden ->
+            roaming && !roamingForceHidden
+        }
+        .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
     // Satellite level is unaffected by the inflateSignalStrength property
     // See b/346904529 for details
     private val satelliteShownLevel: StateFlow<Int> =
@@ -339,12 +450,14 @@ class MobileIconInteractorImpl(
             numberOfLevels,
             showExclamationMark,
             carrierNetworkChangeActive,
-        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->
+            showRoaming,
+        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange, showRoaming ->
             SignalIconModel.Cellular(
                 cellularShownLevel,
                 numberOfLevels,
                 showExclamationMark,
                 carrierNetworkChange,
+                showRoaming,
             )
         }
 
@@ -365,6 +478,7 @@ class MobileIconInteractorImpl(
                 numberOfLevels.value,
                 showExclamationMark.value,
                 carrierNetworkChangeActive.value,
+                showRoaming.value,
             )
         isNonTerrestrial
             .flatMapLatest { ntn ->
@@ -378,4 +492,14 @@ class MobileIconInteractorImpl(
             .logDiffsForTable(tableLogBuffer, columnPrefix = "icon", initialValue = initial)
             .stateIn(scope, SharingStarted.WhileSubscribed(), initial)
     }
+
+    override val isMobileHd: StateFlow<Boolean> =
+        connectionRepository.imsState
+            .map { it.isHdVoiceCapable() }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+    override val isVoWifi: StateFlow<Boolean> =
+        connectionRepository.imsState
+            .map { it.isVoWifiAvailable() }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairos.kt
index f9be9e49de552..99386e0151348 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairos.kt
@@ -17,11 +17,14 @@
 package com.android.systemui.statusbar.pipeline.mobile.domain.interactor
 
 import android.content.Context
+import android.provider.Settings
+import com.android.systemui.Dependency
 import com.android.settingslib.SignalIcon.MobileIconGroup
 import com.android.settingslib.graph.SignalDrawable
 import com.android.settingslib.mobile.MobileIconCarrierIdOverrides
 import com.android.settingslib.mobile.MobileIconCarrierIdOverridesImpl
 import com.android.systemui.KairosBuilder
+import com.android.systemui.tuner.TunerService
 import com.android.systemui.kairos.ExperimentalKairosApi
 import com.android.systemui.kairos.State
 import com.android.systemui.kairos.combine
@@ -42,6 +45,8 @@ import com.android.systemui.statusbar.pipeline.mobile.domain.model.NetworkTypeIc
 import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel
 import com.android.systemui.statusbar.pipeline.satellite.ui.model.SatelliteIconModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
 
 @ExperimentalKairosApi
 interface MobileIconInteractorKairos {
@@ -124,11 +129,32 @@ interface MobileIconInteractorKairos {
     /** See [MobileIconsInteractor.isForceHidden]. */
     val isForceHidden: State<Boolean>
 
+    /** See [MobileIconsInteractor.isRoamingForceHidden]. */
+    val isRoamingForceHidden: State<Boolean>
+
+    /** True when VoLTE/VONR available */
+    val isMobileHd: State<Boolean>
+
+    /** See [MobileIconsInteractor.isMobileHdForceHidden]. */
+    val isMobileHdForceHidden: State<Boolean>
+
+    /** True when VoWifi available */
+    val isVoWifi: State<Boolean>
+
+    /** See [MobileIconsInteractor.isVoWifiForceHidden]. */
+    val isVoWifiForceHidden: State<Boolean>
+
     /** See [MobileConnectionRepository.isAllowedDuringAirplaneMode]. */
     val isAllowedDuringAirplaneMode: State<Boolean>
 
     /** True when in carrier network change mode */
     val carrierNetworkChangeActive: State<Boolean>
+
+    /** Whether to show the 4G icon instead of LTE. */
+    val shouldShowFourgIcon: State<Boolean>
+
+    /** True if stacked mobile icons should be disabled */
+    val disableStackedMobileIcons: State<Boolean>
 }
 
 /** Interactor for a single mobile connection. This connection _should_ have one subscription ID */
@@ -143,6 +169,9 @@ class MobileIconInteractorKairosImpl(
     defaultMobileIconGroup: State<MobileIconGroup>,
     isDefaultConnectionFailed: State<Boolean>,
     override val isForceHidden: State<Boolean>,
+    override val isRoamingForceHidden: State<Boolean>,
+    override val isMobileHdForceHidden: State<Boolean>,
+    override val isVoWifiForceHidden: State<Boolean>,
     private val connectionRepository: MobileConnectionRepositoryKairos,
     private val context: Context,
     private val carrierIdOverrides: MobileIconCarrierIdOverrides =
@@ -325,19 +354,28 @@ class MobileIconInteractorKairosImpl(
     // See b/346904529 for details
     private val satelliteShownLevel: State<Int> = connectionRepository.satelliteLevel
 
+    private val showRoaming: State<Boolean> =
+        combine(isRoaming, isRoamingForceHidden) { roaming, hidden -> roaming && !hidden }
+
     private val cellularIcon: State<SignalIconModel.Cellular> =
         combine(
-            cellularShownLevel,
-            numberOfLevels,
-            showExclamationMark,
-            carrierNetworkChangeActive,
-        ) { cellularShownLevel, numberOfLevels, showExclamationMark, carrierNetworkChange ->
-            SignalIconModel.Cellular(
+            combine(
                 cellularShownLevel,
                 numberOfLevels,
                 showExclamationMark,
-                carrierNetworkChange,
-            )
+                carrierNetworkChangeActive,
+            ) { level, numLevels, showEx, carrierChange ->
+                SignalIconModel.Cellular(
+                    level = level,
+                    numberOfLevels = numLevels,
+                    showExclamationMark = showEx,
+                    carrierNetworkChange = carrierChange,
+                    showRoaming = false,
+                )
+            },
+            showRoaming,
+        ) { icon, roaming ->
+            icon.copy(showRoaming = roaming)
         }
 
     private val satelliteIcon: State<SignalIconModel.Satellite> =
@@ -372,4 +410,56 @@ class MobileIconInteractorKairosImpl(
                     )
                 }
             }
+
+    override val isMobileHd: State<Boolean> =
+        connectionRepository.imsState
+            .map { it.isHdVoiceCapable() }
+
+    override val isVoWifi: State<Boolean> =
+        connectionRepository.imsState
+            .map { it.isVoWifiAvailable() }
+
+    private val SHOW_FOURG_ICON: String =
+            "system:" + Settings.System.SHOW_FOURG_ICON
+
+    private final val DISABLE_STACKED_MOBILE_ICONS: String =
+            "system:" + Settings.System.DISABLE_STACKED_MOBILE_ICONS
+
+    override val shouldShowFourgIcon: State<Boolean> = buildState {
+        callbackFlow {
+                val callback =
+                    object : TunerService.Tunable {
+                        override fun onTuningChanged(key: String, newValue: String?) {
+                            when (key) {
+                                SHOW_FOURG_ICON ->
+                                    trySend(TunerService.parseIntegerSwitch(newValue, false))
+                            }
+                        }
+                    }
+                Dependency.get(TunerService::class.java).addTunable(callback, SHOW_FOURG_ICON)
+
+                awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+            }
+            .toState(initialValue = false)
+    }
+
+    private val _disableStackedMobileIcons: State<Boolean> = buildState {
+        callbackFlow {
+                val callback =
+                    object : TunerService.Tunable {
+                        override fun onTuningChanged(key: String, newValue: String?) {
+                            when (key) {
+                                DISABLE_STACKED_MOBILE_ICONS ->
+                                    trySend(TunerService.parseIntegerSwitch(newValue, false))
+                            }
+                        }
+                    }
+                Dependency.get(TunerService::class.java).addTunable(callback, DISABLE_STACKED_MOBILE_ICONS)
+
+                awaitClose { Dependency.get(TunerService::class.java).removeTunable(callback) }
+            }
+            .toState(initialValue = false)
+    }
+
+    override val disableStackedMobileIcons: State<Boolean> = _disableStackedMobileIcons
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairosAdapter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairosAdapter.kt
index c725cc92478ed..08616b2192787 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairosAdapter.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorKairosAdapter.kt
@@ -131,6 +131,35 @@ fun BuildScope.MobileIconInteractorKairosAdapter(
                         "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isForceHidden"
                     },
                 ),
+            isRoamingForceHidden =
+                isRoamingForceHidden.toColdConflatedFlow(
+                    kairosNetwork,
+                    nameTag {
+                        "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isRoamingForceHidden"
+                    },
+                ),
+            isMobileHd = isMobileHd.toStateFlow(
+                nameTag {
+                    "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isMobileHd"
+                }
+            ),
+            isMobileHdForceHidden = isMobileHdForceHidden.toColdConflatedFlow(
+                kairosNetwork,
+                nameTag {
+                    "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isMobileHdForceHidden"
+                }
+            ),
+            isVoWifi = isVoWifi.toStateFlow(
+                nameTag {
+                    "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isVoWifi"
+                }
+            ),
+            isVoWifiForceHidden = isVoWifiForceHidden.toColdConflatedFlow(
+                kairosNetwork,
+                nameTag {
+                    "MobileIconInteractorKairosAdapter(subId=$subscriptionId).isVoWifiForceHidden"
+                }
+            ),
             isAllowedDuringAirplaneMode =
                 isAllowedDuringAirplaneMode.toStateFlow(
                     nameTag {
@@ -143,9 +172,20 @@ fun BuildScope.MobileIconInteractorKairosAdapter(
                         "MobileIconInteractorKairosAdapter(subId=$subscriptionId).carrierNetworkChangeActive"
                     }
                 ),
+            shouldShowFourgIcon =
+                shouldShowFourgIcon.toStateFlow(
+                    nameTag {
+                        "MobileIconInteractorKairosAdapter(subId=$subscriptionId).shouldShowFourgIcon"
+                    }
+                ),
+            disableStackedMobileIcons =
+                disableStackedMobileIcons.toStateFlow(
+                    nameTag {
+                        "MobileIconInteractorKairosAdapter(subId=$subscriptionId).disableStackedMobileIcons"
+                    }
+                ),
         )
     }
-
 private class MobileIconInteractorKairosAdapter(
     override val subscriptionId: Int,
     override val tableLogBuffer: TableLogBuffer,
@@ -165,6 +205,13 @@ private class MobileIconInteractorKairosAdapter(
     override val isSingleCarrier: StateFlow<Boolean>,
     override val isRoaming: StateFlow<Boolean>,
     override val isForceHidden: Flow<Boolean>,
+    override val isRoamingForceHidden: Flow<Boolean>,
+    override val isMobileHd: StateFlow<Boolean>,
+    override val isMobileHdForceHidden: Flow<Boolean>,
+    override val isVoWifi: StateFlow<Boolean>,
+    override val isVoWifiForceHidden: Flow<Boolean>,
     override val isAllowedDuringAirplaneMode: StateFlow<Boolean>,
     override val carrierNetworkChangeActive: StateFlow<Boolean>,
+    override val shouldShowFourgIcon: StateFlow<Boolean>,
+    override val disableStackedMobileIcons: StateFlow<Boolean>,
 ) : MobileIconInteractor
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt
index e468c05563261..5fe7abcd758e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt
@@ -31,6 +31,7 @@ import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.statusbar.core.NewStatusBarIcons
 import com.android.systemui.statusbar.core.StatusBarRootModernization
 import com.android.systemui.statusbar.pipeline.dagger.MobileSummaryLog
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository
@@ -125,6 +126,15 @@ interface MobileIconsInteractor {
     /** True if we're configured to force-hide the mobile icons and false otherwise. */
     val isForceHidden: Flow<Boolean>
 
+    /** True if we're configured to force-hide the roaming and false otherwise. */
+    val isRoamingForceHidden: Flow<Boolean>
+
+    /** True if we're configured to force-hide the hd (VoLTE/VoNR) and false otherwise. */
+    val isMobileHdForceHidden: Flow<Boolean>
+
+    /** True if we're configured to force-hide the hd (VoLTE/VoNR) and false otherwise. */
+    val isVoWifiForceHidden: Flow<Boolean>
+
     /**
      * True if the device-level service state (with -1 subscription id) reports emergency calls
      * only. This value is only useful when there are no other subscriptions OR all existing
@@ -151,6 +161,7 @@ constructor(
     connectivityRepository: ConnectivityRepository,
     userSetupRepo: UserSetupRepository,
     @Background private val scope: CoroutineScope,
+    commonImsRepo: CommonImsRepository,
     private val context: Context,
     private val featureFlagsClassic: FeatureFlagsClassic,
 ) : MobileIconsInteractor {
@@ -307,26 +318,29 @@ constructor(
             }
             .stateIn(scope, SharingStarted.WhileSubscribed(), emptyList())
 
-    override val isStackable =
-        if (NewStatusBarIcons.isEnabled && StatusBarRootModernization.isEnabled) {
-            icons.flatMapLatest { icons ->
-                if (icons.isEmpty()) {
-                    flowOf(false)
-                } else {
-                    combine(icons.map { it.signalLevelIcon }) { signalLevelIcons ->
-                        // These are only stackable if:
-                        // - They are cellular
-                        // - There's exactly two
-                        // - They have the same number of levels
-                        signalLevelIcons.filterIsInstance<SignalIconModel.Cellular>().let {
-                            it.size == 2 && it[0].numberOfLevels == it[1].numberOfLevels
-                        }
+    override val isStackable: StateFlow<Boolean> =
+    if (NewStatusBarIcons.isEnabled && StatusBarRootModernization.isEnabled) {
+        icons.flatMapLatest { iconsList ->
+            when {
+                iconsList.isEmpty() -> flowOf(false)
+                iconsList.size != 2 -> flowOf(false)
+                else -> {
+                    combine(
+                        iconsList[0].disableStackedMobileIcons,
+                        iconsList[0].signalLevelIcon,
+                        iconsList[1].signalLevelIcon
+                    ) { disableStacking, icon0, icon1 ->
+                        !disableStacking &&
+                        icon0 is SignalIconModel.Cellular &&
+                        icon1 is SignalIconModel.Cellular &&
+                        icon0.numberOfLevels == icon1.numberOfLevels
                     }
                 }
             }
-        } else {
-            flowOf(false)
-        }
+        }.stateIn(scope, SharingStarted.WhileSubscribed(), false)
+    } else {
+        flowOf(false).stateIn(scope, SharingStarted.WhileSubscribed(), false)
+    }
 
     /**
      * Copied from the old pipeline. We maintain a 2s period of time where we will keep the
@@ -425,6 +439,21 @@ constructor(
             .map { it.contains(ConnectivitySlot.MOBILE) }
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isRoamingForceHidden: Flow<Boolean> =
+        connectivityRepository.forceHiddenSlots
+            .map { it.contains(ConnectivitySlot.ROAMING) }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+    override val isMobileHdForceHidden: Flow<Boolean> =
+        commonImsRepo.imsIconState
+            .map { !it.showHdIcon }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
+    override val isVoWifiForceHidden: Flow<Boolean> =
+        commonImsRepo.imsIconState
+            .map { !it.showVowifiIcon }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
     override val isDeviceInEmergencyCallsOnlyMode: Flow<Boolean> =
         mobileConnectionsRepo.isDeviceEmergencyCallCapable
 
@@ -444,6 +473,9 @@ constructor(
                 defaultMobileIconGroup,
                 isDefaultConnectionFailed,
                 isForceHidden,
+                isRoamingForceHidden,
+                isMobileHdForceHidden,
+                isVoWifiForceHidden,
                 mobileConnectionsRepo.getRepoForSubId(subId),
                 context,
             )
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairos.kt
index c3385abe02142..e0940a6eef994 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairos.kt
@@ -49,6 +49,7 @@ import com.android.systemui.statusbar.core.StatusBarRootModernization
 import com.android.systemui.statusbar.pipeline.dagger.MobileSummaryLog
 import com.android.systemui.statusbar.pipeline.mobile.StatusBarMobileIconKairos
 import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepository
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepositoryKairos
 import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepositoryKairos
 import com.android.systemui.statusbar.pipeline.mobile.domain.model.SignalIconModel
@@ -124,6 +125,15 @@ interface MobileIconsInteractorKairos {
     /** True if we're configured to force-hide the mobile icons and false otherwise. */
     val isForceHidden: State<Boolean>
 
+    /** True if we're configured to force-hide the roaming icon and false otherwise. */
+    val isRoamingForceHidden: State<Boolean>
+
+    /** True if we're configured to force-hide the hd (VoLTE/VoNR) icon and false otherwise. */
+    val isMobileHdForceHidden: State<Boolean>
+
+    /** True if we're configured to force-hide the VoWifi icon and false otherwise. */
+    val isVoWifiForceHidden: State<Boolean>
+
     /**
      * True if the device-level service state (with -1 subscription id) reports emergency calls
      * only. This value is only useful when there are no other subscriptions OR all existing
@@ -143,6 +153,7 @@ constructor(
     connectivityRepository: ConnectivityRepository,
     userSetupRepo: UserSetupRepository,
     private val context: Context,
+    commonImsRepo: CommonImsRepository,
     private val featureFlagsClassic: FeatureFlagsClassic,
 ) : MobileIconsInteractorKairos, KairosBuilder by kairosBuilder() {
 
@@ -295,7 +306,8 @@ constructor(
     }
 
     override val isStackable: State<Boolean> =
-        if (NewStatusBarIcons.isEnabled && StatusBarRootModernization.isEnabled) {
+    if (NewStatusBarIcons.isEnabled && StatusBarRootModernization.isEnabled) {
+        combine(
             icons.flatMap { iconsBySubId: Map<Int, MobileIconInteractorKairos> ->
                 iconsBySubId.values
                     .map { it.signalLevelIcon }
@@ -308,10 +320,16 @@ constructor(
                             it.size == 2 && it[0].numberOfLevels == it[1].numberOfLevels
                         }
                     }
+            },
+            icons.flatMap { iconsBySubId ->
+                iconsBySubId.values.firstOrNull()?.disableStackedMobileIcons ?: stateOf(false)
             }
-        } else {
-            stateOf(false)
+        ) { shouldStack, disableStacking ->
+            shouldStack && !disableStacking
         }
+    } else {
+        stateOf(false)
+    }
 
     override val activeDataIconInteractor: State<MobileIconInteractorKairos?> =
         combine(mobileConnectionsRepo.activeMobileDataSubscriptionId, icons) { activeSubId, icons ->
@@ -429,6 +447,20 @@ constructor(
             .map { it.contains(ConnectivitySlot.MOBILE) }
     }
 
+    override val isRoamingForceHidden: State<Boolean> = buildState {
+        connectivityRepository.forceHiddenSlots.toState().map {
+            it.contains(ConnectivitySlot.ROAMING)
+        }
+    }
+
+    override val isMobileHdForceHidden: State<Boolean> = buildState {
+        commonImsRepo.imsIconState.toState().map { !it.showHdIcon }
+    }
+
+    override val isVoWifiForceHidden: State<Boolean> = buildState {
+        commonImsRepo.imsIconState.toState().map { !it.showVowifiIcon }
+    }
+
     override val isDeviceInEmergencyCallsOnlyMode: State<Boolean>
         get() = mobileConnectionsRepo.isDeviceEmergencyCallCapable
 
@@ -446,6 +478,9 @@ constructor(
             defaultMobileIconGroup,
             isDefaultConnectionFailed,
             isForceHidden,
+            isRoamingForceHidden,
+            isMobileHdForceHidden,
+            isVoWifiForceHidden,
             repo,
             context,
         )
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairosAdapter.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairosAdapter.kt
index e22fb922250b4..9d4aafc77a225 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairosAdapter.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairosAdapter.kt
@@ -67,7 +67,7 @@ constructor(
     private val repo: MobileConnectionsRepository,
     repoK: MobileConnectionsRepositoryKairos,
     kairosNetwork: KairosNetwork,
-    @Application scope: CoroutineScope,
+    @Application private val scope: CoroutineScope,
     context: Context,
     mobileMappingsProxy: MobileMappingsProxy,
     private val userSetupRepo: UserSetupRepository,
@@ -123,6 +123,21 @@ constructor(
             )
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isRoamingForceHidden: Flow<Boolean> =
+        kairosInteractor.isRoamingForceHidden
+            .toColdConflatedFlow(kairosNetwork)
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+    override val isMobileHdForceHidden: Flow<Boolean> =
+        kairosInteractor.isMobileHdForceHidden
+            .toColdConflatedFlow(kairosNetwork)
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
+    override val isVoWifiForceHidden: Flow<Boolean> =
+        kairosInteractor.isVoWifiForceHidden
+            .toColdConflatedFlow(kairosNetwork)
+            .stateIn(scope, SharingStarted.WhileSubscribed(), true)
+
     override val activeMobileDataSubscriptionId: StateFlow<Int?>
         get() = repo.activeMobileDataSubscriptionId
 
@@ -233,6 +248,11 @@ constructor(
             override val isSingleCarrier: Flow<Boolean> = latest { isSingleCarrier }
             override val isRoaming: Flow<Boolean> = latest { isRoaming }
             override val isForceHidden: Flow<Boolean> = latest { isForceHidden }
+            override val isRoamingForceHidden: Flow<Boolean> = latest { isRoamingForceHidden }
+            override val isMobileHd: Flow<Boolean> = latest { isMobileHd }
+            override val isMobileHdForceHidden: Flow<Boolean> = latest { isMobileHdForceHidden }
+            override val isVoWifi: Flow<Boolean> = latest { isVoWifi }
+            override val isVoWifiForceHidden: Flow<Boolean> = latest { isVoWifiForceHidden }
             override val isAllowedDuringAirplaneMode: Flow<Boolean> = latest {
                 isAllowedDuringAirplaneMode
             }
@@ -240,6 +260,12 @@ constructor(
                 carrierNetworkChangeActive
             }
 
+            override val shouldShowFourgIcon: StateFlow<Boolean> = latest { shouldShowFourgIcon }
+                .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+            override val disableStackedMobileIcons: StateFlow<Boolean> = latest { disableStackedMobileIcons }
+                .stateIn(scope, SharingStarted.WhileSubscribed(), false) 
+
             private fun <T> latest(block: MobileIconInteractor.() -> Flow<T>): Flow<T> =
                 interactorsBySubId.flatMapLatestConflated { it[subId]?.block() ?: emptyFlow() }
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt
index ad27b091d500e..29fb7ec6b680a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt
@@ -41,6 +41,7 @@ sealed interface SignalIconModel : Diffable<SignalIconModel> {
         val numberOfLevels: Int,
         val showExclamationMark: Boolean,
         val carrierNetworkChange: Boolean,
+        val showRoaming: Boolean,
     ) : SignalIconModel {
         override fun logPartial(prevVal: SignalIconModel, row: TableRowLogger) {
             if (prevVal !is Cellular) {
@@ -58,6 +59,9 @@ sealed interface SignalIconModel : Diffable<SignalIconModel> {
                 if (prevVal.carrierNetworkChange != carrierNetworkChange) {
                     row.logChange(COL_CARRIER_NETWORK_CHANGE, carrierNetworkChange)
                 }
+                if (prevVal.showRoaming != showRoaming) {
+                    row.logChange(COL_SHOW_ROAMING, showRoaming)
+                }
             }
         }
 
@@ -67,6 +71,7 @@ sealed interface SignalIconModel : Diffable<SignalIconModel> {
             row.logChange(COL_NUM_LEVELS, numberOfLevels)
             row.logChange(COL_SHOW_EXCLAMATION, showExclamationMark)
             row.logChange(COL_CARRIER_NETWORK_CHANGE, carrierNetworkChange)
+            row.logChange(COL_SHOW_ROAMING, showRoaming)
         }
 
         /** Convert this model to an [Int] consumable by [SignalDrawable]. */
@@ -74,7 +79,7 @@ sealed interface SignalIconModel : Diffable<SignalIconModel> {
             if (carrierNetworkChange) {
                 SignalDrawable.getCarrierChangeState(numberOfLevels)
             } else {
-                SignalDrawable.getState(level, numberOfLevels, showExclamationMark)
+                SignalDrawable.getState(level, numberOfLevels, showExclamationMark, showRoaming)
             }
     }
 
@@ -106,11 +111,13 @@ sealed interface SignalIconModel : Diffable<SignalIconModel> {
                 numberOfLevels = DEFAULT_NUM_LEVELS,
                 showExclamationMark = true,
                 carrierNetworkChange = false,
+                showRoaming = false,
             )
         private const val COL_LEVEL = "level"
         private const val COL_NUM_LEVELS = "numLevels"
         private const val COL_SHOW_EXCLAMATION = "showExclamation"
         private const val COL_CARRIER_NETWORK_CHANGE = "carrierNetworkChange"
         private const val COL_TYPE = "type"
+        private const val COL_SHOW_ROAMING = "showRoaming"
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt
index 87c128a8dd0e0..ad6f86564e620 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt
@@ -70,8 +70,8 @@ object MobileIconBinder {
         val networkTypeContainer = view.requireViewById<FrameLayout>(R.id.mobile_type_container)
         val iconView = view.requireViewById<ImageView>(R.id.mobile_signal)
         val mobileDrawable = SignalDrawable(view.context)
-        val roamingView = view.requireViewById<ImageView>(R.id.mobile_roaming)
-        val roamingSpace = view.requireViewById<Space>(R.id.mobile_roaming_space)
+        val mobileHdView = view.requireViewById<ImageView>(R.id.mobile_hd)
+        val mobileHdSpace = view.requireViewById<Space>(R.id.mobile_hd_space)
         val endSideRoamingView = view.requireViewById<ImageView>(R.id.mobile_roaming_updated)
         val dotView = view.requireViewById<StatusBarIconView>(R.id.status_bar_dot)
 
@@ -223,15 +223,18 @@ object MobileIconBinder {
                         }
                     }
 
-                    // Set the roaming indicator
+                    // Set the mobile HD indicator (VoLTE/VoNR)
                     launch {
-                        viewModel.roaming.distinctUntilChanged().collect { isRoaming ->
-                            if (NewStatusBarIcons.isEnabled) {
-                                endSideRoamingView.isVisible = isRoaming
-                            } else {
-                                roamingView.isVisible = isRoaming
-                                roamingSpace.isVisible = isRoaming
-                            }
+                        viewModel.showHd.distinctUntilChanged().collect { isHd ->
+                            mobileHdView.isVisible = isHd
+                            mobileHdSpace.isVisible = isHd
+                        }
+                    }
+
+                    // Set the roaming indicator (single SIM - end side)
+                    launch {
+                        viewModel.isRoamingVisible.distinctUntilChanged().collect { isRoaming ->
+                            endSideRoamingView.isVisible = isRoaming
                         }
                     }
 
@@ -281,8 +284,8 @@ object MobileIconBinder {
                                 networkTypeView.imageTintList = tint
                             }
 
-                            roamingView.imageTintList = tint
                             endSideRoamingView.imageTintList = tint
+                            mobileHdView.imageTintList = tint
                             activityIn.imageTintList = tint
                             activityOut.imageTintList = tint
                             dotView.setDecorColor(colors.tint)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt
index cbbc922a49b2d..b8f25d36e11ca 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt
@@ -39,6 +39,8 @@ import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.LocationBased
 import com.android.systemui.statusbar.pipeline.shared.ui.view.ModernStatusBarView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewBinding
+import kotlin.math.roundToInt
 
 class ModernStatusBarMobileView(context: Context, attrs: AttributeSet?) :
     ModernStatusBarView(context, attrs) {
@@ -107,6 +109,22 @@ class ModernStatusBarMobileView(context: Context, attrs: AttributeSet?) :
         }
     }
 
+    override fun initView(slot: String, bindingCreator: () -> ModernStatusBarViewBinding) {
+        super.initView(slot, bindingCreator)
+        // Resize HD icon to make fit into the mobile view
+        val signalSize = context.resources.getDimensionPixelSize(
+                com.android.settingslib.R.dimen.signal_icon_size
+        )
+        val viewportSize = context.resources.getDimensionPixelSize(
+                R.dimen.signal_icon_viewport_size
+        )
+        val mobileHd = requireViewById<ImageView>(R.id.mobile_hd)
+        val lp = mobileHd.layoutParams
+        lp.height = (lp.height * (signalSize / viewportSize.toFloat())).roundToInt()
+        lp.width = (lp.width * (signalSize / viewportSize.toFloat())).roundToInt()
+        mobileHd.layoutParams = lp
+    }
+
     companion object {
 
         /**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt
index 3b40cdec87219..3a5f5a10d2c14 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModel.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel
 
+import com.android.settingslib.mobile.TelephonyIcons
 import com.android.systemui.Flags.statusBarStaticInoutIndicators
 import com.android.systemui.common.shared.model.ContentDescription
 import com.android.systemui.common.shared.model.Icon
@@ -50,6 +51,7 @@ interface MobileIconViewModelCommon {
     val icon: Flow<SignalIconModel>
     val contentDescription: Flow<MobileContentDescription?>
     val roaming: Flow<Boolean>
+    val isRoamingVisible: Flow<Boolean>
     /** The RAT icon (LTE, 3G, 5G, etc) to be displayed. Null if we shouldn't show anything */
     val networkTypeIcon: Flow<Icon.Resource?>
     /** The slice attribution. Drawn as a background layer */
@@ -57,6 +59,7 @@ interface MobileIconViewModelCommon {
     val activityInVisible: Flow<Boolean>
     val activityOutVisible: Flow<Boolean>
     val activityContainerVisible: Flow<Boolean>
+    val showHd: Flow<Boolean>
 }
 
 /**
@@ -125,6 +128,8 @@ class MobileIconViewModel(
 
     override val roaming: Flow<Boolean> = vmProvider.flatMapLatest { it.roaming }
 
+    override val isRoamingVisible: Flow<Boolean> = vmProvider.flatMapLatest { it.isRoamingVisible }
+
     override val networkTypeIcon: Flow<Icon.Resource?> =
         vmProvider.flatMapLatest { it.networkTypeIcon }
 
@@ -141,6 +146,8 @@ class MobileIconViewModel(
 
     override val activityContainerVisible: Flow<Boolean> =
         vmProvider.flatMapLatest { it.activityContainerVisible }
+
+    override val showHd: Flow<Boolean> = vmProvider.flatMapLatest { it.showHd }
 }
 
 /** Representation of this network when it is non-terrestrial (e.g., satellite) */
@@ -161,11 +168,13 @@ private class CarrierBasedSatelliteViewModelImpl(
 
     /** These fields are not used for satellite icons currently */
     override val roaming: Flow<Boolean> = flowOf(false)
+    override val isRoamingVisible: Flow<Boolean> = flowOf(false)
     override val networkTypeIcon: Flow<Icon.Resource?> = flowOf(null)
     override val networkTypeBackground: StateFlow<Icon.Resource?> = MutableStateFlow(null)
     override val activityInVisible: Flow<Boolean> = flowOf(false)
     override val activityOutVisible: Flow<Boolean> = flowOf(false)
     override val activityContainerVisible: Flow<Boolean> = flowOf(false)
+    override val showHd: Flow<Boolean> = flowOf(false)
 }
 
 /** Terrestrial (cellular) icon. */
@@ -261,25 +270,58 @@ private class CellularIconViewModel(
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
     override val networkTypeIcon: Flow<Icon.Resource?> =
-        combine(iconInteractor.networkTypeIconGroup, showNetworkTypeIcon) {
-                networkTypeIconGroup,
-                shouldShow ->
+        combine(
+                iconInteractor.networkTypeIconGroup,
+                showNetworkTypeIcon,
+                iconInteractor.shouldShowFourgIcon,
+            ) { networkTypeIconGroup, shouldShow, shouldShowFourgIcon ->
                 val desc =
-                    if (networkTypeIconGroup.contentDescription != 0)
-                        ContentDescription.Resource(networkTypeIconGroup.contentDescription)
+                    if (networkTypeIconGroup.contentDescription != 0) {
+                        var contDesc: Int = networkTypeIconGroup.contentDescription
+                        if (shouldShowFourgIcon) contDesc = convertLteToFourg(contDesc)
+                        ContentDescription.Resource(contDesc)
+                    }
                     else null
                 val icon =
-                    if (networkTypeIconGroup.iconId != 0)
-                        Icon.Resource(networkTypeIconGroup.iconId, desc)
+                    if (networkTypeIconGroup.iconId != 0) {
+                        var contIcon: Int = networkTypeIconGroup.iconId
+                        if (shouldShowFourgIcon) contIcon = convertLteToFourg(contIcon)
+                        Icon.Resource(contIcon, desc)
+                    }
                     else null
                 return@combine when {
                     !shouldShow -> null
+                    shouldShowFourgIcon ||
+                    !shouldShowFourgIcon -> icon
                     else -> icon
                 }
             }
             .distinctUntilChanged()
             .stateIn(scope, SharingStarted.WhileSubscribed(), null)
 
+    private fun convertLteToFourg(res: Int): Int {
+        when (res) {
+            com.android.settingslib.R.string.data_connection_lte,
+            com.android.settingslib.R.string.data_connection_4g_lte -> {
+                return com.android.settingslib.R.string.data_connection_4g as Int
+            }
+            com.android.settingslib.R.string.data_connection_lte_plus,
+            com.android.settingslib.R.string.data_connection_4g_lte_plus -> {
+                return com.android.settingslib.R.string.data_connection_4g_plus as Int
+            }
+            TelephonyIcons.ICON_LTE,
+            TelephonyIcons.ICON_4G_LTE -> {
+                return TelephonyIcons.ICON_4G as Int
+            }
+            TelephonyIcons.ICON_LTE_PLUS,
+            TelephonyIcons.ICON_4G_LTE_PLUS -> {
+                return TelephonyIcons.ICON_4G_PLUS as Int
+            }
+            else -> {}
+        }
+        return res
+    }
+
     override val networkTypeBackground =
         iconInteractor.showSliceAttribution
             .map {
@@ -301,6 +343,16 @@ private class CellularIconViewModel(
             )
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isRoamingVisible: StateFlow<Boolean> =
+        combine(
+                roaming,
+                iconInteractor.isRoamingForceHidden
+            ) { isRoaming, isHidden ->
+                isRoaming && !isHidden
+            }
+            .distinctUntilChanged()
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
     private val activity: Flow<DataActivityModel?> =
         if (!constants.shouldShowActivityConfig) {
             flowOf(null)
@@ -325,4 +377,30 @@ private class CellularIconViewModel(
                 activity.map { it != null && (it.hasActivityIn || it.hasActivityOut) }
             }
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+    private val showVoWifi: StateFlow<Boolean> =
+        combine(
+                iconInteractor.isVoWifi,
+                iconInteractor.isVoWifiForceHidden
+            ) { isVoWifi, isHidden ->
+                // If it's force hidden, just hide.
+                // Otherwise follow VoWifi state
+                isVoWifi && !isHidden
+            }
+            .distinctUntilChanged()
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
+    override val showHd: StateFlow<Boolean> =
+        combine(
+                iconInteractor.isMobileHd,
+                iconInteractor.isMobileHdForceHidden,
+                showVoWifi,
+            ) { isHd, isHidden, voWifi ->
+                // If it's force hidden or VoWifi available, just hide.
+                // Otherwise follow HD state
+                isHd && !(isHidden || voWifi)
+            }
+            .distinctUntilChanged()
+            .stateIn(scope, SharingStarted.WhileSubscribed(), false)
+
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelKairos.kt
index 968c6acc6f1ec..65b1645f3f1db 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelKairos.kt
@@ -50,6 +50,7 @@ interface MobileIconViewModelKairosCommon {
     val icon: KairosState<SignalIconModel>
     val contentDescription: KairosState<MobileContentDescription?>
     val roaming: KairosState<Boolean>
+    val isRoamingVisible: KairosState<Boolean>
     /** The RAT icon (LTE, 3G, 5G, etc) to be displayed. Null if we shouldn't show anything */
     val networkTypeIcon: KairosState<Icon.Resource?>
     /** The slice attribution. Drawn as a background layer */
@@ -117,6 +118,8 @@ class MobileIconViewModelKairos(
 
     override val roaming: KairosState<Boolean> = vmProvider.flatMap { it.roaming }
 
+    override val isRoamingVisible: KairosState<Boolean> = vmProvider.flatMap { it.isRoamingVisible }
+
     override val networkTypeIcon: KairosState<Icon.Resource?> =
         vmProvider.flatMap { it.networkTypeIcon }
 
@@ -148,6 +151,7 @@ private class CarrierBasedSatelliteViewModelKairosImpl(
 
     /** These fields are not used for satellite icons currently */
     override val roaming: KairosState<Boolean> = stateOf(false)
+    override val isRoamingVisible: KairosState<Boolean> = stateOf(false)
     override val networkTypeIcon: KairosState<Icon.Resource?> = stateOf(null)
     override val networkTypeBackground: KairosState<Icon.Resource?> = stateOf(null)
     override val activityInVisible: KairosState<Boolean> = stateOf(false)
@@ -304,6 +308,23 @@ private class CellularIconViewModelKairos(
             }
         }
 
+    override val isRoamingVisible: KairosState<Boolean> =
+        combine(
+            iconInteractor.isRoaming,
+            iconInteractor.isRoamingForceHidden
+        ) { isRoaming, isHidden ->
+            isRoaming && !isHidden
+        }.also {
+            onActivated {
+                logDiffsForTable(
+                    name = nameTag { "CellularIconViewModelKairos(subId=$subscriptionId).isRoamingVisible" },
+                    it,
+                    iconInteractor.tableLogBuffer,
+                    columnName = "roamingVisible",
+                )
+            }
+        }
+
     private val activity: KairosState<DataActivityModel?> =
         if (!constants.shouldShowActivityConfig) {
             stateOf(null)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelKairos.kt
index 0457fbbbd2314..fbef7850e3686 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelKairos.kt
@@ -165,10 +165,17 @@ constructor(
             override val isSingleCarrier: State<Boolean> = latest(true) { isSingleCarrier }
             override val isRoaming: State<Boolean> = latest(false) { isRoaming }
             override val isForceHidden: State<Boolean> = latest(false) { isForceHidden }
+            override val isRoamingForceHidden: State<Boolean> = latest(false) { isRoamingForceHidden }
             override val isAllowedDuringAirplaneMode: State<Boolean> =
                 latest(false) { isAllowedDuringAirplaneMode }
             override val carrierNetworkChangeActive: State<Boolean> =
                 latest(false) { carrierNetworkChangeActive }
+            override val isMobileHd: State<Boolean> = latest(false) { isMobileHd }
+            override val isMobileHdForceHidden: State<Boolean> = latest(true) { isMobileHdForceHidden }
+            override val isVoWifi: State<Boolean> = latest(false) { isVoWifi }
+            override val isVoWifiForceHidden: State<Boolean> = latest(true) { isVoWifiForceHidden }
+            override val shouldShowFourgIcon: State<Boolean> = latest(false) { shouldShowFourgIcon }
+            override val disableStackedMobileIcons: State<Boolean> = latest(false) { disableStackedMobileIcons }
         }
 
     private fun trackedCommonViewModel(subId: Int) =
@@ -187,6 +194,7 @@ constructor(
             override val contentDescription: State<MobileContentDescription?> =
                 latest(null) { contentDescription }
             override val roaming: State<Boolean> = latest(false) { roaming }
+            override val isRoamingVisible: KairosState<Boolean> = stateOf(false)
             override val networkTypeIcon: State<Icon.Resource?> = latest(null) { networkTypeIcon }
             override val networkTypeBackground: State<Icon.Resource?> =
                 latest(null) { networkTypeBackground }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModel.kt
index 532dafef8bd72..8a86a6f2ee3a2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModel.kt
@@ -48,7 +48,7 @@ interface StackedMobileIconViewModel {
     val activityContainerVisible: Boolean
     /** [Context] to use when loading the [networkTypeIcon] */
     val mobileContext: Context?
-    val roaming: Boolean
+    val isRoamingVisible: Boolean
     val isIconVisible: Boolean
 }
 
@@ -190,7 +190,7 @@ constructor(
             initialValue = null,
         )
 
-    override val roaming: Boolean by
+    private val roaming: Boolean by
         hydrator.hydratedStateOf(
             traceName = "isRoaming",
             source =
@@ -211,6 +211,21 @@ constructor(
             initialValue = false,
         )
 
+    override val isRoamingVisible: Boolean by
+        hydrator.hydratedStateOf(
+            traceName = "isRoamingVisible",
+            source =
+                iconViewModelFlow.flatMapLatest { viewModels ->
+                    viewModels.firstOrNull()?.isRoamingVisible ?: flowOf(false)
+                }
+                .logDiffsForTable(
+                    tableLogBuffer = tableLogger,
+                    columnName = COL_ROAMING_VISIBLE,
+                    initialValue = false,
+                ),
+            initialValue = false,
+        )
+
     override val isIconVisible: Boolean by
         hydrator.hydratedStateOf(
             traceName = "isIconVisible",
@@ -245,5 +260,6 @@ constructor(
     private companion object {
         const val COL_IS_ICON_VISIBLE = "isIconVisible"
         const val COL_ROAMING = "roam"
+        const val COL_ROAMING_VISIBLE = "roamVisible"
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModelKairos.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModelKairos.kt
index 0cac207beffaf..5b41b0106f23a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModelKairos.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/StackedMobileIconViewModelKairos.kt
@@ -132,13 +132,22 @@ constructor(
             initialValue = null,
         )
 
-    override val roaming: Boolean by
+    private val roaming: Boolean by
         hydratedComposeStateOf(
             name = "roaming",
             source = iconList.flatMap { icons -> icons.firstOrNull()?.roaming ?: stateOf(false) },
             initialValue = false,
         )
 
+    override val isRoamingVisible: Boolean by
+        hydratedComposeStateOf(
+            name = "isRoamingVisible",
+            source = iconList.flatMap { icons -> 
+                icons.firstOrNull()?.isRoamingVisible ?: stateOf(false) 
+            },
+            initialValue = false,
+        )
+
     override val isIconVisible: Boolean
         get() = isStackable && dualSim != null
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/ConnectivitySlots.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/ConnectivitySlots.kt
index d52d0fb91b825..9850784d6608d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/ConnectivitySlots.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/ConnectivitySlots.kt
@@ -30,12 +30,14 @@ class ConnectivitySlots @Inject constructor(context: Context) {
     private val mobileSlot: String = context.getString(R.string.status_bar_mobile)
     private val wifiSlot: String = context.getString(R.string.status_bar_wifi)
     private val ethernetSlot: String = context.getString(R.string.status_bar_ethernet)
+    private val roamingSlot: String = "roaming"
 
     private val slotByName: Map<String, ConnectivitySlot> = mapOf(
         airplaneSlot to ConnectivitySlot.AIRPLANE,
         mobileSlot to ConnectivitySlot.MOBILE,
         wifiSlot to ConnectivitySlot.WIFI,
-        ethernetSlot to ConnectivitySlot.ETHERNET
+        ethernetSlot to ConnectivitySlot.ETHERNET,
+        roamingSlot to ConnectivitySlot.ROAMING
     )
 
     /**
@@ -52,5 +54,6 @@ enum class ConnectivitySlot {
     AIRPLANE,
     ETHERNET,
     MOBILE,
+    ROAMING,
     WIFI,
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarIconBlockListInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarIconBlockListInteractor.kt
index becf6e57de41d..e0b2fe41a060f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarIconBlockListInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarIconBlockListInteractor.kt
@@ -16,21 +16,29 @@
 
 package com.android.systemui.statusbar.pipeline.shared.domain.interactor
 
+import android.content.Context
 import android.content.res.Resources
 import android.provider.Settings
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Main
 import com.android.systemui.res.R
 import com.android.systemui.shared.settings.data.repository.SecureSettingsRepository
+import com.android.systemui.statusbar.phone.ui.StatusBarIconController
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 
 /** A place to define the blocklist/allowlist for home status bar icons */
 @SysUISingleton
 class HomeStatusBarIconBlockListInteractor
 @Inject
-constructor(@Main res: Resources, secureSettingsRepository: SecureSettingsRepository) {
+constructor(
+    @Main private val context: Context,
+    @Main res: Resources,
+    secureSettingsRepository: SecureSettingsRepository,
+) {
     private val defaultBlockedIcons =
         res.getStringArray(R.array.config_collapsed_statusbar_icon_blocklist)
 
@@ -40,17 +48,29 @@ constructor(@Main res: Resources, secureSettingsRepository: SecureSettingsReposi
     private val shouldShowVibrateIcon: Flow<Boolean> =
         secureSettingsRepository.boolSetting(Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON, false)
 
+    private val tunerBlockedIcons: Flow<Set<String>> =
+        secureSettingsRepository
+            .stringSetting(StatusBarIconController.ICON_HIDE_LIST)
+            .map { hideListStr ->
+                StatusBarIconController.getIconHideList(context, hideListStr).toSet()
+            }
+            .distinctUntilChanged()
+
     val iconBlockList: Flow<List<String>> =
-        shouldShowVibrateIcon.map {
-            val defaultSet = defaultBlockedIcons.toMutableSet()
+        combine(tunerBlockedIcons, shouldShowVibrateIcon) { tunerSet, showVibrate ->
+            val set = defaultBlockedIcons.toMutableSet()
+
+            // Merge tuner blacklist (this is what hides “clock”, “battery”, etc)
+            set.addAll(tunerSet)
+
             // It's possible that the vibrate icon was in the default blocklist, so we manually
             // merge the setting and list
-            if (it) {
-                defaultSet.remove(vibrateIconSlot)
+            if (showVibrate) {
+                set.remove(vibrateIconSlot)
             } else {
-                defaultSet.add(vibrateIconSlot)
+                set.add(vibrateIconSlot)
             }
 
-            defaultSet.toList()
+            set.toList()
         }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ClockChipGradientDrawable.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ClockChipGradientDrawable.kt
new file mode 100644
index 0000000000000..cc6103c2ba808
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ClockChipGradientDrawable.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2024-2026 Lunaris AOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.pipeline.shared.ui.binder
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RectF
+import android.graphics.Shader
+import android.graphics.drawable.Drawable
+import android.graphics.ColorFilter
+import android.graphics.PixelFormat
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.math.PI
+import kotlin.math.sqrt
+import kotlin.math.abs
+
+class ClockChipGradientDrawable(
+    startColor: Int = Color.TRANSPARENT,
+    endColor: Int = Color.TRANSPARENT,
+    angleDeg: Float = 0f,
+    cornerRadiusPx: Float = 0f,
+    val maskTextMode: Boolean = false,
+) : Drawable() {
+
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val path = Path()
+    private val rect = RectF()
+
+    private var _startColor: Int = startColor
+    private var _endColor: Int = endColor
+
+    private var _angleDeg: Float = angleDeg.normalise()
+    private var _cornerRadius: Float = cornerRadiusPx
+
+    fun updateColors(startColor: Int, endColor: Int) {
+        _startColor = startColor
+        _endColor = endColor
+        rebuildShader()
+        invalidateSelf()
+    }
+
+    fun updateAngle(angleDeg: Float) {
+        _angleDeg = angleDeg.normalise()
+        rebuildShader()
+        invalidateSelf()
+    }
+
+    fun updateCornerRadius(px: Float) {
+        _cornerRadius = px
+        invalidateSelf()
+    }
+
+    override fun onBoundsChange(bounds: android.graphics.Rect) {
+        super.onBoundsChange(bounds)
+        rect.set(bounds)
+        rebuildShader()
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (bounds.isEmpty) return
+        path.reset()
+        path.addRoundRect(rect, _cornerRadius, _cornerRadius, Path.Direction.CW)
+        canvas.drawPath(path, paint)
+    }
+
+    override fun setAlpha(alpha: Int) {
+        paint.alpha = alpha
+        invalidateSelf()
+    }
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        paint.colorFilter = colorFilter
+        invalidateSelf()
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+
+    private fun rebuildShader() {
+        val w = bounds.width().toFloat()
+        val h = bounds.height().toFloat()
+        if (w <= 0f || h <= 0f) return
+
+        val rad = _angleDeg * (PI / 180.0)
+
+        val len = (abs(w * cos(rad)) + abs(h * sin(rad))).toFloat() / 2f
+
+        val cx = w / 2f
+        val cy = h / 2f
+        val dx = sin(rad).toFloat()
+        val dy = -cos(rad).toFloat()
+
+        paint.shader = LinearGradient(
+            cx - dx * len, cy - dy * len,
+            cx + dx * len, cy + dy * len,
+            _startColor, _endColor,
+            Shader.TileMode.CLAMP
+        )
+    }
+
+    private fun Float.normalise(): Float = ((this % 360f) + 360f) % 360f
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt
index 5b305b712cee8..f36b697df645a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt
@@ -20,7 +20,9 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.app.WindowConfiguration
 import android.content.ContentResolver
+import android.content.Context
 import android.database.ContentObserver
+import android.graphics.Color
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
@@ -32,6 +34,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.app.animation.Interpolators
+import com.android.systemui.matrixx.batterybar.BatteryBarController
+import com.android.systemui.matrixx.logo.LogoImage
 import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDisplaySingleton
 import com.android.systemui.lifecycle.repeatWhenAttached
 import com.android.systemui.res.R
@@ -100,14 +104,25 @@ constructor(
         private const val CLOCK_POSITION_RIGHT = 0
         private const val CLOCK_POSITION_CENTER = 1
         private const val CLOCK_POSITION_LEFT = 2
+        const val CHIP_STYLE_CUSTOM_GRADIENT = 13
+        const val GRADIENT_TEXT_STYLE_MASK = 1
     }
 
     private data class ClockState(
         val autoHide: Boolean,
         val denyListed: Boolean,
         val hideForHun: Boolean,
+        val chipStyle: Int,
         val position: Int,
         val visibilityModel: VisibilityModel,
+        val gradientStartColor: Int = Color.parseColor("#FF6B6B"),
+        val gradientEndColor: Int = Color.parseColor("#4ECDC4"),
+        val gradientAngle: Float = 0f,
+        val gradientMaskText: Boolean = false,
+    )
+
+    private data class Padding(
+        val start: Int, val top: Int, val end: Int, val bottom: Int,
     )
 
     override fun bind(
@@ -128,6 +143,13 @@ constructor(
         val networkTrafficStartView = view.findViewById<View>(R.id.network_traffic_holder_start)
         val notificationIconsArea = view.requireViewById<View>(R.id.notificationIcons)
 
+        val leftPaddingInit = leftClock.capturePadding()
+        val centerPaddingInit = centerClock.capturePadding()
+        val rightPaddingInit = rightClock.capturePadding()
+
+        val batteryBar: BatteryBarController = view.requireViewById(R.id.battery_bar)
+        val leftLogo: LogoImage = view.requireViewById(R.id.statusbar_logo)
+
         // CollapsedStatusBarFragment doesn't need this
         if (StatusBarRootModernization.isEnabled) {
             // GONE because this shouldn't take space in the layout
@@ -136,6 +158,8 @@ constructor(
             leftClock.hideInitially(state = View.GONE)
             centerClock.hideInitially(state = View.GONE)
             rightClock.hideInitially(state = View.GONE)
+            batteryBar.hideInitially()
+            leftLogo.hideInitially()
             notificationIconsArea.hideInitially()
         }
 
@@ -149,8 +173,13 @@ constructor(
                             autoHide = false,
                             denyListed = false,
                             hideForHun = false,
+                            chipStyle = 0,
                             position = context.contentResolver.readClockPosition(),
                             visibilityModel = VisibilityModel(View.GONE, true),
+                            gradientStartColor = context.contentResolver.readGradientStartColor(),
+                            gradientEndColor = context.contentResolver.readGradientEndColor(),
+                            gradientAngle = context.contentResolver.readGradientAngle(),
+                            gradientMaskText = context.contentResolver.readGradientMaskText(),
                         )
                     )
 
@@ -162,6 +191,16 @@ constructor(
                     Settings.Secure.getUriFor(StatusBarIconController.ICON_HIDE_LIST)
                 val statusBarClockUri: Uri =
                     LineageSettings.System.getUriFor(LineageSettings.System.STATUS_BAR_CLOCK)
+                val statusBarClockChipUri: Uri =
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_CLOCK_CHIP)
+                val gradientStartColorUri: Uri =
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_START_COLOR)
+                val gradientEndColorUri: Uri =
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_END_COLOR)
+                val gradientAngleUri: Uri =
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_ANGLE)
+                val gradientMaskTextUri: Uri =
+                    Settings.System.getUriFor(Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_MASK_TEXT)
 
                 val taskStackListener =
                     object : TaskStackChangeListener {
@@ -212,13 +251,45 @@ constructor(
                                         current.copy(
                                             position = context.contentResolver.readClockPosition()
                                         )
+                                    statusBarClockChipUri -> {
+                                        val chipStyle =
+                                            Settings.System.getIntForUser(context.contentResolver,
+                                                Settings.System.STATUSBAR_CLOCK_CHIP, 0,
+                                                UserHandle.USER_CURRENT
+                                            )
+                                        current.copy(
+                                            chipStyle = chipStyle
+                                        )
+                                    }
+                                    gradientStartColorUri ->
+                                        current.copy(
+                                            gradientStartColor =
+                                                context.contentResolver.readGradientStartColor()
+                                        )
+                                    gradientEndColorUri ->
+                                        current.copy(
+                                            gradientEndColor =
+                                                context.contentResolver.readGradientEndColor()
+                                        )
+                                    gradientAngleUri ->
+                                        current.copy(
+                                            gradientAngle =
+                                                context.contentResolver.readGradientAngle()
+                                        )
+                                    gradientMaskTextUri ->
+                                       current.copy(
+                                           gradientMaskText =
+                                               context.contentResolver.readGradientMaskText()
+                                       )
                                     else -> current
                                 }
                             }
                         }
                     }
 
-                val urisToObserve = listOf(clockAutoHideUri, iconHideListUri, statusBarClockUri)
+                val urisToObserve = listOf(clockAutoHideUri, iconHideListUri, statusBarClockUri,
+                    statusBarClockChipUri, gradientStartColorUri, gradientEndColorUri, gradientAngleUri,
+                    gradientMaskTextUri)
                 urisToObserve.forEach { uri ->
                     context.contentResolver.registerContentObserver(
                         uri,
@@ -434,6 +505,13 @@ constructor(
                     }
 
                     launch {
+                        var lastChipStyle: Int? = null
+                        var lastClockPosition: Int? = null
+                        var lastGradientStartColor: Int? = null
+                        var lastGradientEndColor: Int? = null
+                        var lastGradientAngle: Float? = null
+                        var lastGradientMaskText: Boolean? = null
+
                         clockState.collect { state ->
                             // We only want to hide left clock for HUN
                             val hunBlocksClock =
@@ -468,12 +546,49 @@ constructor(
 
                             // Show only the active one
                             activeClock.adjustVisibility(finalVisibility)
+
+                            // Only touch chip UI when needed
+                            val gradientParamsChanged =
+                                state.chipStyle == CHIP_STYLE_CUSTOM_GRADIENT && (
+                                    lastGradientStartColor != state.gradientStartColor ||
+                                    lastGradientEndColor != state.gradientEndColor ||
+                                    lastGradientAngle != state.gradientAngle ||
+                                    lastGradientMaskText != state.gradientMaskText
+                                )
+                            val chipNeedsUpdate = (lastChipStyle != state.chipStyle)
+                                        || (lastClockPosition != state.position)
+                                        || gradientParamsChanged
+                            if (chipNeedsUpdate) {
+                                applyClockChip(
+                                    context = context,
+                                    chipStyle = state.chipStyle,
+                                    activeClock = activeClock,
+                                    leftClock = leftClock,
+                                    centerClock = centerClock,
+                                    rightClock = rightClock,
+                                    leftPaddingInit = leftPaddingInit,
+                                    centerPaddingInit = centerPaddingInit,
+                                    rightPaddingInit = rightPaddingInit,
+                                    gradientStartColor = state.gradientStartColor,
+                                    gradientEndColor = state.gradientEndColor,
+                                    gradientAngle = state.gradientAngle,
+                                    gradientMaskText = state.gradientMaskText,
+                                )
+                                lastChipStyle = state.chipStyle
+                                lastClockPosition = state.position
+                                lastGradientStartColor = state.gradientStartColor
+                                lastGradientEndColor = state.gradientEndColor
+                                lastGradientAngle = state.gradientAngle
+                                lastGradientMaskText = state.gradientMaskText
+                            }
                         }
                     }
 
                     launch {
                         viewModel.isNotificationIconContainerVisible.collect {
                             notificationIconsArea.adjustVisibility(it)
+                            batteryBar.adjustVisibility(it)
+                            leftLogo.adjustVisibility(it)
                         }
                     }
 
@@ -575,6 +690,38 @@ constructor(
         )
     }
 
+    private fun ContentResolver.readGradientStartColor(): Int =
+        Settings.System.getIntForUser(
+            this,
+            Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_START_COLOR,
+            Color.parseColor("#FF6B6B"),
+            UserHandle.USER_CURRENT,
+        )
+
+    private fun ContentResolver.readGradientEndColor(): Int =
+        Settings.System.getIntForUser(
+            this,
+            Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_END_COLOR,
+            Color.parseColor("#4ECDC4"),
+            UserHandle.USER_CURRENT,
+        )
+
+    private fun ContentResolver.readGradientAngle(): Float =
+        Settings.System.getIntForUser(
+            this,
+            Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_ANGLE,
+            0,
+            UserHandle.USER_CURRENT,
+        ).toFloat()
+
+    private fun ContentResolver.readGradientMaskText(): Boolean =
+        Settings.System.getIntForUser(
+            this,
+            Settings.System.STATUSBAR_CLOCK_CHIP_GRADIENT_MASK_TEXT,
+            0,
+            UserHandle.USER_CURRENT,
+        ) == GRADIENT_TEXT_STYLE_MASK
+
     private fun shouldClockAutoHideForCurrentTask(): Boolean {
         return ActivityManagerWrapper.getInstance()
             .runningTask
@@ -637,6 +784,146 @@ constructor(
         }
     }
 
+    private fun View.capturePadding() = Padding(paddingStart, paddingTop, paddingEnd, paddingBottom)
+
+    private fun dpToPx(context: Context, dp: Int): Int {
+        return (dp * context.resources.displayMetrics.density).toInt()
+    }
+
+    private fun applyClockChip(
+        context: Context,
+        chipStyle: Int,
+        activeClock: Clock,
+        leftClock: Clock,
+        centerClock: Clock,
+        rightClock: Clock,
+        leftPaddingInit: Padding,
+        centerPaddingInit: Padding,
+        rightPaddingInit: Padding,
+        gradientStartColor: Int = Color.parseColor("#FF6B6B"),
+        gradientEndColor: Int = Color.parseColor("#4ECDC4"),
+        gradientAngle: Float = 0f,
+        gradientMaskText: Boolean = false,
+    ) {
+        fun reset(clock: Clock, padding: Padding) {
+            if (clock == null || padding == null) return
+            clock.setBackgroundResource(0)
+            clock.setPaddingRelative(padding.start, padding.top, padding.end, padding.bottom)
+            clock.setMaskTextMode(false)
+            // Reset text color - Clock will handle it via DarkIconDispatcher
+        }
+
+        fun apply(clock: Clock, style: Int) {
+            val clockBackgrounds = listOf(
+                R.drawable.sb_date_bg1,
+                R.drawable.sb_date_bg2,
+                R.drawable.sb_date_bg3,
+                R.drawable.sb_date_bg4,
+                R.drawable.sb_date_bg5,
+                R.drawable.sb_date_bg6,
+                R.drawable.sb_date_bg7,
+                R.drawable.sb_date_bg8,
+                R.drawable.sb_date_bg9,
+                R.drawable.sb_date_bg10,
+                R.drawable.sb_date_bg11,
+                R.drawable.sb_date_bg12
+            )
+            
+            if (style < 1 || style > clockBackgrounds.size) {
+                clock.setStaticColor(false)
+                return
+            }
+            
+            val chipTopBottomPadding = context.resources.getDimensionPixelSize(
+                R.dimen.status_bar_clock_chip_tb_padding)
+            val chipLeftRightPadding = context.resources.getDimensionPixelSize(
+                R.dimen.status_bar_clock_chip_lr_padding)
+            
+            clock.setBackgroundResource(clockBackgrounds[style - 1])
+            clock.setPadding(
+                chipLeftRightPadding, 
+                chipTopBottomPadding, 
+                chipLeftRightPadding, 
+                chipTopBottomPadding
+            )
+            clock.setTextAlignment(View.TEXT_ALIGNMENT_CENTER)
+            // Set text color to white for visibility on filled chip backgrounds
+            // Styles 2 and 8 are outline-only (transparent background), so use normal color
+            if (style != 2 && style != 8) {
+                clock.setStaticColor(true)
+                clock.setTextColor(Color.WHITE)
+            } else {
+                clock.setStaticColor(false)
+            }
+            // For outline styles (2, 8), let Clock's DarkIconDispatcher handle the color
+        }
+
+        // Always reset first so the previous active clock loses chip when position changes
+        reset(leftClock, leftPaddingInit)
+        reset(centerClock, centerPaddingInit)
+        reset(rightClock, rightPaddingInit)
+
+        if (chipStyle == 0) return
+
+        if (chipStyle == CHIP_STYLE_CUSTOM_GRADIENT) {
+            applyGradient(activeClock, gradientStartColor, gradientEndColor, gradientAngle, context, maskTextMode = gradientMaskText)
+        } else {
+            apply(activeClock, chipStyle)
+        }
+    }
+
+    private fun applyGradient(
+        clock: Clock,
+        startColor: Int,
+        endColor: Int,
+        angleDeg: Float,
+        context: Context,
+        maskTextMode: Boolean = false,
+    ) {
+        val chipTopBottomPadding = context.resources.getDimensionPixelSize(
+            R.dimen.status_bar_clock_chip_tb_padding)
+        val chipLeftRightPadding = context.resources.getDimensionPixelSize(
+            R.dimen.status_bar_clock_chip_lr_padding)
+        val cornerPx = try {
+            context.resources.getDimension(R.dimen.chip_corner_radius)
+        } catch (e: Exception) {
+            chipTopBottomPadding * 2f
+        }
+        val existing = clock.background as? ClockChipGradientDrawable
+        if (existing != null) {
+            existing.updateColors(startColor, endColor)
+            existing.updateAngle(angleDeg)
+            if (existing.maskTextMode != maskTextMode) {
+               clock.background = ClockChipGradientDrawable(
+                   startColor = startColor,
+                   endColor = endColor,
+                   angleDeg = angleDeg,
+                   cornerRadiusPx = cornerPx,
+                   maskTextMode = maskTextMode,
+               )
+           }
+        } else {
+            clock.background = ClockChipGradientDrawable(
+                startColor = startColor,
+                endColor = endColor,
+                angleDeg = angleDeg,
+                cornerRadiusPx = cornerPx,
+                maskTextMode = maskTextMode,
+            )
+        }
+        clock.setPadding(chipLeftRightPadding, chipTopBottomPadding,
+            chipLeftRightPadding, chipTopBottomPadding)
+        clock.setTextAlignment(View.TEXT_ALIGNMENT_CENTER)
+        if (maskTextMode) {
+            clock.setStaticColor(true)
+            clock.setTextColor(Color.WHITE)
+            clock.setMaskTextMode(true)
+        } else {
+            clock.setMaskTextMode(false)
+            clock.setStaticColor(false)
+        }
+    }
+
     /**
      * Hide the view for initialization, but skip if it's already hidden and does not cancel
      * animations.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StackedMobileIcon.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StackedMobileIcon.kt
index 1e93ee0d4f644..1f35ef14b21d3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StackedMobileIcon.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StackedMobileIcon.kt
@@ -123,7 +123,7 @@ fun StackedMobileIcon(viewModel: StackedMobileIconViewModel, modifier: Modifier
             contentDescription = viewModel.contentDescription,
         )
 
-        if (viewModel.roaming) {
+        if (viewModel.isRoamingVisible) {
             val height = with(LocalDensity.current) { RoamingIconHeightSp.toDp() }
             val paddingTop = with(LocalDensity.current) { RoamingIconPaddingTopSp.toDp() }
             Image(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt
index 23e715dccde81..db9090d5521b8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt
@@ -34,6 +34,7 @@ import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableIntState
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -77,6 +78,8 @@ import com.android.systemui.res.R
 import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import com.android.systemui.shade.ui.composable.VariableDayDate
 import com.android.systemui.statusbar.StatusBarAlwaysUseRegionSampling
+import com.android.systemui.axdynamicbar.ui.AxDynamicBarChipViewModel
+import com.android.systemui.axdynamicbar.ui.compose.AxDynamicBarChip
 import com.android.systemui.statusbar.chips.ui.compose.OngoingActivityChips
 import com.android.systemui.statusbar.core.NewStatusBarIcons
 import com.android.systemui.statusbar.core.RudimentaryBattery
@@ -119,6 +122,9 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlinx.coroutines.DisposableHandle
 import kotlinx.coroutines.awaitCancellation
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.collect
 
 /** Factory to simplify the dependency management for [StatusBarRoot] */
 @PerDisplaySingleton
@@ -140,6 +146,7 @@ constructor(
     @DisplayAware private val homeStatusBarViewBinder: HomeStatusBarViewBinder,
     @DisplayAware private val homeStatusBarViewModelFactory: HomeStatusBarViewModelFactory,
     private val statusBarRegionSamplingViewModelFactory: StatusBarRegionSamplingViewModel.Factory,
+    private val axDynamicBarChipViewModel: AxDynamicBarChipViewModel,
 ) {
     fun create(root: ViewGroup, andThen: (ViewGroup) -> Unit): ComposeView {
         val composeView = ComposeView(root.context)
@@ -164,6 +171,7 @@ constructor(
                         mediaViewModelFactory = mediaViewModelFactory,
                         statusBarRegionSamplingViewModelFactory =
                             statusBarRegionSamplingViewModelFactory,
+                        axDynamicBarChipViewModel = axDynamicBarChipViewModel,
                         onViewCreated = andThen,
                         modifier = Modifier.sysUiResTagContainer(),
                     )
@@ -203,6 +211,7 @@ fun StatusBarRoot(
     mediaHost: MediaHost,
     mediaViewModelFactory: MediaViewModel.Factory,
     statusBarRegionSamplingViewModelFactory: StatusBarRegionSamplingViewModel.Factory,
+    axDynamicBarChipViewModel: AxDynamicBarChipViewModel,
     onViewCreated: (ViewGroup) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -263,6 +272,7 @@ fun StatusBarRoot(
                         statusBarViewModel = statusBarViewModel,
                         iconViewStore = iconViewStore,
                         appHandlesViewModel = appHandlesViewModel,
+                        axDynamicBarChipViewModel = axDynamicBarChipViewModel,
                         context = context,
                     )
                 }
@@ -404,6 +414,7 @@ private fun addStartSideComposable(
     statusBarViewModel: HomeStatusBarViewModel,
     iconViewStore: NotificationIconContainerViewBinder.IconViewStore?,
     appHandlesViewModel: AppHandlesViewModel,
+    axDynamicBarChipViewModel: AxDynamicBarChipViewModel,
     context: Context,
 ) {
     val startSideExceptHeadsUp =
@@ -422,9 +433,7 @@ private fun addStartSideComposable(
                         LinearLayout.LayoutParams.WRAP_CONTENT,
                     )
                     .apply {
-                        if (showDate) {
-                            gravity = android.view.Gravity.CENTER_VERTICAL
-                        }
+                        gravity = android.view.Gravity.CENTER_VERTICAL
                     }
 
             setContent {
@@ -485,15 +494,19 @@ private fun addStartSideComposable(
                         )
                     }
 
+                val axEnabled by axDynamicBarChipViewModel.interactor.settings.isEnabled.collectAsState()
+                if (axEnabled) {
+                    AxDynamicBarChip(
+                        viewModel = axDynamicBarChipViewModel,
+                        modifier = Modifier.widthIn(max = chipsMaxWidth),
+                    )
+                }
                 val chipsVisibilityModel = statusBarViewModel.ongoingActivityChips
                 if (chipsVisibilityModel.areChipsAllowed) {
                     OngoingActivityChips(
                         chips = chipsVisibilityModel.chips,
                         iconViewStore = iconViewStore,
                         onChipBoundsChanged = statusBarViewModel::onChipBoundsChanged,
-                        // TODO(b/393581408): Now that we always enforce a max width on the chips,
-                        //  we should be able to convert the chips to a LazyRow and get some
-                        //  animations for free.
                         modifier = Modifier.sysUiResTagContainer().widthIn(max = chipsMaxWidth),
                     )
                 }
@@ -548,6 +561,8 @@ fun chipsMaxWidth(
     return (widthInPx / density).dp
 }
 
+private const val SLOT_BATTERY = "battery"
+
 /** Create a new [UnifiedBattery] and add it to the end of the system_icons container */
 private fun addBatteryComposable(
     phoneStatusBarView: PhoneStatusBarView,
@@ -585,6 +600,15 @@ private fun addBatteryComposable(
     phoneStatusBarView.findViewById<ViewGroup>(R.id.system_icons).apply {
         addView(batteryComposeView, -1)
     }
+
+    batteryComposeView.repeatWhenAttached {
+        statusBarViewModel.iconBlockList
+            .map { blocked -> blocked.contains(SLOT_BATTERY) }
+            .distinctUntilChanged()
+            .collect { isBlocked ->
+                batteryComposeView.visibility = if (isBlocked) View.GONE else View.VISIBLE
+            }
+    }
 }
 
 /**
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt
index 2433d112bc69b..ec6a9f76f1796 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt
@@ -33,6 +33,7 @@ import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon
 sealed interface InternetTileModel {
     val secondaryTitle: CharSequence?
     val secondaryLabel: Text?
+    val dataUsageSummary: String?
     val iconId: Int?
     val icon: QSTile.Icon?
     val stateDescription: ContentDescription?
@@ -41,11 +42,12 @@ sealed interface InternetTileModel {
     @SuppressLint("UseCompatLoadingForDrawables")
     fun applyTo(state: QSTile.BooleanState, context: Context) {
         if (secondaryLabel != null) {
-            state.secondaryLabel = secondaryLabel.loadText(context)
+            state.label = secondaryLabel.loadText(context)
         } else {
-            state.secondaryLabel = secondaryTitle
+            state.label = secondaryTitle
         }
 
+        state.secondaryLabel = dataUsageSummary
         state.stateDescription = stateDescription.loadContentDescription(context)
         state.contentDescription = contentDescription.loadContentDescription(context)
 
@@ -70,6 +72,7 @@ sealed interface InternetTileModel {
     data class Active(
         override val secondaryTitle: CharSequence? = null,
         override val secondaryLabel: Text? = null,
+        override val dataUsageSummary: String? = null,
         override val iconId: Int? = null,
         override val icon: QSTile.Icon? = null,
         override val stateDescription: ContentDescription? = null,
@@ -79,6 +82,7 @@ sealed interface InternetTileModel {
     data class Inactive(
         override val secondaryTitle: CharSequence? = null,
         override val secondaryLabel: Text? = null,
+        override val dataUsageSummary: String? = null,
         override val iconId: Int? = null,
         override val icon: QSTile.Icon? = null,
         override val stateDescription: ContentDescription? = null,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/InternetTileViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/InternetTileViewModel.kt
index 53a27f966be99..44de30429906d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/InternetTileViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/InternetTileViewModel.kt
@@ -23,6 +23,7 @@ import com.android.systemui.common.shared.model.ContentDescription.Companion.loa
 import com.android.systemui.common.shared.model.Text
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.qs.tiles.dialog.DataUsageRepository
 import com.android.systemui.qs.tileimpl.QSTileImpl
 import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon
 import com.android.systemui.res.R
@@ -62,6 +63,7 @@ constructor(
     mobileIconsInteractor: MobileIconsInteractor,
     mobileContextProvider: MobileContextProvider,
     wifiInteractor: WifiInteractor,
+    private val dataUsageRepository: DataUsageRepository,
     private val context: Context,
     @Background scope: CoroutineScope,
 ) {
@@ -70,20 +72,30 @@ constructor(
     // Three symmetrical Flows that can be switched upon based on the value of
     // [DefaultConnectionModel]
     private val wifiIconFlow: Flow<InternetTileModel> =
-        wifiInteractor.wifiNetwork.flatMapLatest {
-            val wifiIcon = WifiIcon.fromModel(it, context, showHotspotInfo = true)
-            if (it is WifiNetworkModel.Active && wifiIcon is WifiIcon.Visible) {
-                val secondary = removeDoubleQuotes(it.ssid)
-                flowOf(
-                    InternetTileModel.Active(
-                        secondaryTitle = secondary,
-                        icon = ResourceIcon.get(wifiIcon.icon.resId),
-                        stateDescription = wifiIcon.contentDescription,
-                        contentDescription = ContentDescription.Loaded("$internetLabel,$secondary"),
+        combine(
+            wifiInteractor.wifiNetwork.flatMapLatest {
+                val wifiIcon = WifiIcon.fromModel(it, context, showHotspotInfo = true)
+                if (it is WifiNetworkModel.Active && wifiIcon is WifiIcon.Visible) {
+                    val secondary = removeDoubleQuotes(it.ssid)
+                    flowOf(
+                        InternetTileModel.Active(
+                            secondaryTitle = secondary,
+                            icon = ResourceIcon.get(wifiIcon.icon.resId),
+                            stateDescription = wifiIcon.contentDescription,
+                            contentDescription =
+                                ContentDescription.Loaded("$internetLabel,$secondary"),
+                        )
                     )
-                )
+                } else {
+                    notConnectedFlow
+                }
+            },
+            dataUsageRepository.wifiUsageFormatted,
+        ) { model, wifiUsage ->
+            if (model is InternetTileModel.Active) {
+                model.copy(dataUsageSummary = wifiUsage)
             } else {
-                notConnectedFlow
+                model
             }
         }
 
@@ -111,40 +123,51 @@ constructor(
         }
 
     private val mobileIconFlow: Flow<InternetTileModel> =
-        mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
-            if (it == null) {
-                notConnectedFlow
-            } else {
-                combine(it.networkName, it.signalLevelIcon, mobileDataContentName) {
-                    networkNameModel,
-                    signalIcon,
-                    dataContentDescription ->
-                    when (signalIcon) {
-                        is SignalIconModel.Cellular -> {
-                            val secondary =
-                                mobileDataContentConcat(
-                                    networkNameModel.name,
-                                    dataContentDescription,
+        combine(
+            mobileIconsInteractor.activeDataIconInteractor.flatMapLatest {
+                if (it == null) {
+                    notConnectedFlow
+                } else {
+                    combine(it.networkName, it.signalLevelIcon, mobileDataContentName) {
+                        networkNameModel,
+                        signalIcon,
+                        dataContentDescription ->
+                        when (signalIcon) {
+                            is SignalIconModel.Cellular -> {
+                                val secondary =
+                                    mobileDataContentConcat(
+                                        networkNameModel.name,
+                                        dataContentDescription,
+                                    )
+                                InternetTileModel.Active(
+                                    secondaryTitle = secondary,
+                                    icon = SignalIcon(signalIcon.toSignalDrawableState()),
+                                    stateDescription =
+                                        ContentDescription.Loaded(secondary.toString()),
+                                    contentDescription = ContentDescription.Loaded(internetLabel),
                                 )
-                            InternetTileModel.Active(
-                                secondaryTitle = secondary,
-                                icon = SignalIcon(signalIcon.toSignalDrawableState()),
-                                stateDescription = ContentDescription.Loaded(secondary.toString()),
-                                contentDescription = ContentDescription.Loaded(internetLabel),
-                            )
-                        }
-                        is SignalIconModel.Satellite -> {
-                            val secondary =
-                                signalIcon.icon.contentDescription.loadContentDescription(context)
-                            InternetTileModel.Active(
-                                secondaryTitle = secondary,
-                                iconId = signalIcon.icon.resId,
-                                stateDescription = ContentDescription.Loaded(secondary),
-                                contentDescription = ContentDescription.Loaded(internetLabel),
-                            )
+                            }
+                            is SignalIconModel.Satellite -> {
+                                val secondary =
+                                    signalIcon.icon.contentDescription
+                                        .loadContentDescription(context)
+                                InternetTileModel.Active(
+                                    secondaryTitle = secondary,
+                                    iconId = signalIcon.icon.resId,
+                                    stateDescription = ContentDescription.Loaded(secondary),
+                                    contentDescription = ContentDescription.Loaded(internetLabel),
+                                )
+                            }
                         }
                     }
                 }
+            },
+            dataUsageRepository.mobileUsageFormatted,
+        ) { model, mobileUsage ->
+            if (model is InternetTileModel.Active) {
+                model.copy(dataUsageSummary = mobileUsage)
+            } else {
+                model
             }
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
index 64d4acb57f25f..3ed24c805b624 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.pipeline.wifi.data.repository
 
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
@@ -73,6 +74,11 @@ interface WifiRepository {
      */
     fun scanForWifi()
 
+    /**
+     * The list of IMS state of all subscription Ids
+     */
+    val imsStates: StateFlow<List<ImsStateModel>>
+
     /**
      * Returns true if the device is currently connected to a wifi network with a valid SSID and
      * false otherwise.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt
index 71f00998e6d60..70958d0d96690 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt
@@ -22,6 +22,7 @@ import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Background
 import com.android.systemui.demomode.DemoMode
 import com.android.systemui.demomode.DemoModeController
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoWifiRepository
@@ -134,6 +135,11 @@ constructor(
             .flatMapLatest { it.wifiToggleState }
             .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.wifiToggleState.value)
 
+    override val imsStates: StateFlow<List<ImsStateModel>> =
+        activeRepo
+            .flatMapLatest { it.imsStates }
+            .stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.imsStates.value)
+
     override fun disableWifi() {
         activeRepo.value.disableWifi()
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt
index 2d516848d355f..35fd0b0c8cc9b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo
 
 import com.android.app.tracing.coroutines.launchTraced as launch
 import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
@@ -64,6 +65,10 @@ constructor(
     private val _wifiToggleState = MutableStateFlow<WifiToggleState>(WifiToggleState.Normal)
     override val wifiToggleState: StateFlow<WifiToggleState> = _wifiToggleState
 
+    private val _imsStates: MutableStateFlow<List<ImsStateModel>> =
+        MutableStateFlow(emptyList())
+    override val imsStates: StateFlow<List<ImsStateModel>> = _imsStates
+
     override fun disableWifi() {
         // No-op
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt
index 620319cb99c86..67d06560b10c5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt
@@ -17,6 +17,7 @@
 package com.android.systemui.statusbar.pipeline.wifi.data.repository.prod
 
 import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
@@ -53,6 +54,9 @@ class DisabledWifiRepository @Inject constructor() : RealWifiRepository {
     override val wifiToggleState: StateFlow<WifiToggleState> =
         MutableStateFlow<WifiToggleState>(WifiToggleState.Normal).asStateFlow()
 
+    override val imsStates: StateFlow<List<ImsStateModel>> =
+        MutableStateFlow<List<ImsStateModel>>(emptyList()).asStateFlow()
+
     override fun disableWifi() {
         // No-op
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt
index b705cc64b7df2..91af43f2172a4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt
@@ -38,6 +38,8 @@ import com.android.systemui.log.table.logDiffsForTable
 import com.android.systemui.statusbar.connectivity.WifiPickerTrackerFactory
 import com.android.systemui.statusbar.pipeline.dagger.WifiInputLog
 import com.android.systemui.statusbar.pipeline.dagger.WifiTableLog
+import com.android.systemui.statusbar.pipeline.ims.data.model.ImsStateModel
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepository
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel
 import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel
@@ -94,6 +96,7 @@ constructor(
     private val wifiManager: WifiManager,
     @WifiInputLog private val inputLogger: LogBuffer,
     @WifiTableLog private val tableLogger: TableLogBuffer,
+    private val commonImsRepo: CommonImsRepository,
 ) : RealWifiRepository, LifecycleOwner {
     private var pauseWifiTimeoutJob: Job? = null
     private var scanForWifiTimeoutJob: Job? = null
@@ -568,6 +571,7 @@ constructor(
         private val wifiPickerTrackerFactory: WifiPickerTrackerFactory,
         @WifiInputLog private val inputLogger: LogBuffer,
         @WifiTableLog private val tableLogger: TableLogBuffer,
+        private val commonImsRepository: CommonImsRepository
     ) {
         fun create(wifiManager: WifiManager): WifiRepositoryImpl {
             return WifiRepositoryImpl(
@@ -581,10 +585,13 @@ constructor(
                 wifiManager,
                 inputLogger,
                 tableLogger,
+                commonImsRepository,
             )
         }
     }
 
+    override val imsStates: StateFlow<List<ImsStateModel>> = commonImsRepo.imsStates
+
     companion object {
         // Start out with no known wifi network.
         @VisibleForTesting val WIFI_NETWORK_DEFAULT = WifiNetworkModel.Inactive()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt
index 735fc2bb179a2..4ec94b7516b68 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt
@@ -18,11 +18,13 @@ package com.android.systemui.statusbar.pipeline.wifi.domain.interactor
 
 import com.android.systemui.dagger.SysUISingleton
 import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.statusbar.pipeline.ims.data.repository.CommonImsRepository
 import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
 import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
 import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository
 import com.android.systemui.statusbar.pipeline.shared.ui.model.WifiToggleState
 import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
+import com.android.systemui.statusbar.pipeline.wifi.shared.model.VoWifiState
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiScanEntry
 import javax.inject.Inject
@@ -67,6 +69,12 @@ interface WifiInteractor {
 
     /** A flow representing the user's optimistic intent to toggle Wi-Fi. */
     val wifiToggleState: StateFlow<WifiToggleState>
+
+    /** Our current VoWifi state. */
+    val voWifiState: StateFlow<VoWifiState>
+
+    /** True if we're configured to force-hide the VoWifi icon and false otherwise. */
+    val isVoWifiForceHidden: Flow<Boolean>
 }
 
 @SysUISingleton
@@ -75,6 +83,7 @@ class WifiInteractorImpl
 constructor(
     connectivityRepository: ConnectivityRepository,
     wifiRepository: WifiRepository,
+    commonImsRepo: CommonImsRepository,
     @Application scope: CoroutineScope,
 ) : WifiInteractor {
 
@@ -120,6 +129,25 @@ constructor(
 
     override val wifiToggleState: StateFlow<WifiToggleState> = wifiRepository.wifiToggleState
 
+    override val voWifiState: StateFlow<VoWifiState> =
+        wifiRepository.imsStates.map { states ->
+            val voWifiEnabled = states.filter { it.isVoWifiAvailable() }
+            if (voWifiEnabled.isNotEmpty()) {
+                // Get the VoWifi enabled slots
+                val slots = voWifiEnabled.map { it.slotIndex }
+                // Get the active subscription count from any one of the states
+                // (All states are being collected at the same time so doesn't matter)
+                val activeSubCount = voWifiEnabled.first().activeSubCount
+                VoWifiState.Enabled(slots, activeSubCount)
+            } else {
+                VoWifiState.Disabled
+            }
+        }
+        .stateIn(scope, SharingStarted.WhileSubscribed(), VoWifiState.Disabled)
+
+    override val isVoWifiForceHidden: Flow<Boolean> =
+        commonImsRepo.imsIconState.map { !it.showVowifiIcon }
+
     private fun anyNonMatchingNetworkExists(
         currentNetwork: WifiNetworkModel.Active,
         availableNetworks: List<WifiScanEntry>,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/model/VoWifiState.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/model/VoWifiState.kt
new file mode 100644
index 0000000000000..1cb570f7a13a0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/model/VoWifiState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2024 The LibreMobileOS Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.pipeline.wifi.shared.model
+
+sealed interface VoWifiState {
+    data class Enabled(val slots: List<Int>, val activeSubCount: Int) : VoWifiState
+    object Disabled : VoWifiState
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt
index 14c5279f4adf6..d5b013932e76c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt
@@ -35,6 +35,7 @@ import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarV
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewVisibilityHelper
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarViewBinderConstants.ALPHA_ACTIVE
 import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarViewBinderConstants.ALPHA_INACTIVE
+import com.android.systemui.statusbar.pipeline.wifi.ui.model.VoWifiIcon
 import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
 import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel
 import kotlinx.coroutines.InternalCoroutinesApi
@@ -64,6 +65,8 @@ object WifiViewBinder {
         val activityContainerView = view.requireViewById<View>(R.id.inout_container)
         val airplaneSpacer = view.requireViewById<View>(R.id.wifi_airplane_spacer)
         val signalSpacer = view.requireViewById<View>(R.id.wifi_signal_spacer)
+        val voWifiView = view.requireViewById<ImageView>(R.id.vowifi)
+        val wifiStandardView = view.requireViewById<ImageView>(R.id.wifi_standard)
 
         view.isVisible = true
         iconView.isVisible = true
@@ -113,6 +116,8 @@ object WifiViewBinder {
                         iconView.imageTintList = tintList
                         activityInView.imageTintList = tintList
                         activityOutView.imageTintList = tintList
+                        voWifiView.imageTintList = tintList
+                        wifiStandardView.imageTintList = tintList
                         dotView.setDecorColor(tint)
                     }
                 }
@@ -173,6 +178,15 @@ object WifiViewBinder {
                     }
                 }
 
+                launch {
+                    viewModel.voWifiIcon.distinctUntilChanged().collect { voWifiIcon ->
+                        voWifiView.isVisible = voWifiIcon is VoWifiIcon.Visible
+                        if (voWifiIcon is VoWifiIcon.Visible) {
+                            IconViewBinder.bind(voWifiIcon.icon, voWifiView)
+                        }
+                    }
+                }
+
                 try {
                     awaitCancellation()
                 } finally {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/VoWifiIcon.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/VoWifiIcon.kt
new file mode 100644
index 0000000000000..5867ddb003a34
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/VoWifiIcon.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 The LibreMobileOS Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.pipeline.wifi.ui.model
+
+import com.android.systemui.res.R
+import com.android.systemui.common.shared.model.Icon
+import com.android.systemui.statusbar.pipeline.wifi.shared.model.VoWifiState
+
+sealed interface VoWifiIcon {
+    data class Visible(val icon: Icon) : VoWifiIcon
+    object Hidden : VoWifiIcon
+}
+
+val VoWifiState.icon: VoWifiIcon
+    get() = when (this) {
+        is VoWifiState.Enabled -> {
+            val ic = if (activeSubCount == 2) {
+                if (slots.size >= 2) {
+                    R.drawable.ic_vowifi_dual
+                } else {
+                    val id = slots.firstOrNull() ?: -1
+                    when (id) {
+                        0 -> R.drawable.ic_vowifi_one // Sim 1
+                        1 -> R.drawable.ic_vowifi_two // Sim 2
+                        else -> 0
+                    }
+                }
+            } else {
+                R.drawable.ic_vowifi
+            }
+            if (ic == 0) {
+                VoWifiIcon.Hidden
+            } else {
+                VoWifiIcon.Visible(
+                    Icon.Resource(
+                        ic, null /* Content description */
+                    )
+                )
+            }
+        }
+
+        else -> VoWifiIcon.Hidden
+    }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt
index 986068bc00bce..1f6bc2f8a4a1c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt
@@ -30,7 +30,9 @@ import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityMod
 import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
 import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants
 import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
+import com.android.systemui.statusbar.pipeline.wifi.ui.model.VoWifiIcon
 import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
+import com.android.systemui.statusbar.pipeline.wifi.ui.model.icon
 import java.util.function.Supplier
 import javax.inject.Inject
 import javax.inject.Named
@@ -39,6 +41,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
@@ -135,4 +138,16 @@ constructor(
         airplaneModeViewModel.isAirplaneModeIconVisible
 
     override val isSignalSpacerVisible: Flow<Boolean> = shouldShowSignalSpacerProvider.get()
+
+    override val voWifiIcon: Flow<VoWifiIcon> =
+        combine(
+                interactor.voWifiState,
+                interactor.isVoWifiForceHidden
+            ) { state, isHidden ->
+                // If it's force hidden, just hide.
+                // Otherwise follow VoWifi state
+                if (isHidden) VoWifiIcon.Hidden else state.icon
+            }
+            .distinctUntilChanged()
+            .stateIn(scope, SharingStarted.WhileSubscribed(), VoWifiIcon.Hidden)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelCommon.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelCommon.kt
index 617e19200a0a9..51504446a8aaa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelCommon.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelCommon.kt
@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel
 
+import com.android.systemui.statusbar.pipeline.wifi.ui.model.VoWifiIcon
 import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -42,4 +43,7 @@ interface WifiViewModelCommon {
 
     /** True if the spacer between the wifi icon and the RAT icon should be visible. */
     val isSignalSpacerVisible: Flow<Boolean>
+
+    /** The VoWifi icon that should be displayed. */
+    val voWifiIcon: Flow<VoWifiIcon>
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index 6775be951dab6..3cbbd604c1835 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -18,6 +18,7 @@
 
 import android.annotation.Nullable;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.os.Handler;
@@ -334,10 +335,18 @@ private void updateAudioProfile() {
 
     @Override
     public int getBatteryLevel() {
-        if (!mConnectedDevices.isEmpty()) {
-            return mConnectedDevices.get(0).getBatteryLevel();
+        synchronized (mConnectedDevices) {
+            if (mConnectedDevices.isEmpty()) {
+                return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;
+            }
+            for (CachedBluetoothDevice device : mConnectedDevices) {
+                int level = device.getBatteryLevel();
+                if (level != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {
+                    return level;
+                }
+            }
+            return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;
         }
-        return -1;
     }
 
     private void updateBattery() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.kt
new file mode 100644
index 0000000000000..472b197982454
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BurnInProtectionController.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2017-2018 Paranoid Android
+ * Copyright (C) 2022 FlamingoOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.statusbar.policy
+
+import android.content.Context
+import android.util.Log
+
+import com.android.systemui.res.R
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.doze.util.getBurnInOffset
+import com.android.systemui.statusbar.phone.PhoneStatusBarView
+import com.android.systemui.statusbar.policy.ConfigurationController
+import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener
+
+import javax.inject.Inject
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+
+private const val BURN_IN_PREVENTION_PERIOD = 83f
+private const val UPDATE_INTERVAL = 1000 * 10L
+
+private val TAG = BurnInProtectionController::class.simpleName
+
+@SysUISingleton
+class BurnInProtectionController @Inject constructor(
+    private val context: Context,
+    configurationController: ConfigurationController,
+) : ConfigurationListener {
+
+    private val coroutineScope = CoroutineScope(Dispatchers.Main)
+
+    private val shiftEnabled = context.resources.getBoolean(com.android.internal.R.bool.config_enableBurnInProtection)
+
+    private var phoneStatusBarView: PhoneStatusBarView? = null
+
+    private var shiftJob: Job? = null
+
+    private var maxStatusBarOffsetX = 0
+    private var maxStatusBarOffsetY = 0
+
+    private var statusBarOffset = Offset.Zero
+
+    init {
+        logD {
+            "shiftEnabled = $shiftEnabled}"
+        }
+        configurationController.addCallback(this)
+        loadResources()
+    }
+
+    private fun loadResources()  {
+        with(context.resources) {
+            maxStatusBarOffsetX = minOf(
+                getDimensionPixelSize(R.dimen.status_bar_padding_start),
+                getDimensionPixelSize(R.dimen.status_bar_padding_end)
+            ) / 2
+            maxStatusBarOffsetY = getDimensionPixelSize(R.dimen.status_bar_offset_max_y) / 2
+        }
+        logD {
+            "maxStatusBarOffsetX = $maxStatusBarOffsetX, maxStatusBarOffsetY = $maxStatusBarOffsetY"
+        }
+    }
+
+    fun setPhoneStatusBarView(phoneStatusBarView: PhoneStatusBarView?) {
+        this.phoneStatusBarView = phoneStatusBarView
+    }
+
+    fun startShiftTimer() {
+        if (!shiftEnabled || (shiftJob?.isActive == true)) return
+        shiftJob = coroutineScope.launch {
+            while (isActive) {
+                val sbOffset = Offset(
+                    getBurnInOffsetX(maxStatusBarOffsetX),
+                    getBurnInOffsetY(maxStatusBarOffsetY)
+                )
+                logD {
+                    "new offsets: sbOffset = $sbOffset"
+                }
+                updateViews(sbOffset)
+                delay(UPDATE_INTERVAL)
+            }
+        }
+        logD {
+            "Started shift job"
+        }
+    }
+
+    private fun updateViews(sbOffset: Offset) {
+        if (sbOffset != statusBarOffset) {
+            logD {
+                "Translating statusbar"
+            }
+            phoneStatusBarView?.offsetStatusBar(sbOffset)
+            statusBarOffset = sbOffset
+        }
+    }
+
+    fun stopShiftTimer() {
+        if (!shiftEnabled || (shiftJob?.isActive != true)) return
+        logD {
+            "Cancelling shift job"
+        }
+        coroutineScope.launch {
+            shiftJob?.cancelAndJoin()
+            updateViews(Offset.Zero)
+            logD {
+                "Cancelled shift job"
+            }
+        }
+    }
+
+    override fun onDensityOrFontScaleChanged() {
+        logD {
+            "onDensityOrFontScaleChanged"
+        }
+        loadResources()
+    }
+}
+
+private fun getBurnInOffsetX(maxOffset: Int): Int {
+    return maxOffset - getBurnInOffset(
+        amplitude = maxOffset * 2,
+        xAxis = true,
+        periodX = BURN_IN_PREVENTION_PERIOD,
+        periodY = BURN_IN_PREVENTION_PERIOD
+    )
+}
+
+private fun getBurnInOffsetY(maxOffset: Int): Int {
+    return maxOffset - getBurnInOffset(
+        amplitude = maxOffset * 2,
+        xAxis = false,
+        periodX = BURN_IN_PREVENTION_PERIOD,
+        periodY = BURN_IN_PREVENTION_PERIOD
+    )
+}
+
+private inline fun logD(crossinline msg: () -> String) {
+    if (Log.isLoggable(TAG, Log.DEBUG)) {
+        Log.d(TAG, msg())
+    }
+}
+
+data class Offset(
+    val x: Int,
+    val y: Int
+) {
+    companion object {
+        val Zero = Offset(0, 0)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
index 97c71b2c319b8..009bc842e0b61 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -25,15 +25,19 @@
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
-import android.database.ContentObserver;
 import android.graphics.Rect;
 import android.icu.lang.UCharacter;
 import android.icu.text.DateTimePatternGenerator;
 import android.os.Bundle;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -59,7 +63,6 @@
 import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.core.StatusBarRootModernization;
-import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
 import com.android.systemui.tuner.TunerService;
 import com.android.systemui.tuner.TunerService.Tunable;
 
@@ -68,6 +71,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -80,7 +84,6 @@ public class Clock extends TextView implements
         CommandQueue.Callbacks,
         DarkReceiver {
 
-    public static final String CLOCK_SECONDS = "clock_seconds";
     private static final String CLOCK_SUPER_PARCELABLE = "clock_super_parcelable";
     private static final String CURRENT_USER_ID = "current_user_id";
     private static final String VISIBLE_BY_POLICY = "visible_by_policy";
@@ -88,6 +91,19 @@ public class Clock extends TextView implements
     private static final String SHOW_SECONDS = "show_seconds";
     private static final String VISIBILITY = "visibility";
 
+    public static final String STATUS_BAR_CLOCK_SECONDS =
+            "system:" + Settings.System.STATUS_BAR_CLOCK_SECONDS;
+    private static final String STATUS_BAR_AM_PM =
+            "lineagesystem:" + LineageSettings.System.STATUS_BAR_AM_PM;
+    public static final String STATUS_BAR_CLOCK_DATE_DISPLAY =
+            "system:" + Settings.System.STATUS_BAR_CLOCK_DATE_DISPLAY;
+    public static final String STATUS_BAR_CLOCK_DATE_STYLE =
+            "system:" + Settings.System.STATUS_BAR_CLOCK_DATE_STYLE;
+    public static final String STATUS_BAR_CLOCK_DATE_POSITION =
+            "system:" + Settings.System.STATUS_BAR_CLOCK_DATE_POSITION;
+    public static final String STATUS_BAR_CLOCK_DATE_FORMAT =
+            "system:" + Settings.System.STATUS_BAR_CLOCK_DATE_FORMAT;
+
     private final UserTracker mUserTracker;
     private final CommandQueue mCommandQueue;
     private int mCurrentUserId;
@@ -108,10 +124,31 @@ public class Clock extends TextView implements
     private static final int AM_PM_STYLE_SMALL   = 1;
     private static final int AM_PM_STYLE_GONE    = 2;
 
+    private static final int CLOCK_DATE_DISPLAY_GONE = 0;
+    private static final int CLOCK_DATE_DISPLAY_SMALL = 1;
+    private static final int CLOCK_DATE_DISPLAY_NORMAL = 2;
+
+    private static final int CLOCK_DATE_STYLE_REGULAR = 0;
+    private static final int CLOCK_DATE_STYLE_LOWERCASE = 1;
+    private static final int CLOCK_DATE_STYLE_UPPERCASE = 2;
+
+    private static final int STYLE_DATE_LEFT = 0;
+    private static final int STYLE_DATE_RIGHT = 1;
+
     private int mAmPmStyle = AM_PM_STYLE_GONE;
     private boolean mShowSeconds;
-    private ContentObserver mContentObserver;
     private Handler mSecondsHandler;
+    private int mClockDateDisplay = CLOCK_DATE_DISPLAY_GONE;
+    private int mClockDateStyle = CLOCK_DATE_STYLE_REGULAR;
+    private int mClockDatePosition;
+    private String mClockDateFormat = null;
+
+    private boolean mIsStatusBar;
+    private boolean useStaticColor = false;
+    private int lastDynamicColor = -1;
+
+    private boolean mMaskTextMode = false;
+    private final PorterDuffXfermode mDstOutXfermode = new PorterDuffXfermode(PorterDuff.Mode.DST_OUT);
 
     // Tracks config changes that will make the clock change dimensions
     private final InterestingConfigChanges mInterestingConfigChanges;
@@ -143,19 +180,10 @@ public Clock(Context context, AttributeSet attrs, int defStyle) {
                 R.styleable.Clock,
                 0, 0);
         try {
-            mAmPmStyle = readClockAmPm(context);
-            mContentObserver = new ContentObserver(null) {
-                @Override
-                public void onChange(boolean selfChange) {
-                    mAmPmStyle = readClockAmPm(context);
-                    // Force refresh of dependent variables.
-                    mContentDescriptionFormatString = "";
-                    mDateTimePatternGenerator = null;
-                    context.getMainExecutor().execute(() -> {
-                        updateClock(true);
-                    });
-                }
-            };
+            mAmPmStyle = LineageSettings.System.getIntForUser(
+                context.getContentResolver(), LineageSettings.System.STATUS_BAR_AM_PM,
+                AM_PM_STYLE_GONE, UserHandle.USER_CURRENT);
+            mIsStatusBar = a.getBoolean(R.styleable.Clock_isStatusBar, mIsStatusBar);
             mNonAdaptedColor = getCurrentTextColor();
         } finally {
             a.recycle();
@@ -224,11 +252,13 @@ protected void onAttachedToWindow() {
             // The receiver will return immediately if the view does not have a Handler yet.
             mBroadcastDispatcher.registerReceiverWithHandler(mIntentReceiver, filter,
                     Dependency.get(Dependency.TIME_TICK_HANDLER), UserHandle.ALL);
-            Dependency.get(TunerService.class).addTunable(this, CLOCK_SECONDS,
-                    StatusBarIconController.ICON_HIDE_LIST);
-            mContext.getContentResolver().registerContentObserver(
-                    LineageSettings.System.getUriFor(LineageSettings.System.STATUS_BAR_AM_PM),
-                    false, mContentObserver);
+            Dependency.get(TunerService.class).addTunable(this,
+                    STATUS_BAR_CLOCK_SECONDS,
+                    STATUS_BAR_AM_PM,
+                    STATUS_BAR_CLOCK_DATE_DISPLAY,
+                    STATUS_BAR_CLOCK_DATE_STYLE,
+                    STATUS_BAR_CLOCK_DATE_POSITION,
+                    STATUS_BAR_CLOCK_DATE_FORMAT);
             mCommandQueue.addCallback(this);
             mUserTracker.addCallback(mUserChangedCallback, mContext.getMainExecutor());
             mCurrentUserId = mUserTracker.getUserId();
@@ -261,7 +291,6 @@ protected void onDetachedFromWindow() {
         if (mAttached) {
             mBroadcastDispatcher.unregisterReceiver(mIntentReceiver);
             mAttached = false;
-            mContext.getContentResolver().unregisterContentObserver(mContentObserver);
             Dependency.get(TunerService.class).removeTunable(this);
             mCommandQueue.removeCallback(this);
             mUserTracker.removeCallback(mUserChangedCallback);
@@ -360,18 +389,38 @@ final void updateClock() {
 
     @Override
     public void onTuningChanged(String key, String newValue) {
-        if (CLOCK_SECONDS.equals(key)) {
-            mShowSeconds = TunerService.parseIntegerSwitch(newValue, false);
-            updateShowSeconds();
-        } else if (!StatusBarRootModernization.isEnabled()) {
-            if (StatusBarIconController.ICON_HIDE_LIST.equals(key)) {
-                setClockVisibleByUser(
-                        !StatusBarIconController
-                                .getIconHideList(getContext(), newValue)
-                                .contains("clock"));
-                updateClockVisibility();
-            }
+        switch (key) {
+            case STATUS_BAR_CLOCK_SECONDS:
+                mShowSeconds =
+                        TunerService.parseIntegerSwitch(newValue, false);
+                updateShowSeconds();
+                break;
+            case STATUS_BAR_AM_PM:
+                mAmPmStyle =
+                        TunerService.parseInteger(newValue, AM_PM_STYLE_GONE);
+                break;
+            case STATUS_BAR_CLOCK_DATE_DISPLAY:
+                mClockDateDisplay =
+                        TunerService.parseInteger(newValue, CLOCK_DATE_DISPLAY_GONE);
+                break;
+            case STATUS_BAR_CLOCK_DATE_STYLE:
+                mClockDateStyle =
+                        TunerService.parseInteger(newValue, CLOCK_DATE_STYLE_REGULAR);
+                break;
+            case STATUS_BAR_CLOCK_DATE_POSITION:
+                mClockDatePosition =
+                        TunerService.parseInteger(newValue, STYLE_DATE_LEFT);
+                break;
+            case STATUS_BAR_CLOCK_DATE_FORMAT:
+                mClockDateFormat = newValue;
+                break;
+            default:
+                break;
         }
+        // Force refresh of dependent variables.
+        mContentDescriptionFormatString = "";
+        mDateTimePatternGenerator = null;
+        updateClock(true);
     }
 
     @Override
@@ -392,14 +441,61 @@ public void disable(int displayId, int state1, int state2, boolean animate) {
     @Override
     public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {
         mNonAdaptedColor = DarkIconDispatcher.getTint(areas, this, tint);
-        setTextColor(mNonAdaptedColor);
+        lastDynamicColor = mNonAdaptedColor;
+        if (useStaticColor) return;
+        setTextColor(lastDynamicColor);
     }
 
     // Update text color based when shade scrim changes color.
     public void onColorsChanged(boolean lightTheme) {
         final Context context = new ContextThemeWrapper(mContext,
                 lightTheme ? R.style.Theme_SystemUI_LightWallpaper : R.style.Theme_SystemUI);
-        setTextColor(Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor));
+        lastDynamicColor = Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor);
+        if (useStaticColor) return;
+        setTextColor(lastDynamicColor);
+    }
+
+    public void setStaticColor(boolean enable) {
+        useStaticColor = enable;
+        if (!useStaticColor && lastDynamicColor != -1) {
+            setTextColor(lastDynamicColor);
+        }
+    }
+
+    public void setMaskTextMode(boolean enabled) {
+        if (mMaskTextMode == enabled) return;
+        mMaskTextMode = enabled;
+        if (enabled) {
+            setLayerType(LAYER_TYPE_SOFTWARE, null);
+        } else {
+            getPaint().setXfermode(null);
+            setLayerType(LAYER_TYPE_NONE, null);
+        }
+        invalidate();
+    }
+
+    public boolean isMaskTextMode() {
+        return mMaskTextMode;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (!mMaskTextMode) {
+            super.onDraw(canvas);
+            return;
+        }
+
+        final int savedColor = getPaint().getColor();
+        final int savedAlpha = getPaint().getAlpha();
+
+        getPaint().setColor(Color.WHITE);
+        getPaint().setXfermode(mDstOutXfermode);
+
+        super.onDraw(canvas);
+
+        getPaint().setXfermode(null);
+        getPaint().setColor(savedColor);
+        getPaint().setAlpha(savedAlpha);
     }
 
     public void onDensityOrFontScaleChanged() {
@@ -436,12 +532,6 @@ protected void onConfigurationChanged(Configuration newConfig) {
         }
     }
 
-    private int readClockAmPm(Context context) {
-        return LineageSettings.System.getIntForUser(
-                context.getContentResolver(), LineageSettings.System.STATUS_BAR_AM_PM,
-                AM_PM_STYLE_GONE, UserHandle.USER_CURRENT);
-    }
-
     private void updateShowSeconds() {
         if (mShowSeconds) {
             // Wait until we have a display to start trying to show seconds.
@@ -521,13 +611,61 @@ private final CharSequence getSmallTime() {
             }
             mClockFormat = new SimpleDateFormat(format);
         }
-        String result = mClockFormat.format(mCalendar.getTime());
+
+        CharSequence dateString = null;
+
+        String result = "";
+        String timeResult = mClockFormat.format(mCalendar.getTime());
+        String dateResult = "";
+
+        if (mIsStatusBar && mClockDateDisplay != CLOCK_DATE_DISPLAY_GONE) {
+            Date now = new Date();
+
+            if (mClockDateFormat == null || mClockDateFormat.isEmpty()) {
+                // Set dateString to short uppercase Weekday if empty
+                dateString = DateFormat.format("EEE", now);
+            } else {
+                dateString = DateFormat.format(mClockDateFormat, now);
+            }
+            if (mClockDateStyle == CLOCK_DATE_STYLE_LOWERCASE) {
+                // When Date style is small, convert date to uppercase
+                dateResult = dateString.toString().toLowerCase();
+            } else if (mClockDateStyle == CLOCK_DATE_STYLE_UPPERCASE) {
+                dateResult = dateString.toString().toUpperCase();
+            } else {
+                dateResult = dateString.toString();
+            }
+            result = (mClockDatePosition == STYLE_DATE_LEFT) ? dateResult + " " + timeResult
+                    : timeResult + " " + dateResult;
+        } else {
+            // No date, just show time
+            result = timeResult;
+        }
+
+        SpannableStringBuilder formatted = new SpannableStringBuilder(result);
+
+        if (mClockDateDisplay != CLOCK_DATE_DISPLAY_NORMAL) {
+            if (dateString != null) {
+                int dateStringLen = dateString.length();
+                int timeStringOffset = (mClockDatePosition == STYLE_DATE_RIGHT)
+                        ? timeResult.length() + 1 : 0;
+                if (mClockDateDisplay == CLOCK_DATE_DISPLAY_GONE) {
+                   formatted.delete(0, dateStringLen);
+                } else {
+                    if (mClockDateDisplay == CLOCK_DATE_DISPLAY_SMALL) {
+                        CharacterStyle style = new RelativeSizeSpan(0.7f);
+                        formatted.setSpan(style, timeStringOffset,
+                                timeStringOffset + dateStringLen,
+                                Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+                    }
+                }
+            }
+        }
 
         if (mAmPmStyle != AM_PM_STYLE_NORMAL) {
             int magic1 = result.indexOf(MAGIC1);
             int magic2 = result.indexOf(MAGIC2);
             if (magic1 >= 0 && magic2 > magic1) {
-                SpannableStringBuilder formatted = new SpannableStringBuilder(result);
                 if (mAmPmStyle == AM_PM_STYLE_GONE) {
                     formatted.delete(magic1, magic2 + 1);
                 } else {
@@ -539,12 +677,10 @@ private final CharSequence getSmallTime() {
                     formatted.delete(magic2, magic2 + 1);
                     formatted.delete(magic1, magic1 + 1);
                 }
-                return formatted;
             }
         }
 
-        return result;
-
+        return formatted;
     }
 
     private boolean mDemoMode;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
index dc1b27cfb1f27..a3746c7cf8f5b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
@@ -25,6 +25,13 @@ public interface FlashlightController extends CallbackController<FlashlightListe
     boolean isAvailable();
     boolean isEnabled();
 
+    boolean isStrengthControlSupported();
+    int getMaxLevel();
+    int getDefaultLevel();
+    int getCurrentLevel();
+    float getCurrentPercent();
+    void setFlashlightStrengthLevel(int level);
+
     @WeaklyReferencedCallback
     public interface FlashlightListener {
 
@@ -45,5 +52,8 @@ public interface FlashlightListener {
          * @param available true if the flashlight is currently available.
          */
         void onFlashlightAvailabilityChanged(boolean available);
+
+        /** Called when the flashlight strength changes (if supported). */
+        void onFlashlightStrengthChanged(int level);
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java
index 615cc74ef5e4f..752a4a1f13153 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightControllerImpl.java
@@ -17,10 +17,13 @@
 package com.android.systemui.statusbar.policy;
 
 import android.annotation.WorkerThread;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
+import android.os.Handler;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.text.TextUtils;
@@ -32,6 +35,7 @@
 import com.android.systemui.broadcast.BroadcastSender;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Background;
+import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.dump.DumpManager;
 import com.android.systemui.util.settings.SecureSettings;
 
@@ -56,11 +60,14 @@ public class FlashlightControllerImpl implements FlashlightController {
     private static final int DISPATCH_ERROR = 0;
     private static final int DISPATCH_CHANGED = 1;
     private static final int DISPATCH_AVAILABILITY_CHANGED = 2;
+    private static final int DISPATCH_STRENGTH_CHANGED = 3;
 
     private static final String ACTION_FLASHLIGHT_CHANGED =
         "com.android.settings.flashlight.action.FLASHLIGHT_CHANGED";
 
+    private final Context mContext;
     private final CameraManager mCameraManager;
+    private final Handler mHandler;
     private final Executor mExecutor;
     private final SecureSettings mSecureSettings;
     private final DumpManager mDumpManager;
@@ -79,16 +86,31 @@ public class FlashlightControllerImpl implements FlashlightController {
     private final AtomicReference<String> mCameraId;
     private final AtomicBoolean mInitted = new AtomicBoolean(false);
 
+    private static final String FLASHLIGHT_BRIGHTNESS_SETTING = "flashlight_brightness";
+
+    @GuardedBy("this")
+    private int mDefaultLevel;
+    @GuardedBy("this")
+    private int mMaxLevel;
+    @GuardedBy("this")
+    private int mCurrentLevel;
+    @GuardedBy("this")
+    private boolean mStrengthControlSupported;
+
     @Inject
     public FlashlightControllerImpl(
+            Context context,
             DumpManager dumpManager,
             CameraManager cameraManager,
+            @Main Handler mainHandler,
             @Background Executor bgExecutor,
             SecureSettings secureSettings,
             BroadcastSender broadcastSender,
             PackageManager packageManager
     ) {
+        mContext = context;
         mCameraManager = cameraManager;
+        mHandler = mainHandler;
         mExecutor = bgExecutor;
         mCameraId = new AtomicReference<>(null);
         mSecureSettings = secureSettings;
@@ -110,7 +132,29 @@ private void init() {
     private void tryInitCamera() {
         if (!mHasFlashlight || mCameraId.get() != null) return;
         try {
-            mCameraId.set(getCameraId());
+            String id = getCameraId();
+            if (id != null) {
+                CameraCharacteristics c = mCameraManager.getCameraCharacteristics(id);
+                Boolean flashAvailable = c.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+                if (flashAvailable != null && flashAvailable) {
+                    mDefaultLevel = c.get(CameraCharacteristics.FLASH_INFO_STRENGTH_DEFAULT_LEVEL);
+                    mMaxLevel = c.get(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL);
+                    mStrengthControlSupported = (mMaxLevel > 1);
+                    mCameraId.set(id);
+
+                    if (mStrengthControlSupported) {
+                        float percent = Settings.System.getFloatForUser(
+                                mContext.getContentResolver(),
+                                FLASHLIGHT_BRIGHTNESS_SETTING,
+                                (float) mDefaultLevel / mMaxLevel,
+                                UserHandle.USER_CURRENT);
+                        synchronized (this) {
+                            mCurrentLevel = Math.max(1, Math.round(percent * mMaxLevel));
+                        }
+                        if (DEBUG) Log.d(TAG, "Restored torch level: " + mCurrentLevel);
+                    }
+                }
+            }
         } catch (Throwable e) {
             Log.e(TAG, "Couldn't initialize.", e);
             return;
@@ -131,7 +175,20 @@ public void setFlashlight(boolean enabled) {
             synchronized (this) {
                 if (mFlashlightEnabled != enabled) {
                     try {
-                        mCameraManager.setTorchMode(mCameraId.get(), enabled);
+                        if (enabled) {
+                            if (mStrengthControlSupported) {
+                                int level = (mCurrentLevel > 0) ? mCurrentLevel : mDefaultLevel;
+                                level = Math.max(1, Math.min(level, mMaxLevel));
+                                if (DEBUG) Log.d(TAG, "Turning on torch with level " + level);
+                                mCameraManager.turnOnTorchWithStrengthLevel(mCameraId.get(), level);
+                            } else {
+                                if (DEBUG) Log.d(TAG, "Turning on torch (no strength support)");
+                                mCameraManager.setTorchMode(mCameraId.get(), true);
+                            }
+                        } else {
+                            if (DEBUG) Log.d(TAG, "Turning off torch");
+                            mCameraManager.setTorchMode(mCameraId.get(), false);
+                        }
                     } catch (CameraAccessException e) {
                         Log.e(TAG, "Couldn't set torch mode", e);
                         dispatchError();
@@ -153,6 +210,80 @@ public synchronized boolean isAvailable() {
         return mTorchAvailable;
     }
 
+    public boolean isStrengthControlSupported() {
+        return mStrengthControlSupported;
+    }
+
+    public int getMaxLevel() {
+        return mMaxLevel;
+    }
+
+    public int getDefaultLevel() {
+        return mDefaultLevel;
+    }
+
+    public synchronized int getCurrentLevel() {
+        return mCurrentLevel;
+    }
+
+    public synchronized float getCurrentPercent() {
+        if (!mStrengthControlSupported || mMaxLevel <= 0) {
+            return 0f;
+        }
+        return Math.max(0.01f, (float) mCurrentLevel / (float) mMaxLevel);
+    }
+
+    public void setFlashlightStrengthLevel(int level) {
+        if (!mStrengthControlSupported) {
+            setFlashlight(level > 0);
+            return;
+        }
+        if (mCameraId.get() == null) {
+            mExecutor.execute(this::tryInitCamera);
+        }
+
+        final int requestedLevel = level;
+
+        mHandler.post(() -> {
+            if (mCameraId.get() == null) return;
+
+            int clampedLevel;
+            boolean wasEnabled;
+            synchronized (this) {
+                clampedLevel = Math.max(1, Math.min(requestedLevel, mMaxLevel));
+                if (mCurrentLevel == clampedLevel && !mFlashlightEnabled) return;
+                mCurrentLevel = clampedLevel;
+                wasEnabled = mFlashlightEnabled;
+            }
+
+            try {
+                if (DEBUG) Log.d(TAG, "Setting torch strength level: " + clampedLevel + 
+                        ", wasEnabled: " + wasEnabled);
+                
+                if (wasEnabled) {
+                    mCameraManager.turnOnTorchWithStrengthLevel(mCameraId.get(), clampedLevel);
+                }
+
+                dispatchStrengthChanged(clampedLevel);
+
+                mExecutor.execute(() -> {
+                    float percent = Math.max(0.01f, (float) clampedLevel / mMaxLevel);
+                    Settings.System.putFloatForUser(
+                            mContext.getContentResolver(),
+                            FLASHLIGHT_BRIGHTNESS_SETTING,
+                            percent,
+                            UserHandle.USER_CURRENT
+                    );
+                });
+
+            } catch (CameraAccessException e) {
+                Log.e(TAG, "Couldn't set torch strength level", e);
+                dispatchError();
+            }
+        });
+    }
+
+
     @Override
     public void addCallback(@NonNull FlashlightListener l) {
         synchronized (mListeners) {
@@ -163,6 +294,7 @@ public void addCallback(@NonNull FlashlightListener l) {
             mListeners.add(new WeakReference<>(l));
             l.onFlashlightAvailabilityChanged(isAvailable());
             l.onFlashlightChanged(isEnabled());
+            l.onFlashlightStrengthChanged(getCurrentLevel());
         }
     }
 
@@ -175,7 +307,11 @@ public void removeCallback(@NonNull FlashlightListener l) {
 
     @WorkerThread
     private String getCameraId() throws CameraAccessException {
-        String[] ids = mCameraManager.getCameraIdList();
+        String[] ids = mCameraManager == null ? null : mCameraManager.getCameraIdList();
+        if (ids == null || ids.length == 0) {
+            Log.e(TAG, "Camera ID list is null or empty.");
+            return null;
+        }
         for (String id : ids) {
             CameraCharacteristics c = mCameraManager.getCameraCharacteristics(id);
             Boolean flashAvailable = c.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
@@ -200,6 +336,17 @@ private void dispatchAvailabilityChanged(boolean available) {
         dispatchListeners(DISPATCH_AVAILABILITY_CHANGED, available);
     }
 
+    private void dispatchStrengthChanged(int level) {
+        synchronized (mListeners) {
+            for (WeakReference<FlashlightListener> ref : mListeners) {
+                FlashlightListener l = ref.get();
+                if (l != null) {
+                    l.onFlashlightStrengthChanged(level);
+                }
+            }
+        }
+    }
+
     private void dispatchListeners(int message, boolean argument) {
         synchronized (mListeners) {
             final ArrayList<WeakReference<FlashlightController.FlashlightListener>> copy =
@@ -259,6 +406,24 @@ public void onTorchModeChanged(String cameraId, boolean enabled) {
             }
         }
 
+        @Override
+        @WorkerThread
+        public void onTorchStrengthLevelChanged(@NonNull String cameraId, int newStrengthLevel) {
+            if (!TextUtils.equals(cameraId, mCameraId.get())) return;
+            synchronized (FlashlightControllerImpl.this) {
+                if (mCurrentLevel == newStrengthLevel) return;
+                mCurrentLevel = newStrengthLevel;
+            }
+            float percent = Math.max(0.01f, (float) newStrengthLevel / (float) mMaxLevel);
+            Settings.System.putFloatForUser(
+                    mContext.getContentResolver(),
+                    FLASHLIGHT_BRIGHTNESS_SETTING,
+                    percent,
+                    UserHandle.USER_CURRENT);
+            if (DEBUG) Log.d(TAG, "Strength level changed: " + newStrengthLevel + "/" + mMaxLevel);
+            dispatchStrengthChanged(newStrengthLevel);
+        }
+
         private void setCameraAvailable(boolean available) {
             boolean changed;
             synchronized (FlashlightControllerImpl.this) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
index 9758ec59cb954..c32f8d50a4da1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java
@@ -45,6 +45,7 @@
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
 import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
 import com.android.systemui.res.R;
+import com.android.systemui.util.ScrimUtils;
 import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 
 import dagger.Lazy;
@@ -255,6 +256,7 @@ private void setKeyguardFadingAway(boolean keyguardFadingAway) {
                     keyguardFadingAway ? 1 : 0);
             mKeyguardFadingAway = keyguardFadingAway;
             invokeForEachCallback(Callback::onKeyguardFadingAwayChanged);
+            ScrimUtils.get().onKeyguardFadingAwayChanged(keyguardFadingAway);
         }
     }
 
@@ -371,6 +373,7 @@ public void notifyKeyguardGoingAway(boolean keyguardGoingAway) {
             mKeyguardGoingAway = keyguardGoingAway;
             mKeyguardInteractorLazy.get().setIsKeyguardGoingAway(keyguardGoingAway);
             invokeForEachCallback(Callback::onKeyguardGoingAwayChanged);
+            ScrimUtils.get().onKeyguardGoingAwayChanged(keyguardGoingAway);
         }
     }
 
@@ -380,6 +383,7 @@ public void notifyPrimaryBouncerShowing(boolean showing) {
             mPrimaryBouncerShowing = showing;
 
             invokeForEachCallback(Callback::onPrimaryBouncerShowingChanged);
+            ScrimUtils.get().onPrimaryBouncerShowingChanged(showing);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkSpeedController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkSpeedController.kt
new file mode 100644
index 0000000000000..f35f50828b431
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkSpeedController.kt
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.policy
+
+import android.content.*
+import android.database.ContentObserver
+import android.net.*
+import android.net.TrafficStats
+import android.os.*
+import android.provider.Settings
+import android.view.ViewGroup
+import com.android.keyguard.KeyguardUpdateMonitor
+import com.android.keyguard.KeyguardUpdateMonitorCallback
+import com.android.systemui.Dependency
+import com.android.systemui.statusbar.StatusIconDisplayable
+import com.android.systemui.statusbar.phone.StatusBarIconHolder
+import com.android.systemui.statusbar.phone.NetworkSpeedIconHolder
+import com.android.systemui.statusbar.phone.StatusBarIconControllerImplEx
+import com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedIconState
+import com.android.systemui.statusbar.policy.networkspeed.NetworkSpeedView
+import kotlinx.coroutines.*
+
+class NetworkSpeedController private constructor(
+    private val context: Context
+) {
+
+    private val connectivityManager =
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    private val contentResolver = context.contentResolver
+
+    private var isSwitchOn = false
+    private var isConnected = false
+    private var networkVisibility = false
+
+    private var lastTime = 0L
+    private var lastTotalBytes = 0L
+
+    private var keyguardUpdateMonitor: KeyguardUpdateMonitor? = null
+    private var keyguardCallback: KeyguardUpdateMonitorCallback? = null
+
+    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+    private var speedUpdateJob: Job? = null
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            updateConnectionState(true)
+        }
+
+        override fun onLost(network: Network) {
+            updateConnectionState(false)
+        }
+    }
+
+    private val networkSpeedObserver =
+        object : ContentObserver(Handler(Looper.getMainLooper())) {
+            override fun onChange(selfChange: Boolean) {
+                reset()
+                updateSwitchState()
+                restartSpeedUpdates()
+            }
+        }
+
+    fun init() {
+        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+
+        contentResolver.registerContentObserver(
+            Settings.Secure.getUriFor(ICON_HIDE_LIST),
+            true,
+            networkSpeedObserver
+        )
+        networkSpeedObserver.onChange(true)
+
+        keyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor::class.java)
+        keyguardCallback = object : KeyguardUpdateMonitorCallback() {
+            override fun onUserSwitchComplete(newUserId: Int) {
+                networkSpeedObserver.onChange(true)
+            }
+        }
+        keyguardUpdateMonitor?.registerCallback(keyguardCallback)
+    }
+
+    private fun updateSwitchState() {
+        val iconHideList = Settings.Secure.getStringForUser(
+            contentResolver,
+            ICON_HIDE_LIST,
+            UserHandle.USER_CURRENT
+        )
+        isSwitchOn = !iconHideList.isNullOrEmpty() 
+            && !iconHideList.contains(SLOT_NETWORK_SPEED)
+    }
+
+    private fun updateConnectionState(connected: Boolean) {
+        isConnected = connected
+        restartSpeedUpdates()
+    }
+
+    private fun restartSpeedUpdates() {
+        speedUpdateJob?.cancel()
+        if (isConnected && isSwitchOn) {
+            speedUpdateJob = scope.launch {
+                while (isActive) {
+                    updateNetworkSpeed()
+                    delay(REFRESH_INTERVAL_MS)
+                }
+            }
+        } else {
+            scope.launch {
+                updateNetworkSpeed()
+            }
+        }
+    }
+
+    private suspend fun updateNetworkSpeed() {
+        val currentTime = System.currentTimeMillis()
+        val totalBytes = getTotalBytes()
+
+        var speed = 0L
+        if (lastTime > 0 && lastTotalBytes > 0 &&
+            totalBytes > lastTotalBytes && currentTime > lastTime
+        ) {
+            speed = (((totalBytes - lastTotalBytes) * 1000) / (currentTime - lastTime)).toLong()
+        }
+
+        val iconState = NetworkSpeedIconState().apply {
+            setVisible(isConnected && isSwitchOn)
+            setSpeedText(speed)
+            setSlot(SLOT_NETWORK_SPEED)
+        }
+
+        withContext(Dispatchers.Main) {
+            StatusBarIconControllerImplEx.get().setNetworkSpeedIcon(SLOT_NETWORK_SPEED, iconState)
+            if (networkVisibility != iconState.isVisible()) {
+                networkVisibility = iconState.isVisible()
+            }
+        }
+
+        lastTime = currentTime
+        lastTotalBytes = totalBytes
+    }
+
+    private fun getTotalBytes(): Long {
+        val rx = TrafficStats.getTotalRxBytes()
+        val tx = TrafficStats.getTotalTxBytes()
+        return if (rx >= 0 && tx >= 0) rx + tx else 0
+    }
+
+    private fun reset() {
+        lastTime = 0
+        lastTotalBytes = 0
+    }
+
+    fun isSwitchOn(): Boolean = isSwitchOn
+
+    fun addHolder(
+        index: Int,
+        slot: String,
+        rootGroup: ViewGroup,
+        holder: StatusBarIconHolder,
+        blocked: Boolean
+    ): StatusIconDisplayable? {
+        return StatusBarIconControllerImplEx.get()
+            .addHolder(index, slot, rootGroup, holder, blocked)
+    }
+
+    fun onSetIconHolder(viewIndex: Int, holder: StatusBarIconHolder, rootGroup: ViewGroup) {
+        if (holder.type == 6 && holder is NetworkSpeedIconHolder) {
+            val view = rootGroup.getChildAt(viewIndex) as? NetworkSpeedView ?: return
+            view.applyNetworkState(holder.getNetworkSpeedIconState())
+        }
+    }
+
+    companion object {
+        @Volatile
+        private var instance: NetworkSpeedController? = null
+
+        fun init(context: Context): NetworkSpeedController {
+            return instance ?: synchronized(this) {
+                instance ?: NetworkSpeedController(context.applicationContext).also {
+                    instance = it
+                }
+            }
+        }
+
+        fun get(): NetworkSpeedController {
+            return instance ?: throw IllegalStateException("init must be called first!!!")
+        }
+
+        const val TAG = "NetworkSpeedController"
+        const val SLOT_NETWORK_SPEED = "network_speed"
+        const val ICON_HIDE_LIST = "icon_blacklist"
+        const val REFRESH_INTERVAL_MS = 4000L
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index cfea02477cfb7..dbcb566937863 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -33,6 +33,7 @@
 import android.graphics.drawable.GradientDrawable;
 import android.os.Trace;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.service.notification.StatusBarNotification;
 import android.text.Editable;
 import android.text.SpannedString;
@@ -82,7 +83,6 @@
 import com.android.internal.logging.UiEventLogger;
 import com.android.internal.util.ContrastColorUtil;
 import com.android.systemui.Dependency;
-import com.android.systemui.Flags;
 import com.android.systemui.res.R;
 import com.android.systemui.statusbar.RemoteInputController;
 import com.android.systemui.statusbar.notification.collection.RemoteInputEntryAdapter;
@@ -253,7 +253,7 @@ public void setBackgroundTintColor(final int backgroundColor, boolean colorized)
         mProgressBar.setProgressTintList(accentColor);
         mProgressBar.setIndeterminateTintList(accentColor);
         mProgressBar.setSecondaryProgressTintList(accentColor);
-        if (!Flags.notificationRowTransparency()) {
+        if (!translucentEnabled()) {
             setBackgroundColor(backgroundColor);
         }
     }
@@ -481,7 +481,7 @@ public void onAnimationEnd(Animator animation) {
                 if (mWrapper != null) {
                     mWrapper.setRemoteInputVisible(false);
                 }
-                if (Flags.notificationRowTransparency()) {
+                if (translucentEnabled()) {
                     if (actionsContainer != null) actionsContainer.setAlpha(1);
                 }
             }
@@ -852,7 +852,7 @@ private Animator getFocusAnimator(@Nullable View fadeOutView) {
                     ObjectAnimator.ofFloat(fadeOutView, View.ALPHA, 1f, 0f);
             fadeOutViewAlphaAnimator.setDuration(FOCUS_ANIMATION_CROSSFADE_DURATION);
             fadeOutViewAlphaAnimator.setInterpolator(InterpolatorsAndroidX.LINEAR);
-            if (!Flags.notificationRowTransparency()) {
+            if (!translucentEnabled()) {
                 animatorSet.addListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(Animator animation, boolean isReverse) {
@@ -924,6 +924,15 @@ private void setFocusAnimationScaleY(float scaleY) {
         setTranslationY(verticalBoundOffset);
     }
 
+    private boolean translucentEnabled() {
+        return Settings.Secure.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY,
+                1,
+                UserHandle.USER_CURRENT)
+                != 0;
+    }
+
     /** Handler for button click on send action in IME. */
     private class EditorActionHandler implements TextView.OnEditorActionListener {
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java
index 712bab03ca953..b55f73532546b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoControllerImpl.java
@@ -119,7 +119,12 @@ public void reloadUserInfo() {
             mUserInfoTask.cancel(false);
             mUserInfoTask = null;
         }
-        queryForUserInformation();
+
+        try {
+            queryForUserInformation();
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't query user info", e);
+        }
     }
 
     private void queryForUserInformation() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.kt
new file mode 100644
index 0000000000000..c66ffad26f049
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.systemui.statusbar.policy
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioManager
+import android.os.Handler
+import android.util.Log
+import com.android.internal.jank.InteractionJankMonitor
+import com.android.systemui.animation.DialogCuj
+import com.android.systemui.animation.DialogTransitionAnimator
+import com.android.systemui.animation.Expandable
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import javax.inject.Inject
+import javax.inject.Provider
+
+@SysUISingleton
+class VolumeController @Inject constructor(
+    private val ctx: Context,
+    private val dialogTransitionAnimator: DialogTransitionAnimator,
+    private val dialogDelegateProvider: Provider<VolumeDialogDelegate>,
+    private val keyguardStateController: KeyguardStateController,
+    private val activityStarter: ActivityStarter,
+    private val mainHandler: Handler
+) {
+
+    interface VolumeListener {
+        fun onVolumeChanged(volume: Int)
+        fun onMuteStateChanged(muted: Boolean)
+    }
+
+    fun interface OnDialogDismissedListener {
+        fun onDismiss()
+    }
+
+    private val am: AudioManager = 
+        ctx.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    private val listeners = mutableSetOf<VolumeListener>()
+    
+    private val volumeChangeReceiver = object : BroadcastReceiver() {
+        override fun onReceive(ctx: Context?, intent: Intent?) {
+            when (intent?.action) {
+                AudioManager.VOLUME_CHANGED_ACTION -> {
+                    val streamType = intent.getIntExtraValue(
+                        AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1
+                    )
+                    if (streamType == AudioManager.STREAM_MUSIC) {
+                        notifyVolumeChanged()
+                    }
+                }
+                AudioManager.STREAM_MUTE_CHANGED_ACTION -> {
+                    val streamType = intent.getIntExtraValue(
+                        AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1
+                    )
+                    if (streamType == AudioManager.STREAM_MUSIC) {
+                        notifyMuteStateChanged()
+                    }
+                }
+            }
+        }
+    }
+
+    val max get() = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+    val current get() = am.getStreamVolume(AudioManager.STREAM_MUSIC)
+    val percent get() = if (max > 0) (current * 100f / max).toInt() else 0
+
+    fun addListener(listener: VolumeListener) {
+        synchronized(listeners) {
+            val wasEmpty = listeners.isEmpty()
+            listeners.add(listener)
+            if (wasEmpty) {
+                registerVolumeReceiver()
+            }
+        }
+    }
+
+    fun removeListener(listener: VolumeListener) {
+        synchronized(listeners) {
+            listeners.remove(listener)
+            if (listeners.isEmpty()) {
+                unregisterVolumeReceiver()
+            }
+        }
+    }
+
+    private fun registerVolumeReceiver() {
+        val filter = IntentFilter().apply {
+            addAction(AudioManager.VOLUME_CHANGED_ACTION)
+            addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION)
+        }
+        ctx.registerReceiver(volumeChangeReceiver, filter)
+    }
+
+    private fun unregisterVolumeReceiver() {
+        try {
+            ctx.unregisterReceiver(volumeChangeReceiver)
+        } catch (e: IllegalArgumentException) {
+            Log.w(TAG, "Volume receiver not registered", e)
+        }
+    }
+
+    private fun notifyVolumeChanged() {
+        synchronized(listeners) {
+            listeners.forEach { it.onVolumeChanged(percent) }
+        }
+    }
+
+    private fun notifyMuteStateChanged() {
+        val muted = am.isStreamMute(AudioManager.STREAM_MUSIC)
+        synchronized(listeners) {
+            listeners.forEach { it.onMuteStateChanged(muted) }
+        }
+    }
+
+    fun toVolume(p: Int) {
+        val vol = (p.coerceIn(0, 100) * max / 100f).toInt().coerceIn(0, max)
+        am.setStreamVolume(AudioManager.STREAM_MUSIC, vol, 0)
+    }
+
+    fun expandDialog(expandable: Expandable?) {
+        val animateFromExpandable = expandable != null && !keyguardStateController.isShowing
+        val runnable = Runnable {
+            val delegate = dialogDelegateProvider.get()
+            val dialog: SystemUIDialog = delegate.createDialog()
+            if (animateFromExpandable) {
+                val controller = expandable?.dialogTransitionController(
+                    DialogCuj(
+                        InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,
+                        "volume_control"
+                    )
+                )
+                if (controller != null) {
+                    dialogTransitionAnimator.show(dialog, controller)
+                } else {
+                    dialog.show()
+                }
+            } else {
+                dialog.show()
+            }
+        }
+        mainHandler.post {
+            activityStarter.executeRunnableDismissingKeyguard(
+                runnable, null, false, true, false
+            )
+        }
+    }
+
+    private fun Intent.getIntExtraValue(name: String, defaultValue: Int): Int {
+        return getIntExtra(name, defaultValue)
+    }
+    
+    private companion object {
+        private const val TAG = "VolumeController"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeDialogDelegate.kt
new file mode 100644
index 0000000000000..5e0e1dcdce884
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeDialogDelegate.kt
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.systemui.statusbar.policy
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.os.Handler
+import android.widget.Button
+import android.widget.TextView
+import androidx.annotation.MainThread
+import androidx.core.content.ContextCompat
+import com.android.settingslib.Utils
+import com.android.systemui.dagger.qualifiers.Background
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import com.android.systemui.util.concurrency.DelayableExecutor
+import com.android.systemui.util.time.SystemClock
+import com.google.android.material.slider.Slider
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+class VolumeDialogDelegate @Inject constructor(
+    private val ctx: Context,
+    private val systemUIDialogFactory: SystemUIDialog.Factory,
+    private val layoutInflater: android.view.LayoutInflater,
+    private val ctl: VolumeController,
+    private val systemClock: SystemClock,
+    @Main private val mainHandler: Handler,
+    @Background private val backgroundDelayableExecutor: DelayableExecutor
+) : SystemUIDialog.Delegate, VolumeController.VolumeListener {
+
+    companion object {
+        private const val INTERVAL_MS: Long = 50
+        private const val SLIDER_DELAY_MS: Long = 50
+    }
+
+    private lateinit var percentText: TextView
+    private lateinit var doneButton: Button
+    private lateinit var slider: Slider
+
+    private var updateTime: Long = 0
+    private var task: Runnable? = null
+    private var muted = false
+    private var userTracking = false
+
+    private val muteText = string(R.string.qs_volume_dialog_mute)
+    private val iconVolume: Drawable get() = ContextCompat.getDrawable(ctx, R.drawable.ic_volume_media)!!
+    private val iconColor: ColorStateList
+        get() = ColorStateList.valueOf(
+            Utils.getColorAttrDefaultColor(ctx, android.R.attr.textColorPrimaryInverse)
+        )
+
+    private var percent: Int = 0
+        set(value) {
+            percentText.text = if (value == 0) muteText else "${value}%"
+            field = value
+        }
+
+    private var volumePercent: Int = 0
+        @MainThread set(value) {
+            mainHandler.post {
+                task?.run()
+                val now = systemClock.elapsedRealtime()
+                val delay = if (now - updateTime < INTERVAL_MS) SLIDER_DELAY_MS else 0L
+                task = backgroundDelayableExecutor.executeDelayed({
+                    ctl.toVolume(value)
+                    field = value
+                    updateTime = systemClock.elapsedRealtime()
+                }, delay)
+            }
+        }
+        
+    private var progress = 0
+        set(value) {
+            slider.value = value.toFloat()
+            percent = value
+            field = value
+        }
+
+    override fun createDialog(): SystemUIDialog = systemUIDialogFactory.create(this)
+
+    override fun beforeCreate(d: SystemUIDialog, b: Bundle?) {
+        d.setTitle(R.string.qs_volume_dialog_title)
+        d.setView(layoutInflater.inflate(R.layout.qs_volume_dialog, null))
+        d.setPositiveButton(R.string.quick_settings_done, null, true)
+    }
+
+    override fun onCreate(d: SystemUIDialog, savedInstanceState: Bundle?) {
+        percentText = d.requireViewById(R.id.volume_percentage_text)
+        doneButton = d.requireViewById(com.android.internal.R.id.button1)
+        slider = d.requireViewById(R.id.volume_slider)
+
+        ctl.addListener(this)
+
+        setupSlider()
+        setupListeners(d)
+    }
+
+    private fun setupSlider() {
+        slider.valueFrom = 0f
+        slider.valueTo = 100f
+        slider.stepSize = 1f
+        progress = ctl.percent
+        slider.trackIconActiveStart = iconVolume
+        slider.trackIconActiveColor = iconColor
+    }
+
+    private fun setupListeners(d: SystemUIDialog) {
+        slider.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) {
+                val v = value.roundToInt()
+                percent = v
+                volumePercent = v
+            }
+        }
+        slider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
+            override fun onStartTrackingTouch(slider: Slider) {
+                task?.run()
+                userTracking = true
+            }
+            override fun onStopTrackingTouch(slider: Slider) {
+                userTracking = false
+                volumePercent = slider.value.roundToInt()
+            }
+        })
+        doneButton.setOnClickListener { d.dismiss() }
+    }
+
+    override fun onStop(d: SystemUIDialog) {
+        task?.run()
+        task = null
+        ctl.removeListener(this)
+    }
+
+    override fun onVolumeChanged(volume: Int) {
+        if (!userTracking) {
+            progress = volume
+        }
+    }
+
+    override fun onMuteStateChanged(muted: Boolean) {
+        this.muted = muted
+        if (!userTracking) {
+            progress = if (muted) 0 else ctl.percent
+        }
+    }
+
+    private fun string(res: Int): String {
+        return ctx.getString(res)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java
index 35e770a5bd676..562246371a2e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java
@@ -29,6 +29,7 @@
 import com.android.settingslib.devicestate.PostureDeviceStateConverter;
 import com.android.settingslib.devicestate.SecureSettings;
 import com.android.settingslib.notification.modes.ZenIconLoader;
+import com.android.systemui.animation.DialogTransitionAnimator;
 import com.android.systemui.CoreStartable;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Application;
@@ -37,6 +38,7 @@
 import com.android.systemui.dagger.qualifiers.UiBackground;
 import com.android.systemui.log.LogBuffer;
 import com.android.systemui.log.LogBufferFactory;
+import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.connectivity.AccessPointController;
 import com.android.systemui.statusbar.connectivity.AccessPointControllerImpl;
@@ -79,6 +81,8 @@
 import com.android.systemui.statusbar.policy.SplitShadeStateControllerImpl;
 import com.android.systemui.statusbar.policy.UserInfoController;
 import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
+import com.android.systemui.statusbar.policy.VolumeController;
+import com.android.systemui.statusbar.policy.VolumeDialogDelegate;
 import com.android.systemui.statusbar.policy.WalletController;
 import com.android.systemui.statusbar.policy.WalletControllerImpl;
 import com.android.systemui.statusbar.policy.ZenModeController;
@@ -104,6 +108,7 @@
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Named;
+import javax.inject.Provider;
 
 /** Dagger Module for code in the statusbar.policy package. */
 @Module(includes = {DeviceProvisioningRepositoryModule.class, SupervisionRepositoryModule.class})
@@ -331,4 +336,25 @@ static ZenIconLoader provideZenIconLoader(
     @IntoMap
     @ClassKey(SecurityControllerStartable.class)
     CoreStartable bindSecurityControllerCoreStartable(SecurityControllerStartable startable);
+
+    /** Provides a {@link FlashlightStrengthController} */
+    @Provides
+    @SysUISingleton
+    static VolumeController provideVolumeController(
+            @Application Context context,
+            DialogTransitionAnimator dialogTransitionAnimator,
+            Provider<VolumeDialogDelegate> dialogDelegateProvider,
+            KeyguardStateController keyguardStateController,
+            ActivityStarter activityStarter,
+            @Main Handler mainHandler
+    ) {
+        return new VolumeController(
+                context,
+                dialogTransitionAnimator,
+                dialogDelegateProvider,
+                keyguardStateController,
+                activityStarter,
+                mainHandler
+        );
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedIconState.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedIconState.kt
new file mode 100644
index 0000000000000..e348c04840304
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedIconState.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.policy.networkspeed
+
+import java.util.Objects
+
+class NetworkSpeedIconState {
+
+    private var mVisible: Boolean = false
+    private var mSpeedText: Long = 0
+    private var mSlot: String? = null
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is NetworkSpeedIconState) return false
+        return mVisible == other.mVisible &&
+               mSpeedText == other.mSpeedText &&
+               mSlot == other.mSlot
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hash(mVisible, mSpeedText, mSlot)
+    }
+
+    fun setSpeedText(speed: Long) {
+        mSpeedText = speed
+    }
+
+    fun getSpeedText(): Long {
+        return mSpeedText
+    }
+
+    private fun copyTo(target: NetworkSpeedIconState) {
+        target.mVisible = this.mVisible
+        target.mSpeedText = this.mSpeedText
+        target.mSlot = this.mSlot
+    }
+
+    fun setVisible(visible: Boolean) {
+        if (mVisible != visible) {
+            mVisible = visible
+        }
+    }
+
+    fun isVisible(): Boolean {
+        return mVisible
+    }
+
+    fun copy(): NetworkSpeedIconState {
+        val copy = NetworkSpeedIconState()
+        copyTo(copy)
+        return copy
+    }
+
+    fun setSlot(slot: String?) {
+        mSlot = slot
+    }
+
+    override fun toString(): String {
+        return "NetworkSpeedIconState(slot: $mSlot, visible: $mVisible, speed: $mSpeedText)"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedView.kt
new file mode 100644
index 0000000000000..019162f9da603
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/networkspeed/NetworkSpeedView.kt
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2025 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.statusbar.policy.networkspeed
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.TextView
+import com.android.systemui.plugins.DarkIconDispatcher
+import com.android.systemui.res.R
+import com.android.systemui.statusbar.StatusBarIconView
+import com.android.systemui.statusbar.StatusIconDisplayable
+import com.android.systemui.statusbar.policy.NetworkSpeedController
+
+class NetworkSpeedView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : FrameLayout(context, attrs), StatusIconDisplayable {
+
+    companion object {
+        private const val TAG = "NetworkSpeedView"
+
+        private const val KB = 1024L
+        private const val MB = KB * 1024
+        private const val GB = MB * 1024
+
+        fun fromContext(context: Context, slot: String, blocked: Boolean): NetworkSpeedView {
+            val view = LayoutInflater.from(context)
+                .inflate(R.layout.network_speed_view, null) as NetworkSpeedView
+            view.setSlot(slot)
+            view.initDotView()
+            view.isBlocked = blocked
+            return view
+        }
+    }
+
+    private var isBlocked: Boolean = false
+    private var speedNumber: TextView? = null
+    private var speedUnit: TextView? = null
+    private lateinit var dotView: StatusBarIconView
+    private var slot: String = ""
+    private var speed: Long = 0L
+    private var iconTint: Int = -1
+    private var isStaticDrawableColor: Boolean = false
+    private var visibleState: Int = 0
+    private var layoutLeft: Int = -1
+    private var darkIntensity: Float = 0f
+    private var tintArea: MutableList<Rect> = mutableListOf()
+    private var state: NetworkSpeedIconState? = null
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        speedNumber = findViewById(R.id.number)
+        speedUnit = findViewById(R.id.unit)
+    }
+
+    private fun initDotView() {
+        dotView = StatusBarIconView(context, slot, null)
+        dotView.visibleState = StatusBarIconView.STATE_ICON
+        dotView.visibility = View.GONE
+
+        val size = context.resources.getDimensionPixelSize(R.dimen.status_bar_icon_size)
+        val layoutParams = LayoutParams(size, size).apply {
+            gravity = android.view.Gravity.START or android.view.Gravity.CENTER_VERTICAL
+        }
+        addView(dotView, layoutParams)
+    }
+
+    private fun updateNetworkSpeed(fullSpeed: String, parts: List<String>) {
+        if (parts.size < 2) return
+        speedNumber?.text = parts[0]
+        speedUnit?.text = parts[1]
+        requestLayout()
+    }
+
+    private fun speedChanged(newSpeed: Long) {
+        if (newSpeed < 0) return
+
+        speed = newSpeed
+        val formatted = formatSpeed(speed)
+        updateNetworkSpeed(formatted, formatted.split(":"))
+    }
+
+    private fun formatSpeed(speed: Long): String {
+        val divisor: Long
+        val unit: String
+        val decimals: Int
+
+        when {
+            speed < 1024 -> {
+                divisor = KB
+                unit = "KB"
+                decimals = 2
+            }
+            speed < 10240 -> {
+                divisor = KB
+                unit = "KB"
+                decimals = 2
+            }
+            speed < 102400 -> {
+                divisor = KB
+                unit = "KB"
+                decimals = 1
+            }
+            speed < 1024000 -> {
+                divisor = KB
+                unit = "KB"
+                decimals = 0
+            }
+            speed < 10485760 -> {
+                divisor = MB
+                unit = "MB"
+                decimals = 2
+            }
+            speed < 104857600 -> {
+                divisor = MB
+                unit = "MB"
+                decimals = 1
+            }
+            speed < 1048576000 -> {
+                divisor = MB
+                unit = "MB"
+                decimals = 0
+            }
+            speed < 10737418240L -> {
+                divisor = GB
+                unit = "GB"
+                decimals = 2
+            }
+            speed < 107374182400L -> {
+                divisor = GB
+                unit = "GB"
+                decimals = 1
+            }
+            else -> {
+                divisor = GB
+                unit = "GB"
+                decimals = 0
+            }
+        }
+
+        val value = divToFractionDigits(speed, divisor, decimals)
+        return "$value:$unit/s"
+    }
+
+    private fun divToFractionDigits(number: Long, divisor: Long, maxNum: Int): String {
+        if (divisor == 0L) {
+            Log.e(TAG, "Cannot divide by zero")
+            return "Error"
+        }
+
+        val whole = number / divisor
+        var remainder = number % divisor
+        val builder = StringBuilder().append(whole)
+
+        if (maxNum > 0) {
+            builder.append(".")
+            repeat(maxNum) {
+                remainder *= 10
+                builder.append(remainder / divisor)
+                remainder %= divisor
+            }
+        }
+
+        return builder.toString()
+    }
+
+    fun setSlot(slot: String) {
+        this.slot = slot
+    }
+
+    override fun getSlot(): String = slot
+
+    override fun setVisibleState(state: Int, animate: Boolean) {
+        if (this.visibleState == state) return
+
+        this.visibleState = state
+        when (state) {
+            0 -> {
+                speedNumber?.visibility = View.VISIBLE
+                speedUnit?.visibility = View.VISIBLE
+                dotView.visibility = View.GONE
+            }
+            1 -> {
+                speedNumber?.visibility = View.INVISIBLE
+                speedUnit?.visibility = View.INVISIBLE
+                dotView.visibility = View.VISIBLE
+            }
+            else -> {
+                speedNumber?.visibility = View.INVISIBLE
+                speedUnit?.visibility = View.INVISIBLE
+                dotView.visibility = View.INVISIBLE
+            }
+        }
+    }
+
+    override fun getVisibleState(): Int = visibleState
+
+    override fun isIconVisible(): Boolean = state?.isVisible() ?: false
+
+    override fun setDecorColor(color: Int) {
+        dotView.setDecorColor(color)
+    }
+
+    fun setIconTint(tint: Int) {
+        speedNumber?.setTextColor(tint)
+        speedUnit?.setTextColor(tint)
+    }
+
+    override fun setStaticDrawableColor(color: Int) {
+        isStaticDrawableColor = true
+        setIconTint(color)
+        dotView.setDecorColor(color)
+    }
+
+    override fun onDarkChanged(area: ArrayList<Rect>, darkIntensity: Float, tint: Int) {
+        if (isStaticDrawableColor) return
+
+        tintArea.clear()
+        tintArea.addAll(area)
+        iconTint = tint
+        this.darkIntensity = darkIntensity
+
+        val appliedTint = DarkIconDispatcher.getTint(area, this, tint)
+        setIconTint(appliedTint)
+        dotView.setDecorColor(tint)
+        dotView.setIconColor(tint, false)
+    }
+
+    fun applyNetworkState(newState: NetworkSpeedIconState?) {
+        if (newState == null) {
+            visibility = View.GONE
+            state = null
+            return
+        }
+
+        state = newState.copy()
+        visibility = if (newState.isVisible()) View.VISIBLE else View.GONE
+
+        if (newState.isVisible()) {
+            speedChanged(newState.getSpeedText())
+        }
+    }
+
+    override fun isIconBlocked(): Boolean {
+        return isBlocked && NetworkSpeedController.get().isSwitchOn() == false
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/theme/RisingSettingsConstants.java b/packages/SystemUI/src/com/android/systemui/theme/RisingSettingsConstants.java
new file mode 100644
index 0000000000000..5df126e7b9f17
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/theme/RisingSettingsConstants.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023-2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.theme;
+
+import android.provider.Settings;
+
+public class RisingSettingsConstants {
+
+    public static final String[] SYSTEM_SETTINGS_KEYS = {
+        "status_bar_logo",
+        "statusbar_clock_chip",
+        "qs_show_data_usage_tile"
+    };
+    
+    public static final String[] SECURE_SETTINGS_KEYS = {
+        "clock_text_accent_color",
+        "clock_text_opacity"
+    };
+    
+    public static final String[] SYSTEM_SETTINGS_NOTIFY_ONLY_KEYS = {
+    };
+    
+    public static final String[] SECURE_SETTINGS_NOTIFY_ONLY_KEYS = {
+    };
+}
diff --git a/packages/SystemUI/src/com/android/systemui/theme/RisingThemeController.java b/packages/SystemUI/src/com/android/systemui/theme/RisingThemeController.java
new file mode 100644
index 0000000000000..f3f3a1959c8a6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/theme/RisingThemeController.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023-2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.theme;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.systemui.res.R;
+
+public class RisingThemeController {
+
+    private static final String TAG = "RisingThemeController";
+    private final ContentResolver mContentResolver;
+    private final Handler mBackgroundHandler;
+    private Context mContext;
+
+    private Runnable mDebounceRunnable;
+
+    public RisingThemeController(Context context, Handler backgroundHandler) {
+        this.mContext = context;
+        this.mContentResolver = mContext.getContentResolver();
+        this.mBackgroundHandler = backgroundHandler;
+    }
+
+    public void observeSettings(Runnable reevaluateSystemThemeCallback) {
+        observeSettingsKeys(RisingSettingsConstants.SYSTEM_SETTINGS_KEYS, reevaluateSystemThemeCallback, true);
+        observeSettingsKeys(RisingSettingsConstants.SECURE_SETTINGS_KEYS, reevaluateSystemThemeCallback, false);
+        observeSettingsKeys(RisingSettingsConstants.SYSTEM_SETTINGS_NOTIFY_ONLY_KEYS, null, true);
+        observeSettingsKeys(RisingSettingsConstants.SECURE_SETTINGS_NOTIFY_ONLY_KEYS, null, false);
+        observeRestartKey();
+    }
+    
+    private void observeRestartKey() {
+        Uri restartUri = Settings.System.getUriFor("system_ui_restart");
+        observe(restartUri, () -> {
+            android.os.Process.killProcess(android.os.Process.myPid());
+        });
+    }
+
+    private void observeSettingsKeys(String[] keys, Runnable reevaluateSystemThemeCallback, boolean isSystem) {
+        for (String key : keys) {
+            Uri uri = isSystem ? Settings.System.getUriFor(key) : Settings.Secure.getUriFor(key);
+            observe(uri, reevaluateSystemThemeCallback);
+        }
+    }
+
+    private void observe(Uri uri, Runnable reevaluateSystemThemeCallback) {
+        if (uri != null) {
+            ContentObserver contentObserver = new ContentObserver(mBackgroundHandler) {
+                @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    Toast toast = Toast.makeText(mContext, R.string.reevaluating_system_theme, Toast.LENGTH_SHORT);
+                    if (isDeviceSetupComplete()) {
+                        toast.show();
+                    }
+                    if (mDebounceRunnable != null) {
+                        mBackgroundHandler.removeCallbacks(mDebounceRunnable);
+                    }
+                    mDebounceRunnable = () -> {
+                        if (reevaluateSystemThemeCallback != null) {
+                            mBackgroundHandler.post(() -> reevaluateSystemThemeCallback.run());
+                        }
+                    };
+                    mBackgroundHandler.postDelayed(mDebounceRunnable, 2000);
+                }
+            };
+            mContentResolver.registerContentObserver(uri, false, contentObserver);
+        } else {
+            Log.e(TAG, "Failed to get URI for key");
+        }
+    }
+
+    private boolean isDeviceSetupComplete() {
+        try {
+            return Settings.Secure.getInt(mContentResolver, Settings.Secure.USER_SETUP_COMPLETE) == 1;
+        } catch (Settings.SettingNotFoundException e) {
+            Log.e(TAG, "USER_SETUP_COMPLETE setting not found", e);
+            return false;
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
index 9bfc193a508e3..c4fb8865e989c 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java
@@ -113,6 +113,12 @@ public class ThemeOverlayApplier implements Dumpable {
     @VisibleForTesting
     static final String OVERLAY_CATEGORY_ICON_THEME_PICKER =
             "android.theme.customization.icon_pack.themepicker";
+    @VisibleForTesting
+    static final String OVERLAY_CATEGORY_ICON_SIGNAL =
+            "android.theme.customization.signal_icon";
+    @VisibleForTesting
+    static final String OVERLAY_CATEGORY_ICON_WIFI =
+            "android.theme.customization.wifi_icon";
 
     /*
      * All theme customization categories used by the system, in order that they should be applied,
@@ -120,7 +126,6 @@ public class ThemeOverlayApplier implements Dumpable {
      */
     static final List<String> THEME_CATEGORIES = Lists.newArrayList(
             OVERLAY_CATEGORY_SYSTEM_PALETTE,
-            OVERLAY_CATEGORY_ICON_LAUNCHER,
             OVERLAY_CATEGORY_SHAPE,
             OVERLAY_CATEGORY_FONT,
             OVERLAY_CATEGORY_ACCENT_COLOR,
@@ -128,7 +133,8 @@ public class ThemeOverlayApplier implements Dumpable {
             OVERLAY_CATEGORY_ICON_ANDROID,
             OVERLAY_CATEGORY_ICON_SYSUI,
             OVERLAY_CATEGORY_ICON_SETTINGS,
-            OVERLAY_CATEGORY_ICON_THEME_PICKER);
+            OVERLAY_CATEGORY_ICON_SIGNAL,
+            OVERLAY_CATEGORY_ICON_WIFI);
 
     /* Categories that need to be applied to the current user as well as the system user. */
     @VisibleForTesting
@@ -139,7 +145,9 @@ public class ThemeOverlayApplier implements Dumpable {
             OVERLAY_CATEGORY_FONT,
             OVERLAY_CATEGORY_SHAPE,
             OVERLAY_CATEGORY_ICON_ANDROID,
-            OVERLAY_CATEGORY_ICON_SYSUI);
+            OVERLAY_CATEGORY_ICON_SYSUI,
+            OVERLAY_CATEGORY_ICON_SIGNAL,
+            OVERLAY_CATEGORY_ICON_WIFI);
 
     /* Allowed overlay categories for each target package. */
     private final Map<String, Set<String>> mTargetPackageToCategories = new ArrayMap<>();
@@ -172,10 +180,6 @@ public ThemeOverlayApplier(OverlayManager overlayManager,
                 Sets.newHashSet(OVERLAY_CATEGORY_ICON_SYSUI));
         mTargetPackageToCategories.put(SETTINGS_PACKAGE,
                 Sets.newHashSet(OVERLAY_CATEGORY_ICON_SETTINGS));
-        mTargetPackageToCategories.put(mLauncherPackage,
-                Sets.newHashSet(OVERLAY_CATEGORY_ICON_LAUNCHER));
-        mTargetPackageToCategories.put(mThemePickerPackage,
-                Sets.newHashSet(OVERLAY_CATEGORY_ICON_THEME_PICKER));
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ACCENT_COLOR, ANDROID_PACKAGE);
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_DYNAMIC_COLOR, ANDROID_PACKAGE);
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_FONT, ANDROID_PACKAGE);
@@ -183,8 +187,8 @@ public ThemeOverlayApplier(OverlayManager overlayManager,
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_ANDROID, ANDROID_PACKAGE);
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_SYSUI, SYSUI_PACKAGE);
         mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_SETTINGS, SETTINGS_PACKAGE);
-        mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_LAUNCHER, mLauncherPackage);
-        mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_THEME_PICKER, mThemePickerPackage);
+        mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_SIGNAL, SYSUI_PACKAGE);
+        mCategoryToTargetPackage.put(OVERLAY_CATEGORY_ICON_WIFI, SYSUI_PACKAGE);
 
         dumpManager.registerDumpable(TAG, this);
     }
@@ -234,8 +238,12 @@ public void applyCurrentUserOverlays(
             if (pendingCreation != null) {
                 isBlackMode = pendingCreation.length == 2;
                 for (FabricatedOverlay overlay : pendingCreation) {
-                    identifiersPending.add(overlay.getIdentifier());
-                    transaction.registerFabricatedOverlay(overlay);
+                    try {
+                        identifiersPending.add(overlay.getIdentifier());
+                        transaction.registerFabricatedOverlay(overlay);
+                    } catch (NullPointerException e) {
+                        Log.e(TAG, "NPE for overlay.getIdentifier()", e);
+                    }
                 }
             }
 
@@ -328,18 +336,6 @@ private void setEnabled(OverlayManagerTransaction.Builder transaction,
                 && SYSTEM_USER_CATEGORIES.contains(category)) {
             transaction.setEnabled(identifier, enabled, UserHandle.SYSTEM.getIdentifier());
         }
-
-        // Do not apply Launcher or Theme picker overlays to managed users. Apps are not
-        // installed in there.
-        overlayInfo = mOverlayManager.getOverlayInfo(identifier, UserHandle.SYSTEM);
-        if (overlayInfo == null || overlayInfo.targetPackageName.equals(mLauncherPackage)
-                || overlayInfo.targetPackageName.equals(mThemePickerPackage)) {
-            return;
-        }
-
-        for (UserHandle userHandle : managedProfiles) {
-            transaction.setEnabled(identifier, enabled, userHandle.getIdentifier());
-        }
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index c3ce071e6ed30..efe9629927913 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -68,6 +68,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
+import com.android.internal.graphics.cam.Cam;
+import com.android.internal.graphics.ColorUtils;
 import com.android.systemui.CoreStartable;
 import com.android.systemui.Dumpable;
 import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -92,6 +94,7 @@
 
 import com.google.ux.material.libmonet.dynamiccolor.DynamicColor;
 import com.google.ux.material.libmonet.dynamiccolor.MaterialDynamicColors;
+import com.google.ux.material.libmonet.hct.Cam16;
 
 import kotlinx.coroutines.flow.Flow;
 import kotlinx.coroutines.flow.StateFlow;
@@ -156,6 +159,8 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
     protected int mMainWallpaperColor = Color.TRANSPARENT;
     // UI contrast as reported by UiModeManager
     private double mContrast = 0.0;
+    private double mChromaBoost = 0.0;
+    private boolean mIsFidelityEnabled = true;
     // Theme variant: Vibrant, Tonal, Expressive, etc
     @VisibleForTesting
     @ThemeStyle.Type
@@ -180,6 +185,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
     private final UserScopedService<UiModeManager> mUiModeManagerProvider;
     private ColorScheme mDarkColorScheme;
     private ColorScheme mLightColorScheme;
+    private final RisingThemeController mThemeController;
 
     // Defers changing themes until Setup Wizard is done.
     private boolean mDeferredThemeEvaluation;
@@ -477,6 +483,7 @@ public ThemeOverlayController(
         Flow<Boolean> isFinishedInAsleepStateFlow = mKeyguardTransitionInteractor
                 .isFinishedInStateWhere(KeyguardState.Companion::deviceIsAsleepInState);
         mIsKeyguardOnAsleepState = mJavaAdapter.stateInApp(isFinishedInAsleepStateFlow, false);
+        mThemeController = new RisingThemeController(mContext, mBgHandler);
     }
 
     @Override
@@ -485,8 +492,10 @@ public void start() {
         final IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_PROFILE_ADDED);
         filter.addAction(Intent.ACTION_WALLPAPER_CHANGED);
+        mThemeController.observeSettings(() -> reevaluateSystemTheme(true));
         mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter, mMainExecutor,
                 UserHandle.ALL);
+        int userId = mUserTracker.getUserId();
         mSecureSettings.registerContentObserverForUserSync(
                 Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
                 false,
@@ -512,19 +521,6 @@ public void onChange(boolean selfChange, Collection<Uri> collection, int flags,
                     }
                 },
                 UserHandle.USER_ALL);
-        int userId = mUserTracker.getUserId();
-        if (fixContrastAndForceInvertStateForMultiUser()) {
-            UiModeManager uiModeManager = mUiModeManagerProvider.forUser(UserHandle.of(userId));
-            uiModeManager.addContrastChangeListener(mMainExecutor, mContrastChangeListener);
-            mContrast = uiModeManager.getContrast();
-        } else {
-            mContrast = mUiModeManager.getContrast();
-            mUiModeManager.addContrastChangeListener(mMainExecutor, contrast -> {
-                mContrast = contrast;
-                // Force reload so that we update even when the main color has not changed
-                reevaluateSystemTheme(true /* forceReload */);
-            });
-        }
 
         mSecureSettings.registerContentObserverForUserSync(
                 LineageSettings.Secure.getUriFor(LineageSettings.Secure.BERRY_BLACK_THEME),
@@ -669,6 +665,7 @@ private void reevaluateSystemTheme(boolean forceReload) {
         mMainWallpaperColor = mainColor;
 
         if (mIsMonetEnabled) {
+            fetchCustomThemeSettings();
             mThemeStyle = fetchThemeStyleFromSetting();
             createOverlays(mMainWallpaperColor);
             mNeedsOverlayCreation = true;
@@ -681,6 +678,28 @@ private void reevaluateSystemTheme(boolean forceReload) {
         updateThemeOverlays();
     }
 
+    private void fetchCustomThemeSettings() {
+        final String overlayPackageJson = mSecureSettings.getStringForUser(
+                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                mUserTracker.getUserId());
+        if (!TextUtils.isEmpty(overlayPackageJson)) {
+            try {
+                JSONObject object = new JSONObject(overlayPackageJson);
+                mContrast = object.optDouble("_contrast_level", 0.0);
+                mChromaBoost = object.optDouble("_chroma_boost", 0.0);
+                mIsFidelityEnabled = object.optBoolean("_fidelity_enabled", true);
+                if (DEBUG) {
+                    Log.d(TAG, "Custom theme settings: contrast=" + mContrast
+                            + " chromaBoost=" + mChromaBoost
+                            + " fidelity=" + mIsFidelityEnabled);
+                }
+            } catch (JSONException e) {
+                Log.w(TAG, "Failed to parse custom theme settings.", e);
+            }
+        }
+    }
+
+
     /**
      * Return the main theme color from a given {@link WallpaperColors} instance.
      */
@@ -710,8 +729,12 @@ protected boolean isPrivateProfile(UserHandle userHandle) {
     }
 
     private void createOverlays(int color) {
-        mDarkColorScheme = new ColorScheme(color, true /* isDark */, mThemeStyle, mContrast);
-        mLightColorScheme = new ColorScheme(color, false /* isDark */, mThemeStyle, mContrast);
+        int style = mThemeStyle;
+        if (mIsFidelityEnabled) {
+            style = ThemeStyle.CONTENT;
+        }
+        mDarkColorScheme = new ColorScheme(color, true /* isDark */, style, mContrast);
+        mLightColorScheme = new ColorScheme(color, false /* isDark */, style, mContrast);
         mColorScheme = isNightMode() ? mDarkColorScheme : mLightColorScheme;
 
         mAccentOverlay = newFabricatedOverlay("accent");
@@ -731,20 +754,46 @@ private void createOverlays(int color) {
 
     private void assignColorsToOverlay(FabricatedOverlay overlay,
             List<Pair<String, DynamicColor>> colors, Boolean isFixed) {
-        colors.forEach(p -> {
+        for (Pair<String, DynamicColor> p : colors) {
+
             String prefix = "android:color/system_" + p.first;
 
             if (isFixed) {
-                overlay.setResourceValue(prefix, TYPE_INT_COLOR_ARGB8,
-                        p.second.getArgb(mLightColorScheme.getMaterialScheme()), null);
-                return;
+                int original = p.second.getArgb(mLightColorScheme.getMaterialScheme());
+                int boosted  = boostChroma(original);
+                overlay.setResourceValue(prefix, TYPE_INT_COLOR_ARGB8, boosted, null);
+                continue;
             }
 
-            overlay.setResourceValue(prefix + "_light", TYPE_INT_COLOR_ARGB8,
-                    p.second.getArgb(mLightColorScheme.getMaterialScheme()), null);
-            overlay.setResourceValue(prefix + "_dark", TYPE_INT_COLOR_ARGB8,
-                    p.second.getArgb(mDarkColorScheme.getMaterialScheme()), null);
-        });
+            int lightOriginal = p.second.getArgb(mLightColorScheme.getMaterialScheme());
+            int darkOriginal  = p.second.getArgb(mDarkColorScheme.getMaterialScheme());
+
+            int boostedLight = boostChroma(lightOriginal);
+            int boostedDark  = boostChroma(darkOriginal);
+
+            overlay.setResourceValue(prefix + "_light",
+                    TYPE_INT_COLOR_ARGB8, boostedLight, null);
+
+            overlay.setResourceValue(prefix + "_dark",
+                    TYPE_INT_COLOR_ARGB8, boostedDark, null);
+        }
+    }
+
+    private int boostChroma(int argb) {
+        Cam cam = Cam.fromInt(argb);
+
+        final float chromaBoost = (float) mChromaBoost;
+
+        float boostedChroma = cam.getChroma() * (1f +  chromaBoost/ 100f);
+        boostedChroma = Math.min(boostedChroma, 150f);
+
+        int boosted = ColorUtils.CAMToColor(
+                cam.getHue(),
+                boostedChroma,
+                cam.getJ()
+        );
+
+        return ColorUtils.setAlphaComponent(boosted, Color.alpha(argb));
     }
 
     /**
@@ -800,6 +849,10 @@ private void updateThemeOverlays() {
         if (!TextUtils.isEmpty(overlayPackageJson)) {
             try {
                 JSONObject object = new JSONObject(overlayPackageJson);
+                
+                mContrast = object.optDouble("_contrast_level", 0.0);
+                mChromaBoost = object.optDouble("_chroma_boost", 0.0);
+
                 for (String category : ThemeOverlayApplier.THEME_CATEGORIES) {
                     if (object.has(category)) {
                         OverlayIdentifier identifier =
@@ -918,7 +971,7 @@ private int fetchThemeStyleFromSetting() {
             try {
                 JSONObject object = new JSONObject(overlayPackageJson);
                 style = ThemeStyle.valueOf(
-                        object.getString(OVERLAY_CATEGORY_THEME_STYLE));
+                        object.optString(OVERLAY_CATEGORY_THEME_STYLE, ThemeStyle.name(ThemeStyle.TONAL_SPOT)));
                 if (!validStyles.contains(style)) {
                     style = ThemeStyle.TONAL_SPOT;
                 }
diff --git a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
index d367455d26c78..14db3257ea47e 100644
--- a/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
+++ b/packages/SystemUI/src/com/android/systemui/toast/SystemUIToast.java
@@ -176,6 +176,7 @@ private View inflateToastView() {
         final TextView textView = toastView.findViewById(com.android.systemui.res.R.id.text);
         final ImageView iconView = toastView.findViewById(com.android.systemui.res.R.id.icon);
         textView.setText(mText);
+        textView.setSelected(true);
 
         ApplicationInfo appInfo = null;
         try {
diff --git a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiController.java b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiController.java
new file mode 100644
index 0000000000000..203522132a3e4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiController.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 CypherOS
+ * Copyright 2014-2019 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.tristate;
+
+import com.android.systemui.plugins.Plugin;
+import com.android.systemui.plugins.VolumeDialog.Callback;
+import com.android.systemui.plugins.annotations.DependsOn;
+import com.android.systemui.plugins.annotations.ProvidesInterface;
+
+@DependsOn(target = Callback.class)
+@ProvidesInterface(action = "com.android.systemui.action.PLUGIN_TRI_STATE_UI", version = 1)
+public interface TriStateUiController extends Plugin {
+
+    public interface UserActivityListener {
+        void onTriStateUserActivity();
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
new file mode 100644
index 0000000000000..abd97e4bfd780
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
@@ -0,0 +1,671 @@
+/*
+ * Copyright (C) 2019 CypherOS
+ *           (C) 2014-2020 Paranoid Android
+ *           (C) 2020-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.tristate;
+
+import static android.view.Surface.ROTATION_90;
+import static android.view.Surface.ROTATION_180;
+import static android.view.Surface.ROTATION_270;
+
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.hardware.display.DisplayManagerGlobal;
+import android.media.AudioManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.provider.Settings;
+import android.util.DisplayUtils;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
+import android.view.Display;
+import android.view.OrientationEventListener;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager.LayoutParams;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.res.R;
+import com.android.systemui.tristate.TriStateUiController;
+import com.android.systemui.tristate.TriStateUiController.UserActivityListener;
+import com.android.systemui.plugins.VolumeDialogController;
+import com.android.systemui.plugins.VolumeDialogController.Callbacks;
+import com.android.systemui.plugins.VolumeDialogController.State;
+import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.systemui.tuner.TunerService;
+
+public class TriStateUiControllerImpl implements TriStateUiController,
+        ConfigurationController.ConfigurationListener, TunerService.Tunable {
+
+
+    private static String TAG = "TriStateUiControllerImpl";
+
+    public static final String ALERT_SLIDER_NOTIFICATIONS =
+            "system:" + Settings.System.ALERT_SLIDER_NOTIFICATIONS;
+
+    private static final int MSG_DIALOG_SHOW = 1;
+    private static final int MSG_DIALOG_DISMISS = 2;
+    private static final int MSG_RESET_SCHEDULE = 3;
+    private static final int MSG_STATE_CHANGE = 4;
+
+    private static final int RINGER_MODE_NORMAL = AudioManager.RINGER_MODE_NORMAL;
+    private static final int RINGER_MODE_SILENT = AudioManager.RINGER_MODE_SILENT;
+    private static final int RINGER_MODE_VIBRATE = AudioManager.RINGER_MODE_VIBRATE;
+
+    private static final int POSITION_TOP = 0;
+    private static final int POSITION_MIDDLE = 1;
+    private static final int POSITION_BOTTOM = 2;
+
+    // Slider
+    private static final int MODE_TOTAL_SILENCE = 600;
+    private static final int MODE_ALARMS_ONLY = 601;
+    private static final int MODE_PRIORITY_ONLY = 602;
+    private static final int MODE_NONE = 603;
+    private static final int MODE_VIBRATE = 604;
+    private static final int MODE_RING = 605;
+    // Arbitrary value which hopefully doesn't conflict with upstream anytime soon
+    private static final int MODE_SILENT = 620;
+    private static final int MODE_FLASHLIGHT_ON = 621;
+    private static final int MODE_FLASHLIGHT_OFF = 622;
+    private static final int MODE_FLASHLIGHT_BLINK = 623;
+    private static final int MODE_BRIGHTNESS_BRIGHT = 630;
+    private static final int MODE_BRIGHTNESS_DARK = 631;
+    private static final int MODE_BRIGHTNESS_AUTO = 632;
+    private static final int MODE_ROTATION_AUTO = 640;
+    private static final int MODE_ROTATION_0 = 641;
+    private static final int MODE_ROTATION_90 = 642;
+    private static final int MODE_ROTATION_270 = 643;
+
+    private static final String EXTRA_SLIDER_POSITION = "position";
+    private static final String EXTRA_SLIDER_POSITION_VALUE = "position_value";
+
+    private static final int TRI_STATE_UI_POSITION_LEFT = 0;
+    private static final int TRI_STATE_UI_POSITION_RIGHT = 1;
+
+    private static final long DIALOG_TIMEOUT = 2000;
+    private static final long DIALOG_DELAY = 300;
+
+    private Context mContext;
+    private final VolumeDialogController mVolumeDialogController;
+    private final ConfigurationController mConfigurationController;
+    private final TunerService mTunerService;
+
+    private final Callbacks mVolumeDialogCallback = new Callbacks() {
+        @Override
+        public void onShowRequested(int reason, boolean keyguardLocked, int lockTaskModeState) { }
+
+        @Override
+        public void onDismissRequested(int reason) { }
+
+        @Override
+        public void onScreenOff() { }
+
+        @Override
+        public void onStateChanged(State state) { }
+
+        @Override
+        public void onLayoutDirectionChanged(int layoutDirection) { }
+
+        @Override
+        public void onShowVibrateHint() { }
+
+        @Override
+        public void onShowSilentHint() { }
+
+        @Override
+        public void onShowSafetyWarning(int flags) { }
+
+        @Override
+        public void onShowCsdWarning(int csdWarning, int durationMs) { }
+
+        @Override
+        public void onAccessibilityModeChanged(Boolean showA11yStream) { }
+
+        @Override
+        public void onCaptionComponentStateChanged(
+                Boolean isComponentEnabled, Boolean fromTooltip) {}
+
+        @Override
+        public void onCaptionEnabledStateChanged(Boolean isEnabled, Boolean checkBeforeSwitch) {}
+
+        @Override
+        public void onVolumeChangedFromKey() {}
+
+        @Override
+        public void onConfigurationChanged() {
+            updateTriStateLayout();
+        }
+    };
+
+    private int mDensity;
+    private Dialog mDialog;
+    private int mDialogPosition;
+    private ViewGroup mDialogView;
+    private final H mHandler;
+    private UserActivityListener mListener;
+    OrientationEventListener mOrientationListener;
+    private int mOrientationType = 0;
+    private boolean mShowing = false;
+    private int mBackgroundColor = 0;
+    private ImageView mTriStateIcon;
+    private TextView mTriStateText;
+    private int mTriStateMode = -1;
+    private int mPosition = -1;
+    private int mPositionValue = -1;
+    private Window mWindow;
+    private LayoutParams mWindowLayoutParams;
+    private int mWindowType;
+    private String mIntentAction;
+    private boolean mIntentActionSupported;
+    private boolean mRingModeChanged;
+    private boolean mSliderPositionChanged;
+    private boolean mAlertSliderNotification;
+
+    private final BroadcastReceiver mSliderStateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (!mAlertSliderNotification) {
+                mRingModeChanged = false;
+                mSliderPositionChanged = false;
+                return;
+            }
+
+            String action = intent.getAction();
+            if (mIntentActionSupported && action.equals(mIntentAction)) {
+                Bundle extras = intent.getExtras();
+                mPosition = extras.getInt(EXTRA_SLIDER_POSITION);
+                mPositionValue = extras.getInt(EXTRA_SLIDER_POSITION_VALUE);
+                mHandler.sendEmptyMessage(MSG_DIALOG_DISMISS);
+                mHandler.sendEmptyMessage(MSG_STATE_CHANGE);
+                mSliderPositionChanged = true;
+                Log.d(TAG, "received slider position " + mPosition
+                                    + " with value " + mPositionValue);
+            } else if (!mIntentActionSupported && action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
+                mHandler.sendEmptyMessage(MSG_DIALOG_DISMISS);
+                mHandler.sendEmptyMessage(MSG_STATE_CHANGE);
+                mRingModeChanged = true;
+            }
+
+            if (mRingModeChanged || mSliderPositionChanged) {
+                mRingModeChanged = false;
+                mSliderPositionChanged = false;
+                if (mTriStateMode != -1) {
+                    mHandler.sendEmptyMessageDelayed(MSG_DIALOG_SHOW, (long) DIALOG_DELAY);
+               }
+            }
+        }
+    };
+
+    private final class H extends Handler {
+        private TriStateUiControllerImpl mUiController;
+
+        public H(TriStateUiControllerImpl uiController) {
+            super(Looper.getMainLooper());
+            mUiController = uiController;
+        }
+
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_DIALOG_SHOW:
+                    mUiController.handleShow();
+                    return;
+                case MSG_DIALOG_DISMISS:
+                    mUiController.handleDismiss();
+                    return;
+                case MSG_RESET_SCHEDULE:
+                    mUiController.handleResetTimeout();
+                    return;
+                case MSG_STATE_CHANGE:
+                    mUiController.handleStateChanged();
+                    return;
+                default:
+                    return;
+            }
+        }
+    }
+
+    public TriStateUiControllerImpl(
+            Context context,
+            VolumeDialogController volumeDialogController,
+            ConfigurationController configurationController,
+            TunerService tunerService) {
+        mContext =
+                new ContextThemeWrapper(context, R.style.qs_theme);
+        mVolumeDialogController = volumeDialogController;
+        mConfigurationController = configurationController;
+        mTunerService = tunerService;
+        mHandler = new H(this);
+        mOrientationListener = new OrientationEventListener(mContext, 3) {
+            @Override
+            public void onOrientationChanged(int orientation) {
+                checkOrientationType();
+            }
+        };
+        mIntentAction = context.getResources().getString(R.string.config_alertSliderIntent);
+        mIntentActionSupported = mIntentAction != null && !mIntentAction.isEmpty();
+
+        IntentFilter filter = new IntentFilter();
+        if (mIntentActionSupported) {
+            filter.addAction(mIntentAction);
+        } else {
+            filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+        }
+        mContext.registerReceiver(mSliderStateReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+    }
+
+    @Override
+    public void onTuningChanged(String key, String newValue) {
+        switch (key) {
+            case ALERT_SLIDER_NOTIFICATIONS:
+                mAlertSliderNotification
+                        = TunerService.parseIntegerSwitch(newValue, true);
+                mHandler.sendEmptyMessage(MSG_DIALOG_DISMISS);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onUiModeChanged() {
+        mContext.getTheme().applyStyle(mContext.getThemeResId(), true);
+        initDialog();
+    }
+
+    private void checkOrientationType() {
+        Display display = DisplayManagerGlobal.getInstance().getRealDisplay(0);
+        if (display != null) {
+            int rotation = display.getRotation();
+            if (rotation != mOrientationType) {
+                mOrientationType = rotation;
+                updateTriStateLayout();
+            }
+        }
+    }
+
+    public void init(int windowType, UserActivityListener listener) {
+        mWindowType = windowType;
+        mDensity = mContext.getResources().getConfiguration().densityDpi;
+        mListener = listener;
+        mConfigurationController.addCallback(this);
+        mVolumeDialogController.addCallback(mVolumeDialogCallback, mHandler);
+        mTunerService.addTunable(this, ALERT_SLIDER_NOTIFICATIONS);
+        initDialog();
+    }
+
+    public void destroy() {
+        mTunerService.removeTunable(this);
+        mConfigurationController.removeCallback(this);
+        mVolumeDialogController.removeCallback(mVolumeDialogCallback);
+        mContext.unregisterReceiver(mSliderStateReceiver);
+    }
+
+    private void initDialog() {
+        if (mDialog != null) {
+            mDialog.dismiss();
+            mDialog = null;
+        }
+        mDialog = new Dialog(mContext, R.style.qs_theme);
+        mShowing = false;
+        mWindow = mDialog.getWindow();
+        mWindow.requestFeature(Window.FEATURE_NO_TITLE);
+        mWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        mWindow.clearFlags(LayoutParams.FLAG_DIM_BEHIND
+                | LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+        mWindow.addFlags(LayoutParams.FLAG_NOT_FOCUSABLE
+                | LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
+                | LayoutParams.FLAG_HARDWARE_ACCELERATED);
+        mWindow.setType(LayoutParams.TYPE_VOLUME_OVERLAY);
+        mWindow.setWindowAnimations(com.android.internal.R.style.Animation_Toast);
+        mDialog.setCanceledOnTouchOutside(false);
+        mWindowLayoutParams = mWindow.getAttributes();
+        mWindowLayoutParams.type = mWindowType;
+        mWindowLayoutParams.format = -3;
+        mWindowLayoutParams.setTitle(TriStateUiControllerImpl.class.getSimpleName());
+        mWindowLayoutParams.gravity = 53;
+        mWindowLayoutParams.y = mDialogPosition;
+        mWindow.setAttributes(mWindowLayoutParams);
+        mWindow.setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+        mDialog.setContentView(R.layout.tri_state_dialog);
+        mDialogView = (ViewGroup) mDialog.findViewById(R.id.tri_state_layout);
+        mTriStateIcon = (ImageView) mDialog.findViewById(R.id.tri_state_icon);
+        mTriStateText = (TextView) mDialog.findViewById(R.id.tri_state_text);
+    }
+
+    private void registerOrientationListener(boolean enable) {
+        if (mOrientationListener.canDetectOrientation() && enable) {
+            Log.v(TAG, "Can detect orientation");
+            mOrientationListener.enable();
+            return;
+        }
+        Log.v(TAG, "Cannot detect orientation");
+        mOrientationListener.disable();
+    }
+
+    private void updateTriStateLayout() {
+        if (mContext != null) {
+            int iconId = 0;
+            int textId = 0;
+            int bg = 0;
+            Resources res = mContext.getResources();
+            if (res != null) {
+                int positionY;
+                int positionY2 = mWindowLayoutParams.y;
+                int positionX = mWindowLayoutParams.x;
+                int gravity = mWindowLayoutParams.gravity;
+                switch (mTriStateMode) {
+                    case MODE_RING:
+                    case MODE_NONE:
+                    case RINGER_MODE_NORMAL:
+                        iconId = R.drawable.ic_volume_ringer;
+                        textId = R.string.volume_ringer_status_normal;
+                        break;
+                    case MODE_VIBRATE:
+                    case RINGER_MODE_VIBRATE:
+                        iconId = R.drawable.ic_volume_ringer_vibrate;
+                        textId = R.string.volume_ringer_status_vibrate;
+                        break;
+                    case MODE_SILENT:
+                    case RINGER_MODE_SILENT:
+                        iconId = R.drawable.ic_volume_ringer_mute;
+                        textId = R.string.volume_ringer_status_silent;
+                        break;
+                    case MODE_PRIORITY_ONLY:
+                        iconId = R.drawable.ic_qs_dnd_on;
+                        textId = R.string.volume_ringer_priority_only;
+                        break;
+                    case MODE_ALARMS_ONLY:
+                        iconId = R.drawable.ic_qs_dnd_on;
+                        textId = R.string.volume_ringer_alarms_only;
+                        break;
+                    case MODE_TOTAL_SILENCE:
+                        iconId = R.drawable.ic_qs_dnd_on;
+                        textId = R.string.volume_ringer_dnd;
+                        break;
+                    case MODE_FLASHLIGHT_ON:
+                        iconId = R.drawable.ic_tristate_flashlight;
+                        textId = R.string.tristate_flashlight_on;
+                        break;
+                    case MODE_FLASHLIGHT_OFF:
+                        iconId = R.drawable.ic_tristate_flashlight_off;
+                        textId = R.string.tristate_flashlight_off;
+                        break;
+                    case MODE_FLASHLIGHT_BLINK:
+                        iconId = R.drawable.ic_tristate_flashlight;
+                        textId = R.string.tristate_flashlight_blink;
+                        break;
+                    case MODE_BRIGHTNESS_BRIGHT:
+                        iconId = R.drawable.ic_tristate_brightness_bright;
+                        textId = R.string.tristate_brightness_bright;
+                        break;
+                    case MODE_BRIGHTNESS_DARK:
+                        iconId = R.drawable.ic_tristate_brightness_dark;
+                        textId = R.string.tristate_brightness_dark;
+                        break;
+                    case MODE_BRIGHTNESS_AUTO:
+                        iconId = R.drawable.ic_tristate_brightness_auto;
+                        textId = R.string.tristate_brightness_auto;
+                        break;
+                    case MODE_ROTATION_AUTO:
+                        iconId = R.drawable.ic_tristate_rotate_auto;
+                        textId = R.string.tristate_rotation_auto;
+                        break;
+                    case MODE_ROTATION_0:
+                        iconId = R.drawable.ic_tristate_rotate_portrait;
+                        textId = R.string.tristate_rotation_0;
+                        break;
+                    case MODE_ROTATION_90:
+                        iconId = R.drawable.ic_tristate_rotate_landscape;
+                        textId = R.string.tristate_rotation_90;
+                        break;
+                    case MODE_ROTATION_270:
+                        iconId = R.drawable.ic_tristate_rotate_landscape;
+                        textId = R.string.tristate_rotation_270;
+                        break;
+                }
+
+                int triStatePos = res.getInteger(R.integer.config_alertSliderLocation);
+                boolean isTsKeyRight = true;
+                if (triStatePos == TRI_STATE_UI_POSITION_LEFT) {
+                    isTsKeyRight = false;
+                } else if (triStatePos == TRI_STATE_UI_POSITION_RIGHT) {
+                    isTsKeyRight = true;
+                }
+                switch (mOrientationType) {
+                    case ROTATION_90:
+                        if (isTsKeyRight) {
+                            gravity = 51;
+                        } else {
+                            gravity = 83;
+                        }
+                        positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep_land);
+                        if (isTsKeyRight) {
+                            positionY2 += res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                        }
+                        if (mPosition == POSITION_TOP) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                        } else if (mPosition == POSITION_MIDDLE) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                        } else if (mPosition == POSITION_BOTTOM) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_SILENT) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_VIBRATE) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_NORMAL) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                        }
+                        bg = R.drawable.dialog_tri_state_middle_bg;
+                        break;
+                    case ROTATION_180:
+                        if (isTsKeyRight) {
+                            gravity = 83;
+                        } else {
+                            gravity = 85;
+                        }
+                        positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep);
+                        positionY = res.getDimensionPixelSize(R.dimen.status_bar_height);
+                        if (mPosition == POSITION_TOP) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position);
+                            bg = !isTsKeyRight ? R.drawable.right_dialog_tri_state_down_bg : R.drawable.left_dialog_tri_state_down_bg;
+                        } else if (mPosition == POSITION_MIDDLE) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position);
+                            bg = R.drawable.dialog_tri_state_middle_bg;
+                        } else if (mPosition == POSITION_BOTTOM) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position);
+                            bg = !isTsKeyRight ? R.drawable.right_dialog_tri_state_up_bg : R.drawable.left_dialog_tri_state_up_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_SILENT) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position);
+                            bg = !isTsKeyRight ? R.drawable.right_dialog_tri_state_down_bg : R.drawable.left_dialog_tri_state_down_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_VIBRATE) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position);
+                            bg = R.drawable.dialog_tri_state_middle_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_NORMAL) {
+                            positionY += res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position);
+                            bg = !isTsKeyRight ? R.drawable.right_dialog_tri_state_up_bg : R.drawable.left_dialog_tri_state_up_bg;
+                        }
+                        positionY2 = positionY;
+                        break;
+                    case ROTATION_270:
+                        if (isTsKeyRight) {
+                            gravity = 85;
+                        } else {
+                            gravity = 53;
+                        }
+                        positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep_land);
+                        if (!isTsKeyRight) {
+                            positionY2 += res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                        }
+                        if (mPosition == POSITION_TOP) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                        } else if (mPosition == POSITION_MIDDLE) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                        } else if (mPosition == POSITION_BOTTOM) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_SILENT) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_VIBRATE) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_NORMAL) {
+                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                        }
+                        bg = R.drawable.dialog_tri_state_middle_bg;
+                        break;
+                    default:
+                        if (isTsKeyRight) {
+                            gravity = 53;
+                        } else {
+                            gravity = 51;
+                        }
+                        positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep);
+                        if (mPosition == POSITION_TOP) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position);
+                            bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_up_bg : R.drawable.left_dialog_tri_state_up_bg;
+                        } else if (mPosition == POSITION_MIDDLE) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position);
+                            bg = R.drawable.dialog_tri_state_middle_bg;
+                        } else if (mPosition == POSITION_BOTTOM) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position);
+                            bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_down_bg : R.drawable.left_dialog_tri_state_down_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_SILENT) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position);
+                            bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_up_bg : R.drawable.left_dialog_tri_state_up_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_VIBRATE) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position);
+                            bg = R.drawable.dialog_tri_state_middle_bg;
+                        } else if (!mIntentActionSupported && mTriStateMode == RINGER_MODE_NORMAL) {
+                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position);
+                            bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_down_bg : R.drawable.left_dialog_tri_state_down_bg;
+                        }
+                        positionY2 += res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                        break;
+                }
+                if (mTriStateMode != -1) {
+                    if (mTriStateIcon != null && iconId != 0) {
+                        mTriStateIcon.setImageResource(iconId);
+                    }
+                    if (mTriStateText != null && textId != 0) {
+                        String inputText = res.getString(textId);
+                        if (inputText != null && mTriStateText.length() == inputText.length()) {
+                            StringBuilder sb = new StringBuilder();
+                            sb.append(inputText);
+                            sb.append(" ");
+                            inputText = sb.toString();
+                        }
+                        mTriStateText.setText(inputText);
+                    }
+                    if (mDialogView != null && bg != 0) {
+                        mDialogView.setBackgroundDrawable(res.getDrawable(bg));
+                        mBackgroundColor = getAttrColor(com.android.internal.R.attr.colorSurface);
+                        mDialogView.setBackgroundTintList(ColorStateList.valueOf(mBackgroundColor));
+                    }
+                    mDialogPosition = positionY2;
+                }
+
+                final float scaleFactor = DisplayUtils.getScaleFactor(mContext);
+
+                positionY = res.getDimensionPixelSize(R.dimen.tri_state_dialog_padding);
+                mWindowLayoutParams.gravity = gravity;
+                mWindowLayoutParams.y = (int) ((positionY2 - positionY) * scaleFactor);
+                mWindowLayoutParams.x = (int) ((positionX - positionY) * scaleFactor);
+                mWindow.setAttributes(mWindowLayoutParams);
+                mHandler.sendEmptyMessageDelayed(MSG_RESET_SCHEDULE, DIALOG_TIMEOUT);
+            }
+        }
+    }
+
+    private void handleShow() {
+        mHandler.removeMessages(MSG_DIALOG_SHOW);
+        if (!mShowing) {
+            registerOrientationListener(true);
+            checkOrientationType();
+            mShowing = true;
+            mDialog.show();
+            if (mListener != null) {
+                mListener.onTriStateUserActivity();
+            }
+            mHandler.sendEmptyMessageDelayed(MSG_RESET_SCHEDULE, DIALOG_TIMEOUT);
+        }
+    }
+
+    private void handleDismiss() {
+        mHandler.removeMessages(MSG_DIALOG_DISMISS);
+        if (mShowing) {
+            registerOrientationListener(false);
+            mShowing = false;
+            mDialog.dismiss();
+        }
+    }
+
+    private void handleStateChanged() {
+        mHandler.removeMessages(MSG_STATE_CHANGE);
+        if (mIntentActionSupported && mPositionValue != mTriStateMode) {
+            mTriStateMode = mPositionValue;
+            updateTriStateLayout();
+            if (mListener != null) {
+                mListener.onTriStateUserActivity();
+            }
+        } else if (!mIntentActionSupported) {
+            AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            int ringerMode = am.getRingerModeInternal();
+            if (ringerMode != mTriStateMode) {
+                mTriStateMode = ringerMode;
+                updateTriStateLayout();
+                if (mListener != null) {
+                    mListener.onTriStateUserActivity();
+                }
+            }
+        }
+    }
+
+    public void handleResetTimeout() {
+        mHandler.removeMessages(MSG_RESET_SCHEDULE);
+        mHandler.sendEmptyMessage(MSG_DIALOG_DISMISS);
+        if (mListener != null) {
+            mListener.onTriStateUserActivity();
+        }
+    }
+
+    @Override
+    public void onDensityOrFontScaleChanged() {
+        mHandler.sendEmptyMessage(MSG_DIALOG_DISMISS);
+        initDialog();
+        updateTriStateLayout();
+    }
+
+    public int getAttrColor(int attr) {
+        TypedArray ta = mContext.obtainStyledAttributes(new int[]{attr});
+        int colorAccent = ta.getColor(0, 0);
+        ta.recycle();
+        return colorAccent;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java
deleted file mode 100644
index e94d8ea2dd078..0000000000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2016 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. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package com.android.systemui.tuner;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.ArraySet;
-import android.util.AttributeSet;
-
-import androidx.preference.DropDownPreference;
-
-import com.android.systemui.Dependency;
-import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
-import com.android.systemui.statusbar.policy.Clock;
-
-public class ClockPreference extends DropDownPreference implements TunerService.Tunable {
-
-    private static final String SECONDS = "seconds";
-    private static final String DEFAULT = "default";
-    private static final String DISABLED = "disabled";
-
-    private final String mClock;
-    private boolean mClockEnabled;
-    private boolean mHasSeconds;
-    private ArraySet<String> mHideList;
-    private boolean mHasSetValue;
-    private boolean mReceivedSeconds;
-    private boolean mReceivedClock;
-
-    public ClockPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mClock = context.getString(com.android.internal.R.string.status_bar_clock);
-        setEntryValues(new CharSequence[] { SECONDS, DEFAULT, DISABLED });
-    }
-
-    @Override
-    public void onAttached() {
-        super.onAttached();
-        Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_HIDE_LIST,
-                Clock.CLOCK_SECONDS);
-    }
-
-    @Override
-    public void onDetached() {
-        Dependency.get(TunerService.class).removeTunable(this);
-        super.onDetached();
-    }
-
-    @Override
-    public void onTuningChanged(String key, String newValue) {
-        if (StatusBarIconController.ICON_HIDE_LIST.equals(key)) {
-            mReceivedClock = true;
-            mHideList = StatusBarIconController.getIconHideList(getContext(), newValue);
-            mClockEnabled = !mHideList.contains(mClock);
-        } else if (Clock.CLOCK_SECONDS.equals(key)) {
-            mReceivedSeconds = true;
-            mHasSeconds = newValue != null && Integer.parseInt(newValue) != 0;
-        }
-        if (!mHasSetValue && mReceivedClock && mReceivedSeconds) {
-            // Because of the complicated tri-state it can end up looping and setting state back to
-            // what the user didn't choose.  To avoid this, just set the state once and rely on the
-            // preference to handle updates.
-            mHasSetValue = true;
-            if (mClockEnabled && mHasSeconds) {
-                setValue(SECONDS);
-            } else if (mClockEnabled) {
-                setValue(DEFAULT);
-            } else {
-                setValue(DISABLED);
-            }
-        }
-    }
-
-    @Override
-    protected boolean persistString(String value) {
-        Dependency.get(TunerService.class).setValue(Clock.CLOCK_SECONDS, SECONDS.equals(value) ? 1
-                : 0);
-        if (DISABLED.equals(value)) {
-            mHideList.add(mClock);
-        } else {
-            mHideList.remove(mClock);
-        }
-        Dependency.get(TunerService.class).setValue(StatusBarIconController.ICON_HIDE_LIST,
-                TextUtils.join(",", mHideList));
-        return true;
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java
index 913d6cf3c800a..cbdca0a32d6ed 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java
@@ -18,10 +18,13 @@
 import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.preference.SwitchPreferenceCompat;
 
 import com.android.internal.logging.MetricsLogger;
@@ -37,13 +40,14 @@ public class StatusBarSwitch extends SwitchPreferenceCompat implements Tunable {
     private Set<String> mHideList;
 
     public StatusBarSwitch(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        super(context, attrs, androidx.preference.R.attr.switchPreferenceCompatStyle);
     }
 
     @Override
     public void onAttached() {
         super.onAttached();
         Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_HIDE_LIST);
+        setupTheme();
     }
 
     @Override
@@ -80,6 +84,18 @@ protected boolean persistBoolean(boolean value) {
         return true;
     }
 
+    private void setupTheme() {
+        Drawable icon = getIcon();
+        if (icon != null) {
+            TypedArray a = getContext().obtainStyledAttributes(new int[]{android.R.attr.textColorPrimary});
+            int color = a.getColor(0, 0);
+            a.recycle();
+            Drawable wrappedIcon = DrawableCompat.wrap(icon);
+            DrawableCompat.setTint(wrappedIcon, color);
+            setIcon(wrappedIcon);
+        }
+    }
+
     private void setList(Set<String> hideList) {
         ContentResolver contentResolver = getContext().getContentResolver();
         Settings.Secure.putStringForUser(contentResolver, StatusBarIconController.ICON_HIDE_LIST,
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java
index ee4dc9ea52c59..653ee56270a71 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarTuner.java
@@ -15,9 +15,14 @@
  */
 package com.android.systemui.tuner;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.os.Vibrator;
+import android.telephony.TelephonyManager;
 
 import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -31,6 +36,49 @@ public class StatusBarTuner extends SettingsBasePreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.status_bar_prefs, rootKey);
+        if (!isVoiceCapable(requireContext())) {
+            removeMobilePreferences();
+        }
+        if (!hasVibrator(requireContext())) {
+            Preference pref = findPreference("volume");
+            if (pref != null) {
+                getPreferenceScreen().removePreference(pref);
+            }
+        }
+    }
+
+    private static boolean isVoiceCapable(Context context) {
+        TelephonyManager telephony =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return telephony != null && telephony.isVoiceCapable();
+    }
+
+    private static boolean hasVibrator(Context context) {
+        Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+        if (vibrator == null || !vibrator.hasVibrator()) {
+            return false;
+        }
+        return true;
+    }
+
+    private void removeMobilePreferences() {
+        String[] mobileKeys = new String[] {
+                "mobile",
+                "system:data_disabled_icon",
+                "call_strength",
+                "roaming",
+                "system:show_fourg_icon",
+                "status_bar_show_hd_calling",
+                "status_bar_show_vowifi"
+        };
+
+        PreferenceScreen screen = getPreferenceScreen();
+        for (String key : mobileKeys) {
+            Preference pref = findPreference(key);
+            if (pref != null) {
+                screen.removePreference(pref);
+            }
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
index a501e87902a8e..b3bd5206cd8ec 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
@@ -20,11 +20,6 @@
 
 import com.android.systemui.Dependency;
 
-/**
- * @deprecated Don't use this class to listen to Secure Settings. Use {@code SecureSettings} instead
- * or {@code SettingsObserver} to be able to specify the handler.
- */
-@Deprecated
 public abstract class TunerService {
 
     public static final String ACTION_CLEAR = "com.android.systemui.action.CLEAR_TUNER";
@@ -80,4 +75,12 @@ public static boolean parseIntegerSwitch(String value, boolean defaultValue) {
             return defaultValue;
         }
     }
+
+    public static int parseInteger(String value, int defaultValue) {
+        try {
+            return value != null ? Integer.parseInt(value) : defaultValue;
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java
index 4bc5581c48693..2230d9cb11705 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java
@@ -27,6 +27,7 @@
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.Looper;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
@@ -46,22 +47,22 @@
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.phone.SystemUIDialog;
 import com.android.systemui.statusbar.phone.ui.StatusBarIconController;
+import com.android.systemui.statusbar.policy.Clock;
 import com.android.systemui.util.leak.LeakDetector;
 
 import dagger.Lazy;
 
+import lineageos.providers.LineageSettings;
+
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 import javax.inject.Inject;
 
 /**
- * @deprecated Don't use this class to listen to Secure Settings. Use {@code SecureSettings} instead
- * or {@code SettingsObserver} to be able to specify the handler.
- * This class will interact with SecureSettings using the main looper.
  */
-@Deprecated
 @SysUISingleton
 public class TunerServiceImpl extends TunerService {
 
@@ -73,6 +74,11 @@ public class TunerServiceImpl extends TunerService {
     // Things that use the tunable infrastructure but are now real user settings and
     // shouldn't be reset with tuner settings.
     private static final String[] RESET_EXCEPTION_LIST = new String[] {
+            Clock.STATUS_BAR_CLOCK_SECONDS,
+            Clock.STATUS_BAR_CLOCK_DATE_DISPLAY,
+            Clock.STATUS_BAR_CLOCK_DATE_STYLE,
+            Clock.STATUS_BAR_CLOCK_DATE_POSITION,
+            Clock.STATUS_BAR_CLOCK_DATE_FORMAT,
             QSHost.TILES_SETTING,
             Settings.Secure.DOUBLE_TAP_TO_WAKE,
             Settings.Secure.DOZE_ALWAYS_ON,
@@ -170,31 +176,138 @@ private void upgradeTuner(int oldVersion, int newVersion, Handler mainHandler) {
         setValue(TUNER_VERSION, newVersion);
     }
 
+    private boolean isLineageSetting(String key) {
+        return isLineageGlobal(key) || isLineageSystem(key) || isLineageSecure(key);
+    }
+
+    private boolean isLineageGlobal(String key) {
+        return key.startsWith("lineageglobal:");
+    }
+
+    private boolean isLineageSystem(String key) {
+        return key.startsWith("lineagesystem:");
+    }
+
+    private boolean isLineageSecure(String key) {
+        return key.startsWith("lineagesecure:");
+    }
+
+    private boolean isSystem(String key) {
+        return key.startsWith("system:");
+    }
+
+    private boolean isGlobal(String key) {
+        return key.startsWith("global:");
+    }
+
+    private String chomp(String key) {
+        return key.replaceFirst("^(lineageglobal|lineagesecure|lineagesystem|system|global):", "");
+    }
+
     @Override
     public String getValue(String setting) {
-        return Settings.Secure.getStringForUser(mContentResolver, setting, mCurrentUser);
+        if (isLineageGlobal(setting)) {
+            return LineageSettings.Global.getString(mContentResolver, chomp(setting));
+        } else if (isLineageSecure(setting)) {
+            return LineageSettings.Secure.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isLineageSystem(setting)) {
+            return LineageSettings.System.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isSystem(setting)) {
+            return Settings.System.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isGlobal(setting)) {
+            return Settings.Global.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else {
+            return Settings.Secure.getStringForUser(mContentResolver, setting, mCurrentUser);
+        }
     }
 
     @Override
     public void setValue(String setting, String value) {
-         Settings.Secure.putStringForUser(mContentResolver, setting, value, mCurrentUser);
+        if (isLineageGlobal(setting)) {
+            LineageSettings.Global.putString(mContentResolver, chomp(setting), value);
+        } else if (isLineageSecure(setting)) {
+            LineageSettings.Secure.putStringForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isLineageSystem(setting)) {
+            LineageSettings.System.putStringForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isSystem(setting)) {
+            Settings.System.putStringForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isGlobal(setting)) {
+            Settings.Global.putStringForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else {
+            Settings.Secure.putStringForUser(mContentResolver, setting, value, mCurrentUser);
+        }
     }
 
     @Override
     public int getValue(String setting, int def) {
-        return Settings.Secure.getIntForUser(mContentResolver, setting, def, mCurrentUser);
+        if (isLineageGlobal(setting)) {
+            return LineageSettings.Global.getInt(mContentResolver, chomp(setting), def);
+        } else if (isLineageSecure(setting)) {
+            return LineageSettings.Secure.getIntForUser(
+                    mContentResolver, chomp(setting), def, mCurrentUser);
+        } else if (isLineageSystem(setting)) {
+            return LineageSettings.System.getIntForUser(
+                    mContentResolver, chomp(setting), def, mCurrentUser);
+        } else if (isSystem(setting)) {
+            return Settings.System.getIntForUser(
+                    mContentResolver, chomp(setting), def, mCurrentUser);
+        } else if (isGlobal(setting)) {
+            return Settings.Global.getInt(
+                    mContentResolver, chomp(setting), def);
+        } else {
+            return Settings.Secure.getIntForUser(mContentResolver, setting, def, mCurrentUser);
+        }
     }
 
     @Override
     public String getValue(String setting, String def) {
-        String ret = Secure.getStringForUser(mContentResolver, setting, mCurrentUser);
+        String ret;
+        if (isLineageGlobal(setting)) {
+            ret = LineageSettings.Global.getString(mContentResolver, chomp(setting));
+        } else if (isLineageSecure(setting)) {
+            ret = LineageSettings.Secure.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isLineageSystem(setting)) {
+            ret = LineageSettings.System.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isSystem(setting)) {
+            ret = Settings.System.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else if (isGlobal(setting)) {
+            ret = Settings.Global.getStringForUser(
+                    mContentResolver, chomp(setting), mCurrentUser);
+        } else {
+            ret = Secure.getStringForUser(mContentResolver, setting, mCurrentUser);
+        }
         if (ret == null) return def;
         return ret;
     }
 
     @Override
     public void setValue(String setting, int value) {
-         Settings.Secure.putIntForUser(mContentResolver, setting, value, mCurrentUser);
+        if (isLineageGlobal(setting)) {
+            LineageSettings.Global.putInt(mContentResolver, chomp(setting), value);
+        } else if (isLineageSecure(setting)) {
+            LineageSettings.Secure.putIntForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isLineageSystem(setting)) {
+            LineageSettings.System.putIntForUser(
+                    mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isSystem(setting)) {
+            Settings.System.putIntForUser(mContentResolver, chomp(setting), value, mCurrentUser);
+        } else if (isGlobal(setting)) {
+            Settings.Global.putInt(mContentResolver, chomp(setting), value);
+        } else {
+            Settings.Secure.putIntForUser(mContentResolver, setting, value, mCurrentUser);
+        }
     }
 
     @Override
@@ -206,21 +319,34 @@ public void addTunable(Tunable tunable, String... keys) {
 
     private void addTunable(Tunable tunable, String key) {
         if (!mTunableLookup.containsKey(key)) {
-            mTunableLookup.put(key, new ArraySet<Tunable>());
+            mTunableLookup.put(key, new CopyOnWriteArraySet<Tunable>());
         }
         mTunableLookup.get(key).add(tunable);
         if (LeakDetector.ENABLED) {
             mTunables.add(tunable);
             mLeakDetector.trackCollection(mTunables, "TunerService.mTunables");
         }
-        Uri uri = Settings.Secure.getUriFor(key);
+        final Uri uri;
+        if (isLineageGlobal(key)) {
+            uri = LineageSettings.Global.getUriFor(chomp(key));
+        } else if (isLineageSecure(key)) {
+            uri = LineageSettings.Secure.getUriFor(chomp(key));
+        } else if (isLineageSystem(key)) {
+            uri = LineageSettings.System.getUriFor(chomp(key));
+        } else if (isSystem(key)) {
+            uri = Settings.System.getUriFor(chomp(key));
+        } else if (isGlobal(key)) {
+            uri = Settings.Global.getUriFor(chomp(key));
+        } else {
+            uri = Settings.Secure.getUriFor(key);
+        }
         if (!mListeningUris.containsKey(uri)) {
             mListeningUris.put(uri, key);
-            mContentResolver.registerContentObserver(uri, false, mObserver, mCurrentUser);
+            mContentResolver.registerContentObserver(uri, false, mObserver,
+                    isLineageGlobal(key) ? UserHandle.USER_ALL : mCurrentUser);
         }
         // Send the first state.
-        String value = DejankUtils.whitelistIpcs(() -> Settings.Secure
-                .getStringForUser(mContentResolver, key, mCurrentUser));
+        String value = DejankUtils.whitelistIpcs(() -> getValue(key));
         tunable.onTuningChanged(key, value);
     }
 
@@ -240,7 +366,9 @@ protected void reregisterAll() {
         }
         mContentResolver.unregisterContentObserver(mObserver);
         for (Uri uri : mListeningUris.keySet()) {
-            mContentResolver.registerContentObserver(uri, false, mObserver, mCurrentUser);
+            String key = mListeningUris.get(uri);
+            mContentResolver.registerContentObserver(uri, false, mObserver,
+                    isLineageGlobal(key) ? UserHandle.USER_ALL : mCurrentUser);
         }
     }
 
@@ -250,18 +378,21 @@ private void reloadSetting(Uri uri) {
         if (tunables == null) {
             return;
         }
-        String value = Settings.Secure.getStringForUser(mContentResolver, key, mCurrentUser);
+        String value = getValue(key);
         for (Tunable tunable : tunables) {
-            tunable.onTuningChanged(key, value);
+            if (tunable != null) {
+                tunable.onTuningChanged(key, value);
+            }
         }
     }
 
     private void reloadAll() {
         for (String key : mTunableLookup.keySet()) {
-            String value = Settings.Secure.getStringForUser(mContentResolver, key,
-                    mCurrentUser);
+            String value = getValue(key);
             for (Tunable tunable : mTunableLookup.get(key)) {
-                tunable.onTuningChanged(key, value);
+                if (tunable != null) {
+                    tunable.onTuningChanged(key, value);
+                }
             }
         }
     }
@@ -278,10 +409,10 @@ public void clearAllFromUser(int user) {
 
         // A couple special cases.
         for (String key : mTunableLookup.keySet()) {
-            if (ArrayUtils.contains(RESET_EXCEPTION_LIST, key)) {
+            if (ArrayUtils.contains(RESET_EXCEPTION_LIST, key) || isLineageSetting(key)) {
                 continue;
             }
-            Settings.Secure.putStringForUser(mContentResolver, key, null, user);
+            setValue(key, null);
         }
     }
 
@@ -334,8 +465,9 @@ public Observer() {
         @Override
         public void onChange(boolean selfChange, java.util.Collection<Uri> uris,
                 int flags, int userId) {
-            if (userId == mUserTracker.getUserId()) {
-                for (Uri u : uris) {
+            for (Uri u : uris) {
+                String key = mListeningUris.get(u);
+                if (userId == mUserTracker.getUserId() || isLineageGlobal(key)) {
                     reloadSetting(u);
                 }
             }
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java
index 97ac97a23a273..0af5f5b35877e 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java
@@ -18,7 +18,7 @@ public class TunerSwitch extends SwitchPreferenceCompat implements Tunable {
     private final int mAction;
 
     public TunerSwitch(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        super(context, attrs, androidx.preference.R.attr.switchPreferenceCompatStyle);
 
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TunerSwitch);
         mDefault = a.getBoolean(R.styleable.TunerSwitch_defValue, false);
@@ -53,8 +53,9 @@ protected void onClick() {
 
     @Override
     protected boolean persistBoolean(boolean value) {
+        TunerService tunerService = Dependency.get(TunerService.class);
         for (String key : getKey().split(",")) {
-            Settings.Secure.putString(getContext().getContentResolver(), key, value ? "1" : "0");
+            tunerService.setValue(key, value ? "1" : "0");
         }
         return true;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbFunctionActivity.kt b/packages/SystemUI/src/com/android/systemui/usb/UsbFunctionActivity.kt
new file mode 100644
index 0000000000000..6618275a5f18d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbFunctionActivity.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.usb
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.util.Log
+import com.android.internal.app.AlertActivity
+import com.android.systemui.broadcast.BroadcastDispatcher
+import javax.inject.Inject
+
+class UsbFunctionActivity @Inject constructor(
+    @Suppress("UNUSED_PARAMETER") broadcastDispatcher: BroadcastDispatcher,
+) : AlertActivity(), DialogInterface.OnClickListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.d(TAG, "onCreate: deferring to UsbModePickerDialogDelegate, finishing immediately.")
+        super.onCreate(savedInstanceState)
+        finish()
+    }
+
+    override fun onClick(dialog: DialogInterface, which: Int) {
+    }
+
+    private companion object {
+        const val TAG = "UsbFunctionActivity"
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerContent.kt b/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerContent.kt
new file mode 100644
index 0000000000000..9f236ee014bb4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerContent.kt
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.usb
+
+import androidx.annotation.StringRes
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.android.systemui.res.R
+
+data class UsbModeItem(
+    val function: Long,
+    @StringRes val labelResId: Int,
+    val icon: ImageVector,
+    val selected: Boolean,
+)
+
+@Composable
+fun UsbModePickerContent(
+    modes: List<UsbModeItem>,
+    statusText: String,
+    onModeSelected: (Long) -> Unit,
+    onSettingsClick: () -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val isDark = isSystemInDarkTheme()
+
+    val glassBackground = if (isDark) {
+        Color(0xFF1C1B1F).copy(alpha = 0.82f)
+    } else {
+        Color.White.copy(alpha = 0.78f)
+    }
+
+    val glassBorder = if (isDark) {
+        Color.White.copy(alpha = 0.10f)
+    } else {
+        Color.White.copy(alpha = 0.65f)
+    }
+
+    val sheetShape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp)
+
+    Surface(
+        modifier = Modifier
+            .fillMaxWidth()
+            .border(width = 1.dp, color = glassBorder, shape = sheetShape),
+        shape = sheetShape,
+        color = glassBackground,
+        tonalElevation = 0.dp,
+    ) {
+        Column(modifier = Modifier.fillMaxWidth()) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 24.dp, end = 4.dp, top = 20.dp, bottom = 4.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = stringResource(R.string.usb_mode_picker_title),
+                    style = MaterialTheme.typography.titleLarge,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.weight(1f),
+                )
+                IconButton(onClick = onSettingsClick) {
+                    Icon(
+                        imageVector = Icons.Outlined.Settings,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+                IconButton(onClick = onDismiss) {
+                    Icon(
+                        imageVector = Icons.Outlined.Close,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+
+            val listState = rememberLazyListState()
+            val scrollbarColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f)
+
+            LazyColumn(
+                state = listState,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .heightIn(max = MAX_LIST_HEIGHT)
+                    .drawScrollbar(listState, scrollbarColor, modes.size),
+            ) {
+                items(modes, key = { it.function }) { mode ->
+                    UsbModeRow(mode, onModeSelected)
+                }
+            }
+
+            HorizontalDivider(
+                modifier = Modifier.padding(top = 4.dp),
+                color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f),
+            )
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 14.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Bolt,
+                    contentDescription = null,
+                    modifier = Modifier.size(18.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+                Text(
+                    text = statusText,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.padding(start = 6.dp),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun UsbModeRow(mode: UsbModeItem, onModeSelected: (Long) -> Unit) {
+    val containerColor by animateColorAsState(
+        targetValue = if (mode.selected) {
+            MaterialTheme.colorScheme.primary
+        } else {
+            MaterialTheme.colorScheme.secondaryContainer
+        },
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "iconBg",
+    )
+    val iconTint by animateColorAsState(
+        targetValue = if (mode.selected) {
+            MaterialTheme.colorScheme.onPrimary
+        } else {
+            MaterialTheme.colorScheme.onSecondaryContainer
+        },
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "iconTint",
+    )
+    val rowBackground by animateColorAsState(
+        targetValue = if (mode.selected) {
+            MaterialTheme.colorScheme.primary.copy(alpha = 0.10f)
+        } else {
+            Color.Transparent
+        },
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "rowBg",
+    )
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(rowBackground)
+            .clickable { onModeSelected(mode.function) }
+            .padding(horizontal = 24.dp, vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier = Modifier
+                .size(40.dp)
+                .clip(CircleShape)
+                .background(containerColor),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                imageVector = mode.icon,
+                contentDescription = null,
+                modifier = Modifier.size(22.dp),
+                tint = iconTint,
+            )
+        }
+        Text(
+            text = stringResource(mode.labelResId),
+            style = MaterialTheme.typography.bodyLarge,
+            color = if (mode.selected) {
+                MaterialTheme.colorScheme.primary
+            } else {
+                MaterialTheme.colorScheme.onSurface
+            },
+            modifier = Modifier.padding(start = 16.dp),
+        )
+    }
+}
+
+private fun Modifier.drawScrollbar(
+    listState: androidx.compose.foundation.lazy.LazyListState,
+    color: androidx.compose.ui.graphics.Color,
+    totalItems: Int,
+): Modifier = drawWithContent {
+    drawContent()
+    if (totalItems <= MAX_VISIBLE_ITEMS) return@drawWithContent
+
+    val visibleFraction = listState.layoutInfo.visibleItemsInfo.size.toFloat() / totalItems
+    val thumbHeight = (size.height * visibleFraction).coerceAtLeast(SCROLLBAR_MIN_HEIGHT_PX)
+    val scrollRange = size.height - thumbHeight
+    val firstVisible = listState.firstVisibleItemIndex
+    val scrollOffset = listState.firstVisibleItemScrollOffset
+    val maxScroll = totalItems - listState.layoutInfo.visibleItemsInfo.size
+    val scrollFraction = if (maxScroll > 0) {
+        (firstVisible.toFloat() + scrollOffset.toFloat() /
+            (listState.layoutInfo.visibleItemsInfo.firstOrNull()?.size ?: 1)) / maxScroll
+    } else 0f
+    val thumbOffset = scrollRange * scrollFraction.coerceIn(0f, 1f)
+
+    drawRoundRect(
+        color = color,
+        topLeft = Offset(size.width - SCROLLBAR_WIDTH_PX, thumbOffset),
+        size = Size(SCROLLBAR_WIDTH_PX, thumbHeight),
+        cornerRadius = CornerRadius(SCROLLBAR_WIDTH_PX / 2f),
+    )
+}
+
+private const val MAX_VISIBLE_ITEMS = 4
+private val MAX_LIST_HEIGHT = 240.dp
+private const val SCROLLBAR_WIDTH_PX = 8f
+private const val SCROLLBAR_MIN_HEIGHT_PX = 40f
+
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerDialogDelegate.kt
new file mode 100644
index 0000000000000..b66d82bccbafb
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbModePickerDialogDelegate.kt
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.usb
+
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.graphics.drawable.ColorDrawable
+import android.hardware.usb.UsbManager
+import android.net.TetheringManager
+import android.os.Build
+import android.os.Handler
+import android.os.HandlerExecutor
+import android.os.UserHandle
+import android.os.UserManager
+import android.view.WindowManager
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.icons.outlined.CameraAlt
+import androidx.compose.material.icons.outlined.MusicNote
+import androidx.compose.material.icons.outlined.SwapVert
+import androidx.compose.material.icons.outlined.Usb
+import androidx.compose.material.icons.outlined.Videocam
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.android.compose.theme.PlatformTheme
+import com.android.systemui.CoreStartable
+import com.android.systemui.broadcast.BroadcastDispatcher
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.plugins.ActivityStarter
+import com.android.systemui.res.R
+import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor
+import com.android.systemui.statusbar.phone.ComponentSystemUIDialog
+import com.android.systemui.statusbar.phone.SystemUIDialog
+import com.android.systemui.statusbar.phone.SystemUIDialogFactory
+import com.android.systemui.statusbar.phone.createBottomSheet
+import com.android.systemui.statusbar.policy.KeyguardStateController
+import java.io.PrintWriter
+import javax.inject.Inject
+
+@SysUISingleton
+class UsbModePickerDialogDelegate @Inject constructor(
+    private val context: Context,
+    private val sysuiDialogFactory: SystemUIDialogFactory,
+    private val shadeDialogContextInteractor: ShadeDialogContextInteractor,
+    private val broadcastDispatcher: BroadcastDispatcher,
+    private val userManager: UserManager,
+    private val keyguardStateController: KeyguardStateController,
+    private val activityStarter: ActivityStarter,
+    @Main private val mainHandler: Handler,
+) : CoreStartable {
+
+    private var currentDialog: ComponentSystemUIDialog? = null
+    private var shownForCurrentSession = false
+    private var pendingShow = false
+
+    private val usbManager: UsbManager =
+        context.getSystemService(UsbManager::class.java)!!
+    private val tetheringManager: TetheringManager =
+        context.getSystemService(TetheringManager::class.java)!!
+    private val midiSupported = context.packageManager
+        .hasSystemFeature(PackageManager.FEATURE_MIDI)
+    private val tetheringSupported = tetheringManager.isTetheringSupported
+    private val isAdminUser = userManager.isAdminUser
+    private val fileTransferRestricted = userManager.hasBaseUserRestriction(
+        UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.of(UserHandle.myUserId()),
+    )
+    private val tetheringRestricted = userManager.hasBaseUserRestriction(
+        UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.of(UserHandle.myUserId()),
+    )
+
+    private val keyguardCallback = object : KeyguardStateController.Callback {
+        override fun onUnlockedChanged() {
+            if (keyguardStateController.isUnlocked && pendingShow) {
+                pendingShow = false
+                mainHandler.postDelayed({ showDialog() }, UNLOCK_SHOW_DELAY_MS)
+            }
+        }
+    }
+
+    override fun start() {
+        keyguardStateController.addCallback(keyguardCallback)
+
+        broadcastDispatcher.registerReceiver(
+            object : BroadcastReceiver() {
+                override fun onReceive(ctx: Context, intent: Intent) {
+                    val connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false)
+                    if (connected) {
+                        if (!shownForCurrentSession) {
+                            shownForCurrentSession = true
+                            if (keyguardStateController.isUnlocked) {
+                                showDialog()
+                            } else {
+                                pendingShow = true
+                            }
+                        }
+                    } else {
+                        shownForCurrentSession = false
+                        pendingShow = false
+                        dismissDialog()
+                    }
+                }
+            },
+            IntentFilter(UsbManager.ACTION_USB_STATE),
+        )
+    }
+
+    fun showDialog() {
+        currentDialog?.dismiss()
+
+        val defaultFunctions = usbManager.screenUnlockedFunctions
+        val modes = buildModeList(defaultFunctions)
+        if (modes.isEmpty()) return
+
+        val statusText = resolveStatusText(modes)
+
+        currentDialog = sysuiDialogFactory.createBottomSheet(
+            context = shadeDialogContextInteractor.context,
+            content = { dialog ->
+                UsbModePickerBottomSheet(dialog, modes, statusText)
+            },
+        )
+
+        currentDialog?.show()
+
+        currentDialog?.window?.let { window ->
+            window.setBackgroundDrawable(ColorDrawable(android.graphics.Color.TRANSPARENT))
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                window.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND)
+                val lp = window.attributes
+                lp.blurBehindRadius = 20
+                window.attributes = lp
+            }
+        }
+    }
+
+    @Composable
+    private fun UsbModePickerBottomSheet(
+        dialog: SystemUIDialog,
+        initialModes: List<UsbModeItem>,
+        statusText: String,
+    ) {
+        val isCurrentlyInDarkTheme = isSystemInDarkTheme()
+        val cachedDarkTheme = remember { isCurrentlyInDarkTheme }
+
+        PlatformTheme(isDarkTheme = cachedDarkTheme) {
+            UsbModePickerContent(
+                modes = initialModes,
+                statusText = statusText,
+                onModeSelected = { function ->
+                    onModeSelected(function)
+                    dialog.dismiss()
+                },
+                onSettingsClick = {
+                    dialog.dismiss()
+                    openUsbSettings()
+                },
+                onDismiss = { dialog.dismiss() },
+            )
+        }
+    }
+
+    private fun resolveStatusText(modes: List<UsbModeItem>): String {
+        val selected = modes.firstOrNull { it.selected }
+        return if (selected != null && selected.function != UsbManager.FUNCTION_NONE) {
+            context.getString(selected.labelResId)
+        } else {
+            context.getString(R.string.usb_charging_status)
+        }
+    }
+
+    private fun openUsbSettings() {
+        val intent = Intent.makeRestartActivityTask(
+            ComponentName(
+                "com.android.settings",
+                "com.android.settings.Settings\$UsbDetailsActivity",
+            ),
+        )
+        activityStarter.startActivity(intent, true)
+    }
+
+    private fun onModeSelected(function: Long) {
+        val previousFunction = usbManager.screenUnlockedFunctions
+        if (function == resolveDisplayFunction(previousFunction)) return
+
+        if (isAuthRequired(function)) {
+            if (keyguardStateController.isMethodSecure && !keyguardStateController.isUnlocked) {
+                activityStarter.postQSRunnableDismissingKeyguard {
+                    applyUsbFunction(function, previousFunction)
+                }
+                return
+            }
+        }
+        applyUsbFunction(function, previousFunction)
+    }
+
+    private fun applyUsbFunction(function: Long, previousFunction: Long) {
+        if (function == UsbManager.FUNCTION_RNDIS || function == UsbManager.FUNCTION_NCM) {
+            usbManager.screenUnlockedFunctions = function
+            tetheringManager.startTethering(
+                TetheringManager.TETHERING_USB,
+                HandlerExecutor(mainHandler),
+                object : TetheringManager.StartTetheringCallback {
+                    override fun onTetheringFailed(error: Int) {
+                        usbManager.screenUnlockedFunctions = previousFunction
+                        usbManager.currentFunctions = previousFunction
+                    }
+                },
+            )
+        } else {
+            usbManager.screenUnlockedFunctions = function
+            usbManager.currentFunctions = function
+        }
+    }
+
+    private fun buildModeList(currentFunctions: Long): List<UsbModeItem> {
+        val displayFunction = resolveDisplayFunction(currentFunctions)
+        return USB_MODES.filter { isFunctionSupported(it.function) }
+            .map { it.copy(selected = it.function == displayFunction) }
+    }
+
+    private fun resolveDisplayFunction(functions: Long): Long = when {
+        (functions and UsbManager.FUNCTION_ACCESSORY) != 0L -> UsbManager.FUNCTION_MTP
+        functions == UsbManager.FUNCTION_NCM -> UsbManager.FUNCTION_RNDIS
+        else -> functions
+    }
+
+    private fun isFunctionSupported(function: Long): Boolean {
+        if (!midiSupported && (function and UsbManager.FUNCTION_MIDI) != 0L) return false
+        if (!tetheringSupported && (function and UsbManager.FUNCTION_RNDIS) != 0L) return false
+        if (isDisallowedBySystem(function)) return false
+        if (!isAdminUser && (function and UsbManager.FUNCTION_RNDIS) != 0L) return false
+        return true
+    }
+
+    private fun isDisallowedBySystem(function: Long): Boolean {
+        if (fileTransferRestricted && ((function and UsbManager.FUNCTION_MTP) != 0L
+                    || (function and UsbManager.FUNCTION_PTP) != 0L)) return true
+        if (tetheringRestricted && (function and UsbManager.FUNCTION_RNDIS) != 0L) return true
+        if (!usbManager.isUvcGadgetSupportEnabled()
+            && (function and UsbManager.FUNCTION_UVC) != 0L) return true
+        return false
+    }
+
+    private fun isAuthRequired(function: Long): Boolean =
+        function != UsbManager.FUNCTION_UVC && function != UsbManager.FUNCTION_MIDI
+
+    private fun dismissDialog() {
+        currentDialog?.dismiss()
+        currentDialog = null
+    }
+
+    override fun dump(pw: PrintWriter, args: Array<out String>) {
+        pw.println("UsbModePickerDialogDelegate:")
+        pw.println("  dialogShowing=${currentDialog != null}")
+        pw.println("  pendingShow=$pendingShow")
+        pw.println("  shownForCurrentSession=$shownForCurrentSession")
+        pw.println("  currentFunctions=${usbManager.currentFunctions}")
+    }
+
+    companion object {
+        private const val UNLOCK_SHOW_DELAY_MS = 500L
+
+        private val USB_MODES = listOf(
+            UsbModeItem(UsbManager.FUNCTION_MTP, R.string.usb_mode_file_transfer, Icons.Outlined.SwapVert, false),
+            UsbModeItem(UsbManager.FUNCTION_RNDIS, R.string.usb_mode_tethering, Icons.Outlined.Usb, false),
+            UsbModeItem(UsbManager.FUNCTION_MIDI, R.string.usb_mode_midi, Icons.Outlined.MusicNote, false),
+            UsbModeItem(UsbManager.FUNCTION_PTP, R.string.usb_mode_photo_transfer, Icons.Outlined.CameraAlt, false),
+            UsbModeItem(UsbManager.FUNCTION_UVC, R.string.usb_mode_webcam, Icons.Outlined.Videocam, false),
+            UsbModeItem(UsbManager.FUNCTION_NONE, R.string.usb_mode_charging_only, Icons.Outlined.Bolt, false),
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/ArcProgressWidget.java b/packages/SystemUI/src/com/android/systemui/util/ArcProgressWidget.java
new file mode 100644
index 0000000000000..ed5485b6d5e07
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/ArcProgressWidget.java
@@ -0,0 +1,83 @@
+package com.android.systemui.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BlendMode;
+import android.graphics.BlendModeColorFilter;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import androidx.annotation.Nullable;
+
+public class ArcProgressWidget {
+    public static Bitmap generateBitmap(Context context, int percentage, String textInside, int textInsideSizePx, @Nullable String textBottom, int textBottomSizePx, @Nullable String tf) {
+        return generateBitmap(context, percentage, textInside, textInsideSizePx, null, 28, textBottom, textBottomSizePx, tf);
+    }
+
+    public static Bitmap generateBitmap(Context context, int percentage, String textInside, int textInsideSizePx, @Nullable Drawable iconDrawable, int iconSizePx, @Nullable String tf) {
+        return generateBitmap(context, percentage, textInside, textInsideSizePx, iconDrawable, iconSizePx, "Usage", 28, tf);
+    }
+
+    public static Bitmap generateBitmap(Context context, 
+            int percentage, 
+            String textInside, 
+            int textInsideSizePx, 
+            @Nullable Drawable iconDrawable, 
+            int iconSizePx, 
+            @Nullable String textBottom, 
+            int textBottomSizePx, 
+            @Nullable String tf) {
+        int width = 400;
+        int height = 400;
+        int stroke = 40;
+        int padding = 5;
+        int minAngle = 135;
+        int maxAngle = 275;
+        Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.DITHER_FLAG | Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(stroke);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.setTextSize(dp2px(context, textInsideSizePx));
+        mTextPaint.setColor(Color.WHITE);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+        final RectF arc = new RectF();
+        arc.set(((float) stroke / 2) + padding, ((float) stroke / 2) + padding, width - padding - ((float) stroke / 2), height - padding - ((float) stroke / 2));
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        paint.setColor(Color.argb(75, 255, 255, 255));
+        canvas.drawArc(arc, minAngle, maxAngle, false, paint);
+        paint.setColor(Color.WHITE);
+        canvas.drawArc(arc, minAngle, ((float) maxAngle / 100) * percentage, false, paint);
+        if (tf != null) {
+            mTextPaint.setTypeface(Typeface.create(tf, Typeface.BOLD));
+        } else {
+            mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+        }
+        canvas.drawText(textInside, (float) bitmap.getWidth() / 2, (bitmap.getHeight() - mTextPaint.ascent() * 0.7f) / 2, mTextPaint);
+        if (iconDrawable != null) {
+            int size = dp2px(context, iconSizePx);
+            int left = (bitmap.getWidth() - size) / 2;
+            int top = bitmap.getHeight() - (int) (size / 1.3) - (stroke + padding) - dp2px(context, 4);
+            int right = left + size;
+            int bottom = top + size;
+            iconDrawable.setBounds(left, top, right, bottom);
+            iconDrawable.setColorFilter(new BlendModeColorFilter(Color.WHITE, BlendMode.SRC_IN));
+            iconDrawable.draw(canvas);
+        } else if (textBottom != null) {
+            mTextPaint.setTextSize(dp2px(context, textBottomSizePx));
+            canvas.drawText(textBottom, (float) bitmap.getWidth() / 2, bitmap.getHeight() - (stroke + padding), mTextPaint);
+        }
+        return bitmap;
+    }
+    
+    private static int dp2px(Context context, float dp) {
+        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics);
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/MediaSessionManagerHelper.kt b/packages/SystemUI/src/com/android/systemui/util/MediaSessionManagerHelper.kt
new file mode 100644
index 0000000000000..1e416e40a0171
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/MediaSessionManagerHelper.kt
@@ -0,0 +1,263 @@
+/*
+* Copyright (C) 2023-2024 The risingOS Android Project
+* Copyright (C) 2025 The AxionAOSP Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.android.systemui.util
+
+import android.content.Context
+import android.content.res.Configuration
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.media.MediaMetadata
+import android.media.session.MediaController
+import android.media.session.MediaSessionLegacyHelper
+import android.media.session.MediaSessionManager
+import android.media.session.PlaybackState
+import android.os.SystemClock
+import android.provider.Settings
+import android.text.TextUtils
+import android.view.KeyEvent
+import android.view.View
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+
+class MediaSessionManagerHelper private constructor(private val context: Context) {
+
+    interface MediaMetadataListener {
+        fun onMediaMetadataChanged() {}
+        fun onPlaybackStateChanged() {}
+    }
+
+    private val _mediaMetadata = MutableStateFlow<MediaMetadata?>(null)
+    val mediaMetadata: StateFlow<MediaMetadata?> = _mediaMetadata
+
+    private val _playbackState = MutableStateFlow<PlaybackState?>(null)
+    val playbackState: StateFlow<PlaybackState?> = _playbackState
+
+    private val scope = CoroutineScope(Dispatchers.Main)
+    private var collectJob: Job? = null
+
+    private var lastSavedPackageName: String? = null
+    private val mediaSessionManager: MediaSessionManager = context.getSystemService(MediaSessionManager::class.java)!!
+    private var activeController: MediaController? = null
+    private val listeners = mutableSetOf<MediaMetadataListener>()
+
+    private val mediaControllerCallback = object : MediaController.Callback() {
+        override fun onMetadataChanged(metadata: MediaMetadata?) {
+            _mediaMetadata.value = metadata
+        }
+
+        override fun onPlaybackStateChanged(state: PlaybackState?) {
+            _playbackState.value = state
+        }
+    }
+
+    private val tickerFlow = flow {
+        while (true) {
+            emit(Unit)
+            delay(1000)
+        }
+    }.flowOn(Dispatchers.Default)
+
+    init {
+        lastSavedPackageName = Settings.System.getString(
+            context.contentResolver,
+            "media_session_last_package_name"
+        )
+
+        scope.launch {
+            tickerFlow
+                .map { fetchActiveController() }
+                .distinctUntilChanged { old, new -> sameSessions(old, new) }
+                .collect { controller ->
+                    activeController?.unregisterCallback(mediaControllerCallback)
+                    activeController = controller
+                    controller?.registerCallback(mediaControllerCallback)
+                    _mediaMetadata.value = controller?.metadata
+                    _playbackState.value = controller?.playbackState
+                    saveLastNonNullPackageName()
+                }
+        }
+    }
+
+    private suspend fun fetchActiveController(): MediaController? = withContext(Dispatchers.IO) {
+        var localController: MediaController? = null
+        val remoteSessions = mutableSetOf<String>()
+        
+        mediaSessionManager.getActiveSessions(null)
+            .filter { controller ->
+                controller.playbackState?.state == PlaybackState.STATE_PLAYING &&
+                controller.playbackInfo != null
+            }
+            .forEach { controller ->
+                when (controller.playbackInfo?.playbackType) {
+                    MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE -> {
+                        remoteSessions.add(controller.packageName)
+                        if (localController?.packageName == controller.packageName) {
+                            localController = null
+                        }
+                    }
+                    MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL -> {
+                        if (!remoteSessions.contains(controller.packageName)) {
+                            localController = localController ?: controller
+                        }
+                    }
+                }
+            }
+        localController
+    }
+
+    fun addMediaMetadataListener(listener: MediaMetadataListener) {
+        listeners.add(listener)
+        if (listeners.size == 1) {
+            startCollecting()
+        }
+        listener.onMediaMetadataChanged()
+        listener.onPlaybackStateChanged()
+    }
+
+    fun removeMediaMetadataListener(listener: MediaMetadataListener) {
+        listeners.remove(listener)
+        if (listeners.isEmpty()) {
+            stopCollecting()
+        }
+    }
+
+    private fun startCollecting() {
+        collectJob = scope.launch {
+            launch { mediaMetadata.collect { notifyListeners { onMediaMetadataChanged() } } }
+            launch { playbackState.collect { notifyListeners { onPlaybackStateChanged() } } }
+        }
+    }
+
+    private fun stopCollecting() {
+        collectJob?.cancel()
+        collectJob = null
+    }
+
+    private fun notifyListeners(action: MediaMetadataListener.() -> Unit) {
+        listeners.forEach { it.action() }
+    }
+
+    fun seekTo(time: Long) {
+        activeController?.transportControls?.seekTo(time)
+    }
+
+    fun getTotalDuration() = mediaMetadata.value?.getLong(MediaMetadata.METADATA_KEY_DURATION) ?: 0L
+
+    private fun saveLastNonNullPackageName() {
+        activeController?.packageName?.takeIf { it.isNotEmpty() }?.let { pkg ->
+            if (pkg != lastSavedPackageName) {
+                Settings.System.putString(
+                    context.contentResolver,
+                    "media_session_last_package_name",
+                    pkg
+                )
+                lastSavedPackageName = pkg
+            }
+        }
+    }
+
+    fun getMediaBitmap(): Bitmap? = mediaMetadata.value?.let {
+        it.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) ?: 
+        it.getBitmap(MediaMetadata.METADATA_KEY_ART) ?: 
+        it.getBitmap(MediaMetadata.METADATA_KEY_DISPLAY_ICON)
+    }
+    
+    fun getCurrentMediaMetadata(): MediaMetadata? {
+        return mediaMetadata.value
+    }
+
+    fun getMediaAppIcon(): Drawable? {
+        val packageName = activeController?.packageName ?: return null
+        return try {
+            val pm = context.packageManager
+            pm.getApplicationIcon(packageName)
+        } catch (e: PackageManager.NameNotFoundException) {
+            null
+        }
+    }
+
+    fun isMediaControllerAvailable() = activeController?.packageName?.isNotEmpty() ?: false
+
+    fun isMediaPlaying() = playbackState.value?.state == PlaybackState.STATE_PLAYING
+
+    fun getMediaControllerPlaybackState(): PlaybackState? {
+        return activeController?.playbackState ?: null
+    }
+
+    private fun sameSessions(a: MediaController?, b: MediaController?): Boolean {
+        if (a == b) return true
+        if (a == null) return false
+        return a.controlsSameSession(b)
+    }
+
+    private fun dispatchMediaKeyWithWakeLockToMediaSession(keycode: Int) {
+        val helper = MediaSessionLegacyHelper.getHelper(context) ?: return
+        var event = KeyEvent(
+            SystemClock.uptimeMillis(),
+            SystemClock.uptimeMillis(),
+            KeyEvent.ACTION_DOWN,
+            keycode,
+            0
+        )
+        helper.sendMediaButtonEvent(event, true)
+        event = KeyEvent.changeAction(event, KeyEvent.ACTION_UP)
+        helper.sendMediaButtonEvent(event, true)
+    }
+
+    fun prevSong() {
+        dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PREVIOUS)
+    }
+
+    fun nextSong() {
+        dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_NEXT)
+    }
+
+    fun toggleMediaPlaybackState() {
+        if (isMediaPlaying()) {
+            dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PAUSE)
+        } else {
+            dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PLAY)
+        }
+    }
+
+    fun launchMediaApp() {
+        lastSavedPackageName?.takeIf { it.isNotEmpty() }?.let {
+            launchMediaPlayerApp(it)
+        }
+    }
+    
+    fun launchMediaPlayerApp(packageName: String) {
+        if (packageName.isNotEmpty()) {
+            val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
+            launchIntent?.let { intent ->
+                context.startActivity(intent)
+            }
+        }
+    }
+
+    companion object {
+        @Volatile
+        private var instance: MediaSessionManagerHelper? = null
+
+        fun getInstance(context: Context): MediaSessionManagerHelper =
+            instance ?: synchronized(this) {
+                instance ?: MediaSessionManagerHelper(context).also { instance = it }
+            }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/NoRemeasureMotionLayout.kt b/packages/SystemUI/src/com/android/systemui/util/NoRemeasureMotionLayout.kt
index f49d616181d21..81b60b048497f 100644
--- a/packages/SystemUI/src/com/android/systemui/util/NoRemeasureMotionLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/util/NoRemeasureMotionLayout.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.Choreographer
 import androidx.constraintlayout.motion.widget.MotionLayout
-import com.android.app.tracing.traceSection
 
 /**
  * [MotionLayout] that avoids remeasuring with the same inputs in the same frame.
@@ -48,11 +47,10 @@ class NoRemeasureMotionLayout @JvmOverloads constructor(
             setMeasuredDimension(measuredWidth, measuredHeight)
             return
         }
-        traceSection("NoRemeasureMotionLayout - measure") {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-            lastWidthSpec = widthMeasureSpec
-            lastHeightSpec = heightMeasureSpec
-            lastFrame = Choreographer.getMainThreadInstance()?.frameTime
-        }
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        lastWidthSpec = widthMeasureSpec
+        lastHeightSpec = heightMeasureSpec
+        lastFrame = Choreographer.getMainThreadInstance()?.frameTime
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/util/ProgressImageView.kt b/packages/SystemUI/src/com/android/systemui/util/ProgressImageView.kt
new file mode 100644
index 0000000000000..1f9edfd320833
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/ProgressImageView.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2023-2024 the risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.util
+
+import android.app.ActivityManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContentResolver
+import android.content.Intent
+import android.content.IntentFilter
+import android.database.ContentObserver
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.media.AudioManager
+import android.os.BatteryManager
+import android.provider.Settings
+import android.util.AttributeSet
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
+import kotlinx.coroutines.*
+
+import com.android.systemui.res.R
+
+class ProgressImageView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ImageView(context, attrs, defStyleAttr) {
+
+    private var progressType: ProgressType = ProgressType.UNKNOWN
+    private var progressPercent = -1
+    private var batteryLevel = -1
+    private var batteryTemperature = -1
+    private var updateJob: Job? = null
+    private var receiverRegistered = false
+    private var typeface: String? = null
+    
+    private val batteryReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == Intent.ACTION_BATTERY_CHANGED) {
+                batteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
+                batteryLevel = batteryLevel.coerceIn(0, 100)
+                batteryTemperature = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) / 10
+                updateProgress()
+            }
+        }
+    }
+
+    private val settingsObserver = object : ContentObserver(null) {
+        override fun onChange(selfChange: Boolean) {
+            updateVisibility()
+        }
+    }
+
+    enum class ProgressType(val iconRes: Int) {
+        BATTERY(R.drawable.ic_battery),
+        MEMORY(R.drawable.ic_memory),
+        TEMPERATURE(R.drawable.ic_temperature),
+        VOLUME(R.drawable.ic_volume_eq),
+        UNKNOWN(-1)
+    }
+
+    init {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ProgressImageView, defStyleAttr, 0)
+        typeface = typedArray.getString(R.styleable.ProgressImageView_typeface)
+        typedArray.recycle()
+        when (id) {
+            R.id.battery_progress -> progressType = ProgressType.BATTERY
+            R.id.memory_progress -> progressType = ProgressType.MEMORY
+            R.id.temperature_progress -> progressType = ProgressType.TEMPERATURE
+            R.id.volume_progress -> progressType = ProgressType.VOLUME
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor("lockscreen_info_widgets_enabled"),
+            false,
+            settingsObserver
+        )
+        if (!receiverRegistered) {
+            if (progressType == ProgressType.BATTERY || progressType == ProgressType.TEMPERATURE) {
+                val filter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+                context.registerReceiver(batteryReceiver, filter, Context.RECEIVER_EXPORTED)
+                receiverRegistered = true
+            }
+        }
+        startProgressUpdates()
+        updateVisibility()
+        updateProgress()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        context.contentResolver.unregisterContentObserver(settingsObserver)
+        if (receiverRegistered) {
+            context.unregisterReceiver(batteryReceiver)
+        }
+        stopProgressUpdates()
+    }
+
+    private fun startProgressUpdates() {
+        if (progressType == ProgressType.MEMORY || progressType == ProgressType.VOLUME) {
+            updateJob = CoroutineScope(Dispatchers.Main).launch {
+                while (isActive) {
+                    updateProgress()
+                    delay(1000L)
+                }
+            }
+        }
+    }
+
+    private fun stopProgressUpdates() {
+        updateJob?.cancel()
+    }
+
+    private fun updateProgress() {
+        val newProgressPercent = when (progressType) {
+            ProgressType.BATTERY -> batteryLevel
+            ProgressType.MEMORY -> getMemoryLevel()
+            ProgressType.TEMPERATURE -> batteryTemperature
+            ProgressType.VOLUME -> getVolumeLevel()
+            ProgressType.UNKNOWN -> -1
+        }
+        if (newProgressPercent != progressPercent) {
+            progressPercent = newProgressPercent
+            updateImageView()
+        }
+    }
+
+    private fun updateImageView() {
+        val degree = "\u2103"
+        val progressText = if (progressType == ProgressType.TEMPERATURE) {
+            if (progressPercent != -1) "$progressPercent$degree" else "N/A"
+        } else {
+            if (progressPercent == -1) "..." else "$progressPercent%"
+        }
+        val icon: Drawable? = ContextCompat.getDrawable(context, progressType.iconRes)
+        val widgetBitmap: Bitmap = ArcProgressWidget.generateBitmap(
+            context,
+            if (progressPercent == -1) 0 else progressPercent,
+            progressText,
+            40,
+            icon,
+            36,
+            typeface
+        )
+        setImageBitmap(widgetBitmap)
+    }
+
+    private fun getMemoryLevel(): Int {
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val memoryInfo = ActivityManager.MemoryInfo()
+        activityManager.getMemoryInfo(memoryInfo)
+        val usedMemory = memoryInfo.totalMem - memoryInfo.availMem
+        val usedMemoryPercentage = ((usedMemory * 100) / memoryInfo.totalMem).toInt()
+        return usedMemoryPercentage.coerceIn(0, 100)
+    }
+
+    private fun getVolumeLevel(): Int {
+        val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+        val maxVolume = audioManager?.getStreamMaxVolume(AudioManager.STREAM_MUSIC) ?: 1
+        val currentVolume = audioManager?.getStreamVolume(AudioManager.STREAM_MUSIC) ?: 0
+        return ((currentVolume * 100) / maxVolume).coerceIn(0, 100)
+    }
+    
+    private fun updateVisibility() {
+        val enabled = Settings.System.getInt(
+            context.contentResolver,
+            "lockscreen_info_widgets_enabled", 0
+        ) == 1
+        visibility = if (enabled) VISIBLE else GONE
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/ScrimUtils.kt b/packages/SystemUI/src/com/android/systemui/util/ScrimUtils.kt
new file mode 100644
index 0000000000000..f4010a2da0595
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/ScrimUtils.kt
@@ -0,0 +1,355 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.util
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.service.notification.StatusBarNotification
+import android.view.View
+import android.view.ViewTreeObserver
+import com.android.systemui.Dependency
+import com.android.systemui.statusbar.StatusBarState.KEYGUARD
+import com.android.systemui.statusbar.StatusBarState.SHADE_LOCKED
+import com.android.systemui.statusbar.phone.ScrimController
+import java.util.concurrent.atomic.AtomicBoolean
+
+/* Scrim - aka testing utils */
+class ScrimUtils private constructor(context: Context?) {
+
+    interface ScrimEventListener {
+        fun onKeyguardShowingChanged(showing: Boolean) {}
+        fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {}
+        fun onKeyguardGoingAwayChanged(goingAway: Boolean) {}
+        fun onPrimaryBouncerShowingChanged(showing: Boolean) {}
+        fun onDozingChanged(dozing: Boolean) {}
+        fun onExpandedFractionChanged(expandedFraction: Float) {}
+        fun onBarStateChanged(state: Int) {}
+        fun onQsVisibilityChanged(visible: Boolean) {}
+        fun onStartedWakingUp() {}
+        fun onScreenTurnedOff() {}
+        fun onUserChanged() {}
+        fun setPulsing(pulsing: Boolean) {}
+        fun onNotificationPosted(sbn: StatusBarNotification) {}
+        fun onNotificationRemoved(sbn: StatusBarNotification) {}
+        fun onKeyguardLayoutChanged() {}
+        fun onKeyguardAlphaChanged(alpha: Float) {}
+    }
+
+    private val listeners = WeakListenerManager<ScrimEventListener>()
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    private val mQsVisible = AtomicBoolean()
+    private val mPulsing = AtomicBoolean()
+    private val mFadingAwayDuration = 500L
+
+    private val mContext: Context by lazy {
+        context ?: throw IllegalStateException("ScrimUtils requires a valid Context")
+    }
+
+    private val mScrimController: ScrimController? by lazy {
+        try {
+            Dependency.get(ScrimController::class.java)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private var mWallpaperDepthUtils: WallpaperDepthUtils? = null
+
+    fun setWallpaperDepthUtils(utils: WallpaperDepthUtils) {
+        mWallpaperDepthUtils = utils
+    }
+
+    @Volatile private var mIsDozing: Boolean? = null
+    @Volatile private var mKeyguardShowing: Boolean? = null
+    @Volatile private var mExpandedFraction: Float? = null
+    @Volatile private var mBarState: Int? = null
+    @Volatile private var mAwake: Boolean? = null
+
+    private val mStateIsKeyguard get() = mBarState == SHADE_LOCKED || mBarState == KEYGUARD
+
+    private var keyguardRetryRunnable: Runnable? = null
+
+    companion object {
+        private const val LAYOUT_STABLE_DELAY = 350L
+
+        @Volatile private var instance: ScrimUtils? = null
+
+        @JvmStatic
+        fun get(): ScrimUtils =
+            instance ?: synchronized(this) {
+                instance ?: ScrimUtils(null).also { instance = it }
+            }
+
+        @JvmStatic
+        fun get(context: Context): ScrimUtils =
+            instance ?: synchronized(this) {
+                instance ?: ScrimUtils(context).also { instance = it }
+            }
+    }
+
+    fun addListener(listener: ScrimEventListener) = listeners.addListener(listener)
+    fun removeListener(listener: ScrimEventListener) = listeners.removeListener(listener)
+
+    fun setKeyguardShowing(showing: Boolean) {
+        if (mKeyguardShowing == null || mKeyguardShowing != showing) {
+            mKeyguardShowing = showing
+            listeners.notifyOnMain { it.onKeyguardShowingChanged(showing) }
+            if (showing) {
+                mainHandler.postDelayed({
+                    mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+                    mWallpaperDepthUtils?.updateDepthWallpaper()
+                }, 120)
+            } else {
+                mWallpaperDepthUtils?.hideDepthWallpaperImmediate()
+            }
+        }
+    }
+
+    fun onKeyguardFadingAwayChanged(fadingAway: Boolean) {
+        listeners.notifyOnMain { it.onKeyguardFadingAwayChanged(fadingAway) }
+        postKeyguardRetry()
+        if (fadingAway) {
+            mWallpaperDepthUtils?.hideDepthWallpaper()
+            mWallpaperDepthUtils?.hideDepthWallpaperImmediate()
+        }
+    }
+
+    fun onKeyguardGoingAwayChanged(goingAway: Boolean) {
+        listeners.notifyOnMain { it.onKeyguardGoingAwayChanged(goingAway) }
+        postKeyguardRetry()
+        if (goingAway) {
+            mWallpaperDepthUtils?.hideDepthWallpaper()
+        }
+    }
+
+    fun onPrimaryBouncerShowingChanged(showing: Boolean) {
+        listeners.notifyOnMain { it.onPrimaryBouncerShowingChanged(showing) }
+        postKeyguardRetry()
+        mWallpaperDepthUtils?.onBouncerShowingChanged(showing)
+    }
+
+    private fun postKeyguardRetry() {
+        keyguardRetryRunnable?.let { mainHandler.removeCallbacks(it) }
+        keyguardRetryRunnable = Runnable {
+            listeners.notifyOnMain { it.onKeyguardShowingChanged(mKeyguardShowing == true) }
+        }
+        mainHandler.postDelayed(keyguardRetryRunnable!!, mFadingAwayDuration)
+    }
+
+    fun setExpandedFraction(fraction: Float) {
+        if (mExpandedFraction == null ||
+            ((fraction == 0.0f || fraction == 1.0f) && mExpandedFraction != fraction)) {
+            mExpandedFraction = fraction
+            listeners.notifyOnBackground { it.onExpandedFractionChanged(fraction) }
+        }
+    }
+
+    fun onDozingChanged(dozing: Boolean) {
+        if (mIsDozing == null || mIsDozing != dozing) {
+            mIsDozing = dozing
+            listeners.notify { it.onDozingChanged(dozing) }
+            mWallpaperDepthUtils?.onDozingChanged(dozing)
+            // Additional refresh when exiting doze to ensure depth wallpaper appears
+            if (!dozing && mStateIsKeyguard) {
+                mainHandler.postDelayed({
+                    mWallpaperDepthUtils?.updateDepthWallpaper()
+                }, 200)
+            }
+        }
+    }
+
+    fun setBarState(state: Int) {
+        if (mBarState == null || mBarState != state) {
+            mBarState = state
+            listeners.notifyOnMain { it.onBarStateChanged(state) }
+        }
+        // hack 4 bug:
+        // 1. user is on keyguard but is mBarState == SHADE
+        // 2. keyguard update monitor wrong state when dozing
+        val shouldShowKeyguard = mStateIsKeyguard || mIsDozing == true || mPulsing.get()
+        setKeyguardShowing(shouldShowKeyguard)
+    }
+
+    fun setQsVisible(visible: Boolean) {
+        if (mQsVisible.getAndSet(visible) != visible) {
+            listeners.notifyOnMain { it.onQsVisibilityChanged(visible) }
+            if (visible) {
+                mWallpaperDepthUtils?.getDepthWallpaperView()?.translationZ = -100f
+            } else if (mStateIsKeyguard) {
+                mWallpaperDepthUtils?.getDepthWallpaperView()?.translationZ = 0f
+                mainHandler.postDelayed({
+                    mWallpaperDepthUtils?.updateDepthWallpaper()
+                    mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+                }, 100)
+            }
+        }
+    }
+
+    fun setPulsing(pulsing: Boolean) {
+        if (mPulsing.getAndSet(pulsing) != pulsing) {
+            listeners.notify { it.setPulsing(pulsing) }
+            if (!pulsing && mStateIsKeyguard) {
+                mainHandler.postDelayed({
+                    mWallpaperDepthUtils?.updateDepthWallpaper()
+                    mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+                }, 120)
+            }
+        }
+    }
+
+    fun onStartedWakingUp() {
+        mAwake = true
+        listeners.notify { it.onStartedWakingUp() }
+        if (mStateIsKeyguard) {
+            mainHandler.postDelayed({
+                mWallpaperDepthUtils?.updateDepthWallpaper()
+                mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+            }, 150)
+        }
+    }
+
+    fun onScreenTurnedOff() {
+        mAwake = false
+        listeners.notify { it.onScreenTurnedOff() }
+    }
+
+    fun onUserChanged() {
+        listeners.notify { it.onUserChanged() }
+    }
+
+    fun onNotificationPosted(sbn: StatusBarNotification) {
+        listeners.notifyOnMain { it.onNotificationPosted(sbn) }
+    }
+
+    fun onNotificationRemoved(sbn: StatusBarNotification) {
+        listeners.notifyOnMain { it.onNotificationRemoved(sbn) }
+    }
+
+    private var keyguardRootView: View? = null
+    private var layoutChangePending = false
+    private var layoutStableRunnable: Runnable? = null
+    private val preDrawActions = mutableListOf<Runnable>()
+
+    private val keyguardPreDrawListener = ViewTreeObserver.OnPreDrawListener {
+        val root = keyguardRootView ?: return@OnPreDrawListener true
+
+        for (action in preDrawActions) {
+            action.run()
+        }
+
+        if (mKeyguardShowing == true && root.isDirty) {
+            if (!layoutChangePending) {
+                layoutChangePending = true
+                listeners.notifyOnMain { it.onKeyguardLayoutChanged() }
+            }
+            layoutStableRunnable?.let { mainHandler.removeCallbacks(it) }
+            layoutStableRunnable = Runnable { layoutChangePending = false }
+            mainHandler.postDelayed(layoutStableRunnable!!, LAYOUT_STABLE_DELAY)
+        }
+        true
+    }
+
+    fun addKeyguardPreDrawAction(action: Runnable) {
+        if (!preDrawActions.contains(action)) preDrawActions.add(action)
+    }
+
+    fun removeKeyguardPreDrawAction(action: Runnable) {
+        preDrawActions.remove(action)
+    }
+
+    fun attachKeyguardView(view: View) {
+        detachKeyguardView()
+        keyguardRootView = view
+        view.viewTreeObserver.addOnPreDrawListener(keyguardPreDrawListener)
+    }
+
+    fun detachKeyguardView() {
+        keyguardRootView?.viewTreeObserver?.removeOnPreDrawListener(keyguardPreDrawListener)
+        keyguardRootView = null
+        layoutStableRunnable?.let { mainHandler.removeCallbacks(it) }
+        layoutStableRunnable = null
+        layoutChangePending = false
+    }
+
+    fun setKeyguardAlpha(alpha: Float) {
+        listeners.notifyOnMain { it.onKeyguardAlphaChanged(alpha) }
+    }
+
+    fun isDozing(): Boolean = mIsDozing == true
+    fun isAwake(): Boolean = mAwake == true
+    fun isPulsing(): Boolean = mPulsing.get()
+    fun isKeyguardShowing(): Boolean = mKeyguardShowing == true
+
+    fun isPanelFullyCollapsed(): Boolean =
+        if (mStateIsKeyguard) {
+            !mQsVisible.get()
+        } else {
+            (mExpandedFraction ?: 0.0f) <= 0.0f
+        }
+
+    // Depth Wallpaper control methods
+    fun setViewAlpha(subjectAlpha: Float) {
+        mWallpaperDepthUtils?.setSubjectAlpha(subjectAlpha)
+    }
+
+    fun setQsExpansion(expansion: Float) {
+        val fullyCollapsed = expansion <= 0f
+        if (fullyCollapsed) {
+            mWallpaperDepthUtils?.getDepthWallpaperView()?.translationZ = 0f
+            if (mStateIsKeyguard) {
+                mWallpaperDepthUtils?.updateDepthWallpaper()
+                mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+            }
+        } else {
+            mWallpaperDepthUtils?.getDepthWallpaperView()?.translationZ = -100f
+        }
+    }
+
+    fun onScreenStateChange() {
+        updateDepthWallpaperElements()
+        mainHandler.postDelayed({
+            updateDepthWallpaperElements()
+        }, 250)
+    }
+
+    private fun updateDepthWallpaperElements() {
+        mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+    }
+
+    fun onScrimDispatched() {
+        mWallpaperDepthUtils?.updateDepthWallpaper()
+        mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+    }
+
+    fun updateDepthWallpaper() {
+        mWallpaperDepthUtils?.updateDepthWallpaper()
+    }
+
+    fun updateDepthWallpaperVisibility() {
+        mWallpaperDepthUtils?.updateDepthWallpaperVisibility()
+    }
+
+    fun hideDepthWallpaper() {
+        mWallpaperDepthUtils?.hideDepthWallpaper()
+    }
+
+    fun getScrimBehindAlphaKeyguard(): Float {
+        return mScrimController?.getScrimBehindAlpha() ?: 0f
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/TaskWorkerManager.kt b/packages/SystemUI/src/com/android/systemui/util/TaskWorkerManager.kt
new file mode 100644
index 0000000000000..d1b3bd6dd81df
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/TaskWorkerManager.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.util
+
+import android.os.Handler
+import android.os.HandlerThread
+
+class TaskWorkerManager private constructor() {
+
+    companion object {
+        val instance: TaskWorkerManager by lazy { TaskWorkerManager() }
+    }
+
+    val taskWorker: TaskWorker = TaskWorker("task_worker_default")
+
+    class TaskWorker(taskWorkerTag: String) {
+
+        private val handler: Handler
+
+        init {
+            val handlerThread = HandlerThread(taskWorkerTag)
+            handlerThread.start()
+            handler = Handler(handlerThread.looper)
+        }
+
+        fun post(runnable: Runnable) {
+            handler.post(runnable)
+        }
+
+        fun postDelayed(runnable: Runnable, delay: Long) {
+            handler.postDelayed(runnable, delay)
+        }
+
+        fun removeCallback(runnable: Runnable) {
+            handler.removeCallbacks(runnable)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/WallpaperDepthUtils.java b/packages/SystemUI/src/com/android/systemui/util/WallpaperDepthUtils.java
new file mode 100644
index 0000000000000..54dd2db1828b0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/WallpaperDepthUtils.java
@@ -0,0 +1,356 @@
+/*
+ * Copyright (C) 2023-2024 The risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.util;
+
+import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import com.android.systemui.Dependency;
+import com.android.systemui.media.MediaViewController;
+import com.android.systemui.statusbar.phone.ScrimController;
+import com.android.systemui.statusbar.phone.ScrimState;
+import com.android.systemui.tuner.TunerService;
+
+public class WallpaperDepthUtils {
+
+    private static final String WALLPAPER_DEPTH_KEY = "system:depth_wallpaper_subject_image_uri";
+    private static final String WALLPAPER_DEPTH_ENABLED_KEY = "system:depth_wallpaper_enabled";
+    private static final String WALLPAPER_DEPTH_OPACITY_KEY = "system:depth_wallpaper_opacity";
+    private static final String WALLPAPER_DEPTH_OFFSET_X_KEY = "system:depth_wallpaper_offset_x";
+    private static final String WALLPAPER_DEPTH_OFFSET_Y_KEY = "system:depth_wallpaper_offset_y";
+
+    private static WallpaperDepthUtils instance;
+    private FrameLayout mLockScreenSubject;
+
+    private final Context mContext;
+    private final ScrimController mScrimController;
+    private final TunerService mTunerService;
+
+    private boolean mDWallpaperEnabled;
+    private int mDWallOpacity = 255;
+    private String mWallpaperSubjectPath;
+    private boolean mDozing;
+    private boolean mBouncerShowing;
+    private boolean mGlanceableHubShowing;
+    private boolean mDynamicBarExpanded;
+    private boolean mWallpaperLoaded = false;
+    private String mPreviousWallpaperPath;
+    private Bitmap mWallpaperBitmap;
+    private int mOffsetX;
+    private int mOffsetY;
+    private boolean mUnlocking;
+
+    private WallpaperDepthUtils(Context context, ScrimController scrimController) {
+        mContext = context.getApplicationContext();
+        mScrimController = scrimController;
+        mTunerService = Dependency.get(TunerService.class);
+        mTunerService.addTunable(mTunable, WALLPAPER_DEPTH_KEY, 
+            WALLPAPER_DEPTH_ENABLED_KEY, WALLPAPER_DEPTH_OPACITY_KEY, 
+            WALLPAPER_DEPTH_OFFSET_X_KEY, WALLPAPER_DEPTH_OFFSET_Y_KEY);
+        mLockScreenSubject = new FrameLayout(mContext) {
+            @Override
+            protected void onDetachedFromWindow() {
+                super.onDetachedFromWindow();
+                WallpaperDepthUtils.this.onDetachedFromWindow();
+            }
+        };
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(-1, -1);
+        mLockScreenSubject.setLayoutParams(lp);
+        // Make view non-interactive so touches pass through to notifications
+        mLockScreenSubject.setClickable(false);
+        mLockScreenSubject.setFocusable(false);
+        mLockScreenSubject.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+    }
+
+    public static WallpaperDepthUtils getInstance(Context context, ScrimController scrimController) {
+        if (instance == null) {
+            instance = new WallpaperDepthUtils(context, scrimController);
+        }
+        return instance;
+    }
+
+    public static WallpaperDepthUtils get() {
+        return instance;
+    }
+
+    public void onUnlockStarted() {
+        mUnlocking = true;
+        hideDepthWallpaperImmediate();
+    }
+
+    public void onUnlockCancelled() {
+        mUnlocking = false;
+        updateDepthWallpaperVisibility();
+    }
+
+    public void onUnlockCompleted() {
+        mUnlocking = false;
+    }
+    
+    public void onDozingChanged(boolean dozing) {
+        if (mDozing == dozing) {
+            return;
+        }
+        mDozing = dozing;
+        if (mDozing) {
+            hideDepthWallpaper();
+        } else {
+            updateDepthWallpaperVisibility();
+        }
+    }
+
+    public void onBouncerShowingChanged(boolean showing) {
+        if (mBouncerShowing == showing) {
+            return;
+        }
+        mBouncerShowing = showing;
+        if (mBouncerShowing) {
+            hideDepthWallpaper();
+        } else {
+            updateDepthWallpaperVisibility();
+        }
+    }
+
+    public void setDynamicBarExpanded(boolean expanded) {
+        if (mDynamicBarExpanded == expanded) return;
+        mDynamicBarExpanded = expanded;
+        if (expanded) {
+            hideDepthWallpaper();
+        } else {
+            updateDepthWallpaperVisibility();
+        }
+    }
+
+    public void onGlanceableHubShowingChanged(boolean showing) {
+        if (mGlanceableHubShowing == showing) {
+            return;
+        }
+        mGlanceableHubShowing = showing;
+        if (mGlanceableHubShowing) {
+            hideDepthWallpaper();
+        } else {
+            updateDepthWallpaperVisibility();
+        }
+    }
+
+    private final TunerService.Tunable mTunable = new TunerService.Tunable() {
+        @Override
+        public void onTuningChanged(String key, String newValue) {
+            switch (key) {
+                case WALLPAPER_DEPTH_ENABLED_KEY:
+                    mDWallpaperEnabled = TunerService.parseIntegerSwitch(newValue, false);
+                    updateDepthWallpaper(true);
+                    break;
+                case WALLPAPER_DEPTH_KEY:
+                    mPreviousWallpaperPath = mWallpaperSubjectPath;
+                    mWallpaperSubjectPath = newValue;
+                    updateDepthWallpaper(true);
+                    break;
+                case WALLPAPER_DEPTH_OPACITY_KEY:
+                    int opacity = TunerService.parseInteger(newValue, 100);
+                    mDWallOpacity = Math.round(opacity * 2.55f);
+                    updateDepthWallpaper(true);
+                    break;
+                case WALLPAPER_DEPTH_OFFSET_X_KEY:
+                    mOffsetX = TunerService.parseInteger(newValue, 0);
+                    updateDepthWallpaper(true);
+                    break;
+                case WALLPAPER_DEPTH_OFFSET_Y_KEY:
+                    mOffsetY = TunerService.parseInteger(newValue, 0);
+                    updateDepthWallpaper(true);
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+    
+    public void setSubjectAlpha(float subjectAlpha) {
+        if (mLockScreenSubject == null) return;
+        mLockScreenSubject.post(() -> mLockScreenSubject.setAlpha(subjectAlpha));
+    }
+    
+    public void updateDepthWallpaper() {
+        updateDepthWallpaper(false);
+    }
+
+    public FrameLayout getDepthWallpaperView() {
+        return mLockScreenSubject;
+    }
+
+    private boolean isDWallpaperEnabled() {
+        return mDWallpaperEnabled && mWallpaperSubjectPath != null
+                && !mWallpaperSubjectPath.isEmpty();
+    }
+
+    private boolean canShowDepthWallpaper() {
+        ScrimState currentState = mScrimController.getState();
+        // Only show on KEYGUARD state when bouncer is NOT showing
+        return mLockScreenSubject != null
+                && isDWallpaperEnabled()
+                && !mDozing
+                && !mBouncerShowing
+                && !mGlanceableHubShowing
+                && !mDynamicBarExpanded
+                && !mUnlocking
+                && currentState == ScrimState.KEYGUARD
+                && mContext.getResources().getConfiguration().orientation != Configuration.ORIENTATION_LANDSCAPE
+                && !MediaViewController.get(mContext).albumArtVisible();
+    }
+
+    public void updateDepthWallpaperVisibility() {
+        if (mLockScreenSubject == null || !isDWallpaperEnabled()) return;
+        int subjectVisibility = canShowDepthWallpaper() ? View.VISIBLE : View.GONE;
+        if (mLockScreenSubject.getVisibility() == subjectVisibility) return;
+        mLockScreenSubject.post(() -> {
+            mLockScreenSubject.setVisibility(subjectVisibility);
+            if (subjectVisibility == View.VISIBLE) {
+                mLockScreenSubject.invalidate();
+            }
+        });
+    }
+    
+    public void hideDepthWallpaper() {
+        if (mLockScreenSubject == null || mLockScreenSubject.getVisibility() == View.GONE) return;
+        mLockScreenSubject.post(() -> mLockScreenSubject.setVisibility(View.GONE));
+    }
+
+    public void hideDepthWallpaperImmediate() {
+        if (mLockScreenSubject == null) return;
+        mLockScreenSubject.post(() -> {
+            mLockScreenSubject.animate().cancel();
+            mLockScreenSubject.animate()
+                    .alpha(0f)
+                    .setDuration(120)
+                    .withEndAction(() -> {
+                        mLockScreenSubject.setVisibility(View.GONE);
+                        mLockScreenSubject.setAlpha(1f);
+                    })
+                    .start();
+        });
+    }
+
+    public Bitmap getResizedBitmap(Bitmap wallpaperBitmap, float xOffsetDp, float yOffsetDp) {
+        Rect displayBounds = mContext.getSystemService(WindowManager.class)
+                .getCurrentWindowMetrics()
+                .getBounds();
+        DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics();
+        float xOffsetPx = xOffsetDp * displayMetrics.density;
+        float yOffsetPx = yOffsetDp * displayMetrics.density;
+        float ratioW = displayBounds.width() / (float) wallpaperBitmap.getWidth();
+        float ratioH = displayBounds.height() / (float) wallpaperBitmap.getHeight();
+        int desiredHeight = Math.round(Math.max(ratioH, ratioW) * wallpaperBitmap.getHeight());
+        int desiredWidth = Math.round(Math.max(ratioH, ratioW) * wallpaperBitmap.getWidth());
+        desiredHeight = Math.max(desiredHeight, 0);
+        desiredWidth = Math.max(desiredWidth, 0);
+        Bitmap scaledWallpaperBitmap = Bitmap.createScaledBitmap(wallpaperBitmap, desiredWidth, desiredHeight, true);
+        int xPixelShift = Math.max((desiredWidth - displayBounds.width()) / 2, 0) - Math.round(xOffsetPx);
+        int yPixelShift = Math.max((desiredHeight - displayBounds.height()) / 2, 0) - Math.round(yOffsetPx);
+        int cropWidth = Math.min(displayBounds.width(), scaledWallpaperBitmap.getWidth() - xPixelShift);
+        int cropHeight = Math.min(displayBounds.height(), scaledWallpaperBitmap.getHeight() - yPixelShift);
+        scaledWallpaperBitmap = Bitmap.createBitmap(scaledWallpaperBitmap, Math.max(xPixelShift, 0), Math.max(yPixelShift, 0), cropWidth, cropHeight);
+        return scaledWallpaperBitmap;
+    }
+
+    public void updateDepthWallpaper(boolean forced) {
+        if (mLockScreenSubject == null || !isDWallpaperEnabled()) return;
+        boolean pathChanged = (mPreviousWallpaperPath != null && !mPreviousWallpaperPath.equals(mWallpaperSubjectPath));
+        if (!mWallpaperLoaded || pathChanged || forced) {
+            Log.d("WallpaperDepthUtils", "updateDepthWallpaper: " + (mWallpaperLoaded || forced ? "update required" : "first load"));
+            new LoadWallpaperTask().execute();
+            mWallpaperLoaded = true;
+            mPreviousWallpaperPath = mWallpaperSubjectPath;
+        }
+        updateDepthWallpaperVisibility();
+    }
+
+    private class LoadWallpaperTask extends AsyncTask<Void, Void, Drawable> {
+        @Override
+        protected Drawable doInBackground(Void... voids) {
+            try {
+                Log.d("LoadWallpaperTask", "Wallpaper path: " + mWallpaperSubjectPath);
+                Bitmap bitmap = BitmapFactory.decodeFile(mWallpaperSubjectPath);
+                if (bitmap == null) {
+                    Log.d("LoadWallpaperTask", "Failed to decode bitmap from file");
+                    return null;
+                }
+                Bitmap resizedBitmap = getResizedBitmap(bitmap, mOffsetX, mOffsetY);
+                if (resizedBitmap == null) {
+                    Log.d("LoadWallpaperTask", "Failed to decode resized bitmap from file");
+                    return null;
+                }
+                if (mWallpaperBitmap != null) {
+                    mWallpaperBitmap = null;
+                }
+                mWallpaperBitmap = resizedBitmap;
+                Drawable bitmapDrawable = new BitmapDrawable(mContext.getResources(), mWallpaperBitmap);
+                bitmapDrawable.setAlpha(255);
+                return bitmapDrawable;
+            } catch (OutOfMemoryError e) {
+                Log.e("LoadWallpaperTask", "Out of memory error", e);
+                return null;
+            } catch (Exception e) {
+                Log.e("LoadWallpaperTask", "Error loading wallpaper", e);
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Drawable drawable) {
+            if (drawable == null || mWallpaperBitmap == null) {
+                Log.d("LoadWallpaperTask", "decodeFile returned nothing, skipping application of subject as background");
+                mWallpaperLoaded = false;
+                return;
+            }
+            if (drawable != null) {
+                mLockScreenSubject.setBackground(drawable);
+                mLockScreenSubject.getBackground().setAlpha(mDWallOpacity);
+                Log.d("LoadWallpaperTask", "Subject Loaded!");
+            } else {
+                updateDepthWallpaperVisibility();
+            }
+        }
+
+        @Override
+        protected void onCancelled() {
+            super.onCancelled();
+            mWallpaperBitmap = null;
+        }
+    }
+    
+    public void onDetachedFromWindow() {
+        mTunerService.removeTunable(mTunable);
+        mWallpaperBitmap = null;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/WeakListenerManager.kt b/packages/SystemUI/src/com/android/systemui/util/WeakListenerManager.kt
new file mode 100644
index 0000000000000..951dc4d3fb1f7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/WeakListenerManager.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2025 The AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.util
+
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.Looper
+import java.lang.ref.WeakReference
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+import java.util.function.Consumer
+
+class WeakListenerManager<T> {
+
+    private val listeners = ConcurrentLinkedQueue<WeakReference<T>>()
+    private var onActive: (() -> Unit)? = null
+    private var onInactive: (() -> Unit)? = null
+    private var isActive = false
+
+    private val bgExecutor: Executor = Executors.newSingleThreadExecutor()
+    private val bgThread = HandlerThread("ScrimUtils-bg").apply { start() }
+    private val bgHandler = Handler(bgThread.looper)
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    fun addListener(listener: T) {
+        if (listeners.any { it.get() === listener }) return
+        listeners.add(WeakReference(listener))
+        cleanup()
+        if (!isActive && listeners.isNotEmpty()) {
+            isActive = true
+            onActive?.invoke()
+        }
+    }
+
+    fun removeListener(listener: T) {
+        listeners.removeIf { it.get() == null || it.get() === listener }
+        cleanup()
+        if (isActive && listeners.isEmpty()) {
+            isActive = false
+            onInactive?.invoke()
+        }
+    }
+
+    fun notify(action: (T) -> Unit) {
+        if (listeners.isEmpty()) return
+        bgExecutor.execute {
+            val snapshot = listeners
+                .mapNotNull { it.get() }
+                .toMutableList()
+            cleanup()
+            if (snapshot.isNotEmpty()) {
+                for (listener in snapshot) {
+                    mainHandler.post { action(listener) }
+                }
+            }
+        }
+    }
+
+    fun notifyOnMain(action: (T) -> Unit) {
+        mainHandler.post {
+            val snapshot = listeners.mapNotNull { it.get() }.toList()
+            cleanup()
+            snapshot.forEach { listener ->
+                action(listener)
+            }
+        }
+    }
+
+    fun notifyOnBackground(action: (T) -> Unit) {
+        bgHandler.post {
+            val snapshot = listeners.mapNotNull { it.get() }.toList()
+            cleanup()
+            snapshot.forEach { listener ->
+                action(listener)
+            }
+        }
+    }
+
+    fun setLifecycleCallbacks(onActive: (() -> Unit)?, onInactive: (() -> Unit)?) {
+        this.onActive = onActive
+        this.onInactive = onInactive
+    }
+
+    fun size(): Int = listeners.count { it.get() != null }
+    fun isEmpty(): Boolean = size() == 0
+
+    private fun cleanup() {
+        listeners.removeIf { it.get() == null }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/settings/repository/UserAwareSettingsRepository.kt b/packages/SystemUI/src/com/android/systemui/util/settings/repository/UserAwareSettingsRepository.kt
index 15c78d20358dd..11deeb15d6945 100644
--- a/packages/SystemUI/src/com/android/systemui/util/settings/repository/UserAwareSettingsRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/util/settings/repository/UserAwareSettingsRepository.kt
@@ -64,6 +64,16 @@ abstract class UserAwareSettingsRepository(
             .flowOn(backgroundDispatcher)
     }
 
+    fun stringSetting(name: String): Flow<String?> =
+        userRepository.selectedUserInfo
+            .flatMapLatest { userInfo ->
+                settingObserver(name, userInfo.id) {
+                    userSettings.getStringForUser(name, userInfo.id)
+                }
+            }
+            .distinctUntilChanged()
+            .flowOn(backgroundDispatcher)
+
     private fun <T> settingObserver(name: String, userId: Int, settingsReader: () -> T): Flow<T> {
         return userSettings
             .observerFlow(userId, name)
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
index a4df2fc50bfc2..bf18b2cd7a935 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
@@ -30,11 +30,14 @@
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.demomode.DemoMode;
 import com.android.systemui.demomode.DemoModeController;
+import com.android.systemui.tristate.TriStateUiController;
+import com.android.systemui.tristate.TriStateUiControllerImpl;
 import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.plugins.ActivityStarter;
 import com.android.systemui.plugins.PluginDependencyProvider;
 import com.android.systemui.plugins.VolumeDialog;
 import com.android.systemui.plugins.VolumeDialogController;
+import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.ExtensionController;
 import com.android.systemui.tuner.TunerService;
 
@@ -49,7 +52,7 @@
  */
 @SysUISingleton
 public class VolumeDialogComponent implements VolumeComponent, TunerService.Tunable,
-        VolumeDialogControllerImpl.UserActivityListener{
+        VolumeDialogControllerImpl.UserActivityListener, TriStateUiController.UserActivityListener {
 
     public static final String VOLUME_DOWN_SILENT = "sysui_volume_down_silent";
     public static final String VOLUME_UP_SILENT = "sysui_volume_up_silent";
@@ -66,6 +69,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna
 
     protected final Context mContext;
     private final VolumeDialogControllerImpl mController;
+    private TriStateUiControllerImpl mTriStateController;
     private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(
             ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE
             | ActivityInfo.CONFIG_ASSETS_PATHS | ActivityInfo.CONFIG_UI_MODE);
@@ -80,6 +84,7 @@ public VolumeDialogComponent(
             KeyguardViewMediator keyguardViewMediator,
             ActivityStarter activityStarter,
             VolumeDialogControllerImpl volumeDialogController,
+            ConfigurationController configurationController,
             DemoModeController demoModeController,
             PluginDependencyProvider pluginDependencyProvider,
             ExtensionController extensionController,
@@ -90,6 +95,8 @@ public VolumeDialogComponent(
         mActivityStarter = activityStarter;
         mController = volumeDialogController;
         mController.setUserActivityListener(this);
+        boolean hasAlertSlider = mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_hasAlertSlider);
         // Allow plugins to reference the VolumeDialogController.
         pluginDependencyProvider.allowPluginDependency(VolumeDialogController.class);
         extensionController.newExtension(VolumeDialog.class)
@@ -101,6 +108,14 @@ public VolumeDialogComponent(
                     }
                     mDialog = dialog;
                     mDialog.init(LayoutParams.TYPE_VOLUME_OVERLAY, mVolumeDialogCallback);
+                    if (hasAlertSlider) {
+                        if (mTriStateController != null) {
+                            mTriStateController.destroy();
+                        }
+                        mTriStateController = new TriStateUiControllerImpl(mContext,
+                            volumeDialogController, configurationController, tunerService);
+                        mTriStateController.init(LayoutParams.TYPE_VOLUME_OVERLAY, this);
+                    }
                 }).build();
 
 
@@ -201,6 +216,11 @@ private void startSettings(Intent intent) {
         mActivityStarter.startActivity(intent, true /* onlyProvisioned */, true /* dismissShade */);
     }
 
+    @Override
+    public void onTriStateUserActivity() {
+        onUserActivity();
+    }
+
     private final VolumeDialogImpl.Callback mVolumeDialogCallback = new VolumeDialogImpl.Callback() {
         @Override
         public void onZenSettingsClicked() {
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 8bc023e244a07..c913a3d6934bf 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -23,11 +23,13 @@
 import static android.media.AudioManager.STREAM_ACCESSIBILITY;
 import static android.media.AudioManager.STREAM_ALARM;
 import static android.media.AudioManager.STREAM_MUSIC;
+import static android.media.AudioManager.STREAM_NOTIFICATION;
 import static android.media.AudioManager.STREAM_RING;
 import static android.media.AudioManager.STREAM_VOICE_CALL;
 import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
+import static android.view.View.LAYOUT_DIRECTION_LTR;
 import static android.view.View.LAYOUT_DIRECTION_RTL;
 import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -46,6 +48,8 @@
 import android.app.ActivityManager;
 import android.app.Dialog;
 import android.app.KeyguardManager;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -54,6 +58,7 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.database.ContentObserver;
 import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.PixelFormat;
@@ -65,18 +70,24 @@
 import android.graphics.drawable.RotateDrawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
+import android.media.AppVolume;
 import android.media.AudioManager;
 import android.media.AudioSystem;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.os.VibrationEffect;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.text.InputFilter;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
@@ -97,6 +108,7 @@
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.DecelerateInterpolator;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -115,6 +127,7 @@
 import com.android.internal.jank.InteractionJankMonitor;
 import com.android.internal.view.RotationPolicy;
 import com.android.settingslib.Utils;
+import com.android.systemui.Dependency;
 import com.android.systemui.Dumpable;
 import com.android.systemui.Flags;
 import com.android.systemui.Prefs;
@@ -132,6 +145,7 @@
 import com.android.systemui.plugins.VolumeDialogController.StreamState;
 import com.android.systemui.res.R;
 import com.android.systemui.statusbar.VibratorHelper;
+import com.android.systemui.statusbar.phone.ExpandableIndicator;
 import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.DevicePostureController;
@@ -141,12 +155,12 @@
 import com.android.systemui.util.settings.SecureSettings;
 import com.android.systemui.volume.domain.interactor.VolumeDialogInteractor;
 import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
-import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;
 import com.android.systemui.volume.ui.navigation.VolumeNavigator;
 
 import com.google.android.msdl.domain.MSDLPlayer;
 
 import dagger.Lazy;
+import lineageos.providers.LineageSettings;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -268,6 +282,10 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
     private CaptionsToggleImageButton mODICaptionsIcon;
     private View mSettingsView;
     private ImageButton mSettingsIcon;
+    private View mAppVolumeView;
+    private ImageButton mAppVolumeIcon;
+    private View mExpandRowsView;
+    private ExpandableIndicator mExpandRows;
     private final List<VolumeRow> mRows = new ArrayList<>();
     private ConfigurableTexts mConfigurableTexts;
     private final SparseBooleanArray mDynamic = new SparseBooleanArray();
@@ -300,6 +318,9 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
     private ViewStub mODICaptionsTooltipViewStub;
     @VisibleForTesting View mODICaptionsTooltipView = null;
 
+    // Volume panel placement left or right
+    private boolean mVolumePanelOnLeft;
+
     private final boolean mUseBackgroundBlur;
     private Consumer<Boolean> mCrossWindowBlurEnabledListener;
     private BackgroundBlurDrawable mDialogRowsViewBackground;
@@ -307,6 +328,17 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
 
     private int mWindowGravity;
 
+    // Variable to track the default row with which the panel is initially shown
+    private VolumeRow mDefaultRow = null;
+
+    private FrameLayout mRoundedBorderBottom;
+
+    // Volume panel expand state
+    private boolean mExpanded;
+
+    // Number of animating rows
+    private int mAnimatingRows = 0;
+
     @VisibleForTesting
     final int mVolumeRingerIconDrawableId = R.drawable.ic_legacy_speaker_on;
     @VisibleForTesting
@@ -322,7 +354,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
     private final VibratorHelper mVibratorHelper;
     private final MSDLPlayer mMSDLPlayer;
     private final com.android.systemui.util.time.SystemClock mSystemClock;
-    private final VolumePanelFlag mVolumePanelFlag;
     private final VolumeDialogInteractor mInteractor;
     // Optional actions for soundDose
     private Optional<List<CsdWarningAction>>
@@ -342,7 +373,6 @@ public VolumeDialogImpl(
             CsdWarningDialog.Factory csdWarningDialogFactory,
             DevicePostureController devicePostureController,
             Looper looper,
-            VolumePanelFlag volumePanelFlag,
             DumpManager dumpManager,
             Lazy<SecureSettings> secureSettings,
             VibratorHelper vibratorHelper,
@@ -382,7 +412,6 @@ public VolumeDialogImpl(
         mVolumeNavigator = volumeNavigator;
         mSecureSettings = secureSettings;
         mDialogTimeoutMillis = DIALOG_TIMEOUT_MILLIS;
-        mVolumePanelFlag = volumePanelFlag;
         mInteractor = interactor;
 
         dumpManager.registerDumpable("VolumeDialogImpl", this);
@@ -399,6 +428,25 @@ public VolumeDialogImpl(
             };
         }
 
+        if (!mIsTv) {
+            ContentObserver volumePanelOnLeftObserver = new ContentObserver(null) {
+                @Override
+                public void onChange(boolean selfChange) {
+                    final boolean volumePanelOnLeft = LineageSettings.Secure.getInt(
+                            mContext.getContentResolver(),
+                            LineageSettings.Secure.VOLUME_PANEL_ON_LEFT, 0) != 0;
+                    if (mVolumePanelOnLeft != volumePanelOnLeft) {
+                        mVolumePanelOnLeft = volumePanelOnLeft;
+                        mHandler.post(mControllerCallbackH::onConfigurationChanged);
+                    }
+                }
+            };
+            mContext.getContentResolver().registerContentObserver(
+                    LineageSettings.Secure.getUriFor(LineageSettings.Secure.VOLUME_PANEL_ON_LEFT),
+                    false, volumePanelOnLeftObserver);
+            volumePanelOnLeftObserver.onChange(true);
+        }
+
         initDimens();
 
         mOrientation = mContext.getResources().getConfiguration().orientation;
@@ -489,27 +537,75 @@ private void unionViewBoundstoTouchableRegion(final View view) {
         final int[] locInWindow = new int[2];
         view.getLocationInWindow(locInWindow);
 
-        float x = locInWindow[0];
-        float y = locInWindow[1];
+        float xExtraSize = 0;
+        float yExtraSize = 0;
 
         // The ringer and rows container has extra height at the top to fit the expanded ringer
         // drawer. This area should not be touchable unless the ringer drawer is open.
         // In landscape the ringer expands to the left and it has to be ensured that if there
         // are multiple rows they are touchable.
-        if (view == mTopContainer && !mIsRingerDrawerOpen) {
+        // The invisible expandable rows reserve space if the panel is not expanded, this space
+        // needs to be touchable.
+        if (view == mTopContainer) {
             if (!isLandscape()) {
-                y += getRingerDrawerOpenExtraSize();
-            } else if (getRingerDrawerOpenExtraSize() > getVisibleRowsExtraSize()) {
-                x += (getRingerDrawerOpenExtraSize() - getVisibleRowsExtraSize());
+                if (!mIsRingerDrawerOpen) {
+                    yExtraSize = getRingerDrawerOpenExtraSize();
+                }
+                if (!mExpanded) {
+                    xExtraSize = getExpandableRowsExtraSize();
+                }
+            } else {
+                if (!mIsRingerDrawerOpen && !mExpanded) {
+                    xExtraSize =
+                            Math.max(getRingerDrawerOpenExtraSize(), getExpandableRowsExtraSize());
+                } else if (!mIsRingerDrawerOpen) {
+                    if (getRingerDrawerOpenExtraSize() > getVisibleRowsExtraSize()) {
+                        xExtraSize = getRingerDrawerOpenExtraSize() - getVisibleRowsExtraSize();
+                    }
+                } else if (!mExpanded) {
+                    if ((getVisibleRowsExtraSize() + getExpandableRowsExtraSize())
+                            > getRingerDrawerOpenExtraSize()) {
+                        xExtraSize = (getVisibleRowsExtraSize() + getExpandableRowsExtraSize())
+                                - getRingerDrawerOpenExtraSize();
+                    }
+                }
             }
         }
 
-        mTouchableRegion.op(
-                (int) x,
-                (int) y,
-                locInWindow[0] + view.getWidth(),
-                locInWindow[1] + view.getHeight(),
-                Region.Op.UNION);
+        if (isWindowGravityLeft()) {
+            mTouchableRegion.op(
+                    locInWindow[0],
+                    locInWindow[1] + (int) yExtraSize,
+                    locInWindow[0] + view.getWidth() - (int) xExtraSize,
+                    locInWindow[1] + view.getHeight(),
+                    Region.Op.UNION);
+        } else {
+            mTouchableRegion.op(
+                    locInWindow[0] + (int) xExtraSize,
+                    locInWindow[1] + (int) yExtraSize,
+                    locInWindow[0] + view.getWidth(),
+                    locInWindow[1] + view.getHeight(),
+                    Region.Op.UNION);
+        }
+    }
+
+    // Helper to set gravity.
+    private void setGravity(ViewGroup viewGroup, int gravity) {
+        if (viewGroup instanceof LinearLayout) {
+            ((LinearLayout) viewGroup).setGravity(gravity);
+        }
+    }
+
+    // Helper to set layout gravity.
+    private void setLayoutGravity(ViewGroup viewGroup, int gravity) {
+        if (viewGroup != null) {
+            Object obj = viewGroup.getLayoutParams();
+            if (obj instanceof FrameLayout.LayoutParams) {
+                ((FrameLayout.LayoutParams) obj).gravity = gravity;
+            } else if (obj instanceof LinearLayout.LayoutParams) {
+                ((LinearLayout.LayoutParams) obj).gravity = gravity;
+            }
+        }
     }
 
     private void initDialog(int lockTaskModeState) {
@@ -520,6 +616,7 @@ private void initDialog(int lockTaskModeState) {
         mConfigurableTexts = new ConfigurableTexts(mContext);
         mHovering = false;
         mShowing = false;
+        mExpanded = false;
         mWindow = mDialog.getWindow();
         mWindow.requestFeature(Window.FEATURE_NO_TITLE);
         mWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -539,6 +636,12 @@ private void initDialog(int lockTaskModeState) {
         lp.windowAnimations = -1;
 
         mOriginalGravity = mContext.getResources().getInteger(R.integer.volume_dialog_gravity);
+        if (!mIsTv) {
+            // Clear the pre-defined gravity for left or right,
+            // this is handled by mVolumePanelOnLeft
+            mOriginalGravity &= ~(Gravity.LEFT | Gravity.RIGHT);
+            mOriginalGravity |= mVolumePanelOnLeft ? Gravity.LEFT : Gravity.RIGHT;
+        }
         mWindowGravity = Gravity.getAbsoluteGravity(mOriginalGravity,
                 mContext.getResources().getConfiguration().getLayoutDirection());
         lp.gravity = mWindowGravity;
@@ -548,6 +651,8 @@ private void initDialog(int lockTaskModeState) {
         mDialog.setContentView(R.layout.volume_dialog_legacy);
         mDialogView = mDialog.findViewById(R.id.volume_dialog);
         mDialogView.setAlpha(0);
+        mDialogView.setLayoutDirection(
+                mVolumePanelOnLeft ? LAYOUT_DIRECTION_LTR : LAYOUT_DIRECTION_RTL);
         mDialogTimeoutMillis = mSecureSettings.get().getInt(
                 Settings.Secure.VOLUME_DIALOG_DISMISS_TIMEOUT, DIALOG_TIMEOUT_MILLIS);
         mDialog.setCanceledOnTouchOutside(true);
@@ -651,6 +756,9 @@ public void onViewDetachedFromWindow(View v) {
 
                     updateBackgroundForDrawerClosedAmount();
                     setTopContainerBackgroundDrawable();
+
+                    // Rows need to be updated after mRingerAndDrawerContainerBackground is set
+                    updateRowsH(getActiveRow());
                 }
             });
         }
@@ -699,6 +807,34 @@ public void onViewDetachedFromWindow(View v) {
         mSettingsView = mDialog.findViewById(R.id.settings_container);
         mSettingsIcon = mDialog.findViewById(R.id.settings);
 
+        mAppVolumeView = mDialog.findViewById(R.id.app_volume_container);
+        mAppVolumeIcon = mDialog.findViewById(R.id.app_volume);
+        mRoundedBorderBottom = mDialog.findViewById(R.id.rounded_border_bottom);
+
+        mExpandRowsView = mDialog.findViewById(R.id.expandable_indicator_container);
+        mExpandRows = mDialog.findViewById(R.id.expandable_indicator);
+
+        if (isWindowGravityLeft()) {
+            ViewGroup container = mDialog.findViewById(R.id.volume_dialog_container);
+            setGravity(container, Gravity.LEFT);
+
+            setGravity(mDialogView, Gravity.LEFT);
+
+            setGravity((ViewGroup) mTopContainer, Gravity.LEFT);
+
+            setLayoutGravity(mRingerDrawerNewSelectionBg, Gravity.BOTTOM | Gravity.LEFT);
+
+            setLayoutGravity(mSelectedRingerContainer, Gravity.BOTTOM | Gravity.LEFT);
+
+            setGravity(mRinger, Gravity.LEFT);
+
+            setGravity(mDialogRowsViewContainer, Gravity.LEFT);
+
+            setGravity(mODICaptionsView, Gravity.LEFT);
+
+            mExpandRows.setRotation(-90);
+        }
+
         if (mRows.isEmpty()) {
             if (!AudioSystem.isSingleVolume(mContext)) {
                 addRow(STREAM_ACCESSIBILITY, R.drawable.ic_volume_accessibility,
@@ -710,7 +846,7 @@ public void onViewDetachedFromWindow(View v) {
                 addRow(AudioManager.STREAM_RING, R.drawable.ic_ring_volume,
                         R.drawable.ic_ring_volume_off, true, false);
                 addRow(AudioManager.STREAM_NOTIFICATION, R.drawable.ic_volume_ringer,
-                        R.drawable.ic_volume_off, true, false);
+                        R.drawable.ic_volume_ringer_mute, true, false);
                 addRow(STREAM_ALARM,
                         R.drawable.ic_alarm, R.drawable.ic_volume_alarm_mute, true, false);
                 addRow(AudioManager.STREAM_VOICE_CALL,
@@ -726,6 +862,7 @@ public void onViewDetachedFromWindow(View v) {
         updateRowsH(getActiveRow());
         initRingerH();
         initSettingsH(lockTaskModeState);
+        initAppVolumeH();
         initODICaptionsH();
         mAccessibility.init();
     }
@@ -770,8 +907,7 @@ private boolean isLandscape() {
     }
 
     private boolean isRtl() {
-        return mContext.getResources().getConfiguration().getLayoutDirection()
-                == LAYOUT_DIRECTION_RTL;
+        return mDialogView.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
     }
 
     public void setStreamImportant(int stream, boolean important) {
@@ -802,6 +938,9 @@ private void addRow(int stream, int iconRes, int iconMuteRes, boolean important,
         initRow(row, stream, iconRes, iconMuteRes, important, defaultStream);
         mDialogRowsView.addView(row.view);
         mRows.add(row);
+        if (mShowing) {
+            updateRowsH(getActiveRow());
+        }
     }
 
     private void addExistingRows() {
@@ -982,6 +1121,12 @@ private void setupRingerDrawer() {
                     mDialogView.getPaddingTop(),
                     mDialogView.getPaddingRight(),
                     mDialogView.getPaddingBottom() + getRingerDrawerOpenExtraSize());
+        } else if (isWindowGravityLeft()) {
+            mDialogView.setPadding(
+                    mDialogView.getPaddingLeft(),
+                    mDialogView.getPaddingTop(),
+                    mDialogView.getPaddingRight() + getRingerDrawerOpenExtraSize(),
+                    mDialogView.getPaddingBottom());
         } else {
             mDialogView.setPadding(
                     mDialogView.getPaddingLeft() + getRingerDrawerOpenExtraSize(),
@@ -1052,15 +1197,16 @@ private ImageView getDrawerIconViewForMode(int mode) {
     }
 
     /**
-     * Translation to apply form the origin (either top or left) to overlap the selection background
-     * with the given mode in the drawer.
+     * Translation to apply form the origin (either top or left/right) to overlap the selection
+     * background with the given mode in the drawer.
      */
     private float getTranslationInDrawerForRingerMode(int mode) {
-        return mode == RINGER_MODE_VIBRATE
-                ? -mRingerDrawerItemSize * 2
-                : mode == RINGER_MODE_SILENT
-                        ? -mRingerDrawerItemSize
-                        : 0;
+        final int distantRinger = ((isLandscape() && isWindowGravityLeft()) ? RINGER_MODE_NORMAL
+                                                                            : RINGER_MODE_VIBRATE);
+        return (mode == distantRinger                       ? mRingerDrawerItemSize * 2
+                               : mode == RINGER_MODE_SILENT ? mRingerDrawerItemSize
+                                                            : 0)
+                * ((isLandscape() && isWindowGravityLeft()) ? 1 : -1);
     }
 
     @VisibleForTesting String getSelectedRingerContainerDescription() {
@@ -1104,12 +1250,13 @@ private void showRingerDrawer() {
                     getTranslationInDrawerForRingerMode(mState.ringerModeInternal));
         }
 
-        // Move the drawer so that the top/rightmost ringer choice overlaps with the selected ringer
+        // Move the drawer so that the top/outmost ringer choice overlaps with the selected ringer
         // icon.
         if (!isLandscape()) {
             mRingerDrawerContainer.setTranslationY(mRingerDrawerItemSize * (mRingerCount - 1));
         } else {
-            mRingerDrawerContainer.setTranslationX(mRingerDrawerItemSize * (mRingerCount - 1));
+            mRingerDrawerContainer.setTranslationX(
+                    (isWindowGravityLeft() ? -1 : 1) * mRingerDrawerItemSize * (mRingerCount - 1));
         }
         mRingerDrawerContainer.setAlpha(0f);
         mRingerDrawerContainer.setVisibility(VISIBLE);
@@ -1188,7 +1335,7 @@ private void hideRingerDrawer() {
                     .start();
         } else {
             mRingerDrawerContainer.animate()
-                    .translationX(mRingerDrawerItemSize * 2)
+                    .translationX((isWindowGravityLeft() ? -1 : 1) * mRingerDrawerItemSize * 2)
                     .start();
         }
 
@@ -1234,19 +1381,133 @@ private void updateSelectedRingerContainerDescription(boolean open) {
         mSelectedRingerContainer.setContentDescription(currentMode + tapToSelect);
     }
 
+    /**
+     *  Returns a {@link MediaController} that state is playing and type is local playback,
+     *  and also have active sessions.
+     */
+    @Nullable
+    private MediaController getActiveLocalMediaController() {
+        MediaSessionManager mediaSessionManager =
+                mContext.getSystemService(MediaSessionManager.class);
+        MediaController localController = null;
+        final List<String> remoteMediaSessionLists = new ArrayList<>();
+        for (MediaController controller : mediaSessionManager.getActiveSessions(null)) {
+            final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
+            if (pi == null) {
+                // do nothing
+                continue;
+            }
+            final PlaybackState playbackState = controller.getPlaybackState();
+            if (playbackState == null) {
+                // do nothing
+                continue;
+            }
+            if (D.BUG) {
+                Log.d(TAG,
+                        "getActiveLocalMediaController() package name : "
+                                + controller.getPackageName()
+                                + ", play back type : " + pi.getPlaybackType()
+                                + ", play back state : " + playbackState.getState());
+            }
+            if (playbackState.getState() != PlaybackState.STATE_PLAYING) {
+                // do nothing
+                continue;
+            }
+            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
+                if (localController != null
+                        && TextUtils.equals(
+                                localController.getPackageName(), controller.getPackageName())) {
+                    localController = null;
+                }
+                if (!remoteMediaSessionLists.contains(controller.getPackageName())) {
+                    remoteMediaSessionLists.add(controller.getPackageName());
+                }
+                continue;
+            }
+            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
+                if (localController == null
+                        && !remoteMediaSessionLists.contains(controller.getPackageName())) {
+                    localController = controller;
+                }
+            }
+        }
+        return localController;
+    }
+
+    private boolean isBluetoothA2dpConnected() {
+        final BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
+                && mBluetoothAdapter.getProfileConnectionState(BluetoothProfile.A2DP)
+                == BluetoothProfile.STATE_CONNECTED;
+    }
+
+    private boolean isMediaControllerAvailable() {
+        final MediaController mediaController = getActiveLocalMediaController();
+        return mediaController != null && !TextUtils.isEmpty(mediaController.getPackageName());
+    }
+
     private void initSettingsH(int lockTaskModeState) {
+        final boolean showSettings = mDeviceProvisionedController.isCurrentUserSetup()
+                && lockTaskModeState == LOCK_TASK_MODE_NONE;
+        if (mRoundedBorderBottom != null) {
+            mRoundedBorderBottom.setVisibility(!showSettings ? VISIBLE : GONE);
+        }
         if (mSettingsView != null) {
             mSettingsView.setVisibility(
-                    mDeviceProvisionedController.isCurrentUserSetup() &&
-                            lockTaskModeState == LOCK_TASK_MODE_NONE ? VISIBLE : GONE);
+                    showSettings && (isMediaControllerAvailable() || isBluetoothA2dpConnected())
+                            ? VISIBLE
+                            : GONE);
         }
         if (mSettingsIcon != null) {
             mSettingsIcon.setOnClickListener(v -> {
+                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
+                String packageName = isMediaControllerAvailable()
+                        ? getActiveLocalMediaController().getPackageName()
+                        : "";
+                mMediaOutputDialogManager.createAndShow(packageName, true, mDialogView, null, null);
+                dismissH(DISMISS_REASON_SETTINGS_CLICKED);
+            });
+        }
+
+        if (mExpandRowsView != null) {
+            mExpandRowsView.setVisibility(showSettings ? VISIBLE : GONE);
+        }
+        if (mExpandRows != null) {
+            mExpandRows.setOnClickListener(v -> {
+                mExpanded = !mExpanded;
+                updateRowsH(mDefaultRow, true);
+                mExpandRows.setExpanded(mExpanded);
+            });
+        }
+    }
+
+    private boolean shouldShowAppVolume() {
+        ContentResolver cr = mContext.getContentResolver();
+        int showAppVolume = Settings.System.getIntForUser(mContext.getContentResolver(),
+                 Settings.System.SHOW_APP_VOLUME,
+                 0, UserHandle.USER_CURRENT);
+        if (showAppVolume == 1) {
+            AudioManager audioManager = mController.getAudioManager();
+            for (AppVolume av : audioManager.listAppVolumes()) {
+                if (av.isActive()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public void initAppVolumeH() {
+        if (mAppVolumeView != null) {
+            mAppVolumeView.setVisibility(shouldShowAppVolume() ? VISIBLE : GONE);
+        }
+        if (mAppVolumeIcon != null) {
+            mAppVolumeIcon.setOnClickListener(v -> {
                 Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
                 dismissH(DISMISS_REASON_SETTINGS_CLICKED);
                 mMediaOutputDialogManager.dismiss();
                 mVolumeNavigator.openVolumePanel(
-                        mVolumePanelNavigationInteractor.getVolumePanelRoute());
+                        mVolumePanelNavigationInteractor.getAppVolumePanelRoute());
             });
         }
     }
@@ -1380,9 +1641,6 @@ protected void tryToRemoveCaptionsTooltip() {
     }
 
     private void updateODICaptionsH(boolean isServiceComponentEnabled, boolean fromTooltip) {
-        // don't show captions view when the new volume panel is enabled.
-        isServiceComponentEnabled =
-                isServiceComponentEnabled && !mVolumePanelFlag.canUseNewVolumePanel();
         if (mODICaptionsView != null) {
             mODICaptionsView.setVisibility(isServiceComponentEnabled ? VISIBLE : GONE);
         }
@@ -1527,7 +1785,12 @@ private void showH(int reason, boolean keyguardLocked, int lockTaskModeState) {
             mConfigChanged = false;
         }
 
+        if (mDefaultRow == null) {
+            mDefaultRow = getActiveRow();
+        }
+
         initSettingsH(lockTaskModeState);
+        initAppVolumeH();
         mShowing = true;
         mIsAnimatingDismiss = false;
         mDialog.show();
@@ -1638,6 +1901,12 @@ protected void dismissH(int reason) {
                         mDialog.dismiss();
                     }
                     tryToRemoveCaptionsTooltip();
+                    mExpanded = false;
+                    if (mExpandRows != null) {
+                        mExpandRows.setExpanded(mExpanded);
+                    }
+                    mAnimatingRows = 0;
+                    mDefaultRow = null;
                     mIsAnimatingDismiss = false;
 
                     hideRingerDrawer();
@@ -1665,6 +1934,13 @@ private boolean isTv() {
                 || mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION);
     }
 
+    private boolean isExpandableRowH(VolumeRow row) {
+        return row != null && row != mDefaultRow && !row.defaultStream
+                && (row.stream == STREAM_RING
+                        || row.stream == STREAM_NOTIFICATION
+                        || row.stream == STREAM_ALARM
+                        || row.stream == STREAM_MUSIC);
+    }
     private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
         boolean isActive = row.stream == activeRow.stream;
 
@@ -1684,6 +1960,10 @@ private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
                 return true;
             }
 
+            if (mExpanded && isExpandableRowH(row)) {
+                return true;
+            }
+
             // Always show the stream for audio sharing if it exists.
             if (row.ss != null
                     && mContext.getString(R.string.volume_dialog_guest_device_volume_description)
@@ -1691,10 +1971,14 @@ private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
                 return true;
             }
 
-            if (row.defaultStream) {
+            // if the row is the default stream or the row with which this panel was created,
+            // show it additonally to the active row if it is one of the following streams
+            if (row.defaultStream || mDefaultRow == row) {
                 return activeRow.stream == STREAM_RING
+                        || activeRow.stream == STREAM_NOTIFICATION
                         || activeRow.stream == STREAM_ALARM
                         || activeRow.stream == STREAM_VOICE_CALL
+                        || activeRow.stream == STREAM_MUSIC
                         || activeRow.stream == STREAM_ACCESSIBILITY
                         || mDynamic.get(activeRow.stream);
             }
@@ -1710,29 +1994,39 @@ private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
 
     private void updateRowsH(final VolumeRow activeRow) {
         Trace.beginSection("VolumeDialogImpl#updateRowsH");
+        updateRowsH(activeRow, false);
+    }
+
+    private void updateRowsH(final VolumeRow activeRow, boolean animate) {
         if (D.BUG) Log.d(TAG, "updateRowsH");
         if (!mShowing) {
             trimObsoleteH();
         }
 
+        boolean isOutmostIndexMax = isWindowGravityLeft() ? isRtl() : !isRtl();
+
         // Index of the last row that is actually visible.
-        int rightmostVisibleRowIndex = !isRtl() ? -1 : Short.MAX_VALUE;
+        int outmostVisibleRowIndex = isOutmostIndexMax ? -1 : Short.MAX_VALUE;
 
         // apply changes to all rows
         for (final VolumeRow row : mRows) {
             final boolean isActive = row == activeRow;
+            final boolean isExpandableRow = isExpandableRowH(row);
             final boolean shouldBeVisible = shouldBeVisibleH(row, activeRow);
-            Util.setVisOrGone(row.view, shouldBeVisible);
 
-            if (shouldBeVisible && mRingerAndDrawerContainerBackground != null) {
-                // For RTL, the rightmost row has the lowest index since child views are laid out
+            if (!isExpandableRow) {
+                Util.setVisOrGone(row.view, shouldBeVisible);
+            } else if (!mExpanded) {
+                row.view.setVisibility(View.INVISIBLE);
+            }
+
+            if ((shouldBeVisible || isExpandableRow)
+                    && mRingerAndDrawerContainerBackground != null) {
+                // For RTL, the outmost row has the lowest index since child views are laid out
                 // from right to left.
-                rightmostVisibleRowIndex =
-                        !isRtl()
-                                ? Math.max(rightmostVisibleRowIndex,
-                                mDialogRowsView.indexOfChild(row.view))
-                                : Math.min(rightmostVisibleRowIndex,
-                                        mDialogRowsView.indexOfChild(row.view));
+                outmostVisibleRowIndex = isOutmostIndexMax
+                        ? Math.max(outmostVisibleRowIndex, mDialogRowsView.indexOfChild(row.view))
+                        : Math.min(outmostVisibleRowIndex, mDialogRowsView.indexOfChild(row.view));
 
                 // Add spacing between each of the visible rows - we'll remove the spacing from the
                 // last row after the loop.
@@ -1740,12 +2034,13 @@ private void updateRowsH(final VolumeRow activeRow) {
                 if (layoutParams instanceof LinearLayout.LayoutParams) {
                     final LinearLayout.LayoutParams linearLayoutParams =
                             ((LinearLayout.LayoutParams) layoutParams);
-                    if (!isRtl()) {
+                    if (isOutmostIndexMax) {
                         linearLayoutParams.setMarginEnd(mRingerRowsPadding);
                     } else {
                         linearLayoutParams.setMarginStart(mRingerRowsPadding);
                     }
                 }
+                row.view.setLayoutParams(layoutParams);
 
                 // Set the background on each of the rows. We'll remove this from the last row after
                 // the loop, since the last row's background is drawn by the main volume container.
@@ -1753,13 +2048,13 @@ private void updateRowsH(final VolumeRow activeRow) {
                         mContext.getDrawable(R.drawable.volume_row_rounded_background));
             }
 
-            if (row.view.isShown()) {
+            if (row.view.isShown() || isExpandableRow) {
                 updateVolumeRowTintH(row, isActive);
             }
         }
 
-        if (rightmostVisibleRowIndex > -1 && rightmostVisibleRowIndex < Short.MAX_VALUE) {
-            final View lastVisibleChild = mDialogRowsView.getChildAt(rightmostVisibleRowIndex);
+        if (outmostVisibleRowIndex > -1 && outmostVisibleRowIndex < Short.MAX_VALUE) {
+            final View lastVisibleChild = mDialogRowsView.getChildAt(outmostVisibleRowIndex);
             final ViewGroup.LayoutParams layoutParams = lastVisibleChild.getLayoutParams();
             // Remove the spacing on the last row, and remove its background since the container is
             // drawing a background for this row.
@@ -1768,8 +2063,106 @@ private void updateRowsH(final VolumeRow activeRow) {
                         ((LinearLayout.LayoutParams) layoutParams);
                 linearLayoutParams.setMarginStart(0);
                 linearLayoutParams.setMarginEnd(0);
+                lastVisibleChild.setLayoutParams(linearLayoutParams);
                 lastVisibleChild.setBackgroundColor(Color.TRANSPARENT);
             }
+
+            int elevationCount = 0;
+            if (animate) {
+                // Increase the elevation of the outmost row so that other rows animate behind it.
+                lastVisibleChild.setElevation(1f / ++elevationCount);
+
+                // Add a solid background to the outmost row temporary so that other rows animate
+                // behind it
+                lastVisibleChild.setBackgroundDrawable(
+                        mContext.getDrawable(R.drawable.volume_background));
+            }
+
+            int[] lastVisibleChildLocation = new int[2];
+            lastVisibleChild.getLocationInWindow(lastVisibleChildLocation);
+
+            // Track previous rows to calculate translations
+            int visibleRowsCount = 0;
+            int hiddenRowsCount = 0;
+            int rowWidth = mDialogWidth + mRingerRowsPadding;
+
+            for (final VolumeRow row : mRows) {
+                final boolean isExpandableRow = isExpandableRowH(row);
+                final boolean shouldBeVisible = shouldBeVisibleH(row, activeRow);
+
+                if (shouldBeVisible) {
+                    visibleRowsCount++;
+                } else if (isExpandableRow) {
+                    hiddenRowsCount++;
+                }
+
+                // Only move rows that are either expandable or visible and not the default stream
+                if ((!isExpandableRow && !shouldBeVisible) || row.defaultStream) {
+                    continue;
+                }
+
+                // Cancel any ongoing animations
+                row.view.animate().cancel();
+
+                // Expandable rows need to animate behind the last visible row, an additional
+                // always visible stream animates next to the default stream
+                float translationX = (isWindowGravityLeft() ? -1 : 1) * hiddenRowsCount * rowWidth;
+
+                if (animate) {
+                    // If the translation is not set and the panel is expanding start the
+                    // animation behind the main row
+                    if (isExpandableRow && mExpanded && row.view.getTranslationX() == 0f) {
+                        row.view.setTranslationX(
+                                (isWindowGravityLeft() ? -1 : 1) * visibleRowsCount * rowWidth);
+                    }
+
+                    // The elevation should decrease from the outmost row to the inner rows, so that
+                    // every row animates behind the outer rows
+                    row.view.setElevation(1f / ++elevationCount);
+
+                    row.view.setVisibility(View.VISIBLE);
+
+                    // Track how many rows are animating to avoid running animation end actions
+                    // if there is still a row animating
+                    mAnimatingRows++;
+                    row.view.animate()
+                            .translationX(translationX)
+                            .setDuration(mExpanded ? mDialogShowAnimationDurationMs
+                                                   : mDialogHideAnimationDurationMs)
+                            .setInterpolator(mExpanded
+                                            ? new SystemUIInterpolators.LogDecelerateInterpolator()
+                                            : new SystemUIInterpolators.LogAccelerateInterpolator())
+                            .setListener(new AnimatorListenerAdapter() {
+                                @Override
+                                public void onAnimationCancel(Animator animation) {
+                                    mAnimatingRows--;
+                                    animation.removeAllListeners();
+                                }
+
+                                @Override
+                                public void onAnimationEnd(Animator animation) {
+                                    row.view.setElevation(0);
+                                    if (!shouldBeVisible) {
+                                        row.view.setVisibility(View.INVISIBLE);
+                                    }
+                                    mAnimatingRows--;
+                                    if (mAnimatingRows == 0) {
+                                        // Restore the elevation and background
+                                        lastVisibleChild.setElevation(0);
+                                        lastVisibleChild.setBackgroundColor(Color.TRANSPARENT);
+                                        // Set the active stream to ensure the volume keys change
+                                        // the volume of the tinted row. The tint was set before
+                                        // already, but setting the active row cancels ongoing
+                                        // animations.
+                                        mController.setActiveStream(activeRow.stream, false);
+                                    }
+                                }
+                            });
+                } else {
+                    row.view.setTranslationX(translationX);
+                    row.view.setVisibility(shouldBeVisible ? View.VISIBLE : View.INVISIBLE);
+                }
+            }
         }
 
         updateBackgroundForDrawerClosedAmount();
@@ -1879,7 +2272,7 @@ private void trimObsoleteH() {
 
     protected void onStateChangedH(State state) {
         if (D.BUG) Log.d(TAG, "onStateChangedH() state: " + state.toString());
-        if (mState != null && state != null
+        if (mShowing && mState != null && state != null
                 && mState.ringerModeInternal != -1
                 && mState.ringerModeInternal != state.ringerModeInternal
                 && state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {
@@ -1950,6 +2343,7 @@ private void updateVolumeRowH(VolumeRow row) {
         final boolean isVoiceCallStream = row.stream == AudioManager.STREAM_VOICE_CALL;
         final boolean isA11yStream = row.stream == STREAM_ACCESSIBILITY;
         final boolean isRingStream = row.stream == AudioManager.STREAM_RING;
+        final boolean isNotificationStream = row.stream == AudioManager.STREAM_NOTIFICATION;
         final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM;
         final boolean isAlarmStream = row.stream == STREAM_ALARM;
         final boolean isMusicStream = row.stream == AudioManager.STREAM_MUSIC;
@@ -1957,6 +2351,7 @@ private void updateVolumeRowH(VolumeRow row) {
                 && mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE;
         final boolean isRingSilent = isRingStream
                 && mState.ringerModeInternal == AudioManager.RINGER_MODE_SILENT;
+        final boolean isNotificationMuted = isNotificationStream && ss.muted;
         final boolean isZenPriorityOnly = mState.zenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
         final boolean isZenAlarms = mState.zenMode == Global.ZEN_MODE_ALARMS;
         final boolean isZenNone = mState.zenMode == Global.ZEN_MODE_NO_INTERRUPTIONS;
@@ -1992,7 +2387,7 @@ private void updateVolumeRowH(VolumeRow row) {
             iconRes = com.android.internal.R.drawable.ic_qs_dnd;
         } else if (isRingVibrate) {
             iconRes = R.drawable.ic_legacy_volume_ringer_vibrate;
-        } else if (isRingSilent) {
+        } else if (isRingSilent || isNotificationMuted) {
             iconRes = row.iconMuteRes;
         } else if (ss.routedToBluetooth) {
             if (isVoiceCallStream) {
@@ -2322,6 +2717,21 @@ private int getVisibleRowsExtraSize() {
         return (visibleRows - 1) * (mDialogWidth + mRingerRowsPadding);
     }
 
+    /**
+     * Return the size of invisible rows.
+     * Expandable rows are invisible while the panel is not expanded.
+     */
+    private int getExpandableRowsExtraSize() {
+        VolumeRow activeRow = getActiveRow();
+        int expandableRows = 0;
+        for (final VolumeRow row : mRows) {
+            if (isExpandableRowH(row)) {
+                expandableRows++;
+            }
+        }
+        return expandableRows * (mDialogWidth + mRingerRowsPadding);
+    }
+
     private void updateBackgroundForDrawerClosedAmount() {
         if (mRingerAndDrawerContainerBackground == null) {
             return;
@@ -2330,6 +2740,9 @@ private void updateBackgroundForDrawerClosedAmount() {
         final Rect bounds = mRingerAndDrawerContainerBackground.copyBounds();
         if (!isLandscape()) {
             bounds.top = (int) (mRingerDrawerClosedAmount * getRingerDrawerOpenExtraSize());
+        } else if (isWindowGravityLeft()) {
+            bounds.right = (int) ((mDialogCornerRadius / 2) + mRingerDrawerItemSize
+                    + (1f - mRingerDrawerClosedAmount) * getRingerDrawerOpenExtraSize());
         } else {
             bounds.left = (int) (mRingerDrawerClosedAmount * getRingerDrawerOpenExtraSize());
         }
@@ -2337,7 +2750,7 @@ private void updateBackgroundForDrawerClosedAmount() {
     }
 
     /*
-     * The top container is responsible for drawing the solid color background behind the rightmost
+     * The top container is responsible for drawing the solid color background behind the outmost
      * (primary) volume row. This is because the volume drawer animates in from below, initially
      * overlapping the primary row. We need the drawer to draw below the row's SeekBar, since it
      * looks strange to overlap it, but above the row's background color, since otherwise it will be
@@ -2392,8 +2805,9 @@ private void setTopContainerBackgroundDrawable() {
                         ? mDialogRowsViewContainer.getTop()
                         : mDialogRowsViewContainer.getTop() - mDialogCornerRadius);
 
-        // Set gravity to top-right, since additional rows will be added on the left.
-        background.setLayerGravity(0, Gravity.TOP | Gravity.RIGHT);
+        // Set gravity to top and opposite side where additional rows will be added.
+        background.setLayerGravity(0,
+                isWindowGravityLeft() ? Gravity.TOP | Gravity.LEFT : Gravity.TOP | Gravity.RIGHT);
 
         // In landscape, the ringer drawer animates out to the left (instead of down). Since the
         // drawer comes from the right (beyond the bounds of the dialog), we should clip it so it
@@ -2442,7 +2856,6 @@ public void onStateChanged(State state) {
 
         @Override
         public void onLayoutDirectionChanged(int layoutDirection) {
-            mDialogView.setLayoutDirection(layoutDirection);
         }
 
         @Override
@@ -2689,8 +3102,8 @@ private static class VolumeRow {
                 new SliderHapticFeedbackConfig(
                 /* velocityInterpolatorFactor= */ 1f,
                 /* progressInterpolatorFactor= */ 1f,
-                /* progressBasedDragMinScale= */ 0f,
-                /* progressBasedDragMaxScale= */ 0.2f,
+                /* progressBasedDragMinScale= */ 0.10f,
+                /* progressBasedDragMaxScale= */ 0.85f,
                 /* additionalVelocityMaxBump= */ 0.25f,
                 /* deltaMillisForDragInterval= */ 0f,
                 /* deltaProgressForDragThreshold= */ 0.05f,
@@ -2699,7 +3112,7 @@ private static class VolumeRow {
                 /* velocityAxis= */ MotionEvent.AXIS_Y,
                 /* upperBookendScale= */ 1f,
                 /* lowerBookendScale= */ 0.05f,
-                /* exponent= */ 1f / 0.89f,
+                /* exponent= */ 0.80f,
                 /* sliderStepSize = */ 0f,
                 /* filter =*/new SliderHapticFeedbackFilter());
         private static final SeekableSliderTrackerConfig sSliderTrackerConfig =
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanelDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanelDialog.java
index 3785f136d2ef3..fae7bb4c62d34 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanelDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanelDialog.java
@@ -220,6 +220,8 @@ private List<Uri> getSlices() {
         uris.add(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
         uris.add(VOLUME_CALL_URI);
         uris.add(VOLUME_RINGER_URI);
+        uris.add(VOLUME_SEPARATE_RING_URI);
+        uris.add(VOLUME_NOTIFICATION_URI);
         uris.add(VOLUME_ALARM_URI);
         return uris;
     }
@@ -255,6 +257,18 @@ private List<Uri> getSlices() {
             .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("ring_volume")
             .build();
+    private static final Uri VOLUME_SEPARATE_RING_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SETTINGS_SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath("separate_ring_volume")
+            .build();
+    private static final Uri VOLUME_NOTIFICATION_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SETTINGS_SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath("notification_volume")
+            .build();
     private static final Uri VOLUME_ALARM_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SETTINGS_SLICE_AUTHORITY)
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
index 94964bbafbd69..48a2c589911e1 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
@@ -48,7 +48,6 @@
 import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
 import com.android.systemui.volume.panel.dagger.VolumePanelComponent;
 import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory;
-import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;
 import com.android.systemui.volume.ui.navigation.VolumeNavigator;
 import com.google.android.msdl.domain.MSDLPlayer;
 
@@ -123,7 +122,6 @@ static VolumeDialog provideVolumeDialog(
             VolumeNavigator volumeNavigator,
             CsdWarningDialog.Factory csdFactory,
             DevicePostureController devicePostureController,
-            VolumePanelFlag volumePanelFlag,
             DumpManager dumpManager,
             Lazy<SecureSettings> secureSettings,
             VibratorHelper vibratorHelper,
@@ -147,7 +145,6 @@ static VolumeDialog provideVolumeDialog(
                     csdFactory,
                     devicePostureController,
                     Looper.getMainLooper(),
-                    volumePanelFlag,
                     dumpManager,
                     secureSettings,
                     vibratorHelper,
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/domain/VolumeDialogAppVolumeButtonInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/domain/VolumeDialogAppVolumeButtonInteractor.kt
new file mode 100644
index 0000000000000..4c7e71f178598
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/domain/VolumeDialogAppVolumeButtonInteractor.kt
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: DerpFest AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.volume.dialog.appvolume.domain
+
+import android.content.Context
+import android.database.ContentObserver
+import android.media.AudioManager
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialog
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogScope
+import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor
+import com.android.systemui.volume.ui.navigation.VolumeNavigator
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.stateIn
+
+/** Exposes [VolumeDialogAppVolumeButtonViewModel]. */
+@VolumeDialogScope
+class VolumeDialogAppVolumeButtonInteractor
+@Inject
+constructor(
+    @Application private val context: Context,
+    @VolumeDialog private val coroutineScope: CoroutineScope,
+    private val volumeNavigator: VolumeNavigator,
+    private val volumePanelNavigationInteractor: VolumePanelNavigationInteractor,
+) {
+    private fun shouldShowAppVolume(): Boolean {
+        val showAppVolume = Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.SHOW_APP_VOLUME,
+            0,
+            UserHandle.USER_CURRENT
+        )
+        if (showAppVolume == 1) {
+            val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            for (appVolume in audioManager.listAppVolumes()) {
+                if (appVolume.isActive) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    val isVisible: StateFlow<Boolean> =
+        callbackFlow {
+            val handler = Handler(Looper.getMainLooper())
+            val observer = object : ContentObserver(handler) {
+                override fun onChange(selfChange: Boolean) {
+                    trySend(shouldShowAppVolume())
+                }
+            }
+            context.contentResolver.registerContentObserver(
+                Settings.System.getUriFor(Settings.System.SHOW_APP_VOLUME),
+                false,
+                observer,
+                UserHandle.USER_CURRENT
+            )
+            trySend(shouldShowAppVolume())
+            awaitClose {
+                context.contentResolver.unregisterContentObserver(observer)
+            }
+        }
+            .stateIn(coroutineScope, SharingStarted.Eagerly, shouldShowAppVolume())
+
+    fun onButtonClicked() {
+        volumeNavigator.openVolumePanel(
+            volumePanelNavigationInteractor.getAppVolumePanelRoute()
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/binder/VolumeDialogAppVolumeButtonViewBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/binder/VolumeDialogAppVolumeButtonViewBinder.kt
new file mode 100644
index 0000000000000..49c827e6578b7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/binder/VolumeDialogAppVolumeButtonViewBinder.kt
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: DerpFest AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.volume.dialog.appvolume.ui.binder
+
+import android.view.View
+import com.android.app.tracing.coroutines.launchInTraced
+import com.android.app.tracing.coroutines.launchTraced
+import com.android.systemui.res.R
+import com.android.systemui.volume.Events
+import com.android.systemui.volume.dialog.appvolume.ui.viewmodel.VolumeDialogAppVolumeButtonViewModel
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogScope
+import com.android.systemui.volume.dialog.ui.binder.ViewBinder
+import com.android.systemui.volume.dialog.ui.viewmodel.VolumeDialogViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.onEach
+
+/** Binds the app volume button view. */
+@VolumeDialogScope
+class VolumeDialogAppVolumeButtonViewBinder
+@Inject
+constructor(
+    private val viewModel: VolumeDialogAppVolumeButtonViewModel,
+    private val dialogViewModel: VolumeDialogViewModel,
+) : ViewBinder {
+    override fun CoroutineScope.bind(view: View) {
+        val appVolumeButton = view.requireViewById<android.widget.ImageButton>(R.id.app_volume_icon)
+
+        launchTraced("VDAVBVB#addTouchableBounds") {
+            dialogViewModel.addTouchableBounds(appVolumeButton)
+        }
+
+        viewModel.isVisible
+            .onEach { isVisible ->
+                appVolumeButton.visibility =
+                    if (isVisible) {
+                        View.VISIBLE
+                    } else {
+                        View.GONE
+                    }
+            }
+            .launchInTraced("VDAVBVB#isVisible", this)
+
+        // Set color filter to match captions button disabled state (theme-aware)
+        appVolumeButton.setColorFilter(
+            appVolumeButton.context.getColor(
+                com.android.internal.R.color.materialColorOnSurface
+            )
+        )
+
+        appVolumeButton.setOnClickListener {
+            viewModel.onButtonClicked()
+            Events.writeEvent(Events.EVENT_SETTINGS_CLICK)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/viewmodel/VolumeDialogAppVolumeButtonViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/viewmodel/VolumeDialogAppVolumeButtonViewModel.kt
new file mode 100644
index 0000000000000..5e6e223230d7c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/appvolume/ui/viewmodel/VolumeDialogAppVolumeButtonViewModel.kt
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: DerpFest AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.systemui.volume.dialog.appvolume.ui.viewmodel
+
+import com.android.systemui.volume.dialog.appvolume.domain.VolumeDialogAppVolumeButtonInteractor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.StateFlow
+
+/** ViewModel for managing the app volume button in the volume dialog. */
+class VolumeDialogAppVolumeButtonViewModel
+@Inject
+constructor(private val interactor: VolumeDialogAppVolumeButtonInteractor) {
+    val isVisible: StateFlow<Boolean> = interactor.isVisible
+
+    fun onButtonClicked() {
+        interactor.onButtonClicked()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/dagger/module/VolumeDialogModule.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/dagger/module/VolumeDialogModule.kt
index e776962a7ef33..a60e450da9a25 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/dialog/dagger/module/VolumeDialogModule.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/dagger/module/VolumeDialogModule.kt
@@ -16,7 +16,9 @@
 
 package com.android.systemui.volume.dialog.dagger.module
 
+import com.android.systemui.volume.dialog.appvolume.ui.binder.VolumeDialogAppVolumeButtonViewBinder
 import com.android.systemui.volume.dialog.captions.ui.binder.VolumeDialogCaptionsButtonViewBinder
+import com.android.systemui.volume.dialog.percentage.ui.binder.VolumeDialogVolumePercentageViewBinder
 import com.android.systemui.volume.dialog.dagger.scope.VolumeDialog
 import com.android.systemui.volume.dialog.ringer.data.repository.VolumeDialogRingerFeedbackRepository
 import com.android.systemui.volume.dialog.ringer.data.repository.VolumeDialogRingerFeedbackRepositoryImpl
@@ -47,12 +49,16 @@ interface VolumeDialogModule {
             ringerViewBinder: VolumeDialogRingerViewBinder,
             settingsButtonViewBinder: VolumeDialogSettingsButtonViewBinder,
             captionsButtonViewBinder: VolumeDialogCaptionsButtonViewBinder,
+            appVolumeButtonViewBinder: VolumeDialogAppVolumeButtonViewBinder,
+            volumePercentageViewBinder: VolumeDialogVolumePercentageViewBinder,
         ): List<ViewBinder> =
             listOf(
                 slidersViewBinder,
                 ringerViewBinder,
                 settingsButtonViewBinder,
                 captionsButtonViewBinder,
+                appVolumeButtonViewBinder,
+                volumePercentageViewBinder,
             )
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/domain/VolumeDialogVolumePercentageInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/domain/VolumeDialogVolumePercentageInteractor.kt
new file mode 100644
index 0000000000000..1ca6f543b7f3f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/domain/VolumeDialogVolumePercentageInteractor.kt
@@ -0,0 +1,76 @@
+/*
+ * SPDX-FileCopyrightText: Lunaris AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.systemui.volume.dialog.percentage.domain
+
+import android.content.Context
+import android.database.ContentObserver
+import android.media.AudioManager
+import android.os.Handler
+import android.os.Looper
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.systemui.dagger.qualifiers.Application
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogScope
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialog
+
+@VolumeDialogScope
+class VolumeDialogVolumePercentageInteractor
+@Inject
+constructor(
+    @Application private val context: Context,
+    @VolumeDialog private val coroutineScope: CoroutineScope,
+) {
+    private val audioManager =
+        context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    private fun isEnabled(): Boolean =
+        Settings.System.getIntForUser(
+            context.contentResolver,
+            Settings.System.SHOW_VOLUME_PERCENTAGE,
+            0,
+            UserHandle.USER_CURRENT,
+        ) == 1
+
+    private fun currentPercentage(): String {
+        val current = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+        val max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+        return if (max > 0) "${(current * 100 / max)}%" else "0%"
+    }
+
+    private fun observeSettings() = callbackFlow {
+        val handler = Handler(Looper.getMainLooper())
+        val observer = object : ContentObserver(handler) {
+            override fun onChange(selfChange: Boolean) {
+                trySend(isEnabled())
+            }
+        }
+        context.contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.SHOW_VOLUME_PERCENTAGE),
+            false,
+            observer,
+            UserHandle.USER_CURRENT,
+        )
+        trySend(isEnabled())
+        awaitClose { context.contentResolver.unregisterContentObserver(observer) }
+    }
+
+    val isVisible: StateFlow<Boolean> =
+        observeSettings()
+            .stateIn(coroutineScope, SharingStarted.Eagerly, isEnabled())
+
+    val percentage: StateFlow<String> =
+        callbackFlow {
+            trySend(currentPercentage())
+            awaitClose {}
+        }.stateIn(coroutineScope, SharingStarted.Eagerly, currentPercentage())
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/binder/VolumeDialogVolumePercentageViewBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/binder/VolumeDialogVolumePercentageViewBinder.kt
new file mode 100644
index 0000000000000..e7bd9255d4835
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/binder/VolumeDialogVolumePercentageViewBinder.kt
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: Lunaris AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.systemui.volume.dialog.percentage.ui.binder
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioManager
+import android.view.View
+import android.widget.TextView
+import com.android.app.tracing.coroutines.launchInTraced
+import com.android.systemui.res.R
+import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogScope
+import com.android.systemui.volume.dialog.percentage.ui.viewmodel.VolumeDialogVolumePercentageViewModel
+import com.android.systemui.volume.dialog.ui.binder.ViewBinder
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.Job
+
+@VolumeDialogScope
+class VolumeDialogVolumePercentageViewBinder
+@Inject
+constructor(
+    private val viewModel: VolumeDialogVolumePercentageViewModel,
+) : ViewBinder {
+    override fun CoroutineScope.bind(view: View) {
+        val percentageText = view.requireViewById<TextView>(R.id.volume_percentage_text)
+
+        viewModel.isVisible
+            .onEach { isVisible ->
+                percentageText.visibility = if (isVisible) View.VISIBLE else View.GONE
+            }
+            .launchInTraced("VDVPVB#isVisible", this)
+
+        val intentFilter = IntentFilter(AudioManager.VOLUME_CHANGED_ACTION)
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                val streamType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1)
+                if (streamType == AudioManager.STREAM_MUSIC) {
+                    val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                    val current = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                    val max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                    percentageText.text = if (max > 0) "${current * 100 / max}%" else "0%"
+                }
+            }
+        }
+        view.context.registerReceiver(receiver, intentFilter)
+
+        val audioManager = view.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        val current = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+        val max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+        percentageText.text = if (max > 0) "${current * 100 / max}%" else "0%"
+
+        coroutineContext[Job]?.invokeOnCompletion {
+            view.context.unregisterReceiver(receiver)
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/viewmodel/VolumeDialogVolumePercentageViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/viewmodel/VolumeDialogVolumePercentageViewModel.kt
new file mode 100644
index 0000000000000..afaebf113a03b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/percentage/ui/viewmodel/VolumeDialogVolumePercentageViewModel.kt
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: Lunaris AOSP
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.android.systemui.volume.dialog.percentage.ui.viewmodel
+
+import com.android.systemui.volume.dialog.percentage.domain.VolumeDialogVolumePercentageInteractor
+import javax.inject.Inject
+import kotlinx.coroutines.flow.StateFlow
+
+class VolumeDialogVolumePercentageViewModel
+@Inject
+constructor(private val interactor: VolumeDialogVolumePercentageInteractor) {
+    val percentage: StateFlow<String> = interactor.percentage
+    val isVisible: StateFlow<Boolean> = interactor.isVisible
+}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt
index 82fabca7a848a..7bdffaee73027 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/VolumeDialogSliderViewBinder.kt
@@ -16,6 +16,8 @@
 
 package com.android.systemui.volume.dialog.sliders.ui
 
+import android.os.UserHandle
+import android.provider.Settings
 import android.view.View
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.interaction.DragInteraction
@@ -30,8 +32,10 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -43,6 +47,9 @@ import com.android.systemui.res.R
 import com.android.systemui.volume.dialog.domain.interactor.DesktopAudioTileDetailsFeatureInteractor
 import com.android.systemui.volume.dialog.sliders.dagger.VolumeDialogSliderScope
 import com.android.systemui.volume.dialog.sliders.ui.compose.SliderTrack
+import com.android.systemui.volume.dialog.sliders.ui.compose.rememberGradientColorMode
+import com.android.systemui.volume.dialog.sliders.ui.compose.rememberGradientCustomColors
+import com.android.systemui.volume.dialog.sliders.ui.compose.rememberVolumeGradientEnabled
 import com.android.systemui.volume.dialog.sliders.ui.viewmodel.VolumeDialogOverscrollViewModel
 import com.android.systemui.volume.dialog.sliders.ui.viewmodel.VolumeDialogSliderViewModel
 import com.android.systemui.volume.haptics.ui.VolumeHapticsConfigsProvider
@@ -81,6 +88,19 @@ constructor(
     }
 }
 
+@Composable
+private fun rememberVolumeHapticsEnabled(): Boolean {
+    val context = LocalContext.current
+    return remember {
+        Settings.Secure.getIntForUser(
+            context.contentResolver,
+            Settings.Secure.VOLUME_DIALOG_HAPTIC_FEEDBACK,
+            1,
+            UserHandle.USER_CURRENT,
+        ) != 0
+    }
+}
+
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 private fun VolumeDialogSlider(
@@ -100,6 +120,7 @@ private fun VolumeDialogSlider(
     val collectedSliderStateModel by viewModel.state.collectAsStateWithLifecycle(null)
     val sliderStateModel = collectedSliderStateModel ?: return
     val interactionSource = remember { MutableInteractionSource() }
+    val isHapticsEnabled = rememberVolumeHapticsEnabled()
 
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect {
@@ -111,6 +132,16 @@ private fun VolumeDialogSlider(
         }
     }
 
+    val thumbColorOverride: Color? =
+        if (!rememberVolumeGradientEnabled()) {
+            null
+        } else if (rememberGradientColorMode() == 1) {
+            val (customStart, _) = rememberGradientCustomColors()
+            customStart
+        } else {
+            MaterialTheme.colorScheme.primary
+        }
+
     Slider(
         value = sliderStateModel.value,
         valueRange = sliderStateModel.valueRange,
@@ -128,7 +159,7 @@ private fun VolumeDialogSlider(
         isVertical = isVolumeDialogVertical,
         colors = colors,
         interactionSource = interactionSource,
-        haptics =
+        haptics = if (isHapticsEnabled) {
             Haptics.Enabled(
                 hapticsViewModelFactory = hapticsViewModelFactory,
                 hapticConfigs =
@@ -139,7 +170,10 @@ private fun VolumeDialogSlider(
                     } else {
                         Orientation.Horizontal
                     },
-            ),
+            )
+        } else {
+            Haptics.Disabled
+        },
         stepDistance = 1f,
         track = { sliderState ->
             SliderTrack(
@@ -171,6 +205,7 @@ private fun VolumeDialogSlider(
                         isVisible = iconsState.isInactiveTrackEndIconVisible,
                     )
                 },
+                ignoreGradient = false,
             )
         },
         thumb = { sliderState, interactions ->
@@ -178,7 +213,9 @@ private fun VolumeDialogSlider(
                 sliderState = sliderState,
                 interactionSource = interactions,
                 enabled = !sliderStateModel.isDisabled,
-                colors = colors,
+                colors = SliderDefaults.colors(
+                    thumbColor = thumbColorOverride ?: SliderDefaults.colors().thumbColor
+                ),
                 thumbSize =
                     if (isVolumeDialogVertical) {
                         DpSize(52.dp, 4.dp)
diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/compose/VolumeDialogSliderTrack.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/compose/VolumeDialogSliderTrack.kt
index 28557c854e1a6..c8234357c2ebe 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/compose/VolumeDialogSliderTrack.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/ui/compose/VolumeDialogSliderTrack.kt
@@ -16,29 +16,48 @@
 
 package com.android.systemui.volume.dialog.sliders.ui.compose
 
+import android.database.ContentObserver
+import android.os.UserHandle
+import android.provider.Settings
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SliderColors
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.material3.SliderState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.Measurable
 import androidx.compose.ui.layout.MeasurePolicy
 import androidx.compose.ui.layout.MeasureResult
 import androidx.compose.ui.layout.MeasureScope
 import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
@@ -63,6 +82,7 @@ fun SliderTrack(
     activeTrackEndIcon: (@Composable BoxScope.(iconsState: SliderIconsState) -> Unit)? = null,
     inactiveTrackStartIcon: (@Composable BoxScope.(iconsState: SliderIconsState) -> Unit)? = null,
     inactiveTrackEndIcon: (@Composable BoxScope.(iconsState: SliderIconsState) -> Unit)? = null,
+    ignoreGradient: Boolean = true,
 ) {
     val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
     val measurePolicy =
@@ -77,21 +97,39 @@ fun SliderTrack(
     Layout(
         measurePolicy = measurePolicy,
         content = {
-            SliderDefaults.Track(
+
+            val gradientColors = if (rememberGradientColorMode() == 1) {
+                val (start, end) = rememberGradientCustomColors()
+                listOf(start, end)
+            } else {
+                listOf(
+                    MaterialTheme.colorScheme.primary,
+                    MaterialTheme.colorScheme.secondary
+                )
+            }
+
+            val activeBrush =
+                if (!ignoreGradient && rememberVolumeGradientEnabled())
+                    gradientColors
+                else
+                    null
+
+            GradientSliderTrack(
                 sliderState = sliderState,
+                isEnabled = isEnabled,
                 colors = colors,
-                enabled = isEnabled,
                 trackCornerSize = trackCornerSize,
                 trackInsideCornerSize = trackInsideCornerSize,
-                drawStopIndicator = null,
                 thumbTrackGapSize = thumbTrackGapSize,
-                drawTick = { _, _ -> },
+                isVertical = isVertical,
+                gradientColors = activeBrush,
                 modifier =
-                    Modifier.then(
+                    Modifier
+                        .then(
                             if (isVertical) {
-                                Modifier.width(trackSize)
+                                Modifier.width(trackSize).fillMaxHeight()
                             } else {
-                                Modifier.height(trackSize)
+                                Modifier.height(trackSize).fillMaxWidth()
                             }
                         )
                         .layoutId(Contents.Track),
@@ -130,6 +168,269 @@ fun SliderTrack(
     )
 }
 
+private data class TrackGradient(
+    val brush: Brush,
+)
+
+@Composable
+fun rememberVolumeGradientEnabled(): Boolean {
+    val context = LocalContext.current
+    val contentResolver = context.contentResolver
+
+    fun readEnabled(): Boolean {
+        return try {
+            Settings.System.getIntForUser(
+                contentResolver, Settings.System.VOLUME_SLIDER_GRADIENT, 0,
+                UserHandle.USER_CURRENT
+            ) != 0
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    var enabled by remember { mutableStateOf(readEnabled()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+                override fun onChange(selfChange: Boolean) {
+                    enabled = readEnabled()
+                }
+            }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.VOLUME_SLIDER_GRADIENT),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return enabled
+}
+
+@Composable
+fun rememberGradientColorMode(): Int {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readMode(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_COLOR_MODE, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var mode by remember { mutableIntStateOf(readMode()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                mode = readMode()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_COLOR_MODE),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    return mode
+}
+
+@Composable
+fun rememberGradientCustomColors(): Pair<Color, Color> {
+    val contentResolver = LocalContext.current.contentResolver
+
+    fun readStart(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_START_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    fun readEnd(): Int = try {
+        Settings.System.getIntForUser(
+            contentResolver, Settings.System.CUSTOM_GRADIENT_END_COLOR, 0,
+            UserHandle.USER_CURRENT
+        )
+    } catch (_: Throwable) {
+        0
+    }
+
+    var startInt by remember { mutableIntStateOf(readStart()) }
+    var endInt by remember { mutableIntStateOf(readEnd()) }
+
+    DisposableEffect(contentResolver) {
+        val observer = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                startInt = readStart()
+                endInt = readEnd()
+            }
+        }
+
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_START_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.CUSTOM_GRADIENT_END_COLOR),
+            false, observer, UserHandle.USER_ALL
+        )
+
+        onDispose {
+            contentResolver.unregisterContentObserver(observer)
+        }
+    }
+
+    val start = if (startInt != 0) Color(startInt) else MaterialTheme.colorScheme.primary
+    val end = if (endInt != 0) Color(endInt) else MaterialTheme.colorScheme.secondary
+    return start to end
+}
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun GradientSliderTrack(
+    sliderState: SliderState,
+    isEnabled: Boolean,
+    colors: SliderColors,
+    trackCornerSize: Dp,
+    trackInsideCornerSize: Dp,
+    thumbTrackGapSize: Dp,
+    isVertical: Boolean,
+    gradientColors: List<Color>?,
+    modifier: Modifier = Modifier,
+) {
+    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+
+    val inactiveColor =
+        if (isEnabled) colors.inactiveTrackColor else colors.disabledInactiveTrackColor
+    val activeSolidColor =
+        if (isEnabled) colors.activeTrackColor else colors.disabledActiveTrackColor
+
+    Box(
+        modifier =
+            modifier.drawBehind {
+                val w = size.width
+                val h = size.height
+                if (w <= 0f || h <= 0f) return@drawBehind
+
+                val frac = sliderState.coercedValueAsFraction.coerceIn(0f, 1f)
+                val outerR = trackCornerSize.toPx().coerceAtMost(minOf(w, h) / 2f)
+                val innerR = trackInsideCornerSize.toPx().coerceAtMost(minOf(w, h) / 2f)
+                val halfGap = (thumbTrackGapSize.toPx() / 2f).coerceAtLeast(0f)
+
+                drawRoundRect(
+                    color = inactiveColor,
+                    size = size,
+                    cornerRadius = CornerRadius(outerR, outerR)
+                )
+
+                if (!isVertical) {
+                    val splitX = if (isRtl) w * (1f - frac) else w * frac
+
+                    val gapEff =
+                        if (isRtl) {
+                            minOf(halfGap, splitX)
+                        } else {
+                            minOf(halfGap, w - splitX)
+                        }
+
+                    val activeStart = if (isRtl) splitX + gapEff else 0f
+                    val activeEnd = if (isRtl) w else splitX - gapEff
+
+                    if (activeEnd <= activeStart) return@drawBehind
+
+                    val eps = 0.5f
+
+                    val hitsStart = activeStart <= eps
+                    val hitsEnd = activeEnd >= (w - eps)
+
+                    val leftR =
+                        if (isRtl) {
+                            if (hitsStart) outerR else innerR   // rounded only at max (when it reaches start)
+                        } else {
+                            outerR                              // far end always rounded
+                        }
+
+                    val rightR =
+                        if (isRtl) {
+                            outerR                              // far end always rounded
+                        } else {
+                            if (hitsEnd) outerR else innerR     // rounded only at max (when it reaches end)
+                        }
+
+                    val path = Path().apply {
+                        addRoundRect(
+                            RoundRect(
+                                rect = Rect(activeStart, 0f, activeEnd, h),
+                                topLeft = CornerRadius(leftR, leftR),
+                                bottomLeft = CornerRadius(leftR, leftR),
+                                topRight = CornerRadius(rightR, rightR),
+                                bottomRight = CornerRadius(rightR, rightR),
+                            )
+                        )
+                    }
+
+                    val brush =
+                        if (gradientColors != null) Brush.horizontalGradient(gradientColors)
+                        else Brush.linearGradient(listOf(activeSolidColor, activeSolidColor))
+
+                    drawPath(path = path, brush = brush)
+                } else {
+                    val frac = sliderState.coercedValueAsFraction.coerceIn(0f, 1f)
+                    val splitY = h * (1f - frac)
+
+                    val gapEff = minOf(halfGap, splitY)
+
+                    val activeTop = splitY + gapEff
+                    val activeBottom = h
+                    if (activeBottom <= activeTop) return@drawBehind
+
+                    val eps = 0.5f
+                    val hitsTop = activeTop <= eps 
+
+                    val topR = if (hitsTop) outerR else innerR
+                    val bottomR = outerR
+
+                    val path = Path().apply {
+                        addRoundRect(
+                            RoundRect(
+                                rect = Rect(0f, activeTop, w, activeBottom),
+                                topLeft = CornerRadius(topR, topR),
+                                bottomLeft = CornerRadius(bottomR, bottomR),
+                                topRight = CornerRadius(topR, topR),
+                                bottomRight = CornerRadius(bottomR, bottomR),
+                            )
+                        )
+                    }
+
+                    val brush =
+                        if (gradientColors != null) {
+                            Brush.verticalGradient(
+                                colors = gradientColors,
+                                startY = activeBottom,
+                                endY = activeTop
+                            )
+                        } else {
+                            Brush.linearGradient(listOf(activeSolidColor, activeSolidColor))
+                        }
+
+                    drawPath(path = path, brush = brush)
+                }
+            }
+    )
+}
+
 @Composable
 private fun TrackIcon(
     icon: (@Composable BoxScope.(sliderIconsState: SliderIconsState) -> Unit)?,
diff --git a/packages/SystemUI/src/com/android/systemui/volume/domain/interactor/VolumePanelNavigationInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/domain/interactor/VolumePanelNavigationInteractor.kt
index d64bb03f04ed4..de08cd9b7d2e7 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/domain/interactor/VolumePanelNavigationInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/domain/interactor/VolumePanelNavigationInteractor.kt
@@ -41,4 +41,8 @@ constructor(
             else -> VolumePanelRoute.SETTINGS_VOLUME_PANEL
         }
     }
+
+    fun getAppVolumePanelRoute(): VolumePanelRoute {
+        return VolumePanelRoute.APP_VOLUME_PANEL
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/domain/model/VolumePanelRoute.kt b/packages/SystemUI/src/com/android/systemui/volume/domain/model/VolumePanelRoute.kt
index c85af152137b3..7b9ed8c9e9b89 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/domain/model/VolumePanelRoute.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/domain/model/VolumePanelRoute.kt
@@ -20,4 +20,5 @@ enum class VolumePanelRoute {
     COMPOSE_VOLUME_PANEL,
     SETTINGS_VOLUME_PANEL,
     SYSTEM_UI_VOLUME_PANEL,
+    APP_VOLUME_PANEL,
 }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/haptics/ui/VolumeHapticsConfigsProvider.kt b/packages/SystemUI/src/com/android/systemui/volume/haptics/ui/VolumeHapticsConfigsProvider.kt
index a1207f421581b..75f032ad5374a 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/haptics/ui/VolumeHapticsConfigsProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/haptics/ui/VolumeHapticsConfigsProvider.kt
@@ -38,7 +38,9 @@ object VolumeHapticsConfigsProvider {
             // Create a set of continuous configs
             hapticFeedbackConfig =
                 SliderHapticFeedbackConfig(
-                    additionalVelocityMaxBump = 0.1f,
+                    progressBasedDragMinScale = 0.1f,
+                    progressBasedDragMaxScale = 0.85f,
+                    additionalVelocityMaxBump = 0.25f,
                     deltaProgressForDragThreshold = 0.02f,
                     numberOfLowTicks = 4,
                     maxVelocityToScale = 0.5f, /* slider progress(from 0 to 1) per sec */
@@ -55,9 +57,9 @@ object VolumeHapticsConfigsProvider {
                 SliderHapticFeedbackConfig(
                     lowerBookendScale = 0.2f,
                     progressBasedDragMinScale = 0.2f,
-                    progressBasedDragMaxScale = 0.5f,
+                    progressBasedDragMaxScale = 0.85f,
                     deltaProgressForDragThreshold = 0f,
-                    additionalVelocityMaxBump = 0.2f,
+                    additionalVelocityMaxBump = 0.25f,
                     maxVelocityToScale = 0.1f, /* slider progress(from 0 to 1) per sec */
                     sliderStepSize = stepSize,
                     filter = filter,
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ui/navigation/VolumeNavigator.kt b/packages/SystemUI/src/com/android/systemui/volume/ui/navigation/VolumeNavigator.kt
index fb9b44f126cfa..66edc9222fc7f 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ui/navigation/VolumeNavigator.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/ui/navigation/VolumeNavigator.kt
@@ -94,6 +94,11 @@ constructor(
                 )
             VolumePanelRoute.SYSTEM_UI_VOLUME_PANEL ->
                 volumePanelFactory.create(aboveStatusBar = true, view = null)
+            VolumePanelRoute.APP_VOLUME_PANEL ->
+                activityStarter.startActivity(
+                    /* intent= */ Intent(Settings.Panel.ACTION_APP_VOLUME),
+                    /* dismissShade= */ true
+                )
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java
index 70a6ddb7b22c1..64ef7904c6470 100644
--- a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java
@@ -29,10 +29,13 @@
 import android.graphics.RecordingCanvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Paint;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManager.DisplayListener;
+import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
+import android.os.SystemProperties;
 import android.os.Trace;
 import android.service.wallpaper.WallpaperService;
 import android.util.Log;
@@ -111,8 +114,11 @@ public Engine onCreateEngine() {
     }
 
     class CanvasEngine extends WallpaperService.Engine implements DisplayListener {
+        private static final long DIM_DEBOUNCE_MS = 300;
         private WallpaperManager mWallpaperManager;
         private final ImageWallpaperColorExtractor mColorExtractor;
+        private final Handler mDimHandler = new Handler(Looper.getMainLooper());
+        private Runnable mPendingDimUpdate;
         private SurfaceHolder mSurfaceHolder;
         private boolean mDrawn = false;
         @VisibleForTesting
@@ -288,6 +294,9 @@ void drawFrameOnCanvas(Bitmap bitmap) {
             Trace.beginSection("ImageWallpaper.CanvasEngine#drawFrame");
             Surface surface = mSurfaceHolder.getSurface();
             Canvas canvas = null;
+            Bitmap processedBitmap = null;
+            Bitmap tempBitmap = null;
+            
             try {
                 canvas = mWideColorGamut
                         ? surface.lockHardwareWideColorGamutCanvas()
@@ -295,18 +304,132 @@ void drawFrameOnCanvas(Bitmap bitmap) {
             } catch (IllegalStateException e) {
                 Log.w(TAG, "Unable to lock canvas", e);
             }
+
             if (canvas != null) {
-                Rect dest = mSurfaceHolder.getSurfaceFrame();
                 try {
-                    canvas.drawBitmap(bitmap, null, dest, null);
+                    Rect dest = mSurfaceHolder.getSurfaceFrame();
+                    processedBitmap = WallpaperUtils.resizeAndCompress(bitmap, getDisplayContext());
+                    
+                    boolean isLockScreen = isLockScreenWallpaper();
+                    
+                    // Apply blur effect
+                    int blurType = SystemProperties.getInt("persist.sys.wallpaper.blur_enabled", 0);
+                    if (shouldApplyEffect(blurType, isLockScreen)) {
+                        int blurStyle = SystemProperties.getInt("persist.sys.wallpaper.blur_type", 0);
+                        int userBlurRadius;
+                        switch (blurStyle) {
+                            case 1: // Frosted glass
+                                userBlurRadius = 50;
+                                break;
+                            default: // Glass
+                                userBlurRadius = 9;
+                                break;
+                        }
+                        tempBitmap = WallpaperUtils.getBlurredBitmap(processedBitmap, userBlurRadius, getDisplayContext());
+                        if (tempBitmap != processedBitmap) {
+                            processedBitmap.recycle();
+                            processedBitmap = tempBitmap;
+                            tempBitmap = null;
+                        }
+                    }
+
+                    int effectType = SystemProperties.getInt("persist.sys.wallpaper.effect_type", 0);
+                    int effectTarget = SystemProperties.getInt("persist.sys.wallpaper.effect_target", 0);
+                    
+                    if (effectType != 0 && shouldApplyEffect(effectTarget, isLockScreen)) {
+                        switch (effectType) {
+                            case 1:
+                                tempBitmap = WallpaperUtils.getFilmGrain(processedBitmap, getDisplayContext());
+                                break;
+                            case 2:
+                                tempBitmap = WallpaperUtils.getChromaticAberrationEffect(processedBitmap);
+                                break;
+                            case 3:
+                                float vignetteIntensity = SystemProperties.getInt("persist.sys.wallpaper.vignette_intensity", 50) / 100f;
+                                tempBitmap = WallpaperUtils.getVignetteEffect(processedBitmap, vignetteIntensity);
+                                break;
+                            case 4:
+                                int pixelationSize = SystemProperties.getInt("persist.sys.wallpaper.pixelation_size", 8);
+                                tempBitmap = WallpaperUtils.getPixelationEffect(processedBitmap, pixelationSize);
+                                break;
+                            case 5:
+                                float saturation = SystemProperties.getInt("persist.sys.wallpaper.saturation_level", 100) / 100f;
+                                tempBitmap = WallpaperUtils.getSaturationEffect(processedBitmap, saturation);
+                                break;
+                            case 6:
+                                tempBitmap = WallpaperUtils.getSepiaEffect(processedBitmap);
+                                break;
+                            case 7:
+                                tempBitmap = WallpaperUtils.getSharpenEffect(processedBitmap);
+                                break;
+                            case 8:
+                                tempBitmap = WallpaperUtils.getGrayscaleEffect(processedBitmap);
+                                break;
+                            case 9:
+                                tempBitmap = WallpaperUtils.getNegativeEffect(processedBitmap);
+                                break;
+                            case 10:
+                                tempBitmap = WallpaperUtils.getRadialBlurEffect(processedBitmap);
+                                break;
+                            case 11:
+                                int posterizeLevels = SystemProperties.getInt("persist.sys.wallpaper.posterize_levels", 8);
+                                tempBitmap = WallpaperUtils.getPosterizeEffect(processedBitmap, posterizeLevels);
+                                break;
+                        }
+                        
+                        if (tempBitmap != null && tempBitmap != processedBitmap) {
+                            processedBitmap.recycle();
+                            processedBitmap = tempBitmap;
+                            tempBitmap = null;
+                        }
+                    }
+                    
+                    // Apply dimming effect
+                    int dimType = SystemProperties.getInt("persist.sys.wallpaper.dim_enabled", 0);
+                    if (shouldApplyEffect(dimType, isLockScreen)) {
+                        int dimLevel = SystemProperties.getInt("persist.sys.wallpaper.dim_level", 10);
+                        tempBitmap = WallpaperUtils.getDimmedBitmap(processedBitmap, dimLevel);
+                        if (tempBitmap != processedBitmap) {
+                            processedBitmap.recycle();
+                            processedBitmap = tempBitmap;
+                            tempBitmap = null;
+                        }
+                    }
+                    
+                    canvas.drawBitmap(processedBitmap, null, dest, null);
                     mDrawn = true;
                 } finally {
+                    if (processedBitmap != null && processedBitmap != bitmap) {
+                        processedBitmap.recycle();
+                    }
+                    if (tempBitmap != null) {
+                        tempBitmap.recycle();
+                    }
                     surface.unlockCanvasAndPost(canvas);
                 }
             }
             Trace.endSection();
         }
 
+        private boolean shouldApplyEffect(int effectTarget, boolean isLockScreen) {
+            switch (effectTarget) {
+                case 0:
+                    return false;
+                case 1:
+                    return true;
+                case 2:
+                    return isLockScreen;
+                case 3:
+                    return !isLockScreen;
+                default:
+                    return false;
+            }
+        }
+
+        private boolean isLockScreenWallpaper() {
+            return (this.getWallpaperFlags() & FLAG_LOCK) == FLAG_LOCK;
+        }
+
         @VisibleForTesting
         boolean isBitmapLoaded() {
             return mBitmap != null && !mBitmap.isRecycled();
@@ -492,7 +615,11 @@ public void onOffsetsChanged(float xOffset, float yOffset,
 
         @Override
         public void onDimAmountChanged(float dimAmount) {
-            mColorExtractor.onDimAmountChanged(dimAmount);
+            if (mPendingDimUpdate != null) {
+                mDimHandler.removeCallbacks(mPendingDimUpdate);
+            }
+            mPendingDimUpdate = () -> mColorExtractor.onDimAmountChanged(dimAmount);
+            mDimHandler.postDelayed(mPendingDimUpdate, DIM_DEBOUNCE_MS);
         }
 
         @Override
diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/WallpaperUtils.java b/packages/SystemUI/src/com/android/systemui/wallpapers/WallpaperUtils.java
new file mode 100644
index 0000000000000..d9af73b33596b
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/wallpapers/WallpaperUtils.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (C) 2023-2024 the risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.wallpapers;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
+import android.graphics.RadialGradient;
+import android.graphics.Shader;
+import android.os.Build;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
+import android.renderscript.ScriptIntrinsicConvolve3x3;
+import android.util.DisplayMetrics;
+import java.io.ByteArrayOutputStream;
+import java.util.Random;
+
+public class WallpaperUtils {
+
+    public static Bitmap resizeAndCompress(Bitmap bitmap, Context context) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        context.getDisplay().getMetrics(displayMetrics);
+        int screenWidth = displayMetrics.widthPixels;
+        int screenHeight = displayMetrics.heightPixels;
+        float maxScale = 1.10f;
+        int targetWidth = Math.round(screenWidth * maxScale);
+        int targetHeight = Math.round(screenHeight * maxScale);
+        if (bitmap.getWidth() == targetWidth && bitmap.getHeight() == targetHeight) {
+            return bitmap;
+        }
+        return Bitmap.createScaledBitmap(bitmap, targetWidth, targetHeight, true);
+    }
+
+    public static Bitmap getDimmedBitmap(Bitmap bitmap, int dimLevel) {
+        float dimFactor = 1 - (Math.max(0, Math.min(dimLevel, 100)) / 100f);
+        Bitmap dimmedBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(dimmedBitmap);
+        Paint paint = new Paint();
+        ColorMatrix colorMatrix = new ColorMatrix();
+        colorMatrix.setScale(dimFactor, dimFactor, dimFactor, 1.0f);
+        ColorMatrixColorFilter colorFilter = new ColorMatrixColorFilter(colorMatrix);
+        paint.setColorFilter(colorFilter);
+        canvas.drawBitmap(bitmap, 0, 0, paint);
+        return dimmedBitmap;
+    }
+
+    public static Bitmap getBlurredBitmap(Bitmap bitmap, int radius, Context context) {
+        RenderScript rs = null;
+        Allocation input = null;
+        Allocation output = null;
+        ScriptIntrinsicBlur blurScript = null;
+        Bitmap mutableBitmap = null;
+        Bitmap scaledBitmap = null;
+        Bitmap outputBitmap = null;
+        
+        try {
+            rs = RenderScript.create(context);
+            float scaleFactor = 0.25f;
+            int scaledWidth = Math.round(bitmap.getWidth() * scaleFactor);
+            int scaledHeight = Math.round(bitmap.getHeight() * scaleFactor);
+            
+            mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+            scaledBitmap = Bitmap.createScaledBitmap(mutableBitmap, scaledWidth, scaledHeight, true);
+            outputBitmap = Bitmap.createBitmap(scaledBitmap.getWidth(), scaledBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+            
+            blurScript = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
+            float blurRadius = Math.min(radius, 25);
+            int passes = Math.max(1, radius / 25);
+            
+            input = Allocation.createFromBitmap(rs, scaledBitmap);
+            output = Allocation.createFromBitmap(rs, outputBitmap);
+            blurScript.setRadius(blurRadius);
+            
+            for (int i = 0; i < passes; i++) {
+                blurScript.setInput(input);
+                blurScript.forEach(output);
+                output.copyTo(outputBitmap);
+                input.copyFrom(outputBitmap);
+            }
+            
+            Bitmap result = Bitmap.createScaledBitmap(outputBitmap, bitmap.getWidth(), bitmap.getHeight(), true);
+            return result;
+        } finally {
+            if (input != null) input.destroy();
+            if (output != null) output.destroy();
+            if (blurScript != null) blurScript.destroy();
+            if (rs != null) rs.destroy();
+            if (mutableBitmap != null) mutableBitmap.recycle();
+            if (scaledBitmap != null) scaledBitmap.recycle();
+            if (outputBitmap != null) outputBitmap.recycle();
+        }
+    }
+
+    public static Bitmap getFilmGrain(Bitmap bitmap, Context context) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        Random random = new Random();
+        int[] pixels = new int[width * height];
+        mutableBitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        
+        for (int i = 0; i < pixels.length; i++) {
+            int pixel = pixels[i];
+            int alpha = (pixel >> 24) & 0xff;
+            int red = (pixel >> 16) & 0xff;
+            int green = (pixel >> 8) & 0xff;
+            int blue = pixel & 0xff;
+            
+            int noise = random.nextInt(51) - 25;
+            red = Math.max(0, Math.min(255, red + noise));
+            green = Math.max(0, Math.min(255, green + noise));
+            blue = Math.max(0, Math.min(255, blue + noise));
+            
+            pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+        }
+        
+        mutableBitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+        return mutableBitmap;
+    }
+
+    public static Bitmap getChromaticAberrationEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        
+        int offset = 5;
+        int[] pixels = new int[width * height];
+        mutableBitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int redX = Math.max(0, Math.min(width - 1, x - offset));
+                int blueX = Math.min(width - 1, Math.max(0, x + offset));
+                
+                int redPixel = pixels[y * width + redX];
+                int greenPixel = pixels[y * width + x];
+                int bluePixel = pixels[y * width + blueX];
+                
+                int alpha = (greenPixel >> 24) & 0xff;
+                int red = (redPixel >> 16) & 0xff;
+                int green = (greenPixel >> 8) & 0xff;
+                int blue = bluePixel & 0xff;
+                
+                result.setPixel(x, y, (alpha << 24) | (red << 16) | (green << 8) | blue);
+            }
+        }
+        
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getVignetteEffect(Bitmap bitmap, float intensity) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        Canvas canvas = new Canvas(mutableBitmap);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        
+        float centerX = width / 2f;
+        float centerY = height / 2f;
+        float maxRadius = (float) Math.sqrt(centerX * centerX + centerY * centerY);
+        
+        int vignetteAlpha = (int)(intensity * 255) & 0xff;
+        RadialGradient gradient = new RadialGradient(
+            centerX, centerY, maxRadius,
+            new int[]{0x00000000, (vignetteAlpha << 24) | 0x00000000},
+            new float[]{0.5f, 1.0f},
+            Shader.TileMode.CLAMP
+        );
+        
+        Paint paint = new Paint();
+        paint.setShader(gradient);
+        canvas.drawRect(0, 0, width, height, paint);
+        return mutableBitmap;
+    }
+
+    public static Bitmap getPixelationEffect(Bitmap bitmap, int pixelSize) {
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        
+        int downWidth = width / pixelSize;
+        int downHeight = height / pixelSize;
+        Bitmap downscaled = Bitmap.createScaledBitmap(bitmap, downWidth, downHeight, false);
+        Bitmap upscaled = Bitmap.createScaledBitmap(downscaled, width, height, false);
+        
+        canvas.drawBitmap(upscaled, 0, 0, null);
+        
+        downscaled.recycle();
+        upscaled.recycle();
+        
+        return result;
+    }
+
+    public static Bitmap getSaturationEffect(Bitmap bitmap, float saturation) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        Bitmap result = Bitmap.createBitmap(mutableBitmap.getWidth(), mutableBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        
+        ColorMatrix colorMatrix = new ColorMatrix();
+        colorMatrix.setSaturation(saturation);
+        ColorMatrixColorFilter filter = new ColorMatrixColorFilter(colorMatrix);
+        paint.setColorFilter(filter);
+        
+        canvas.drawBitmap(mutableBitmap, 0, 0, paint);
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getSepiaEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        Bitmap result = Bitmap.createBitmap(mutableBitmap.getWidth(), mutableBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        
+        ColorMatrix colorMatrix = new ColorMatrix();
+        colorMatrix.set(new float[]{
+            0.393f, 0.769f, 0.189f, 0, 0,
+            0.349f, 0.686f, 0.168f, 0, 0,
+            0.272f, 0.534f, 0.131f, 0, 0,
+            0, 0, 0, 1, 0
+        });
+        ColorMatrixColorFilter filter = new ColorMatrixColorFilter(colorMatrix);
+        paint.setColorFilter(filter);
+        
+        canvas.drawBitmap(mutableBitmap, 0, 0, paint);
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getSharpenEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        
+        int[] pixels = new int[width * height];
+        mutableBitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        
+        float[] kernel = {
+            0, -1, 0,
+            -1, 5, -1,
+            0, -1, 0
+        };
+        
+        int[] result = new int[width * height];
+        System.arraycopy(pixels, 0, result, 0, pixels.length);
+        
+        for (int y = 1; y < height - 1; y++) {
+            for (int x = 1; x < width - 1; x++) {
+                float red = 0, green = 0, blue = 0;
+                
+                for (int ky = -1; ky <= 1; ky++) {
+                    for (int kx = -1; kx <= 1; kx++) {
+                        int pixel = pixels[(y + ky) * width + (x + kx)];
+                        float kernelVal = kernel[(ky + 1) * 3 + (kx + 1)];
+                        
+                        red += ((pixel >> 16) & 0xff) * kernelVal;
+                        green += ((pixel >> 8) & 0xff) * kernelVal;
+                        blue += (pixel & 0xff) * kernelVal;
+                    }
+                }
+                
+                int alpha = (pixels[y * width + x] >> 24) & 0xff;
+                red = Math.max(0, Math.min(255, red));
+                green = Math.max(0, Math.min(255, green));
+                blue = Math.max(0, Math.min(255, blue));
+                
+                result[y * width + x] = (alpha << 24) | ((int)red << 16) | ((int)green << 8) | (int)blue;
+            }
+        }
+        
+        mutableBitmap.setPixels(result, 0, width, 0, 0, width, height);
+        return mutableBitmap;
+    }
+
+    public static Bitmap getGrayscaleEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        Bitmap result = Bitmap.createBitmap(mutableBitmap.getWidth(), mutableBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        
+        ColorMatrix colorMatrix = new ColorMatrix();
+        colorMatrix.setSaturation(0);
+        ColorMatrixColorFilter filter = new ColorMatrixColorFilter(colorMatrix);
+        paint.setColorFilter(filter);
+        
+        canvas.drawBitmap(mutableBitmap, 0, 0, paint);
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getNegativeEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        Bitmap result = Bitmap.createBitmap(mutableBitmap.getWidth(), mutableBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        
+        ColorMatrix colorMatrix = new ColorMatrix(new float[]{
+            -1, 0, 0, 0, 255,
+            0, -1, 0, 0, 255,
+            0, 0, -1, 0, 255,
+            0, 0, 0, 1, 0
+        });
+        ColorMatrixColorFilter filter = new ColorMatrixColorFilter(colorMatrix);
+        paint.setColorFilter(filter);
+        
+        canvas.drawBitmap(mutableBitmap, 0, 0, paint);
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getRadialBlurEffect(Bitmap bitmap) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        
+        float centerX = width / 2f;
+        float centerY = height / 2f;
+        int samples = 10;
+        float strength = 0.05f;
+        
+        int[] pixels = new int[width * height];
+        mutableBitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                float dirX = x - centerX;
+                float dirY = y - centerY;
+                float distance = (float) Math.sqrt(dirX * dirX + dirY * dirY);
+                
+                if (distance == 0) {
+                    result.setPixel(x, y, pixels[y * width + x]);
+                    continue;
+                }
+                
+                float blurAmount = distance * strength;
+                
+                float totalRed = 0, totalGreen = 0, totalBlue = 0, totalAlpha = 0;
+                
+                for (int s = 0; s < samples; s++) {
+                    float t = (float) s / samples;
+                    int sampleX = (int) (x - dirX * t * blurAmount / distance);
+                    int sampleY = (int) (y - dirY * t * blurAmount / distance);
+                    
+                    if (sampleX >= 0 && sampleX < width && sampleY >= 0 && sampleY < height) {
+                        int pixel = pixels[sampleY * width + sampleX];
+                        totalAlpha += (pixel >> 24) & 0xff;
+                        totalRed += (pixel >> 16) & 0xff;
+                        totalGreen += (pixel >> 8) & 0xff;
+                        totalBlue += pixel & 0xff;
+                    }
+                }
+                
+                int alpha = (int) (totalAlpha / samples);
+                int red = (int) (totalRed / samples);
+                int green = (int) (totalGreen / samples);
+                int blue = (int) (totalBlue / samples);
+                
+                result.setPixel(x, y, (alpha << 24) | (red << 16) | (green << 8) | blue);
+            }
+        }
+        
+        mutableBitmap.recycle();
+        return result;
+    }
+
+    public static Bitmap getPosterizeEffect(Bitmap bitmap, int levels) {
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        int width = mutableBitmap.getWidth();
+        int height = mutableBitmap.getHeight();
+        int[] pixels = new int[width * height];
+        mutableBitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        
+        int step = 256 / levels;
+        
+        for (int i = 0; i < pixels.length; i++) {
+            int pixel = pixels[i];
+            int alpha = (pixel >> 24) & 0xff;
+            int red = (pixel >> 16) & 0xff;
+            int green = (pixel >> 8) & 0xff;
+            int blue = pixel & 0xff;
+            
+            red = (red / step) * step;
+            green = (green / step) * step;
+            blue = (blue / step) * step;
+            
+            pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+        }
+        
+        mutableBitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+        return mutableBitmap;
+    }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt
index efb63dadaaf53..028fbc868503a 100644
--- a/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/wallpapers/data/repository/WallpaperRepository.kt
@@ -127,17 +127,13 @@ constructor(
                         Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED,
                     )
                     .onStart { emit(Unit) },
-                secureSettings
-                    .observerFlow(UserHandle.USER_ALL, Settings.Secure.DOZE_ALWAYS_ON)
-                    .onStart { emit(Unit) },
                 configurationInteractor.onAnyConfigurationChange,
-                ::Triple,
+                ::Pair,
             )
             .map {
-                val aodEnabled = secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON, 0) == 1
                 val wallpaperEnabled =
                     secureSettings.getInt(Settings.Secure.DOZE_ALWAYS_ON_WALLPAPER_ENABLED, 0) == 1
-                aodEnabled && wallpaperEnabled && configEnabled() && ambientAod()
+                wallpaperEnabled && configEnabled() && ambientAod()
             }
             .flowOn(bgDispatcher)
 
diff --git a/packages/SystemUI/src/com/android/systemui/weather/WeatherImageView.kt b/packages/SystemUI/src/com/android/systemui/weather/WeatherImageView.kt
new file mode 100644
index 0000000000000..d8b151f528572
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/weather/WeatherImageView.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023-2024 risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.weather
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.View.MeasureSpec
+import android.widget.ImageView
+import android.widget.TextView
+import com.android.systemui.res.R
+
+class WeatherImageView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+    isCustomClock: Boolean = true,
+) : ImageView(context, attrs, defStyle) {
+
+    private val maxSizePx: Int =
+        context.resources.getDimension(R.dimen.weather_image_max_size).toInt()
+
+    private val weatherViewController: WeatherViewController
+
+    init {
+        visibility = View.GONE
+
+        val stubText = TextView(context)
+
+        weatherViewController = WeatherViewController(
+            context = context,
+            weatherIcon = this,
+            weatherTemp = stubText,
+            weatherInfoView = this,
+            isCustomClock = isCustomClock,
+        )
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        weatherViewController.init()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        weatherViewController.removeObserver()
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val width = maxSizePx.coerceAtMost(MeasureSpec.getSize(widthMeasureSpec))
+        val height = maxSizePx.coerceAtMost(MeasureSpec.getSize(heightMeasureSpec))
+        setMeasuredDimension(width, height)
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/weather/WeatherInfoView.kt b/packages/SystemUI/src/com/android/systemui/weather/WeatherInfoView.kt
new file mode 100644
index 0000000000000..531c2e486ad15
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/weather/WeatherInfoView.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2025 the AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.weather
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import android.widget.ImageView
+import android.widget.TextView
+import com.android.systemui.res.R
+
+class WeatherInfoView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyle: Int = 0
+) : ConstraintLayout(context, attrs, defStyle) {
+
+    private lateinit var weatherIcon: ImageView
+    private lateinit var weatherTemp: TextView
+    private lateinit var controller: WeatherViewController
+    private var initialized = false
+
+    fun init() {
+        if (initialized) return
+        initialized = true
+
+        weatherIcon = findViewById(R.id.weather_icon)
+        weatherTemp = findViewById(R.id.weather_temp)
+
+        controller = WeatherViewController(context, weatherIcon, weatherTemp, this)
+        controller.init()
+    }
+
+    fun cleanup() {
+        if (::controller.isInitialized) controller.removeObserver()
+        initialized = false
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        if (!initialized) init()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        cleanup()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/weather/WeatherTextView.kt b/packages/SystemUI/src/com/android/systemui/weather/WeatherTextView.kt
new file mode 100644
index 0000000000000..a603256bf48c1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/weather/WeatherTextView.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023-2024 risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.weather
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.TextView
+import com.android.systemui.res.R
+
+class WeatherTextView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+    isCustomClock: Boolean = true,
+) : TextView(context, attrs, defStyle) {
+
+    private val mWeatherViewController: WeatherViewController
+
+    init {
+        visibility = View.GONE
+
+        val stubIcon = android.widget.ImageView(context)
+
+        mWeatherViewController = WeatherViewController(
+            context = context,
+            weatherIcon = stubIcon,
+            weatherTemp = this,
+            weatherInfoView = this,
+            isCustomClock = isCustomClock,
+        )
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        mWeatherViewController.init()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        mWeatherViewController.removeObserver()
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/weather/WeatherViewController.kt b/packages/SystemUI/src/com/android/systemui/weather/WeatherViewController.kt
new file mode 100644
index 0000000000000..5328267d20edf
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/weather/WeatherViewController.kt
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2025 the AxionAOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.systemui.weather
+
+import android.content.Context
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
+import android.os.UserHandle
+import android.provider.Settings
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+
+import com.android.internal.util.matrixx.OmniJawsClient
+
+import com.android.systemui.Dependency
+import com.android.systemui.plugins.statusbar.StatusBarStateController
+import com.android.systemui.res.R
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+
+class WeatherViewController(
+    private val context: Context,
+    private val weatherIcon: ImageView,
+    private val weatherTemp: TextView,
+    private val weatherInfoView: View,
+    private val isCustomClock: Boolean = false,
+) : OmniJawsClient.OmniJawsObserver {
+
+    private var weatherInfo: OmniJawsClient.WeatherInfo? = null
+    private val scope = CoroutineScope(Dispatchers.Main.immediate + SupervisorJob())
+
+    private var mDozing = false
+    private val statusBarStateController: StatusBarStateController = Dependency.get(StatusBarStateController::class.java)
+
+    private val statusBarStateListener = object : StatusBarStateController.StateListener {
+        override fun onStateChanged(newState: Int) {}
+
+        override fun onDozingChanged(dozing: Boolean) {
+            mDozing = dozing
+            updateIconTint()
+        }
+    }
+
+    private val weatherSettingsFlow = flow {
+        var previousSettings: WeatherSettings? = null
+        while (true) {
+            val currentSettings = getWeatherSettings()
+            if (currentSettings != previousSettings) {
+                emit(currentSettings)
+                previousSettings = currentSettings
+            }
+            delay(5000)
+        }
+    }.stateIn(scope, SharingStarted.Eagerly, getWeatherSettings())
+
+    fun init() {
+        scope.launch {
+            weatherSettingsFlow.collectLatest { applyWeatherSettings(it) }
+        }
+        statusBarStateController.addCallback(statusBarStateListener)
+        statusBarStateListener.onDozingChanged(statusBarStateController.isDozing())
+    }
+
+    private fun getConditionText(condition: String): String {
+        val locale = context.resources.configuration.locales[0]
+        val isEnglish = locale.language.startsWith("en", ignoreCase = true)
+
+        if (!isEnglish) {
+            for ((key, value) in WEATHER_CONDITIONS) {
+                if (condition.contains(key)) {
+                    return context.resources.getString(value)
+                }
+            }
+        }
+        return condition.split(" ").joinToString(" ") { it.replaceFirstChar { char -> char.uppercaseChar() } }
+    }
+
+    private fun getWeatherSettings() = WeatherSettings(
+        weatherEnabled = getSystemSetting(LOCKSCREEN_WEATHER_ENABLED),
+        showWeatherLocation = getSystemSetting(LOCKSCREEN_WEATHER_LOCATION),
+        showWeatherText = getSystemSetting(LOCKSCREEN_WEATHER_TEXT, defaultValue = 1),
+        showWindInfo = getSystemSetting(LOCKSCREEN_WEATHER_WIND_INFO),
+        showHumidityInfo = getSystemSetting(LOCKSCREEN_WEATHER_HUMIDITY_INFO),
+        customClockWeather = getSecureSetting(CUSTOM_CLOCK_WEATHER, defaultValue = 1),
+    )
+
+    private fun getSystemSetting(setting: String, defaultValue: Int = 0) =
+        Settings.System.getIntForUser(context.contentResolver, setting, defaultValue, UserHandle.USER_CURRENT) != 0
+
+    private fun getSecureSetting(setting: String, defaultValue: Int = 0) =
+        Settings.Secure.getIntForUser(context.contentResolver, setting, defaultValue, UserHandle.USER_CURRENT) != 0
+
+    private fun applyWeatherSettings(settings: WeatherSettings) {
+        if (!settings.weatherEnabled) {
+            hideAllViews()
+            OmniJawsClient.get().removeObserver(context, this@WeatherViewController)
+        } else {
+            OmniJawsClient.get().addObserver(context, this@WeatherViewController)
+            updateWeather()
+            showAllViews()
+        }
+    }
+
+    override fun weatherUpdated() = updateWeather()
+
+    private fun updateIconTint() {
+        if (mDozing) {
+            val matrix = ColorMatrix()
+            matrix.setSaturation(0f)
+            weatherIcon.colorFilter = ColorMatrixColorFilter(matrix)
+        } else {
+            weatherIcon.colorFilter = null
+        }
+    }
+
+    private fun updateWeather() {
+        if (!weatherSettingsFlow.value.weatherEnabled) {
+            hideAllViews()
+            return
+        }
+
+        try {
+            OmniJawsClient.get().queryWeather(context)
+            weatherInfo = OmniJawsClient.get().weatherInfo
+            weatherInfo?.let { info ->
+                weatherIcon.setImageDrawable(
+                    OmniJawsClient.get().getWeatherConditionImage(context, 
+                    info.conditionCode))
+                updateIconTint()
+                weatherTemp.text = buildWeatherText(info)
+                weatherTemp.isSelected = true
+            }
+        } catch (e: Exception) {}
+
+        applyElementVisibility(weatherSettingsFlow.value)
+    }
+
+    private fun hideAllViews() {
+        scope.launch {
+            listOf(weatherInfoView, weatherIcon, weatherTemp).forEach {
+                updateViewVisibility(it, false)
+            }
+        }
+    }
+
+    private fun showAllViews() {
+        scope.launch {
+            listOf(weatherInfoView, weatherIcon, weatherTemp).forEach {
+                updateViewVisibility(it, true)
+            }
+            applyElementVisibility(weatherSettingsFlow.value)
+        }
+    }
+
+    private fun applyElementVisibility(settings: WeatherSettings) {
+        scope.launch {
+            val show = settings.weatherEnabled && (
+                if (isCustomClock) settings.customClockWeather
+                else !settings.customClockWeather
+            )
+            updateViewVisibility(weatherIcon, show)
+            updateViewVisibility(weatherTemp, show)
+        }
+    }
+
+    private fun buildWeatherText(info: OmniJawsClient.WeatherInfo): String {
+        val settings = weatherSettingsFlow.value
+        val conditionText = getConditionText(info.condition.lowercase())
+
+        val locationText = if (settings.showWeatherLocation) " • ${info.city}" else ""
+        val conditionDisplay = if (settings.showWeatherText) " • $conditionText" else ""
+        val windDisplay = if (settings.showWindInfo) " • ${info.windSpeed} ${info.windUnits} ${info.pinWheel}" else ""
+        val humidityDisplay = if (settings.showHumidityInfo) " • ${info.humidity}" else ""
+
+        return "${info.temp}${info.tempUnits}$locationText$conditionDisplay$windDisplay$humidityDisplay"
+    }
+
+    override fun weatherError(errorReason: Int) {
+        if (errorReason == OmniJawsClient.EXTRA_ERROR_DISABLED) {
+            weatherInfo = null
+            weatherIcon.setImageDrawable(null)
+            weatherTemp.text = ""
+            hideAllViews()
+        }
+    }
+
+    fun removeObserver() {
+        scope.cancel()
+        OmniJawsClient.get().removeObserver(context, this)
+        statusBarStateController.removeCallback(statusBarStateListener)
+    }
+
+    private suspend fun updateViewVisibility(view: View, visible: Boolean) {
+        withContext(Dispatchers.Main) {
+            view.visibility = if (visible) View.VISIBLE else View.GONE
+        }
+    }
+
+    data class WeatherSettings(
+        val weatherEnabled: Boolean,
+        val showWeatherLocation: Boolean,
+        val showWeatherText: Boolean,
+        val showWindInfo: Boolean,
+        val showHumidityInfo: Boolean,
+        val customClockWeather: Boolean,
+    )
+
+    companion object {
+        private const val LOCKSCREEN_WEATHER_ENABLED = "lockscreen_weather_enabled"
+        private const val LOCKSCREEN_WEATHER_LOCATION = "lockscreen_weather_location"
+        private const val LOCKSCREEN_WEATHER_TEXT = "lockscreen_weather_text"
+        private const val LOCKSCREEN_WEATHER_WIND_INFO = "lockscreen_weather_wind_info"
+        private const val LOCKSCREEN_WEATHER_HUMIDITY_INFO = "lockscreen_weather_humidity_info"
+        const val CUSTOM_CLOCK_WEATHER = "custom_clock_weather"
+
+        private val WEATHER_CONDITIONS = mapOf(
+            "clouds" to R.string.weather_condition_clouds,
+            "rain" to R.string.weather_condition_rain,
+            "clear" to R.string.weather_condition_clear,
+            "storm" to R.string.weather_condition_storm,
+            "snow" to R.string.weather_condition_snow,
+            "wind" to R.string.weather_condition_wind,
+            "mist" to R.string.weather_condition_mist
+        )
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/window/data/repository/NoopWindowRootViewBlurRepository.kt b/packages/SystemUI/src/com/android/systemui/window/data/repository/NoopWindowRootViewBlurRepository.kt
index d10bec9d07943..9d0285f0ca05e 100644
--- a/packages/SystemUI/src/com/android/systemui/window/data/repository/NoopWindowRootViewBlurRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/window/data/repository/NoopWindowRootViewBlurRepository.kt
@@ -24,6 +24,8 @@ class NoopWindowRootViewBlurRepository @Inject constructor() : WindowRootViewBlu
     override val blurRequestedByShade: MutableStateFlow<Float> = MutableStateFlow(0.0f)
     override val scaleRequestedByShade: MutableStateFlow<Float> = MutableStateFlow(1.0f)
     override val isBlurSupported: StateFlow<Boolean> = MutableStateFlow(false)
+    override val isTranslucentSupported: StateFlow<Boolean> = MutableStateFlow(false)
+    override val isLockscreenTranslucentSupported: StateFlow<Boolean> = MutableStateFlow(false)
     override var blurAppliedListener: BlurAppliedListener? = null
     override val trackingShadeMotion: MutableStateFlow<Boolean> = MutableStateFlow(false)
 }
diff --git a/packages/SystemUI/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepository.kt b/packages/SystemUI/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepository.kt
index 5fc5937ba684c..3eacec83124b4 100644
--- a/packages/SystemUI/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepository.kt
@@ -17,7 +17,11 @@
 package com.android.systemui.window.data.repository
 
 import android.app.ActivityManager
+import android.content.Context
+import android.database.ContentObserver
 import android.os.SystemProperties
+import android.os.UserHandle
+import android.provider.Settings
 import android.view.CrossWindowBlurListeners
 import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging
 import com.android.systemui.dagger.SysUISingleton
@@ -34,6 +38,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.combine
 
 typealias BlurAppliedListener = Consumer<Int>
 
@@ -46,6 +51,12 @@ interface WindowRootViewBlurRepository {
     /** Is blur supported based on settings toggle and battery power saver mode. */
     val isBlurSupported: StateFlow<Boolean>
 
+    /** Whether notification row translucency is enabled via user setting. */
+    val isTranslucentSupported: StateFlow<Boolean>
+
+    /** Whether lockscreen notification translucency is enabled via user setting. */
+    val isLockscreenTranslucentSupported: StateFlow<Boolean>
+
     var blurAppliedListener: BlurAppliedListener?
 
     /** true when tracking shade motion that might lead to a shade expansion. */
@@ -70,6 +81,7 @@ constructor(
     crossWindowBlurListeners: CrossWindowBlurListeners,
     @Main private val executor: Executor,
     @Application private val scope: CoroutineScope,
+    @Application private val context: Context,
 ) : WindowRootViewBlurRepository {
 
     override val trackingShadeMotion = MutableStateFlow(false)
@@ -94,8 +106,94 @@ constructor(
             } // stateIn because this is backed by a binder call.
             .stateIn(scope, SharingStarted.WhileSubscribed(), false)
 
+    override val isTranslucentSupported: StateFlow<Boolean> =
+        combine(
+            conflatedCallbackFlow {
+                val sendUpdate = {
+                    trySendWithFailureLogging(
+                        isTranslucentEnabledInSettings(),
+                        TAG,
+                        "unable to send notificationRowTransparency state change",
+                    )
+                }
+                val observer =
+                    object : ContentObserver(null) {
+                        override fun onChange(selfChange: Boolean) = sendUpdate()
+                    }
+                val resolver = context.contentResolver
+                resolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY),
+                    true,
+                    observer,
+                )
+                sendUpdate()
+                awaitClose { resolver.unregisterContentObserver(observer) }
+            },
+            isBlurSupported
+        ) { settingEnabled, blurSupported ->
+            settingEnabled && blurSupported && isSystemBlurEnabled()
+        }
+        .stateIn(scope, SharingStarted.WhileSubscribed(), 
+            isTranslucentEnabledInSettings() && isSystemBlurEnabled())
+
+    override val isLockscreenTranslucentSupported: StateFlow<Boolean> =
+        combine(
+            conflatedCallbackFlow {
+                val sendUpdate = {
+                    trySendWithFailureLogging(
+                        isLockscreenTranslucentEnabledInSettings(),
+                        TAG,
+                        "unable to send notificationRowTransparency lockscreen state change",
+                    )
+                }
+                val observer =
+                    object : ContentObserver(null) {
+                        override fun onChange(selfChange: Boolean) = sendUpdate()
+                    }
+                val resolver = context.contentResolver
+                resolver.registerContentObserver(
+                    Settings.Secure.getUriFor(
+                        Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN,
+                    ),
+                    true,
+                    observer,
+                )
+                sendUpdate()
+                awaitClose { resolver.unregisterContentObserver(observer) }
+            },
+            isBlurSupported
+        ) { settingEnabled, blurSupported ->
+            settingEnabled && blurSupported && isSystemBlurEnabled()
+        }
+        .stateIn(scope, SharingStarted.WhileSubscribed(), 
+            isLockscreenTranslucentEnabledInSettings() && isSystemBlurEnabled())
+
     override var blurAppliedListener: BlurAppliedListener? = null
 
+    private fun isTranslucentEnabledInSettings(): Boolean =
+        Settings.Secure.getIntForUser(
+            context.contentResolver,
+            Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY,
+            1,
+            UserHandle.USER_CURRENT,
+        ) == 1
+
+    private fun isLockscreenTranslucentEnabledInSettings(): Boolean =
+        Settings.Secure.getIntForUser(
+            context.contentResolver,
+            Settings.Secure.NOTIFICATION_ROW_TRANSPARENCY_LOCKSCREEN,
+            1, UserHandle.USER_CURRENT) == 1
+
+    private fun isSystemBlurEnabled(): Boolean {
+        val blurEnabledByDefault = SystemProperties.getBoolean("ro.custom.blur.enable", false)
+        val blurEnabled = Settings.Global.getInt(
+            context.contentResolver,
+            Settings.Global.DISABLE_WINDOW_BLURS, 
+            if (blurEnabledByDefault) 0 else 1
+        ) != 1
+        return blurEnabled
+    }
+
     private fun isBlurAllowed(): Boolean {
         return ActivityManager.isHighEndGfx() && !isDisableBlurSysPropSet()
     }
diff --git a/packages/SystemUI/src/com/android/systemui/window/domain/interactor/WindowRootViewBlurInteractor.kt b/packages/SystemUI/src/com/android/systemui/window/domain/interactor/WindowRootViewBlurInteractor.kt
index aa75cde246e2f..9c3d7b24bbb61 100644
--- a/packages/SystemUI/src/com/android/systemui/window/domain/interactor/WindowRootViewBlurInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/window/domain/interactor/WindowRootViewBlurInteractor.kt
@@ -95,6 +95,12 @@ constructor(
      */
     val isBlurCurrentlySupported: StateFlow<Boolean> = repository.isBlurSupported
 
+    /** Whether notification row translucency is enabled via user setting. */
+    val isTranslucentSupported: StateFlow<Boolean> = repository.isTranslucentSupported
+
+    /** Whether lockscreen notification translucency is enabled via user setting. */
+    val isLockscreenTranslucentSupported: StateFlow<Boolean> = repository.isLockscreenTranslucentSupported
+
     /** Whether the blurred wallpaper is supported. This feature is disabled on desktop. */
     val isBlurredWallpaperSupported: Boolean =
         resources.getBoolean(R.bool.config_supportBlurredWallpaper)
diff --git a/packages/SystemUI/src/com/android/systemui/window/ui/WindowRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/window/ui/WindowRootViewBinder.kt
index a0867e322088a..ea0ca8edff775 100644
--- a/packages/SystemUI/src/com/android/systemui/window/ui/WindowRootViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/window/ui/WindowRootViewBinder.kt
@@ -114,7 +114,7 @@ object WindowRootViewBinder {
                                         lastScheduledBlurRadius != newBlurRadius ||
                                             lastScheduledBlurScale != newBlurScale
                                     ) {
-                                        Log.w(TAG, "Multiple blur values emitted in the same frame")
+                                        Log.d(TAG, "Multiple blur values emitted in the same frame")
                                     }
                                     lastScheduledBlurRadius = newBlurRadius
                                     lastScheduledBlurScale = newBlurScale
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcNextAlarmData.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcNextAlarmData.java
new file mode 100644
index 0000000000000..04ff4b2cf9f8e
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcNextAlarmData.java
@@ -0,0 +1,11 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+
+public final class BcNextAlarmData {
+    public static final SmartspaceAction SHOW_ALARMS_ACTION = new SmartspaceAction.Builder("nextAlarmId", "Next alarm").setIntent(new Intent("android.intent.action.SHOW_ALARMS")).build();
+    public String mDescription;
+    public Drawable mImage;
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java
new file mode 100644
index 0000000000000..7c41312fdbc20
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java
@@ -0,0 +1,251 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.PendingIntent;
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceTargetEvent;
+import android.app.smartspace.uitemplatedata.TapAction;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.provider.CalendarContract;
+import android.util.Log;
+import android.view.View;
+import android.widget.RemoteViews;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLogger;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+import java.util.Map;
+
+public abstract class BcSmartSpaceUtil {
+    private static final String GSA_PACKAGE = "com.google.android.googlequicksearchbox";
+    private static final String GSA_WEATHER_ACTIVITY = "com.google.android.apps.search.weather.WeatherExportedActivity";
+    public static final Map<Integer, Integer> FEATURE_TYPE_TO_SECONDARY_CARD_RESOURCE_MAP;
+    public static FalsingManager sFalsingManager;
+
+    public static class InteractionHandler implements RemoteViews.InteractionHandler {
+        public final BcSmartspaceCardLoggingInfo loggingInfo;
+        public final BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier;
+        public final SmartspaceTarget target;
+        public final SmartspaceAction action;
+
+        public InteractionHandler(
+                BcSmartspaceCardLoggingInfo loggingInfo,
+                BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier,
+                SmartspaceTarget target,
+                SmartspaceAction action) {
+            this.loggingInfo = loggingInfo;
+            this.eventNotifier = eventNotifier;
+            this.target = target;
+            this.action = action;
+        }
+
+        @Override
+        public final boolean onInteraction(View view, PendingIntent pendingIntent, RemoteViews.RemoteResponse remoteResponse) {
+            BcSmartspaceDataPlugin.IntentStarter intentStarter = BcSmartSpaceUtil.getIntentStarter(eventNotifier, "BcSmartspaceRemoteViewsCard");
+            if (pendingIntent != null) {
+                BcSmartspaceCardLogger.log(BcSmartspaceEvent.SMARTSPACE_CARD_CLICK, loggingInfo);
+                if (eventNotifier != null) {
+                    eventNotifier.notifySmartspaceEvent(new SmartspaceTargetEvent.Builder(1).setSmartspaceTarget(target).setSmartspaceActionId(action.getId()).build());
+                }
+                intentStarter.startPendingIntent(view, pendingIntent, false);
+            }
+            return true;
+        }
+    }
+
+    // Workaround for Google weather
+    private static boolean hijackIntent(SmartspaceTarget target, BcSmartspaceDataPlugin.IntentStarter intentStarter, View view) {
+        if (view instanceof IcuDateTextView) {
+            // Ensure we don't change date view
+            return false;
+        }
+        if (target != null && target.getFeatureType() == target.FEATURE_WEATHER) {
+            Intent intent = new Intent().setComponent(new ComponentName(GSA_PACKAGE, GSA_WEATHER_ACTIVITY))
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intentStarter.startIntent(view, intent, true);
+            return true;
+        }
+        return false;
+    }
+
+    public static class DefaultIntentStarter implements BcSmartspaceDataPlugin.IntentStarter {
+        public final String tag;
+
+        public DefaultIntentStarter(String tag) {
+            this.tag = tag;
+        }
+
+        @Override
+        public final void startIntent(View view, Intent intent, boolean showOnLockscreen) {
+            try {
+                view.getContext().startActivity(intent);
+            } catch (ActivityNotFoundException | NullPointerException | SecurityException e) {
+                Log.e(tag, "Cannot invoke smartspace intent", e);
+            }
+        }
+
+        @Override
+        public final void startPendingIntent(View view, PendingIntent pendingIntent, boolean showOnLockscreen) {
+            try {
+                pendingIntent.send();
+            } catch (PendingIntent.CanceledException e) {
+                Log.e(tag, "Cannot invoke canceled smartspace intent", e);
+            }
+        }
+    }
+
+    static {
+        FEATURE_TYPE_TO_SECONDARY_CARD_RESOURCE_MAP = Map.ofEntries(Map.entry(-1, Integer.valueOf(R.layout.smartspace_card_combination)), Map.entry(-2, Integer.valueOf(R.layout.smartspace_card_combination_at_store)), Map.entry(3, Integer.valueOf(R.layout.smartspace_card_generic_landscape_image)), Map.entry(18, Integer.valueOf(R.layout.smartspace_card_generic_landscape_image)), Map.entry(4, Integer.valueOf(R.layout.smartspace_card_flight)), Map.entry(14, Integer.valueOf(R.layout.smartspace_card_loyalty)), Map.entry(13, Integer.valueOf(R.layout.smartspace_card_shopping_list)), Map.entry(9, Integer.valueOf(R.layout.smartspace_card_sports)), Map.entry(10, Integer.valueOf(R.layout.smartspace_card_weather_forecast)), Map.entry(30, Integer.valueOf(R.layout.smartspace_card_doorbell)), Map.entry(20, Integer.valueOf(R.layout.smartspace_card_doorbell)));
+    }
+
+    public static String getDimensionRatio(Bundle bundle) {
+        if (!bundle.containsKey("imageRatioWidth") || !bundle.containsKey("imageRatioHeight")) {
+            return null;
+        }
+        int width = bundle.getInt("imageRatioWidth");
+        int height = bundle.getInt("imageRatioHeight");
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+        return width + ":" + height;
+    }
+
+    public static int getFeatureType(SmartspaceTarget target) {
+        List actionChips = target.getActionChips();
+        int featureType = target.getFeatureType();
+        return (actionChips == null || actionChips.isEmpty()) ? featureType : (featureType == 13 && actionChips.size() == 1) ? -2 : -1;
+    }
+
+    public static Drawable getIconDrawableWithCustomSize(Icon icon, Context context, int size) {
+        if (icon == null) {
+            return null;
+        }
+        Drawable drawable = (icon.getType() == 1 || icon.getType() == 5) ? new BitmapDrawable(context.getResources(), icon.getBitmap()) : icon.loadDrawable(context);
+        if (drawable != null) {
+            drawable.setBounds(0, 0, size, size);
+        }
+        return drawable;
+    }
+
+    public static BcSmartspaceDataPlugin.IntentStarter getIntentStarter(BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, String tag) {
+        BcSmartspaceDataPlugin.IntentStarter intentStarter = eventNotifier != null ? eventNotifier.getIntentStarter() : null;
+        if (intentStarter != null) {
+            return intentStarter;
+        }
+        return new DefaultIntentStarter(tag);
+    }
+
+    public static int getLoggingDisplaySurface(String uiSurface, float dozeAmount) {
+        if (uiSurface == null) {
+            return 0;
+        }
+
+        switch (uiSurface) {
+            case BcSmartspaceDataPlugin.UI_SURFACE_HOME_SCREEN:
+                return 1;
+            case BcSmartspaceDataPlugin.UI_SURFACE_DREAM:
+                return 5;
+            case BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD:
+                if (dozeAmount == 1.0f) {
+                    return 3;
+                } else if (dozeAmount == 0.0f) {
+                    return 2;
+                } else {
+                    return -1;
+                }
+            default:
+                return 0;
+        }
+    }
+
+    public static Intent getOpenCalendarIntent() {
+        return new Intent("android.intent.action.VIEW").setData(ContentUris.appendId(CalendarContract.CONTENT_URI.buildUpon().appendPath("time"), System.currentTimeMillis()).build()).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+    }
+
+    public static void setOnClickListener(View view, SmartspaceTarget target, SmartspaceAction action, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, String tag, BcSmartspaceCardLoggingInfo loggingInfo, int index) {
+        if (view == null || action == null) {
+            Log.e(tag, "No tap action can be set up");
+            return;
+        }
+
+        boolean isNoIntent = action.getIntent() == null && action.getPendingIntent() == null;
+        boolean showOnLockscreen = action.getExtras() != null && action.getExtras().getBoolean("show_on_lockscreen");
+        BcSmartspaceDataPlugin.IntentStarter intentStarter = getIntentStarter(eventNotifier, tag);
+
+        view.setOnClickListener(v -> {
+            if (sFalsingManager != null && sFalsingManager.isFalseTap(1)) {
+                return;
+            }
+
+            if (loggingInfo != null) {
+                if (loggingInfo.mSubcardInfo != null) {
+                    loggingInfo.mSubcardInfo.mClickedSubcardIndex = index;
+                }
+                BcSmartspaceCardLogger.log(BcSmartspaceEvent.SMARTSPACE_CARD_CLICK, loggingInfo);
+            }
+
+            if (!isNoIntent && !hijackIntent(target, intentStarter, v)) {
+                intentStarter.startFromAction(action, v, showOnLockscreen);
+            }
+
+            if (eventNotifier == null) {
+                Log.w(tag, "Cannot notify target interaction smartspace event: event notifier null.");
+            } else {
+                eventNotifier.notifySmartspaceEvent(new SmartspaceTargetEvent.Builder(SmartspaceTargetEvent.EVENT_TARGET_INTERACTION)
+                        .setSmartspaceTarget(target)
+                        .setSmartspaceActionId(action.getId())
+                        .build());
+            }
+        });
+    }
+
+    public static void setOnClickListener(View view, SmartspaceTarget target, TapAction tapAction, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, String tag, BcSmartspaceCardLoggingInfo loggingInfo, int index) {
+        if (view == null || tapAction == null) {
+            Log.e(tag, "No tap action can be set up");
+            return;
+        }
+
+        boolean showOnLockscreen = tapAction.shouldShowOnLockscreen();
+
+        view.setOnClickListener(v -> {
+            if (sFalsingManager != null && sFalsingManager.isFalseTap(1)) {
+                return;
+            }
+
+            if (loggingInfo != null) {
+                if (loggingInfo.mSubcardInfo != null) {
+                    loggingInfo.mSubcardInfo.mClickedSubcardIndex = index;
+                }
+                BcSmartspaceCardLogger.log(BcSmartspaceEvent.SMARTSPACE_CARD_CLICK, loggingInfo);
+            }
+
+            BcSmartspaceDataPlugin.IntentStarter intentStarter = getIntentStarter(eventNotifier, tag);
+            if ((tapAction.getIntent() != null || tapAction.getPendingIntent() != null) && !hijackIntent(target, intentStarter, v)) {
+                intentStarter.startFromAction(tapAction, v, showOnLockscreen);
+            }
+
+            if (eventNotifier == null) {
+                Log.w(tag, "Cannot notify target interaction smartspace event: event notifier null.");
+            } else {
+                eventNotifier.notifySmartspaceEvent(new SmartspaceTargetEvent.Builder(SmartspaceTargetEvent.EVENT_TARGET_INTERACTION)
+                        .setSmartspaceTarget(target)
+                        .setSmartspaceActionId(tapAction.getId().toString())
+                        .build());
+            }
+        });
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java
new file mode 100644
index 0000000000000..f17af784dd260
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java
@@ -0,0 +1,463 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.TouchDelegate;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.animation.PathInterpolator;
+import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import com.android.app.animation.Interpolators;
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardMetadataLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceSubcardLoggingInfo;
+import com.google.android.systemui.smartspace.utils.ContentDescriptionUtil;
+import com.android.systemui.res.R;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/* compiled from: go/retraceme af8e0b46c0cb0ee2c99e9b6d0c434e5c0b686fd9230eaab7fb9a40e3a9d0cf6f */
+/* loaded from: classes2.dex */
+public class BcSmartspaceCard extends ConstraintLayout implements SmartspaceCard {
+    public final DoubleShadowIconDrawable mBaseActionIconDrawable;
+    public Rect mBaseActionIconSubtitleHitRect;
+    public DoubleShadowTextView mBaseActionIconSubtitleView;
+    public float mDozeAmount;
+    public BcSmartspaceDataPlugin.SmartspaceEventNotifier mEventNotifier;
+    public final DoubleShadowIconDrawable mIconDrawable;
+    public int mIconTintColor;
+    public BcSmartspaceCardLoggingInfo mLoggingInfo;
+    public BcSmartspaceCardSecondary mSecondaryCard;
+    public ViewGroup mSecondaryCardGroup;
+    public TextView mSubtitleTextView;
+    public SmartspaceTarget mTarget;
+    public ViewGroup mTextGroup;
+    public TextView mTitleTextView;
+    public boolean mTouchDelegateIsDirty;
+    public String mUiSurface;
+    public boolean mUsePageIndicatorUi;
+    public boolean mValidSecondaryCard;
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    public BcSmartspaceCard(Context context) {
+        this(context, null);
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    public static int getClickedIndex(BcSmartspaceCardLoggingInfo bcSmartspaceCardLoggingInfo, int i) {
+        List list;
+        BcSmartspaceSubcardLoggingInfo bcSmartspaceSubcardLoggingInfo = bcSmartspaceCardLoggingInfo.mSubcardInfo;
+        if (bcSmartspaceSubcardLoggingInfo != null && (list = bcSmartspaceSubcardLoggingInfo.mSubcards) != null) {
+            int i2 = 0;
+            while (true) {
+                ArrayList arrayList = (ArrayList) list;
+                if (i2 >= arrayList.size()) {
+                    break;
+                }
+                BcSmartspaceCardMetadataLoggingInfo bcSmartspaceCardMetadataLoggingInfo = (BcSmartspaceCardMetadataLoggingInfo) arrayList.get(i2);
+                if (bcSmartspaceCardMetadataLoggingInfo != null && bcSmartspaceCardMetadataLoggingInfo.mCardTypeId == i) {
+                    return i2 + 1;
+                }
+                i2++;
+            }
+        }
+        return 0;
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // com.google.android.systemui.smartspace.SmartspaceCard
+    public final void bindData(SmartspaceTarget smartspaceTarget, BcSmartspaceDataPlugin.SmartspaceEventNotifier smartspaceEventNotifier, BcSmartspaceCardLoggingInfo bcSmartspaceCardLoggingInfo, boolean z) {
+        SmartspaceAction smartspaceAction;
+        BcSmartspaceCardLoggingInfo bcSmartspaceCardLoggingInfo2 = bcSmartspaceCardLoggingInfo;
+        Drawable drawable = null;
+        this.mLoggingInfo = null;
+        this.mEventNotifier = null;
+        int i = 8;
+        BcSmartspaceTemplateDataUtils.updateVisibility(this.mSecondaryCardGroup, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(this.mBaseActionIconSubtitleView, 8);
+        this.mIconDrawable.mIconDrawable = null;
+        this.mBaseActionIconDrawable.mIconDrawable = null;
+        int i2 = 0;
+        setTitle(null, null, false);
+        setSubtitle(null, null, false);
+        setBaseActionIconSubtitle(null, null, null);
+        updateIconTint();
+        setOnClickListener(null);
+        TextView textView = this.mTitleTextView;
+        if (textView != null) {
+            textView.setOnClickListener(null);
+            textView.setClickable(false);
+        }
+        TextView textView2 = this.mSubtitleTextView;
+        if (textView2 != null) {
+            textView2.setOnClickListener(null);
+            textView2.setClickable(false);
+        }
+        DoubleShadowTextView doubleShadowTextView = this.mBaseActionIconSubtitleView;
+        if (doubleShadowTextView != null) {
+            doubleShadowTextView.setOnClickListener(null);
+            doubleShadowTextView.setClickable(false);
+        }
+        this.mTarget = smartspaceTarget;
+        this.mEventNotifier = smartspaceEventNotifier;
+        SmartspaceAction headerAction = smartspaceTarget.getHeaderAction();
+        SmartspaceAction baseAction = smartspaceTarget.getBaseAction();
+        this.mLoggingInfo = bcSmartspaceCardLoggingInfo2;
+        this.mUsePageIndicatorUi = z;
+        this.mValidSecondaryCard = false;
+        ViewGroup viewGroup = this.mTextGroup;
+        if (viewGroup != null) {
+            viewGroup.setTranslationX(0.0f);
+        }
+        if (headerAction != null) {
+            BcSmartspaceCardSecondary bcSmartspaceCardSecondary = this.mSecondaryCard;
+            if (bcSmartspaceCardSecondary != null) {
+                bcSmartspaceCardSecondary.reset(smartspaceTarget.getSmartspaceTargetId());
+                this.mValidSecondaryCard = this.mSecondaryCard.setSmartspaceActions(smartspaceTarget, this.mEventNotifier, bcSmartspaceCardLoggingInfo2);
+            }
+            ViewGroup viewGroup2 = this.mSecondaryCardGroup;
+            if (viewGroup2 != null) {
+                viewGroup2.setAlpha(1.0f);
+            }
+            ViewGroup viewGroup3 = this.mSecondaryCardGroup;
+            if (this.mDozeAmount != 1.0f && this.mValidSecondaryCard) {
+                i = 0;
+            }
+            BcSmartspaceTemplateDataUtils.updateVisibility(viewGroup3, i);
+            Icon icon = headerAction.getIcon();
+            Context context = getContext();
+            FalsingManager falsingManager = BcSmartSpaceUtil.sFalsingManager;
+            Drawable iconDrawableWithCustomSize = BcSmartSpaceUtil.getIconDrawableWithCustomSize(icon, context, context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size));
+            boolean z2 = iconDrawableWithCustomSize != null;
+            this.mIconDrawable.setIcon(iconDrawableWithCustomSize);
+            CharSequence title = headerAction.getTitle();
+            CharSequence subtitle = headerAction.getSubtitle();
+            boolean z3 = smartspaceTarget.getFeatureType() == 1 || !TextUtils.isEmpty(title);
+            boolean isEmpty = TextUtils.isEmpty(subtitle);
+            boolean z4 = !isEmpty;
+            if (!z3) {
+                title = subtitle;
+            }
+            setTitle(title, headerAction.getContentDescription(), z3 != z4 && z2);
+            if (!z3 || isEmpty) {
+                subtitle = null;
+            }
+            setSubtitle(subtitle, headerAction.getContentDescription(), z2);
+        }
+        if (baseAction != null) {
+            int i3 = (baseAction.getExtras() == null || baseAction.getExtras().isEmpty()) ? -1 : baseAction.getExtras().getInt("subcardType", -1);
+            if (baseAction.getIcon() != null) {
+                Icon icon2 = baseAction.getIcon();
+                Context context2 = getContext();
+                FalsingManager falsingManager2 = BcSmartSpaceUtil.sFalsingManager;
+                drawable = BcSmartSpaceUtil.getIconDrawableWithCustomSize(icon2, context2, context2.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size));
+            }
+            this.mBaseActionIconDrawable.setIcon(drawable);
+            setBaseActionIconSubtitle(baseAction.getSubtitle(), baseAction.getContentDescription(), this.mBaseActionIconDrawable);
+            if (i3 != -1) {
+                i2 = getClickedIndex(bcSmartspaceCardLoggingInfo2, i3);
+            } else {
+                Log.d("BcSmartspaceCard", "Subcard expected but missing type. loggingInfo=" + bcSmartspaceCardLoggingInfo2.toString() + ", baseAction=" + baseAction.toString());
+            }
+            BcSmartSpaceUtil.setOnClickListener(this.mBaseActionIconSubtitleView, smartspaceTarget, baseAction, this.mEventNotifier, "BcSmartspaceCard", bcSmartspaceCardLoggingInfo, i2);
+            smartspaceAction = baseAction;
+            bcSmartspaceCardLoggingInfo2 = bcSmartspaceCardLoggingInfo;
+        } else {
+            smartspaceAction = baseAction;
+        }
+        updateIconTint();
+        if (headerAction == null || (headerAction.getIntent() == null && headerAction.getPendingIntent() == null)) {
+            SmartspaceAction smartspaceAction2 = smartspaceAction;
+            if (smartspaceAction2 == null || (smartspaceAction2.getIntent() == null && smartspaceAction2.getPendingIntent() == null)) {
+                if (headerAction != null) {
+                    BcSmartSpaceUtil.setOnClickListener(this, smartspaceTarget, headerAction, this.mEventNotifier, "BcSmartspaceCard", bcSmartspaceCardLoggingInfo, 0);
+                }
+            } else if (smartspaceAction2 != null) {
+                BcSmartSpaceUtil.setOnClickListener(this, smartspaceTarget, smartspaceAction2, this.mEventNotifier, "BcSmartspaceCard", bcSmartspaceCardLoggingInfo, 0);
+            }
+        } else {
+            if (smartspaceTarget.getFeatureType() == 1 && bcSmartspaceCardLoggingInfo2.mFeatureType == 39) {
+                getClickedIndex(bcSmartspaceCardLoggingInfo2, 1);
+            }
+            if (headerAction != null) {
+                BcSmartSpaceUtil.setOnClickListener(this, smartspaceTarget, headerAction, this.mEventNotifier, "BcSmartspaceCard", bcSmartspaceCardLoggingInfo2, 0);
+            }
+        }
+        ViewGroup viewGroup4 = this.mSecondaryCardGroup;
+        if (viewGroup4 == null) {
+            return;
+        }
+        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) viewGroup4.getLayoutParams();
+        if (BcSmartSpaceUtil.getFeatureType(smartspaceTarget) == -2) {
+            layoutParams.matchConstraintMaxWidth = (getWidth() * 3) / 4;
+        } else {
+            layoutParams.matchConstraintMaxWidth = getWidth() / 2;
+        }
+        this.mSecondaryCardGroup.setLayoutParams(layoutParams);
+        this.mTouchDelegateIsDirty = true;
+    }
+
+    @Override
+    public final AccessibilityNodeInfo createAccessibilityNodeInfo() {
+        AccessibilityNodeInfo info = super.createAccessibilityNodeInfo();
+        AccessibilityNodeInfoCompat.wrap(info).setRoleDescription(" ");
+        return info;
+    }
+
+    @Override
+    public final BcSmartspaceCardLoggingInfo getLoggingInfo() {
+        if (mLoggingInfo != null) {
+            return mLoggingInfo;
+        }
+        BcSmartspaceCardLoggingInfo.Builder builder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount))
+                        .setFeatureType(mTarget != null ? mTarget.getFeatureType() : 0)
+                        .setUid(-1);
+        return new BcSmartspaceCardLoggingInfo(builder);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        setPaddingRelative(getResources().getDimensionPixelSize(R.dimen.non_remoteviews_card_padding_start), getPaddingTop(), getPaddingEnd(), getPaddingBottom());
+        mTextGroup = (ViewGroup) findViewById(R.id.text_group);
+        mSecondaryCardGroup = (ViewGroup) findViewById(R.id.secondary_card_group);
+        mTitleTextView = (TextView) findViewById(R.id.title_text);
+        mSubtitleTextView = (TextView) findViewById(R.id.subtitle_text);
+        mBaseActionIconSubtitleView = findViewById(R.id.base_action_icon_subtitle);
+        if (mBaseActionIconSubtitleView != null) {
+            mBaseActionIconSubtitleHitRect = new Rect();
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // androidx.constraintlayout.widget.ConstraintLayout, android.view.ViewGroup, android.view.View
+    public final void onLayout(boolean z, int i, int i2, int i3, int i4) {
+        super.onLayout(z, i, i2, i3, i4);
+        if (z || this.mTouchDelegateIsDirty) {
+            this.mTouchDelegateIsDirty = false;
+            setTouchDelegate(null);
+            DoubleShadowTextView doubleShadowTextView = this.mBaseActionIconSubtitleView;
+            if (doubleShadowTextView == null || doubleShadowTextView.getVisibility() != 0) {
+                return;
+            }
+            int dimensionPixelSize = (getResources().getDimensionPixelSize(R.dimen.subtitle_hit_rect_height) - this.mBaseActionIconSubtitleView.getHeight()) / 2;
+            this.mBaseActionIconSubtitleView.getHitRect(this.mBaseActionIconSubtitleHitRect);
+            offsetDescendantRectToMyCoords((View) this.mBaseActionIconSubtitleView.getParent(), this.mBaseActionIconSubtitleHitRect);
+            if (dimensionPixelSize > 0 || this.mBaseActionIconSubtitleHitRect.bottom != getHeight()) {
+                if (dimensionPixelSize > 0) {
+                    this.mBaseActionIconSubtitleHitRect.top -= dimensionPixelSize;
+                }
+                this.mBaseActionIconSubtitleHitRect.bottom = getHeight();
+                setTouchDelegate(new TouchDelegate(this.mBaseActionIconSubtitleHitRect, this.mBaseActionIconSubtitleView));
+            }
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    public final void setBaseActionIconSubtitle(CharSequence charSequence, CharSequence charSequence2, Drawable drawable) {
+        if (this.mBaseActionIconSubtitleView == null) {
+            Log.w("BcSmartspaceCard", "No base action icon subtitle view to update");
+            return;
+        }
+        if (TextUtils.isEmpty(charSequence)) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(this.mBaseActionIconSubtitleView, 8);
+            return;
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(this.mBaseActionIconSubtitleView, 0);
+        this.mBaseActionIconSubtitleView.setText(charSequence);
+        this.mBaseActionIconSubtitleView.setCompoundDrawablesRelative(drawable, null, null, null);
+        ContentDescriptionUtil.setFormattedContentDescription("BcSmartspaceCard", this.mBaseActionIconSubtitleView, charSequence, charSequence2);
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // com.google.android.systemui.smartspace.SmartspaceCard
+    public final void setDozeAmount(float f) {
+        this.mDozeAmount = f;
+        SmartspaceTarget smartspaceTarget = this.mTarget;
+        if (smartspaceTarget != null && smartspaceTarget.getBaseAction() != null && this.mTarget.getBaseAction().getExtras() != null) {
+            Bundle extras = this.mTarget.getBaseAction().getExtras();
+            if (this.mTitleTextView != null && extras.getBoolean("hide_title_on_aod")) {
+                this.mTitleTextView.setAlpha(1.0f - f);
+            }
+            if (this.mSubtitleTextView != null && extras.getBoolean("hide_subtitle_on_aod")) {
+                this.mSubtitleTextView.setAlpha(1.0f - f);
+            }
+        }
+        if (this.mTextGroup == null) {
+            return;
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(this.mSecondaryCardGroup, (this.mDozeAmount == 1.0f || !this.mValidSecondaryCard) ? 8 : 0);
+        SmartspaceTarget smartspaceTarget2 = this.mTarget;
+        if (smartspaceTarget2 == null || smartspaceTarget2.getFeatureType() != 30) {
+            ViewGroup viewGroup = this.mSecondaryCardGroup;
+            if (viewGroup == null || viewGroup.getVisibility() == 8) {
+                this.mTextGroup.setTranslationX(0.0f);
+                return;
+            }
+            this.mTextGroup.setTranslationX(((PathInterpolator) Interpolators.EMPHASIZED).getInterpolation(this.mDozeAmount) * this.mSecondaryCardGroup.getWidth() * (isRtl() ? 1 : -1));
+            this.mSecondaryCardGroup.setAlpha(Math.max(0.0f, Math.min(1.0f, ((1.0f - this.mDozeAmount) * 9.0f) - 6.0f)));
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // com.google.android.systemui.smartspace.SmartspaceCard
+    public final void setPrimaryTextColor(int i) {
+        TextView textView = this.mTitleTextView;
+        if (textView != null) {
+            textView.setTextColor(i);
+        }
+        TextView textView2 = this.mSubtitleTextView;
+        if (textView2 != null) {
+            textView2.setTextColor(i);
+        }
+        DoubleShadowTextView doubleShadowTextView = this.mBaseActionIconSubtitleView;
+        if (doubleShadowTextView != null) {
+            doubleShadowTextView.setTextColor(i);
+        }
+        BcSmartspaceCardSecondary bcSmartspaceCardSecondary = this.mSecondaryCard;
+        if (bcSmartspaceCardSecondary != null) {
+            bcSmartspaceCardSecondary.setTextColor(i);
+        }
+        this.mIconTintColor = i;
+        updateIconTint();
+    }
+
+    public final void setSecondaryCard(BcSmartspaceCardSecondary secondaryCard) {
+        if (mSecondaryCardGroup == null) {
+            return;
+        }
+        mSecondaryCard = secondaryCard;
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondaryCardGroup, View.GONE);
+        mSecondaryCardGroup.removeAllViews();
+        if (secondaryCard != null) {
+            ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_card_height));
+            params.setMarginStart(getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_secondary_card_start_margin));
+            params.startToStart = 0;
+            params.topToTop = 0;
+            params.bottomToBottom = 0;
+            mSecondaryCardGroup.addView(secondaryCard, params);
+        }
+    }
+
+    public final void setSubtitle(CharSequence text, CharSequence contentDescription, boolean useIcon) {
+        if (mSubtitleTextView == null) {
+            Log.w("BcSmartspaceCard", "No subtitle view to update");
+            return;
+        }
+        mSubtitleTextView.setText(text);
+        mSubtitleTextView.setCompoundDrawablesRelative((TextUtils.isEmpty(text) || !useIcon) ? null : mIconDrawable, null, null, null);
+        mSubtitleTextView.setMaxLines((mTarget == null || mTarget.getFeatureType() != 5 || mUsePageIndicatorUi) ? 1 : 2);
+        ContentDescriptionUtil.setFormattedContentDescription("BcSmartspaceCard", mSubtitleTextView, text, contentDescription);
+        BcSmartspaceTemplateDataUtils.offsetTextViewForIcon(mSubtitleTextView, useIcon ? mIconDrawable : null, isRtl());
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    public final void setTitle(CharSequence text, CharSequence contentDescription, boolean useIcon) {
+        boolean z2;
+        if (mTitleTextView == null) {
+            Log.w("BcSmartspaceCard", "No title view to update");
+            return;
+        }
+        mTitleTextView.setText(text);
+        SmartspaceAction headerAction = mTarget == null ? null : mTarget.getHeaderAction();
+        Bundle extras = headerAction == null ? null : headerAction.getExtras();
+        if (extras == null || !extras.containsKey("titleEllipsize")) {
+            if (mTarget != null && mTarget.getFeatureType() == 2 && Locale.ENGLISH.getLanguage().equals(getResources().getConfiguration().locale.getLanguage())) {
+                mTitleTextView.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+            } else {
+                mTitleTextView.setEllipsize(TextUtils.TruncateAt.END);
+            }
+        } else {
+            try {
+                mTitleTextView.setEllipsize(TextUtils.TruncateAt.valueOf(extras.getString("titleEllipsize")));
+            } catch (IllegalArgumentException unused) {
+                Log.w(
+                        "BcSmartspaceCard",
+                        "Invalid TruncateAt value: " + extras.getString("titleEllipsize"));
+            }
+        }
+        boolean z3 = false;
+        if (extras != null) {
+            if (extras.getInt("titleMaxLines") != 0) {
+                mTitleTextView.setMaxLines(extras.getInt("titleMaxLines"));
+            }
+            z2 = extras.getBoolean("disableTitleIcon");
+        } else {
+            z2 = false;
+        }
+        if (useIcon && !z2) {
+            z3 = true;
+        }
+        if (z3) {
+            ContentDescriptionUtil.setFormattedContentDescription("BcSmartspaceCard", mTitleTextView, text, contentDescription);
+        }
+        mTitleTextView.setCompoundDrawablesRelative(z3 ? mIconDrawable : null, null, null, null);
+        BcSmartspaceTemplateDataUtils.offsetTextViewForIcon(mTitleTextView, z3 ? mIconDrawable : null, isRtl());
+    }
+
+    public final void updateIconTint() {
+        if (mTarget == null) {
+            return;
+        }
+        if (mTarget.getFeatureType() == 1) {
+            mIconDrawable.setTintList(null);
+        } else {
+            mIconDrawable.setTint(mIconTintColor);
+        }
+        SmartspaceAction baseAction = mTarget.getBaseAction();
+        int subcardType = -1;
+        if (baseAction != null && baseAction.getExtras() != null && !baseAction.getExtras().isEmpty()) {
+            subcardType = baseAction.getExtras().getInt("subcardType", -1);
+        }
+        if (subcardType == 1) {
+            mBaseActionIconDrawable.setTintList(null);
+        } else {
+            mBaseActionIconDrawable.setTint(mIconTintColor);
+        }
+    }
+
+    public BcSmartspaceCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mSecondaryCard = null;
+        mIconTintColor = GraphicsUtils.getAttrColor(context, android.R.attr.textColorPrimary);
+        mTextGroup = null;
+        mSecondaryCardGroup = null;
+        mTitleTextView = null;
+        mSubtitleTextView = null;
+        mBaseActionIconSubtitleView = null;
+        mBaseActionIconSubtitleHitRect = null;
+        mUiSurface = null;
+        mTouchDelegateIsDirty = false;
+        context.getTheme().applyStyle(R.style.Smartspace, false);
+        mIconDrawable = new DoubleShadowIconDrawable(context);
+        mBaseActionIconDrawable = new DoubleShadowIconDrawable(context);
+        setDefaultFocusHighlightEnabled(false);
+    }
+
+    @Override
+    public final View getView() {
+        return this;
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java
new file mode 100644
index 0000000000000..e309e0a91fe30
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java
@@ -0,0 +1,117 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+public class BcSmartspaceCardCombination extends BcSmartspaceCardSecondary {
+    public ConstraintLayout mFirstSubCard;
+    public ConstraintLayout mSecondSubCard;
+
+    public BcSmartspaceCardCombination(Context context) {
+        super(context);
+    }
+    public final boolean fillSubCard(ConstraintLayout constraintLayout, SmartspaceTarget target, SmartspaceAction action, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        boolean z;
+        TextView textView = (TextView) constraintLayout.findViewById(R.id.sub_card_text);
+        ImageView imageView = (ImageView) constraintLayout.findViewById(R.id.sub_card_icon);
+        if (textView == null) {
+            Log.w("BcSmartspaceCardCombination", "No sub-card text field to update");
+            return false;
+        }
+        if (imageView == null) {
+            Log.w("BcSmartspaceCardCombination", "No sub-card image field to update");
+            return false;
+        }
+        BcSmartSpaceUtil.setOnClickListener(constraintLayout, target, action, eventNotifier, "BcSmartspaceCardCombination", loggingInfo, 0);
+        Icon icon = action.getIcon();
+        Context context = getContext();
+        Drawable iconDrawableWithCustomSize = BcSmartSpaceUtil.getIconDrawableWithCustomSize(icon, context, context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size));
+        boolean z2 = true;
+        if (iconDrawableWithCustomSize == null) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(imageView, 8);
+            z = false;
+        } else {
+            imageView.setImageDrawable(iconDrawableWithCustomSize);
+            BcSmartspaceTemplateDataUtils.updateVisibility(imageView, 0);
+            z = true;
+        }
+        CharSequence title = action.getTitle();
+        if (TextUtils.isEmpty(title)) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(textView, 8);
+            z2 = z;
+        } else {
+            textView.setText(title);
+            BcSmartspaceTemplateDataUtils.updateVisibility(textView, 0);
+        }
+        constraintLayout.setContentDescription(z2 ? action.getContentDescription() : null);
+        if (z2) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(constraintLayout, 0);
+            return z2;
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(constraintLayout, 8);
+        return z2;
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mFirstSubCard = findViewById(R.id.first_sub_card);
+        mSecondSubCard = findViewById(R.id.second_sub_card);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstSubCard, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondSubCard, 8);
+    }
+
+    @Override
+    public boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        SmartspaceAction action;
+        List actionChips = target.getActionChips();
+        if (actionChips == null || actionChips.size() < 1 || (action = (SmartspaceAction) actionChips.get(0)) == null) {
+            return false;
+        }
+        ConstraintLayout constraintLayout = mFirstSubCard;
+        boolean z = constraintLayout != null && fillSubCard(constraintLayout, target, action, eventNotifier, loggingInfo);
+        boolean z2 = actionChips.size() > 1 && actionChips.get(1) != null;
+        boolean fillSubCard = z2 ? fillSubCard(mSecondSubCard, target, (SmartspaceAction) actionChips.get(1), eventNotifier, loggingInfo) : true;
+        if (getLayoutParams() instanceof LinearLayout.LayoutParams) {
+            LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) getLayoutParams();
+            if (z2 && fillSubCard) {
+                layoutParams.weight = 3.0f;
+            } else {
+                layoutParams.weight = 1.0f;
+            }
+            setLayoutParams(layoutParams);
+        }
+        return z && fillSubCard;
+    }
+
+    public BcSmartspaceCardCombination(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    @Override
+    public final void setTextColor(int i) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java
new file mode 100644
index 0000000000000..a67ac1be5b61a
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java
@@ -0,0 +1,43 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+public class BcSmartspaceCardCombinationAtStore extends BcSmartspaceCardCombination {
+    public BcSmartspaceCardCombinationAtStore(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        SmartspaceAction action;
+        List actionChips = target.getActionChips();
+        if (actionChips == null || actionChips.isEmpty() || (action = (SmartspaceAction) actionChips.get(0)) == null) {
+            return false;
+        }
+        ConstraintLayout constraintLayout = this.mFirstSubCard;
+        boolean z = (constraintLayout instanceof BcSmartspaceCardShoppingList) && ((BcSmartspaceCardShoppingList) constraintLayout).setSmartspaceActions(target, eventNotifier, loggingInfo);
+        ConstraintLayout constraintLayout2 = this.mSecondSubCard;
+        boolean z2 = constraintLayout2 != null && fillSubCard(constraintLayout2, target, action, eventNotifier, loggingInfo);
+        if (z) {
+            this.mFirstSubCard.setBackgroundResource(R.drawable.bg_smartspace_combination_sub_card);
+        }
+        return z && z2;
+    }
+
+    public BcSmartspaceCardCombinationAtStore(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java
new file mode 100644
index 0000000000000..495912cceb779
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java
@@ -0,0 +1,370 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ImageDecoder;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.DrawableWrapper;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.android.internal.util.LatencyTracker;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class BcSmartspaceCardDoorbell extends BcSmartspaceCardGenericImage {
+    public static final String TAG = "BcSmartspaceCardBell";
+    public int mGifFrameDurationInMs = 200;
+    public final LatencyInstrumentContext mLatencyInstrumentContext;
+    public ImageView mLoadingIcon;
+    public ViewGroup mLoadingScreenView;
+    public String mPreviousTargetId;
+    public ProgressBar mProgressBar;
+    public final Map<Uri, DrawableWithUri> mUriToDrawable = new HashMap<>();
+
+    public BcSmartspaceCardDoorbell(Context context) {
+        this(context, null);
+    }
+
+    public BcSmartspaceCardDoorbell(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mLatencyInstrumentContext = new LatencyInstrumentContext(context);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mLoadingScreenView = findViewById(R.id.loading_screen);
+        mProgressBar = findViewById(R.id.indeterminateBar);
+        mLoadingIcon = findViewById(R.id.loading_screen_icon);
+    }
+
+    @Override
+    public void resetUi() {
+        super.resetUi();
+        BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mLoadingScreenView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mProgressBar, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mLoadingIcon, View.GONE);
+    }
+
+    public void maybeResetImageView(SmartspaceTarget target) {
+        String targetId = target.getSmartspaceTargetId();
+        boolean sameTarget = targetId.equals(mPreviousTargetId);
+        mPreviousTargetId = targetId;
+
+        if (!sameTarget) {
+            ViewGroup.LayoutParams params = mImageView.getLayoutParams();
+            params.width = ViewGroup.LayoutParams.WRAP_CONTENT;
+            mImageView.setImageDrawable(null);
+            mUriToDrawable.clear();
+        }
+    }
+
+    public void maybeUpdateLayoutHeight(Bundle extras, View view, String key) {
+        if (extras.containsKey(key)) {
+            float density = getContext().getResources().getDisplayMetrics().density;
+            ViewGroup.LayoutParams params = view.getLayoutParams();
+            params.height = (int) (extras.getInt(key) * density);
+        }
+    }
+
+    public void maybeUpdateLayoutWidth(Bundle extras, View view, String key) {
+        if (extras.containsKey(key)) {
+            float density = getContext().getResources().getDisplayMetrics().density;
+            ViewGroup.LayoutParams params = view.getLayoutParams();
+            params.width = (int) (extras.getInt(key) * density);
+        }
+    }
+
+    @Override
+    public boolean setSmartspaceActions(
+            SmartspaceTarget target,
+            BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier,
+            BcSmartspaceCardLoggingInfo loggingInfo) {
+        
+        if (!getContext().getPackageName().equals("com.android.systemui")) {
+            return false;
+        }
+
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction != null ? baseAction.getExtras() : null;
+
+        List<Uri> imageUris = target.getIconGrid().stream()
+                .filter(action -> action.getExtras().containsKey("imageUri"))
+                .map(action -> Uri.parse(action.getExtras().getString("imageUri")))
+                .collect(Collectors.toList());
+
+        if (!imageUris.isEmpty()) {
+            if (extras != null && extras.containsKey("frameDurationMs")) {
+                mGifFrameDurationInMs = extras.getInt("frameDurationMs");
+            }
+
+            Set<Uri> newUris = imageUris.stream()
+                    .filter(uri -> !mUriToDrawable.containsKey(uri))
+                    .collect(Collectors.toSet());
+
+            if (!newUris.isEmpty()) {
+                mLatencyInstrumentContext.mUriSet.addAll(newUris);
+                mLatencyInstrumentContext.mLatencyTracker.onActionStart(22);
+            }
+
+            maybeResetImageView(target);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.VISIBLE);
+
+            ContentResolver contentResolver = getContext().getApplicationContext().getContentResolver();
+            int height = getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_card_height);
+            float cornerRadius = getResources().getDimension(R.dimen.enhanced_smartspace_secondary_card_corner_radius);
+
+            WeakReference<ImageView> imageViewRef = new WeakReference<>(mImageView);
+            WeakReference<ViewGroup> loadingScreenRef = new WeakReference<>(mLoadingScreenView);
+
+            List<DrawableWithUri> drawables = imageUris.stream()
+                    .map(uri -> {
+                        DrawableWithUri drawable = mUriToDrawable.computeIfAbsent(uri, u -> {
+                            DrawableWithUri d = new DrawableWithUri(
+                                    u, contentResolver, height, cornerRadius, 
+                                    imageViewRef, loadingScreenRef);
+                            new LoadUriTask(mLatencyInstrumentContext).execute(d);
+                            return d;
+                        });
+                        return drawable;
+                    })
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+
+            AnimationDrawable animation = new AnimationDrawable();
+            for (DrawableWithUri drawable : drawables) {
+                animation.addFrame(drawable, mGifFrameDurationInMs);
+            }
+            mImageView.setImageDrawable(animation);
+            animation.start();
+            Log.d(TAG, "imageUri is set");
+            return true;
+        } else if (extras != null && extras.containsKey("imageBitmap")) {
+            Bitmap bitmap = (Bitmap) extras.get("imageBitmap");
+            maybeResetImageView(target);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.VISIBLE);
+
+            if (bitmap != null && bitmap.getHeight() != 0) {
+                int height = (int) getResources().getDimension(R.dimen.enhanced_smartspace_card_height);
+                float aspectRatio = (float) bitmap.getWidth() / bitmap.getHeight();
+                bitmap = Bitmap.createScaledBitmap(bitmap, (int) (height * aspectRatio), height, true);
+                
+                RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(getResources(), bitmap);
+                drawable.setCornerRadius(getResources().getDimension(R.dimen.enhanced_smartspace_secondary_card_corner_radius));
+                mImageView.setImageDrawable(drawable);
+                Log.d(TAG, "imageBitmap is set");
+            }
+            return true;
+        } else if (extras != null && extras.containsKey("loadingScreenState")) {
+            int state = extras.getInt("loadingScreenState");
+            String dimensionRatio = BcSmartSpaceUtil.getDimensionRatio(extras);
+            if (dimensionRatio == null) {
+                return false;
+            }
+
+            maybeResetImageView(target);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.GONE);
+
+            ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mLoadingScreenView.getLayoutParams();
+            params.dimensionRatio = dimensionRatio;
+            mLoadingScreenView.setBackgroundTintList(ColorStateList.valueOf(getContext().getColor(R.color.smartspace_button_background)));
+            BcSmartspaceTemplateDataUtils.updateVisibility(mLoadingScreenView, View.VISIBLE);
+
+            maybeUpdateLayoutWidth(extras, mProgressBar, "progressBarWidth");
+            maybeUpdateLayoutHeight(extras, mProgressBar, "progressBarHeight");
+            mProgressBar.setIndeterminateTintList(ColorStateList.valueOf(getContext().getColor(R.color.smartspace_button_text)));
+
+            boolean progressBarVisible = (state == 1 || (state == 4 && extras.getBoolean("progressBarVisible", true)));
+            BcSmartspaceTemplateDataUtils.updateVisibility(mProgressBar, progressBarVisible ? View.VISIBLE : View.GONE);
+
+            boolean iconVisible = false;
+            if (state == 2) {
+                mLoadingIcon.setImageDrawable(getContext().getDrawable(R.drawable.videocam));
+                iconVisible = true;
+            } else if (state == 3) {
+                mLoadingIcon.setImageDrawable(getContext().getDrawable(R.drawable.videocam_off));
+                iconVisible = true;
+            } else if (state == 4 && extras.containsKey("loadingScreenIcon")) {
+                mLoadingIcon.setImageBitmap((Bitmap) extras.get("loadingScreenIcon"));
+                if (extras.getBoolean("tintLoadingIcon", false)) {
+                    mLoadingIcon.setColorFilter(getContext().getColor(R.color.smartspace_button_text));
+                }
+                iconVisible = true;
+            }
+
+            maybeUpdateLayoutWidth(extras, mLoadingIcon, "loadingIconWidth");
+            maybeUpdateLayoutHeight(extras, mLoadingIcon, "loadingIconHeight");
+            BcSmartspaceTemplateDataUtils.updateVisibility(mLoadingIcon, iconVisible ? View.VISIBLE : View.GONE);
+            return true;
+        }
+        return false;
+    }
+
+    public static class DrawableWithUri extends DrawableWrapper {
+        public final Path mClipPath = new Path();
+        public final ContentResolver mContentResolver;
+        public Drawable mDrawable;
+        public final int mHeightInPx;
+        public final WeakReference<ImageView> mImageViewWeakReference;
+        public final WeakReference<ViewGroup> mLoadingScreenWeakReference;
+        public final float mScaledCornerRadius;
+        public final RectF mTempRect = new RectF();
+        public final Uri mUri;
+
+        public DrawableWithUri(
+                Uri uri,
+                ContentResolver contentResolver,
+                int heightInPx,
+                float scaledCornerRadius,
+                WeakReference<ImageView> imageViewRef,
+                WeakReference<ViewGroup> loadingScreenRef) {
+            super(new ColorDrawable(0));
+            mUri = uri;
+            mContentResolver = contentResolver;
+            mHeightInPx = heightInPx;
+            mScaledCornerRadius = scaledCornerRadius;
+            mImageViewWeakReference = imageViewRef;
+            mLoadingScreenWeakReference = loadingScreenRef;
+        }
+
+        @Override
+        public void draw(Canvas canvas) {
+            canvas.save();
+            canvas.clipPath(mClipPath);
+            super.draw(canvas);
+            canvas.restore();
+        }
+
+        @Override
+        protected void onBoundsChange(Rect bounds) {
+            mTempRect.set(bounds);
+            mClipPath.reset();
+            mClipPath.addRoundRect(mTempRect, mScaledCornerRadius, mScaledCornerRadius, Path.Direction.CCW);
+            super.onBoundsChange(bounds);
+        }
+    }
+
+    public static class LatencyInstrumentContext {
+        public final LatencyTracker mLatencyTracker;
+        public final Set<Uri> mUriSet = new HashSet<>();
+
+        public LatencyInstrumentContext(Context context) {
+            mLatencyTracker = LatencyTracker.getInstance(context);
+        }
+
+        public void cancelInstrument() {
+            if (!mUriSet.isEmpty()) {
+                mLatencyTracker.onActionCancel(22);
+                mUriSet.clear();
+            }
+        }
+    }
+
+    public static class LoadUriTask extends AsyncTask<DrawableWithUri, Void, DrawableWithUri> {
+        public final LatencyInstrumentContext mInstrumentContext;
+
+        public LoadUriTask(LatencyInstrumentContext context) {
+            mInstrumentContext = context;
+        }
+
+        @Override
+        protected DrawableWithUri doInBackground(DrawableWithUri... params) {
+            if (params.length == 0) return null;
+            DrawableWithUri drawable = params[0];
+            try (InputStream inputStream = drawable.mContentResolver.openInputStream(drawable.mUri)) {
+                ImageDecoder.Source source = ImageDecoder.createSource((Resources) null, inputStream);
+                drawable.mDrawable = ImageDecoder.decodeDrawable(source, (decoder, info, src) -> {
+                    decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+                    int height = drawable.mHeightInPx;
+                    float aspectRatio = info.getSize().getHeight() != 0
+                            ? (float) info.getSize().getWidth() / info.getSize().getHeight()
+                            : 0;
+                    decoder.setTargetSize((int) (height * aspectRatio), height);
+                });
+            } catch (IOException e) {
+                Log.e(TAG, "Unable to decode stream: " + e);
+            } catch (Exception e) {
+                Log.w(TAG, "open uri:" + drawable.mUri + " got exception:" + e);
+            }
+            return drawable;
+        }
+
+        @Override
+        protected void onPostExecute(DrawableWithUri result) {
+            if (result == null) return;
+            if (result.mDrawable != null) {
+                result.setDrawable(result.mDrawable);
+                ImageView imageView = result.mImageViewWeakReference.get();
+                if (imageView != null) {
+                    int intrinsicWidth = result.mDrawable.getIntrinsicWidth();
+                    if (imageView.getLayoutParams().width != intrinsicWidth) {
+                        Log.d(TAG, "imageView requestLayout " + result.mUri);
+                        imageView.getLayoutParams().width = intrinsicWidth;
+                        imageView.requestLayout();
+                    }
+                }
+                if (result.mUri != null 
+                        && mInstrumentContext.mUriSet.remove(result.mUri) 
+                        && mInstrumentContext.mUriSet.isEmpty()) {
+                    mInstrumentContext.mLatencyTracker.onActionEnd(22);
+                } else if (result.mUri == null) {
+                    mInstrumentContext.cancelInstrument();
+                }
+            } else {
+                ImageView imageView = result.mImageViewWeakReference.get();
+                if (imageView != null) {
+                    BcSmartspaceTemplateDataUtils.updateVisibility(imageView, View.GONE);
+                }
+                mInstrumentContext.cancelInstrument();
+            }
+            View loadingScreen = result.mLoadingScreenWeakReference.get();
+            if (loadingScreen != null) {
+                BcSmartspaceTemplateDataUtils.updateVisibility(loadingScreen, View.GONE);
+            }
+        }
+
+        @Override
+        protected void onCancelled() {
+            mInstrumentContext.cancelInstrument();
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java
new file mode 100644
index 0000000000000..90bd7fa0ad6b0
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java
@@ -0,0 +1,60 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class BcSmartspaceCardFlight extends BcSmartspaceCardSecondary {
+    public ImageView mQrCodeView;
+
+    public BcSmartspaceCardFlight(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mQrCodeView = (ImageView) findViewById(R.id.flight_qr_code);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mQrCodeView, 8);
+    }
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+        if (extras == null || !extras.containsKey("qrCodeBitmap")) {
+            return false;
+        }
+        Bitmap bitmap = (Bitmap) extras.get("qrCodeBitmap");
+        ImageView imageView = mQrCodeView;
+        if (imageView == null) {
+            Log.w("BcSmartspaceCardFlight", "No flight QR code view to update");
+        } else {
+            imageView.setImageBitmap(bitmap);
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(mQrCodeView, 0);
+        return true;
+    }
+
+    public BcSmartspaceCardFlight(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java
new file mode 100644
index 0000000000000..eb770e1042388
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java
@@ -0,0 +1,78 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class BcSmartspaceCardGenericImage extends BcSmartspaceCardSecondary {
+    public ImageView mImageView;
+
+    public BcSmartspaceCardGenericImage(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mImageView = (ImageView) findViewById(R.id.image_view);
+    }
+
+    @Override
+    public void resetUi() {
+        mImageView.setImageBitmap(null);
+    }
+    public void setImageBitmap(Bitmap bitmap) {
+        mImageView.setImageBitmap(bitmap);
+    }
+
+    @Override
+    public boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+        if (extras == null || !extras.containsKey("imageBitmap")) {
+            return false;
+        }
+        if (extras.containsKey("imageScaleType")) {
+            String scaleType = extras.getString("imageScaleType");
+            try {
+                mImageView.setScaleType(ImageView.ScaleType.valueOf(scaleType));
+            } catch (IllegalArgumentException unused) {
+                Log.w("SmartspaceGenericImg", "Invalid imageScaleType value: " + scaleType);
+            }
+        }
+        String dimensionRatio = BcSmartSpaceUtil.getDimensionRatio(extras);
+        if (dimensionRatio != null) {
+            ((ConstraintLayout.LayoutParams) mImageView.getLayoutParams()).dimensionRatio = dimensionRatio;
+        }
+        if (extras.containsKey("imageLayoutWidth")) {
+            ((ViewGroup.MarginLayoutParams) ((ConstraintLayout.LayoutParams) mImageView.getLayoutParams())).width = extras.getInt("imageLayoutWidth");
+        }
+        if (extras.containsKey("imageLayoutHeight")) {
+            ((ViewGroup.MarginLayoutParams) ((ConstraintLayout.LayoutParams) mImageView.getLayoutParams())).height = extras.getInt("imageLayoutHeight");
+        }
+        setImageBitmap((Bitmap) extras.get("imageBitmap"));
+        return true;
+    }
+
+    public BcSmartspaceCardGenericImage(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    @Override
+    public void setTextColor(int i) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java
new file mode 100644
index 0000000000000..6bbb1c4946cb7
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java
@@ -0,0 +1,98 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class BcSmartspaceCardLoyalty extends BcSmartspaceCardGenericImage {
+    public TextView mCardPromptView;
+    public ImageView mLoyaltyProgramLogoView;
+    public TextView mLoyaltyProgramNameView;
+
+    public BcSmartspaceCardLoyalty(Context context) {
+        super(context);
+    }
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mLoyaltyProgramLogoView = findViewById(R.id.loyalty_program_logo);
+        mLoyaltyProgramNameView = findViewById(R.id.loyalty_program_name);
+        mCardPromptView = findViewById(R.id.card_prompt);
+    }
+    @Override
+    public final void resetUi() {
+        super.resetUi();
+        BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mLoyaltyProgramLogoView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mLoyaltyProgramNameView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptView, 8);
+    }
+    @Override
+    public final void setImageBitmap(Bitmap bitmap) {
+        super.setImageBitmap(bitmap);
+        mLoyaltyProgramLogoView.setImageBitmap(bitmap);
+    }
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        super.setSmartspaceActions(target, eventNotifier, loggingInfo);
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+        if (extras == null) {
+            return false;
+        }
+        boolean containsKey = extras.containsKey("imageBitmap");
+        if (extras.containsKey("cardPrompt")) {
+            String string = extras.getString("cardPrompt");
+            TextView textView = mCardPromptView;
+            if (textView == null) {
+                Log.w("BcSmartspaceCardLoyalty", "No card prompt view to update");
+            } else {
+                textView.setText(string);
+            }
+            BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptView, 0);
+            if (containsKey) {
+                BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, 0);
+            }
+            return true;
+        }
+        if (!extras.containsKey("loyaltyProgramName")) {
+            if (containsKey) {
+                BcSmartspaceTemplateDataUtils.updateVisibility(mLoyaltyProgramLogoView, 0);
+            }
+            return containsKey;
+        }
+        String string2 = extras.getString("loyaltyProgramName");
+        TextView textView2 = mLoyaltyProgramNameView;
+        if (textView2 == null) {
+            Log.w("BcSmartspaceCardLoyalty", "No loyalty program name view to update");
+        } else {
+            textView2.setText(string2);
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(mLoyaltyProgramNameView, 0);
+        if (containsKey) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mLoyaltyProgramLogoView, 0);
+        }
+        return true;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        mLoyaltyProgramNameView.setTextColor(color);
+        mCardPromptView.setTextColor(color);
+    }
+    public BcSmartspaceCardLoyalty(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSecondary.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSecondary.java
new file mode 100644
index 0000000000000..bdddd011d4f7b
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSecondary.java
@@ -0,0 +1,40 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+public abstract class BcSmartspaceCardSecondary extends ConstraintLayout {
+    public String mPrevSmartspaceTargetId;
+
+    public BcSmartspaceCardSecondary(Context context) {
+        super(context);
+        mPrevSmartspaceTargetId = "";
+    }
+
+    public final void reset(String str) {
+        if (mPrevSmartspaceTargetId.equals(str)) {
+            return;
+        }
+        mPrevSmartspaceTargetId = str;
+        resetUi();
+    }
+
+    public abstract boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo);
+
+    public abstract void setTextColor(int color);
+
+    public BcSmartspaceCardSecondary(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        mPrevSmartspaceTargetId = "";
+    }
+
+    public void resetUi() {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java
new file mode 100644
index 0000000000000..dba16f42e415a
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java
@@ -0,0 +1,148 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.Locale;
+
+public class BcSmartspaceCardShoppingList extends BcSmartspaceCardSecondary {
+    public static final int[] LIST_ITEM_TEXT_VIEW_IDS = {R.id.list_item_1, R.id.list_item_2, R.id.list_item_3};
+    public ImageView mCardPromptIconView;
+    public TextView mCardPromptView;
+    public TextView mEmptyListMessageView;
+    public ImageView mListIconView;
+    public final TextView[] mListItems;
+
+    public BcSmartspaceCardShoppingList(Context context) {
+        super(context);
+        mListItems = new TextView[3];
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mCardPromptView = findViewById(R.id.card_prompt);
+        mEmptyListMessageView = findViewById(R.id.empty_list_message);
+        mCardPromptIconView = findViewById(R.id.card_prompt_icon);
+        mListIconView = findViewById(R.id.list_icon);
+        for (int i = 0; i < 3; i++) {
+            mListItems[i] = findViewById(LIST_ITEM_TEXT_VIEW_IDS[i]);
+        }
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mEmptyListMessageView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptIconView, 8);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptView, 8);
+        for (int i = 0; i < 3; i++) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mListItems[i], 8);
+        }
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bitmap bitmap = null;
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+        if (extras != null) {
+            if (extras.containsKey("appIcon")) {
+                bitmap = (Bitmap) extras.get("appIcon");
+            } else if (extras.containsKey("imageBitmap")) {
+                bitmap = (Bitmap) extras.get("imageBitmap");
+            }
+            mCardPromptIconView.setImageBitmap(bitmap);
+            mListIconView.setImageBitmap(bitmap);
+            if (extras.containsKey("cardPrompt")) {
+                String string = extras.getString("cardPrompt");
+                TextView textView = mCardPromptView;
+                if (textView == null) {
+                    Log.w("BcSmartspaceCardShoppingList", "No card prompt view to update");
+                } else {
+                    textView.setText(string);
+                }
+                BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptView, 0);
+                if (bitmap != null) {
+                    BcSmartspaceTemplateDataUtils.updateVisibility(mCardPromptIconView, 0);
+                    return true;
+                }
+            } else {
+                if (extras.containsKey("emptyListString")) {
+                    String string2 = extras.getString("emptyListString");
+                    TextView textView2 = mEmptyListMessageView;
+                    if (textView2 == null) {
+                        Log.w("BcSmartspaceCardShoppingList", "No empty list message view to update");
+                    } else {
+                        textView2.setText(string2);
+                    }
+                    BcSmartspaceTemplateDataUtils.updateVisibility(mEmptyListMessageView, 0);
+                    BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, 0);
+                    return true;
+                }
+                if (extras.containsKey("listItems")) {
+                    String[] stringArray = extras.getStringArray("listItems");
+                    if (stringArray.length != 0) {
+                        BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, 0);
+                        for (int i = 0; i < 3; i++) {
+                            TextView textView3 = mListItems[i];
+                            if (textView3 == null) {
+                                Log.w(
+                                        "BcSmartspaceCardShoppingList",
+                                        String.format(
+                                                Locale.US,
+                                                "Missing list item view to update at row: %d",
+                                                i + 1));
+                                return true;
+                            }
+                            if (i < stringArray.length) {
+                                BcSmartspaceTemplateDataUtils.updateVisibility(textView3, 0);
+                                textView3.setText(stringArray[i]);
+                            } else {
+                                BcSmartspaceTemplateDataUtils.updateVisibility(textView3, 8);
+                                textView3.setText("");
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public final void setTextColor(int i) {
+        mCardPromptView.setTextColor(i);
+        mEmptyListMessageView.setTextColor(i);
+        for (int i2 = 0; i2 < 3; i2++) {
+            TextView textView = mListItems[i2];
+            if (textView == null) {
+                Log.w(
+                        "BcSmartspaceCardShoppingList",
+                        String.format(
+                                Locale.US, "Missing list item view to update at row: %d", i2 + 1));
+                return;
+            }
+            textView.setTextColor(i);
+        }
+    }
+
+    public BcSmartspaceCardShoppingList(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        mListItems = new TextView[3];
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java
new file mode 100644
index 0000000000000..971bef26c273b
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java
@@ -0,0 +1,127 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class BcSmartspaceCardSports extends BcSmartspaceCardSecondary {
+    public ImageView mFirstCompetitorLogo;
+    public TextView mFirstCompetitorScore;
+    public ImageView mSecondCompetitorLogo;
+    public TextView mSecondCompetitorScore;
+    public TextView mSummaryView;
+
+    public BcSmartspaceCardSports(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mSummaryView = findViewById(R.id.match_time_summary);
+        mFirstCompetitorScore = findViewById(R.id.first_competitor_score);
+        mSecondCompetitorScore = findViewById(R.id.second_competitor_score);
+        mFirstCompetitorLogo = findViewById(R.id.first_competitor_logo);
+        mSecondCompetitorLogo = findViewById(R.id.second_competitor_logo);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSummaryView, 4);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorScore, 4);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorScore, 4);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorLogo, 4);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorLogo, 4);
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        boolean z;
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+        if (extras == null) {
+            return false;
+        }
+        if (extras.containsKey("matchTimeSummary")) {
+            String string = extras.getString("matchTimeSummary");
+            TextView textView = mSummaryView;
+            if (textView == null) {
+                Log.w("BcSmartspaceCardSports", "No match time summary view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.updateVisibility(textView, 0);
+                this.mSummaryView.setText(string);
+            }
+            z = true;
+        } else {
+            z = false;
+        }
+        if (extras.containsKey("firstCompetitorScore")) {
+            String string2 = extras.getString("firstCompetitorScore");
+            TextView textView2 = mFirstCompetitorScore;
+            if (textView2 == null) {
+                Log.w("BcSmartspaceCardSports", "No first competitor logo view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.updateVisibility(textView2, 0);
+                mFirstCompetitorScore.setText(string2);
+            }
+            z = true;
+        }
+        if (extras.containsKey("secondCompetitorScore")) {
+            String string3 = extras.getString("secondCompetitorScore");
+            TextView textView3 = mSecondCompetitorScore;
+            if (textView3 == null) {
+                Log.w("BcSmartspaceCardSports", "No second competitor logo view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.updateVisibility(textView3, 0);
+                mSecondCompetitorScore.setText(string3);
+            }
+            z = true;
+        }
+        if (extras.containsKey("firstCompetitorLogo")) {
+            Bitmap bitmap = (Bitmap) extras.get("firstCompetitorLogo");
+            ImageView imageView = mFirstCompetitorLogo;
+            if (imageView == null) {
+                Log.w("BcSmartspaceCardSports", "No first competitor logo view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.updateVisibility(imageView, 0);
+                mFirstCompetitorLogo.setImageBitmap(bitmap);
+            }
+            z = true;
+        }
+        if (!extras.containsKey("secondCompetitorLogo")) {
+            return z;
+        }
+        Bitmap bitmap2 = (Bitmap) extras.get("secondCompetitorLogo");
+        ImageView imageView2 = mSecondCompetitorLogo;
+        if (imageView2 == null) {
+            Log.w("BcSmartspaceCardSports", "No second competitor logo view to update");
+        } else {
+            BcSmartspaceTemplateDataUtils.updateVisibility(imageView2, 0);
+            mSecondCompetitorLogo.setImageBitmap(bitmap2);
+        }
+        return true;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        mSummaryView.setTextColor(color);
+        mFirstCompetitorScore.setTextColor(color);
+        mSecondCompetitorScore.setTextColor(color);
+    }
+
+    public BcSmartspaceCardSports(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java
new file mode 100644
index 0000000000000..35544c1524a9f
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java
@@ -0,0 +1,177 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Constraints;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.Locale;
+
+public class BcSmartspaceCardWeatherForecast extends BcSmartspaceCardSecondary {
+
+    public interface ItemUpdateFunction {
+        void update(View view, int i);
+    }
+    public BcSmartspaceCardWeatherForecast(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        ConstraintLayout[] constraintLayoutArr = new ConstraintLayout[4];
+        for (int i = 0; i < 4; i++) {
+            ConstraintLayout constraintLayout = (ConstraintLayout) ViewGroup.inflate(getContext(), R.layout.smartspace_card_weather_forecast_column, null);
+            constraintLayout.setId(View.generateViewId());
+            constraintLayoutArr[i] = constraintLayout;
+        }
+        int i2 = 0;
+        while (i2 < 4) {
+            Constraints.LayoutParams layoutParams = new Constraints.LayoutParams(-2, 0);
+            ConstraintLayout constraintLayout2 = constraintLayoutArr[i2];
+            ConstraintLayout constraintLayout3 = i2 > 0 ? constraintLayoutArr[i2 - 1] : null;
+            ConstraintLayout constraintLayout4 = i2 < 3 ? constraintLayoutArr[i2 + 1] : null;
+            if (i2 == 0) {
+                layoutParams.startToStart = 0;
+                layoutParams.horizontalChainStyle = 1;
+            } else {
+                layoutParams.startToEnd = constraintLayout3.getId();
+            }
+            if (i2 == 3) {
+                layoutParams.endToEnd = 0;
+            } else {
+                layoutParams.endToStart = constraintLayout4.getId();
+            }
+            layoutParams.topToTop = 0;
+            layoutParams.bottomToBottom = 0;
+            addView(constraintLayout2, layoutParams);
+            i2++;
+        }
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        boolean z;
+        SmartspaceAction baseAction = target.getBaseAction();
+        Bundle extras = baseAction == null ? null : baseAction.getExtras();
+
+        if (extras == null) {
+            return false;
+        }
+
+        if (extras.containsKey("temperatureValues")) {
+            String[] stringArray = extras.getStringArray("temperatureValues");
+            if (stringArray == null) {
+                Log.w("BcSmartspaceCardWeatherForecast", "Temperature values array is null.");
+            } else {
+                updateFields((view, i) -> ((TextView) view).setText(stringArray[i]), 
+                            stringArray.length, R.id.temperature_value, "temperature value");
+            }
+            z = true;
+        } else {
+            z = false;
+        }
+
+        if (extras.containsKey("weatherIcons")) {
+            Bitmap[] bitmapArr = (Bitmap[]) extras.get("weatherIcons");
+            if (bitmapArr == null) {
+                Log.w("BcSmartspaceCardWeatherForecast", "Weather icons array is null.");
+            } else {
+                updateFields((view, i) -> ((ImageView) view).setImageBitmap(bitmapArr[i]), 
+                            bitmapArr.length, R.id.weather_icon, "weather icon");
+            }
+            z = true;
+        }
+
+        if (!extras.containsKey("timestamps")) {
+            return z;
+        }
+        String[] stringArray2 = extras.getStringArray("timestamps");
+        if (stringArray2 == null) {
+            Log.w("BcSmartspaceCardWeatherForecast", "Timestamps array is null.");
+            return true;
+        }
+
+        updateFields((view, i) -> ((TextView) view).setText(stringArray2[i]), 
+                    stringArray2.length, R.id.timestamp, "timestamp");
+
+        return true;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        updateFields((view, index) -> ((TextView) view).setTextColor(color), 
+                    4, R.id.temperature_value, "temperature value");
+
+        updateFields((view, index) -> ((TextView) view).setTextColor(color), 
+                    4, R.id.timestamp, "timestamp");
+    }
+
+    public final void updateFields(ItemUpdateFunction itemUpdateFunction, int count, int viewId, String viewName) {
+        if (getChildCount() < 4) {
+            Log.w(
+                    "BcSmartspaceCardWeatherForecast",
+                    String.format(
+                            Locale.US,
+                            "Missing %d %s view(s) to update.",
+                            4 - getChildCount(),
+                            viewName));
+            return;
+        }
+        if (count < 4) {
+            int i3 = 4 - count;
+            Log.w(
+                    "BcSmartspaceCardWeatherForecast",
+                    String.format(
+                            Locale.US,
+                            "Missing %d %s(s). Hiding incomplete columns.",
+                            i3,
+                            viewName));
+            if (getChildCount() < 4) {
+                Log.w("BcSmartspaceCardWeatherForecast", "Missing " + (4 - getChildCount()) + " columns to update.");
+            } else {
+                int i4 = 3 - i3;
+                for (int i = 0; i < 4; i++) {
+                    BcSmartspaceTemplateDataUtils.updateVisibility(getChildAt(i), i <= i4 ? 0 : 8);
+                }
+                ((ConstraintLayout.LayoutParams) ((ConstraintLayout) getChildAt(0)).getLayoutParams()).horizontalChainStyle = i3 == 0 ? 1 : 0;
+            }
+        }
+        int min = Math.min(4, count);
+        for (int i = 0; i < min; i++) {
+            View findViewById = getChildAt(i).findViewById(viewId);
+            if (findViewById == null) {
+                Log.w(
+                        "BcSmartspaceCardWeatherForecast",
+                        String.format(
+                                Locale.US,
+                                "Missing %s view to update at column: %d.",
+                                viewName,
+                                i + 1));
+                return;
+            }
+            itemUpdateFunction.update(findViewById, i);
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 2 */
+    public BcSmartspaceCardWeatherForecast(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java
new file mode 100644
index 0000000000000..6e53df6fc3ac6
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java
@@ -0,0 +1,129 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.os.Debug;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.systemui.res.R;
+
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.stream.Collectors;
+
+public final class BcSmartspaceDataProvider implements BcSmartspaceDataPlugin {
+    public static final boolean DEBUG = Log.isLoggable("BcSmartspaceDataPlugin", 3);
+
+    public final View.OnAttachStateChangeListener mStateChangeListener;
+    public final Set<BcSmartspaceDataPlugin.SmartspaceTargetListener> mSmartspaceTargetListeners = new CopyOnWriteArraySet<>();
+    public List<SmartspaceTarget> mSmartspaceTargets = new ArrayList<>();
+    public final Set<View> mViews = new HashSet<>();
+    public final Set<View.OnAttachStateChangeListener> mAttachListeners = new HashSet<>();
+    public final EventNotifierProxy mEventNotifier = new EventNotifierProxy();
+    public BcSmartspaceConfigPlugin mConfigProvider = new DefaultBcSmartspaceConfigProvider();
+
+    public final class StateChangeListener implements View.OnAttachStateChangeListener {
+        @Override
+        public void onViewAttachedToWindow(View view) {
+            mViews.add(view);
+            for (View.OnAttachStateChangeListener listener : mAttachListeners) {
+                listener.onViewAttachedToWindow(view);
+            }
+            if (view instanceof BcSmartspaceView) {
+                ((BcSmartspaceView) view).registerDataProvider(BcSmartspaceDataProvider.this);
+            }
+        }
+
+        @Override
+        public void onViewDetachedFromWindow(View view) {
+            mViews.remove(view);
+            for (View.OnAttachStateChangeListener listener : mAttachListeners) {
+                listener.onViewDetachedFromWindow(view);
+            }
+        }
+    }
+
+    public BcSmartspaceDataProvider() {
+        mStateChangeListener = new StateChangeListener();
+    }
+
+    @Override
+    public void addOnAttachStateChangeListener(View.OnAttachStateChangeListener listener) {
+        mAttachListeners.add(listener);
+        for (View view : mViews) {
+            listener.onViewAttachedToWindow(view);
+        }
+    }
+
+    @Override
+    public BcSmartspaceDataPlugin.SmartspaceEventNotifier getEventNotifier() {
+        return mEventNotifier;
+    }
+
+    @Override
+    public BcSmartspaceDataPlugin.SmartspaceView getView(Context context) {
+        int layoutId = mConfigProvider.isViewPager2Enabled()
+                ? R.layout.smartspace_enhanced2
+                : R.layout.smartspace_enhanced;
+
+        View view = LayoutInflater.from(context).inflate(layoutId, (ViewGroup) null, false);
+        view.addOnAttachStateChangeListener(mStateChangeListener);
+
+        // Explicitly register data provider.
+        // Note: The StateChangeListener also attempts this on attach, but doing it here ensures immediate availability.
+        if (view instanceof BcSmartspaceView) {
+            ((BcSmartspaceView) view).registerDataProvider(this);
+        }
+
+        return (BcSmartspaceDataPlugin.SmartspaceView) view;
+    }
+
+    @Override
+    public void onTargetsAvailable(List<SmartspaceTarget> list) {
+        if (DEBUG) {
+            Log.d("BcSmartspaceDataPlugin", this + " onTargetsAvailable called. Callers = " + Debug.getCallers(3));
+            Log.d("BcSmartspaceDataPlugin", "    targets.size() = " + list.size());
+        }
+
+        // Filter out feature type 15 (MEDIA?) as seen in reference implementation
+        mSmartspaceTargets = list.stream()
+                .filter(target -> target.getFeatureType() != 15)
+                .collect(Collectors.toList());
+
+        mSmartspaceTargetListeners.forEach(listener -> listener.onSmartspaceTargetsUpdated(mSmartspaceTargets));
+    }
+
+    @Override
+    public void registerConfigProvider(BcSmartspaceConfigPlugin configPlugin) {
+        mConfigProvider = configPlugin;
+    }
+
+    @Override
+    public void registerListener(BcSmartspaceDataPlugin.SmartspaceTargetListener listener) {
+        mSmartspaceTargetListeners.add(listener);
+        listener.onSmartspaceTargetsUpdated(mSmartspaceTargets);
+    }
+
+    @Override
+    public void unregisterListener(BcSmartspaceDataPlugin.SmartspaceTargetListener listener) {
+        mSmartspaceTargetListeners.remove(listener);
+    }
+
+    @Override
+    public void setEventDispatcher(BcSmartspaceDataPlugin.SmartspaceEventDispatcher dispatcher) {
+        mEventNotifier.eventDispatcher = dispatcher;
+    }
+
+    @Override
+    public void setIntentStarter(BcSmartspaceDataPlugin.IntentStarter intentStarter) {
+        mEventNotifier.intentStarterRef = intentStarter;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceEvent.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceEvent.java
new file mode 100644
index 0000000000000..3c2fb29571aa8
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceEvent.java
@@ -0,0 +1,21 @@
+package com.google.android.systemui.smartspace;
+
+public enum BcSmartspaceEvent {
+    IGNORE(-1),
+    SMARTSPACE_CARD_RECEIVED(759),
+    SMARTSPACE_CARD_CLICK(760),
+    SMARTSPACE_CARD_DISMISS(761),
+    SMARTSPACE_CARD_SEEN(800),
+    ENABLED_SMARTSPACE(822),
+    DISABLED_SMARTSPACE(823),
+    SMARTSPACE_CARD_SWIPE(1960);
+
+    private final int mId;
+
+    BcSmartspaceEvent(int i) {
+        mId = i;
+    }
+    public final int getId() {
+        return mId;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceRemoteViewsCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceRemoteViewsCard.java
new file mode 100644
index 0000000000000..1ac0e1d3bc2d3
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceRemoteViewsCard.java
@@ -0,0 +1,80 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.appwidget.AppWidgetHostView;
+import android.content.Context;
+import android.view.View;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+public final class BcSmartspaceRemoteViewsCard extends AppWidgetHostView implements SmartspaceCard {
+    public BcSmartspaceDataPlugin.SmartspaceEventNotifier mEventNotifier;
+    public BcSmartspaceCardLoggingInfo mLoggingInfo;
+    public SmartspaceTarget mTarget;
+    public String mUiSurface;
+
+    public BcSmartspaceRemoteViewsCard(Context context) {
+        super(context);
+        setOnLongClickListener(null);
+        if (BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD.equals(mUiSurface)) {
+            super.setInteractionHandler(null);
+        }
+    }
+
+    @Override
+    public final void bindData(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo, boolean usePageIndicatorUi) {
+        updateAppWidget(null);
+        mTarget = target;
+        mLoggingInfo = loggingInfo;
+        mEventNotifier = eventNotifier;
+        updateAppWidget(target.getRemoteViews());
+        SmartspaceAction headerAction = target.getHeaderAction();
+        if (headerAction == null) {
+            setOnClickListener(null);
+            super.setInteractionHandler(null);
+            return;
+        }
+
+        BcSmartSpaceUtil.setOnClickListener(this, target, headerAction, mEventNotifier, "BcSmartspaceRemoteViewsCard", loggingInfo, 0);
+        if (BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD.equals(mUiSurface)) {
+            super.setInteractionHandler(
+                    new BcSmartSpaceUtil.InteractionHandler(
+                            loggingInfo, mEventNotifier, target, headerAction));
+        }
+    }
+
+    @Override
+    public final BcSmartspaceCardLoggingInfo getLoggingInfo() {
+        if (mLoggingInfo == null) {
+            BcSmartspaceCardLoggingInfo.Builder builder =
+                    new BcSmartspaceCardLoggingInfo.Builder()
+                            .setDisplaySurface(
+                                    BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, 0f))
+                            .setFeatureType(mTarget != null ? mTarget.getFeatureType() : 0)
+                            .setUid(-1);
+            return new BcSmartspaceCardLoggingInfo(builder);
+        }
+        return mLoggingInfo;
+    }
+
+    @Override
+    public final View getView() {
+        return this;
+    }
+
+    @Override
+    public final void setDozeAmount(float dozeAmount) {
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java
new file mode 100644
index 0000000000000..c4a38a2db20d5
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java
@@ -0,0 +1,62 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.Text;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.res.R;
+
+import java.util.Map;
+
+public abstract class BcSmartspaceTemplateDataUtils {
+    public static final Map<Integer, Integer> TEMPLATE_TYPE_TO_SECONDARY_CARD_RES = Map.ofEntries(Map.entry(2, R.layout.smartspace_sub_image_template_card), Map.entry(3, R.layout.smartspace_sub_list_template_card), Map.entry(7, R.layout.smartspace_sub_card_template_card), Map.entry(5, R.layout.smartspace_head_to_head_template_card), Map.entry(6, R.layout.smartspace_combined_cards_template_card), Map.entry(4, R.layout.smartspace_carousel_template_card));
+
+    public static void offsetTextViewForIcon(TextView textView, DoubleShadowIconDrawable iconDrawable, boolean isRtl) {
+        if (iconDrawable == null) {
+            textView.setTranslationX(0.0f);
+        } else {
+            textView.setTranslationX((isRtl ? 1 : -1) * iconDrawable.mIconInsetSize);
+        }
+    }
+
+    public static void setIcon(ImageView imageView, Icon icon) {
+        if (imageView == null) {
+            Log.w("BcSmartspaceTemplateDataUtils", "Cannot set. The image view is null");
+            return;
+        }
+        if (icon == null) {
+            Log.w("BcSmartspaceTemplateDataUtils", "Cannot set. The given icon is null");
+            updateVisibility(imageView, View.GONE);
+        }
+        imageView.setImageIcon(icon.getIcon());
+        if (icon.getContentDescription() != null) {
+            imageView.setContentDescription(icon.getContentDescription());
+        }
+    }
+
+    public static void setText(TextView textView, Text text) {
+        if (textView == null) {
+            Log.w("BcSmartspaceTemplateDataUtils", "Cannot set. The text view is null");
+            return;
+        }
+        if (SmartspaceUtils.isEmpty(text)) {
+            Log.w("BcSmartspaceTemplateDataUtils", "Cannot set. The given text is empty");
+            updateVisibility(textView, View.GONE);
+        } else {
+            textView.setText(text.getText());
+            textView.setEllipsize(text.getTruncateAtType());
+            textView.setMaxLines(text.getMaxLines());
+        }
+    }
+
+    public static void updateVisibility(View view, int visibility) {
+        if (view == null || view.getVisibility() == visibility) {
+            return;
+        }
+        view.setVisibility(visibility);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceView.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceView.java
new file mode 100644
index 0000000000000..e76f40b59174b
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/BcSmartspaceView.java
@@ -0,0 +1,814 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceTargetEvent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Debug;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Parcelable;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.widget.FrameLayout;
+
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+
+import com.google.android.systemui.smartspace.CardPagerAdapter;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLogger;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceSubcardLoggingInfo;
+import com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard;
+
+import com.android.systemui.res.R;
+
+import java.lang.invoke.VarHandle;
+import java.time.DateTimeException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class BcSmartspaceView extends FrameLayout implements BcSmartspaceDataPlugin.SmartspaceTargetListener, BcSmartspaceDataPlugin.SmartspaceView {
+    public static final boolean DEBUG = Log.isLoggable("BcSmartspaceView", 3);
+    public CardAdapter mAdapter;
+    public final ContentObserver mAodObserver;
+    public final ContentObserver mBackgroundToggleObserver;
+    public Handler mBgHandler;
+    public int mCardPosition;
+    public BcSmartspaceConfigPlugin mConfigProvider;
+    public BcSmartspaceDataPlugin mDataProvider;
+    public boolean mHasPerformedLongPress;
+    public boolean mHasPostedLongPress;
+    public boolean mIsAodEnabled;
+    public boolean mIsBackgroundEnabled;
+    public final Set<String> mLastReceivedTargets;
+    public final Runnable mLongPressCallback;
+    public PageIndicator mPageIndicator;
+    public PagerDots mPagerDots;
+    public List<SmartspaceTarget> mPendingTargets;
+    public RecyclerView.ViewHolder mPreInflatedViewHolder;
+    public float mPreviousDozeAmount;
+    public final RecyclerView.RecycledViewPool mRecycledViewPool;
+    public int mScrollState;
+    public boolean mSplitShadeEnabled;
+    public Integer mSwipedCardPosition;
+    public ViewPager mViewPager;
+    public ViewPager2 mViewPager2;
+    public final ViewPager2.OnPageChangeCallback mViewPager2OnPageChangeCallback;
+    public final ViewPager.OnPageChangeListener mViewPagerOnPageChangeListener;
+
+    public final class ViewPager2OnPageChangeCallback extends ViewPager2.OnPageChangeCallback {
+        @Override
+        public final void onPageScrollStateChanged(int state) {
+            mScrollState = state;
+            if (state == ViewPager2.SCROLL_STATE_DRAGGING) {
+                mSwipedCardPosition = mViewPager2.getCurrentItem();
+            }
+            if (state == ViewPager2.SCROLL_STATE_IDLE) {
+                if (mConfigProvider.isSwipeEventLoggingEnabled() && mSwipedCardPosition != null && mSwipedCardPosition != mViewPager2.getCurrentItem() && mAdapter.getCardAtPosition(mSwipedCardPosition) != null) {
+                    BcSmartspaceCardLogger.log(BcSmartspaceEvent.SMARTSPACE_CARD_SWIPE, mAdapter.getCardAtPosition(mSwipedCardPosition).getLoggingInfo());
+                }
+                mSwipedCardPosition = null;
+            }
+        }
+
+        @Override
+        public final void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            setSelectedDot(positionOffset, position);
+        }
+
+        @Override
+        public final void onPageSelected(int position) {
+            setSelectedDot(0.0f, position);
+            onViewPagerPageSelected(BcSmartspaceView.this, position);
+        }
+    }
+
+    public final class ViewPagerOnPageChangeListener implements ViewPager.OnPageChangeListener {
+        @Override
+        public final void onPageScrollStateChanged(int state) {
+            Integer num;
+            SmartspaceCard cardAtPosition;
+            mScrollState = state;
+            if (state == ViewPager.SCROLL_STATE_DRAGGING) {
+                mSwipedCardPosition = mViewPager.getCurrentItem();
+            }
+            if (state == ViewPager.SCROLL_STATE_IDLE) {
+                if (mConfigProvider.isSwipeEventLoggingEnabled() && (num = mSwipedCardPosition) != null && num.intValue() != mViewPager.getCurrentItem() && (cardAtPosition = mAdapter.getCardAtPosition(mSwipedCardPosition.intValue())) != null) {
+                    BcSmartspaceCardLogger.log(BcSmartspaceEvent.SMARTSPACE_CARD_SWIPE, cardAtPosition.getLoggingInfo());
+                }
+                mSwipedCardPosition = null;
+                if (mPendingTargets != null) {
+                    onSmartspaceTargetsUpdated(mPendingTargets);
+                }
+            }
+        }
+
+        @Override
+        public final void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            setSelectedDot(positionOffset, position);
+        }
+
+        @Override
+        public final void onPageSelected(int position) {
+            setSelectedDot(0.0f, position);
+            onViewPagerPageSelected(BcSmartspaceView.this, position);
+        }
+    }
+
+    public static void onViewPagerPageSelected(BcSmartspaceView view, int position) {
+        SmartspaceTarget previousTarget = view.mAdapter.getTargetAtPosition(view.mCardPosition);
+        view.mCardPosition = position;
+        SmartspaceTarget currentTarget = view.mAdapter.getTargetAtPosition(position);
+        if (currentTarget != null) {
+            view.logSmartspaceEvent(currentTarget, view.mCardPosition, BcSmartspaceEvent.SMARTSPACE_CARD_SEEN);
+        }
+        if (view.mDataProvider == null) {
+            Log.w("BcSmartspaceView", "Cannot notify target hidden/shown smartspace events: data provider null");
+            return;
+        }
+        if (previousTarget == null) {
+            Log.w("BcSmartspaceView", "Cannot notify target hidden smartspace event: previous target is null.");
+        } else {
+            SmartspaceTargetEvent.Builder builder = new SmartspaceTargetEvent.Builder(3);
+            builder.setSmartspaceTarget(previousTarget);
+            SmartspaceAction baseAction = previousTarget.getBaseAction();
+            if (baseAction != null) {
+                builder.setSmartspaceActionId(baseAction.getId());
+            }
+            view.mDataProvider.getEventNotifier().notifySmartspaceEvent(builder.build());
+        }
+        if (currentTarget == null) {
+            Log.w("BcSmartspaceView", "Cannot notify target shown smartspace event: shown card smartspace target null.");
+            return;
+        }
+        SmartspaceTargetEvent.Builder builder = new SmartspaceTargetEvent.Builder(2);
+        builder.setSmartspaceTarget(currentTarget);
+        SmartspaceAction baseAction = currentTarget.getBaseAction();
+        if (baseAction != null) {
+            builder.setSmartspaceActionId(baseAction.getId());
+        }
+        view.mDataProvider.getEventNotifier().notifySmartspaceEvent(builder.build());
+    }
+
+    public BcSmartspaceView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mConfigProvider = new DefaultBcSmartspaceConfigProvider();
+        mRecycledViewPool = new RecyclerView.RecycledViewPool();
+        mPreInflatedViewHolder = null;
+        mLastReceivedTargets = new ArraySet<>();
+        mIsAodEnabled = false;
+        mIsBackgroundEnabled = false;
+        mCardPosition = 0;
+        mPreviousDozeAmount = 0.0f;
+        mScrollState = 0;
+        mSplitShadeEnabled = false;
+        mAodObserver = new ContentObserver(new Handler()) {
+            @Override
+            public final void onChange(boolean selfChange) {
+                mIsAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+            }
+        };
+        mBackgroundToggleObserver =
+                new ContentObserver(new Handler(Looper.getMainLooper())) {
+                    @Override
+                    public final void onChange(boolean selfChange) {
+                        onBackgroundToggled();
+                    }
+                };
+        mViewPager2OnPageChangeCallback = new ViewPager2OnPageChangeCallback();
+        mViewPagerOnPageChangeListener = new ViewPagerOnPageChangeListener();
+        mLongPressCallback =
+                () -> {
+                    if (mViewPager2 != null && !mHasPerformedLongPress) {
+                        mHasPerformedLongPress = true;
+                        if (mViewPager2.performLongClick()) {
+                            mViewPager2.setPressed(false);
+                            getParent().requestDisallowInterceptTouchEvent(true);
+                        }
+                    }
+                };
+        getContext().getTheme().applyStyle(R.style.DefaultSmartspaceView, false);
+    }
+
+    public final void cancelScheduledLongPress() {
+        if (mViewPager2 != null && mHasPostedLongPress) {
+            mHasPostedLongPress = false;
+            mViewPager2.removeCallbacks(mLongPressCallback);
+        }
+    }
+
+    public int getCurrentCardTopPadding() {
+        int position = getSelectedPage();
+        BcSmartspaceCard legacyCard = mAdapter.getLegacyCardAtPosition(position);
+        if (legacyCard != null) {
+            return legacyCard.getPaddingTop();
+        }
+        BaseTemplateCard templateCard = mAdapter.getTemplateCardAtPosition(position);
+        if (templateCard != null) {
+            return templateCard.getPaddingTop();
+        }
+        BcSmartspaceRemoteViewsCard remoteViewsCard =
+                mAdapter.getRemoteViewsCardAtPosition(position);
+        if (remoteViewsCard != null) {
+            return remoteViewsCard.getPaddingTop();
+        }
+        return 0;
+    }
+
+    @Override
+    public final int getSelectedPage() {
+        int i = mViewPager != null ? mViewPager.getCurrentItem() : 0;
+        return mViewPager2 != null ? mViewPager2.getCurrentItem() : i;
+    }
+
+    public final boolean handleTouchOverride(MotionEvent event, Predicate<MotionEvent> touchHandler) {
+        boolean onTouchEvent;
+        if (mViewPager2 != null) {
+            int action = event.getAction();
+            if (action == 0) {
+                mHasPerformedLongPress = false;
+                if (mViewPager2.isLongClickable()) {
+                    cancelScheduledLongPress();
+                    mHasPostedLongPress = true;
+                    mViewPager2.postDelayed(mLongPressCallback, ViewConfiguration.getLongPressTimeout());
+                }
+            } else if (action == 1 || action == 3) {
+                cancelScheduledLongPress();
+            }
+
+            if (mHasPerformedLongPress) {
+                cancelScheduledLongPress();
+                return true;
+            }
+
+            if (touchHandler.test(event)) {
+                cancelScheduledLongPress();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public final void logSmartspaceEvent(SmartspaceTarget target, int rank, BcSmartspaceEvent event) {
+        int receivedLatencyMillis;
+        if (event == BcSmartspaceEvent.SMARTSPACE_CARD_RECEIVED) {
+            try {
+                receivedLatencyMillis = (int) Instant.now().minusMillis(target.getCreationTimeMillis()).toEpochMilli();
+            } catch (ArithmeticException | DateTimeException e) {
+                Log.e("BcSmartspaceView", "received_latency_millis will be -1 due to exception ", e);
+                receivedLatencyMillis = -1;
+            }
+        } else {
+            receivedLatencyMillis = 0;
+        }
+        boolean hasValidTemplate = BcSmartspaceCardLoggerUtil.containsValidTemplateType(target.getTemplateData());
+        BcSmartspaceCardLoggingInfo.Builder loggingInfoBuilder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setInstanceId(InstanceId.create(target))
+                        .setFeatureType(target.getFeatureType())
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(
+                                        mAdapter.getUiSurface(), mAdapter.getDozeAmount()))
+                        .setRank(rank)
+                        .setCardinality(mAdapter.getCount())
+                        .setReceivedLatency(receivedLatencyMillis)
+                        .setUid(-1);
+        BcSmartspaceSubcardLoggingInfo subcardInfo =
+                hasValidTemplate
+                        ? BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(
+                                target.getTemplateData())
+                        : BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(target);
+        loggingInfoBuilder.setSubcardInfo(subcardInfo);
+        loggingInfoBuilder.setDimensionalInfo(
+                BcSmartspaceCardLoggerUtil.createDimensionalLoggingInfo(target.getTemplateData()));
+        BcSmartspaceCardLoggingInfo loggingInfo =
+                new BcSmartspaceCardLoggingInfo(loggingInfoBuilder);
+        if (hasValidTemplate) {
+            BcSmartspaceCardLoggerUtil.tryForcePrimaryFeatureTypeOrUpdateLogInfoFromTemplateData(
+                    loggingInfo, target.getTemplateData());
+        }
+        BcSmartspaceCardLogger.log(event, loggingInfo);
+    }
+
+    @Override
+    public final void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mViewPager != null) {
+            if (mAdapter instanceof CardPagerAdapter) {
+                mViewPager.setAdapter((CardPagerAdapter) mAdapter);
+                mViewPager.addOnPageChangeListener(mViewPagerOnPageChangeListener);
+                if (mPagerDots != null) {
+                    mPagerDots.setNumPages(mAdapter.getCount(), isLayoutRtl());
+                }
+	    ContentResolver resolver = getContext().getContentResolver();
+                if (TextUtils.equals(mAdapter.getUiSurface(), BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+                    try {
+                        if (mBgHandler == null) {
+                            throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+                        }
+                        mBgHandler.post(
+                                () -> {
+                                    int userId = getContext().getUserId();
+                                    mIsAodEnabled =
+                                            Settings.Secure.getIntForUser(
+                                                            resolver, "doze_always_on", 0, userId)
+                                                    == 1;
+                                    resolver.registerContentObserver(
+                                            Settings.Secure.getUriFor("doze_always_on"),
+                                            false,
+                                            mAodObserver,
+                                            -1);
+                                });
+                    } catch (Exception e) {
+                        Log.w("BcSmartspaceView", "Unable to register Doze Always on content observer.", e);
+                    }
+                }
+                try {
+                    mBgHandler.post(
+                            () -> {
+                                resolver.registerContentObserver(
+                                        Settings.Secure.getUriFor("smartspace_settings_background"),
+                                        false,
+                                        mBackgroundToggleObserver,
+                                        -1);
+                            });
+                } catch (Exception e) {
+                    Log.w(
+                            "BcSmartspaceView",
+                            "Unable to register Smartspace Background Settings observer.",
+                            e);
+                }
+                onBackgroundToggled();
+                if (mDataProvider != null) {
+                    registerDataProvider(mDataProvider);
+                }
+                return;
+            }
+        }
+        if (mViewPager2 != null) {
+            if (mAdapter instanceof CardRecyclerViewAdapter) {
+                mViewPager2.setAdapter((CardRecyclerViewAdapter) mAdapter);
+                mViewPager2.registerOnPageChangeCallback(mViewPager2OnPageChangeCallback);
+                if (mPagerDots != null) {
+                }
+                if (TextUtils.equals(mAdapter.getUiSurface(), BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+                }
+                if (mDataProvider != null) {
+                }
+            }
+        }
+        Log.w("BcSmartspaceView", "Unable to attach the view pager adapter");
+        if (mPagerDots != null) {
+            mPagerDots.setNumPages(mAdapter.getCount(), isLayoutRtl());
+        }
+        if (TextUtils.equals(mAdapter.getUiSurface(), BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+        }
+        if (mDataProvider != null) {
+        }
+    }
+
+    public final void onBackgroundToggled() {
+        boolean z =
+                Settings.Secure.getIntForUser(
+                                getContext().getContentResolver(),
+                                "smartspace_settings_background",
+                                0,
+                                getContext().getUserId())
+                        == 1;
+        if (mIsBackgroundEnabled == z) {
+            return;
+        }
+        mIsBackgroundEnabled = z;
+        mAdapter.onBackgroundToggled(z);
+    }
+
+    @Override
+    public final void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mBgHandler == null) {
+            throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+        }
+        mBgHandler.post(
+                () -> {
+                    getContext().getContentResolver().unregisterContentObserver(mAodObserver);
+                    getContext()
+                            .getContentResolver()
+                            .unregisterContentObserver(mBackgroundToggleObserver);
+                });
+        if (mViewPager != null) {
+            mViewPager.removeOnPageChangeListener(mViewPagerOnPageChangeListener);
+        } else if (mViewPager2 != null) {
+            mViewPager2.unregisterOnPageChangeCallback(mViewPager2OnPageChangeCallback);
+        }
+        if (mDataProvider != null) {
+            mDataProvider.unregisterListener(this);
+        }
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        View pager = findViewById(R.id.smartspace_card_pager);
+        if (pager instanceof ViewPager) {
+            mViewPager = (ViewPager) pager;
+            mAdapter = new CardPagerAdapter(this, mConfigProvider);
+        } else {
+            if (!(pager instanceof ViewPager2)) {
+                throw new IllegalStateException("smartspace_card_pager is an invalid view type");
+            }
+            mViewPager2 = (ViewPager2) pager;
+            mAdapter = new CardRecyclerViewAdapter(this, mConfigProvider);
+            if (mViewPager2 != null) {
+                CardRecyclerViewAdapter cardRecyclerViewAdapter = new CardRecyclerViewAdapter(this, mConfigProvider);
+                cardRecyclerViewAdapter.setTargets(Collections.EMPTY_LIST, null);
+                if (cardRecyclerViewAdapter.smartspaceTargets.size() > 0) {
+                    RecyclerView recyclerView = (RecyclerView) mViewPager2.getChildAt(0);
+                    recyclerView.setRecycledViewPool(mRecycledViewPool);
+                    mPreInflatedViewHolder = cardRecyclerViewAdapter.createViewHolder(recyclerView, cardRecyclerViewAdapter.getItemViewType(0));
+                }
+            }
+        }
+        View indicator = findViewById(R.id.smartspace_page_indicator);
+        if (indicator instanceof PagerDots) {
+            mPagerDots = (PagerDots) indicator;
+        }
+        if (mPagerDots != null) {
+            int paddingStart =
+                    getResources().getDimensionPixelSize(R.dimen.non_remoteviews_card_padding_start);
+            mPagerDots.setPaddingRelative(paddingStart, mPagerDots.getPaddingTop(), mPagerDots.getPaddingEnd(), mPagerDots.getPaddingBottom());
+        }
+    }
+
+    @Override
+    public final boolean onInterceptTouchEvent(MotionEvent event) {
+        if (mViewPager2 == null) {
+            return super.onInterceptTouchEvent(event);
+        }
+        handleTouchOverride(event, (ev) -> mViewPager2.onInterceptTouchEvent(ev));
+        return super.onInterceptTouchEvent(event) || mHasPerformedLongPress;
+    }
+
+    @Override
+    public final void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        if (mPreInflatedViewHolder != null) {
+            mRecycledViewPool.putRecycledView(mPreInflatedViewHolder);
+            mPreInflatedViewHolder = null;
+        }
+        super.onLayout(changed, left, top, right, bottom);
+    }
+
+    @Override
+    public final void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int height = View.MeasureSpec.getSize(heightMeasureSpec);
+        int desiredHeight = getContext().getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_height);
+        if (height <= 0 || height >= desiredHeight) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            setScaleX(1.0f);
+            setScaleY(1.0f);
+            resetPivot();
+            return;
+        }
+        float scale = (float) height / desiredHeight;
+        int width = (int) (MeasureSpec.getSize(widthMeasureSpec) / scale);
+        super.onMeasure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(desiredHeight, MeasureSpec.EXACTLY));
+        setScaleX(scale);
+        setScaleY(scale);
+        setPivotX(0.0f);
+        setPivotY(desiredHeight / 2.0f);
+    }
+
+    @Override
+    public final void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets) {
+        List<SmartspaceTarget> smartspaceTargets =
+                targets.stream()
+                        .filter(t -> t instanceof SmartspaceTarget)
+                        .map(t -> (SmartspaceTarget) t)
+                        .collect(Collectors.toList());
+        if (DEBUG) {
+            Log.d("BcSmartspaceView", "@" + Integer.toHexString(hashCode()) + ", onTargetsAvailable called. Callers = " + Debug.getCallers(5));
+            StringBuilder sb = new StringBuilder("    targets.size() = ");
+            sb.append(targets.size());
+            Log.d("BcSmartspaceView", sb.toString());
+            Log.d("BcSmartspaceView", "    targets = " + targets.toString());
+        }
+        if (mViewPager != null && mScrollState != 0 && mAdapter.getCount() > 1 && mViewPager != null) {
+            mPendingTargets = smartspaceTargets;
+            return;
+        }
+        mPendingTargets = null;
+        boolean isRtl = isLayoutRtl();
+        int selectedPage = getSelectedPage();
+        if (isRtl && (mAdapter instanceof CardPagerAdapter)) {
+            Collections.reverse(smartspaceTargets);
+        }
+        View templateCardAtPosition = mAdapter.getTemplateCardAtPosition(selectedPage);
+        BcSmartspaceCard legacyCardAtPosition = mAdapter.getLegacyCardAtPosition(selectedPage);
+        BcSmartspaceRemoteViewsCard remoteViewsCardAtPosition = mAdapter.getRemoteViewsCardAtPosition(selectedPage);
+        if (templateCardAtPosition == null) {
+            templateCardAtPosition = legacyCardAtPosition != null ? legacyCardAtPosition : remoteViewsCardAtPosition;
+        }
+        View cardAtPosition = templateCardAtPosition;
+        int count = mAdapter.getCount();
+        CardAdapter cardAdapter = mAdapter;
+        if (!(cardAdapter instanceof CardRecyclerViewAdapter)) {
+            cardAdapter.setTargets(smartspaceTargets);
+            setTargets(isRtl, selectedPage, cardAtPosition, count);
+            return;
+        }
+        ((CardRecyclerViewAdapter) cardAdapter).setTargets(smartspaceTargets, () -> {
+            setTargets(isRtl, selectedPage, cardAtPosition, count);
+        });
+    }
+
+    @Override
+    public final boolean onTouchEvent(MotionEvent event) {
+        if (mViewPager2 == null) {
+            return super.onTouchEvent(event);
+        }
+        return handleTouchOverride(event, (ev) -> mViewPager2.onTouchEvent(ev));
+    }
+
+    @Override
+    public final void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+        if (mDataProvider != null) {
+            mDataProvider.getEventNotifier().notifySmartspaceEvent(new SmartspaceTargetEvent.Builder(isVisible ? 6 : 7).build());
+        }
+        if (mViewPager == null || mScrollState == 0) {
+            return;
+        }
+        mScrollState = 0;
+        if (mPendingTargets != null) {
+            onSmartspaceTargetsUpdated(mPendingTargets);
+        }
+    }
+
+    @Override
+    public final void registerConfigProvider(BcSmartspaceConfigPlugin configProvider) {
+        mConfigProvider = configProvider;
+        mAdapter.setConfigProvider(configProvider);
+    }
+
+    @Override
+    public final void registerDataProvider(BcSmartspaceDataPlugin dataProvider) {
+        if (mDataProvider != null) {
+            mDataProvider.unregisterListener(this);
+        }
+        mDataProvider = dataProvider;
+        mDataProvider.registerListener(this);
+        mAdapter.setDataProvider(mDataProvider);
+    }
+
+    @Override
+    public final void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+        if (disallowIntercept) {
+            cancelScheduledLongPress();
+        }
+        super.requestDisallowInterceptTouchEvent(disallowIntercept);
+    }
+
+    @Override
+    public final void setBgHandler(Handler handler) {
+        mBgHandler = handler;
+        mAdapter.setBgHandler(handler);
+    }
+
+    @Override
+    public final void setDozeAmount(float dozeAmount) {
+        List<SmartspaceTarget> previousTargets = mAdapter.getSmartspaceTargets();
+        mAdapter.setDozeAmount(dozeAmount);
+        if (!mAdapter.getSmartspaceTargets().isEmpty()) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(this, View.VISIBLE);
+        }
+        float alpha = 1.0f;
+        if (mAdapter.getHasAodLockscreenTransition()) {
+            if (dozeAmount == mPreviousDozeAmount) {
+                alpha = getAlpha();
+            } else if (mPreviousDozeAmount > dozeAmount) {
+                alpha = 1.0f - dozeAmount;
+            } else {
+                alpha = dozeAmount;
+            }
+            float threshold = 0.36f;
+            if (alpha < threshold) {
+                alpha = (threshold - alpha) / threshold;
+            } else {
+                alpha = (alpha - threshold) / 0.64f;
+            }
+        } else {
+            alpha = 1.0f;
+        }
+        setAlpha(alpha);
+        if (mPagerDots != null) {
+            mPagerDots.setNumPages(mAdapter.getCount(), isLayoutRtl());
+            mPagerDots.setAlpha(alpha);
+            if (mPagerDots.getVisibility() != View.GONE) {
+                if (dozeAmount == 1.0f) {
+                    BcSmartspaceTemplateDataUtils.updateVisibility(mPagerDots, View.INVISIBLE);
+                } else {
+                    BcSmartspaceTemplateDataUtils.updateVisibility(mPagerDots, View.VISIBLE);
+                }
+            }
+        }
+        mPreviousDozeAmount = dozeAmount;
+        if (mAdapter.getHasDifferentTargets() && mAdapter.getSmartspaceTargets() != previousTargets && mAdapter.getCount() > 0) {
+            if (mAdapter instanceof CardRecyclerViewAdapter) {
+                setSelectedPage(0);
+            } else {
+                setSelectedPage(isLayoutRtl() ? mAdapter.getCount() - 1 : 0);
+            }
+        }
+        int displaySurface = BcSmartSpaceUtil.getLoggingDisplaySurface(mAdapter.getUiSurface(), mAdapter.getDozeAmount());
+        if (displaySurface == -1) {
+            return;
+        }
+        if (displaySurface != 3 || mIsAodEnabled) {
+            if (DEBUG) {
+                Log.d("BcSmartspaceView", "@" + Integer.toHexString(hashCode()) + ", setDozeAmount: Logging SMARTSPACE_CARD_SEEN, currentSurface = " + displaySurface);
+            }
+            SmartspaceTarget target = mAdapter.getTargetAtPosition(mCardPosition);
+            if (target == null) {
+                Log.w("BcSmartspaceView", "Current card is not present in the Adapter; cannot log.");
+            } else {
+                logSmartspaceEvent(target, mCardPosition, BcSmartspaceEvent.SMARTSPACE_CARD_SEEN);
+            }
+        }
+    }
+
+    @Override
+    public final void setDozing(boolean dozing) {
+        if (!dozing && mSplitShadeEnabled && mAdapter.getHasAodLockscreenTransition() && mAdapter.getLockscreenTargets().isEmpty()) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(this, View.GONE);
+        }
+    }
+
+    @Override
+    public final void setFalsingManager(FalsingManager falsingManager) {
+        BcSmartSpaceUtil.sFalsingManager = falsingManager;
+    }
+
+    @Override
+    public final void setHorizontalPaddings(int padding) {
+        if (mPagerDots != null) {
+            mPagerDots.setPaddingRelative(padding, mPagerDots.getPaddingTop(), padding, mPagerDots.getPaddingBottom());
+        }
+        mAdapter.setNonRemoteViewsHorizontalPadding(padding);
+    }
+
+    @Override
+    public final void setKeyguardBypassEnabled(boolean enabled) {
+        mAdapter.setKeyguardBypassEnabled(enabled);
+    }
+
+    @Override
+    public final void setMediaTarget(SmartspaceTarget target) {
+        if (!(mAdapter instanceof CardRecyclerViewAdapter)) {
+            mAdapter.setMediaTarget(target);
+            return;
+        }
+        CardRecyclerViewAdapter cardRecyclerViewAdapter = (CardRecyclerViewAdapter) mAdapter;
+        cardRecyclerViewAdapter.mediaTargets.clear();
+        if (target != null) {
+            cardRecyclerViewAdapter.mediaTargets.add(target);
+        }
+        cardRecyclerViewAdapter.updateTargetVisibility(null, true);
+    }
+
+    @Override
+    public final void setOnLongClickListener(View.OnLongClickListener listener) {
+        if (mViewPager != null) {
+            mViewPager.setOnLongClickListener(listener);
+            return;
+        }
+        if (mViewPager2 != null) {
+            mViewPager2.setOnLongClickListener(listener);
+        }
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        mAdapter.setPrimaryTextColor(color);
+        if (mPagerDots != null) {
+            mPagerDots.primaryColor = color;
+            mPagerDots.paint.setColor(color);
+            mPagerDots.invalidate();
+        }
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+        if (mViewPager != null && mScrollState != 0) {
+            mScrollState = 0;
+            if (mPendingTargets != null) {
+                onSmartspaceTargetsUpdated(mPendingTargets);
+            }
+        }
+        mAdapter.setScreenOn(screenOn);
+    }
+
+    public final void setSelectedDot(float f, int i) {
+        if (mPagerDots != null) {
+            if (i < 0) {
+                mPagerDots.getClass();
+                return;
+            }
+            if (i >= mPagerDots.numPages) {
+                return;
+            }
+            mPagerDots.currentPositionIndex = i;
+            mPagerDots.currentPositionOffset = f;
+            mPagerDots.invalidate();
+            if (f >= 0.5d) {
+                i++;
+            }
+            mPagerDots.updateCurrentPageIndex(i);
+        }
+    }
+
+    public final void setSelectedPage(int i) {
+        if (mViewPager != null) {
+            mViewPager.setCurrentItem(i, false);
+        } else if (mViewPager2 != null) {
+            mViewPager2.post(() -> {
+                mViewPager2.setCurrentItem(i, false);
+            });
+        }
+        setSelectedDot(0.0f, i);
+    }
+
+    @Override
+    public final void setSplitShadeEnabled(boolean enabled) {
+        mSplitShadeEnabled = enabled;
+    }
+
+    public final void setTargets(boolean z, int i, View view, int i2) {
+        int count = mAdapter.getCount();
+        if (mPagerDots != null) {
+            mPagerDots.setNumPages(count, z);
+        }
+        if (z && (mAdapter instanceof CardPagerAdapter)) {
+            setSelectedPage(Math.max(0, Math.min(count - 1, count - (i2 - i))));
+        } else if (mAdapter instanceof CardRecyclerViewAdapter) {
+            setSelectedPage(Math.max(0, Math.min(i, count - 1)));
+        }
+        for (int i3 = 0; i3 < count; i3++) {
+            SmartspaceTarget targetAtPosition = mAdapter.getTargetAtPosition(i3);
+            if (!mLastReceivedTargets.contains(targetAtPosition.getSmartspaceTargetId())) {
+                logSmartspaceEvent(targetAtPosition, i3, BcSmartspaceEvent.SMARTSPACE_CARD_RECEIVED);
+                SmartspaceTargetEvent.Builder builder = new SmartspaceTargetEvent.Builder(8);
+                builder.setSmartspaceTarget(targetAtPosition);
+                SmartspaceAction baseAction = targetAtPosition.getBaseAction();
+                if (baseAction != null) {
+                    builder.setSmartspaceActionId(baseAction.getId());
+                }
+                mDataProvider.getEventNotifier().notifySmartspaceEvent(builder.build());
+            }
+        }
+        mLastReceivedTargets.clear();
+        mLastReceivedTargets.addAll((Collection) mAdapter.getSmartspaceTargets().stream()
+            .map(target -> ((SmartspaceTarget) target).getSmartspaceTargetId())
+            .collect(Collectors.toList()));
+    }
+
+    @Override
+    public final void setTimeChangedDelegate(BcSmartspaceDataPlugin.TimeChangedDelegate delegate) {
+        mAdapter.setTimeChangedDelegate(delegate);
+    }
+
+    @Override
+    public final void setUiSurface(String uiSurface) {
+        if (isAttachedToWindow()) {
+            throw new IllegalStateException("Must call before attaching view to window.");
+        }
+        if (uiSurface == BcSmartspaceDataPlugin.UI_SURFACE_HOME_SCREEN) {
+            getContext().getTheme().applyStyle(R.style.LauncherSmartspaceView, true);
+        }
+        mAdapter.setUiSurface(uiSurface);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/CardAdapter.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardAdapter.java
new file mode 100644
index 0000000000000..76a1cd24a4620
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardAdapter.java
@@ -0,0 +1,63 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.os.Handler;
+
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard;
+
+import java.util.List;
+
+public interface CardAdapter {
+    SmartspaceCard getCardAtPosition(int i);
+
+    int getCount();
+
+    float getDozeAmount();
+
+    boolean getHasAodLockscreenTransition();
+
+    boolean getHasDifferentTargets();
+
+    BcSmartspaceCard getLegacyCardAtPosition(int i);
+
+    List getLockscreenTargets();
+
+    BcSmartspaceRemoteViewsCard getRemoteViewsCardAtPosition(int i);
+
+    List<SmartspaceTarget> getSmartspaceTargets();
+
+    SmartspaceTarget getTargetAtPosition(int i);
+
+    BaseTemplateCard getTemplateCardAtPosition(int i);
+
+    String getUiSurface();
+
+    void onBackgroundToggled(boolean z);
+
+    void setBgHandler(Handler handler);
+
+    void setConfigProvider(BcSmartspaceConfigPlugin bcSmartspaceConfigPlugin);
+
+    void setDataProvider(BcSmartspaceDataPlugin bcSmartspaceDataPlugin);
+
+    void setDozeAmount(float f);
+
+    void setKeyguardBypassEnabled(boolean z);
+
+    void setMediaTarget(SmartspaceTarget smartspaceTarget);
+
+    void setNonRemoteViewsHorizontalPadding(Integer num);
+
+    void setPrimaryTextColor(int i);
+
+    void setScreenOn(boolean z);
+
+    void setTargets(List<SmartspaceTarget> list);
+
+    void setTimeChangedDelegate(BcSmartspaceDataPlugin.TimeChangedDelegate timeChangedDelegate);
+
+    void setUiSurface(String str);
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/CardPagerAdapter.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardPagerAdapter.java
new file mode 100644
index 0000000000000..3c2ce45f28e5f
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardPagerAdapter.java
@@ -0,0 +1,676 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.viewpager.widget.PagerAdapter;
+
+import com.android.internal.graphics.ColorUtils;
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceSubcardLoggingInfo;
+import com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard;
+
+import com.android.systemui.res.R;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.IntStream;
+
+public final class CardPagerAdapter extends PagerAdapter implements CardAdapter {
+    public static final Companion Companion = new Companion();
+    private final List<SmartspaceTarget> _aodTargets = new ArrayList<>();
+    private final List<SmartspaceTarget> _lockscreenTargets = new ArrayList<>();
+    private Handler bgHandler;
+    private BcSmartspaceConfigPlugin configProvider;
+    private int currentTextColor;
+    private BcSmartspaceDataPlugin dataProvider;
+    private float dozeAmount;
+    private int dozeColor = -1;
+    private final LazyServerFlagLoader enableCardRecycling =
+            new LazyServerFlagLoader("enable_card_recycling");
+    private final LazyServerFlagLoader enableReducedCardRecycling =
+            new LazyServerFlagLoader("enable_reduced_card_recycling");
+    private boolean hasAodLockscreenTransition;
+    private boolean hasDifferentTargets;
+    private boolean keyguardBypassEnabled;
+    private final List<SmartspaceTarget> mediaTargets = new ArrayList<>();
+    private Integer nonRemoteViewsHorizontalPadding;
+    private float previousDozeAmount;
+    private int primaryTextColor;
+    private final SparseArray<BaseTemplateCard> recycledCards = new SparseArray<>();
+    private final SparseArray<BcSmartspaceCard> recycledLegacyCards = new SparseArray<>();
+    private final SparseArray<BcSmartspaceRemoteViewsCard> recycledRemoteViewsCards =
+            new SparseArray<>();
+    private BcSmartspaceView root;
+    private List<SmartspaceTarget> smartspaceTargets = new ArrayList<>();
+    private BcSmartspaceDataPlugin.TimeChangedDelegate timeChangedDelegate;
+    private TransitionType transitioningTo = TransitionType.NOT_IN_TRANSITION;
+    private String uiSurface;
+    private final SparseArray<ViewHolder> viewHolders = new SparseArray<>();
+
+    public CardPagerAdapter(BcSmartspaceView root, BcSmartspaceConfigPlugin configProvider) {
+        this.root = root;
+        this.configProvider = configProvider;
+        int color = GraphicsUtils.getAttrColor(root.getContext(), android.R.attr.textColorPrimary);
+        primaryTextColor = color;
+        currentTextColor = color;
+    }
+
+    public static class Companion {
+        public static boolean useRecycledViewForAction(SmartspaceAction newAction, SmartspaceAction recycledAction) {
+            Map map = BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES;
+            if (newAction == null && recycledAction == null) {
+                return true;
+            }
+            if (newAction == null || recycledAction == null) {
+                return false;
+            }
+            Bundle newExtras = newAction.getExtras();
+            Bundle recycledExtras = recycledAction.getExtras();
+            if (newExtras == null && recycledExtras == null) {
+                return true;
+            }
+            if (newExtras == null || recycledExtras == null) {
+                return false;
+            }
+            Set<String> newKeys = newExtras.keySet();
+            Set<String> recycledKeys = recycledExtras.keySet();
+            return Objects.equals(newKeys, recycledKeys);
+        }
+
+        public static boolean useRecycledViewForActionsList(List<SmartspaceAction> newActions, List<SmartspaceAction> recycledActions) {
+            Map map = BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES;
+            if (newActions == null && recycledActions == null) {
+                return true;
+            }
+
+            if (newActions == null || recycledActions == null || newActions.size() != recycledActions.size()) {
+                return false;
+            }
+
+            return IntStream.range(0, newActions.size())
+                    .allMatch(i -> useRecycledViewForAction(newActions.get(i), recycledActions.get(i)));
+        }
+
+        public int getBaseLegacyCardRes(int featureType) {
+            switch (featureType) {
+                case -2:
+                case -1:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 6:
+                case 9:
+                case 10:
+                case 18:
+                case 20:
+                case 30:
+                case 13:
+                case 14:
+                case 15:
+                    return R.layout.smartspace_card;
+                default:
+                    return R.layout.smartspace_card;
+            }
+        }
+
+        public final boolean useRecycledViewForNewTarget(SmartspaceTarget newTarget, SmartspaceTarget recycledTarget) {
+            if (recycledTarget == null) {
+                return false;
+            }
+            if (!newTarget.getSmartspaceTargetId().equals(recycledTarget.getSmartspaceTargetId())) {
+                return false;
+            }
+            if (!useRecycledViewForAction(
+                    newTarget.getHeaderAction(), recycledTarget.getHeaderAction())) {
+                return false;
+            }
+            if (!useRecycledViewForAction(
+                    newTarget.getBaseAction(), recycledTarget.getBaseAction())) {
+                return false;
+            }
+            if (!useRecycledViewForActionsList(
+                    newTarget.getActionChips(), recycledTarget.getActionChips())) {
+                return false;
+            }
+            if (!useRecycledViewForActionsList(
+                    newTarget.getIconGrid(), recycledTarget.getIconGrid())) {
+                return false;
+            }
+            BaseTemplateData newTemplateData = newTarget.getTemplateData();
+            BaseTemplateData recycledTemplateData = recycledTarget.getTemplateData();
+            if (newTemplateData == null && recycledTemplateData == null) {
+                return true;
+            }
+            return (newTemplateData == null || recycledTemplateData == null || !newTemplateData.equals(recycledTemplateData)) ? false : true;
+        }
+    }
+
+    public enum TransitionType {
+        NOT_IN_TRANSITION,
+        TO_LOCKSCREEN,
+        TO_AOD
+    }
+
+    public final class ViewHolder {
+        public final BaseTemplateCard card;
+        public final BcSmartspaceCard legacyCard;
+        public final int position;
+        public final BcSmartspaceRemoteViewsCard remoteViewsCard;
+        public SmartspaceTarget target;
+
+        public ViewHolder(int position, BcSmartspaceCard legacyCard, SmartspaceTarget target, BaseTemplateCard card, BcSmartspaceRemoteViewsCard remoteViewsCard) {
+            this.position = position;
+            this.legacyCard = legacyCard;
+            this.target = target;
+            this.card = card;
+            this.remoteViewsCard = remoteViewsCard;
+        }
+
+        public void setTarget(SmartspaceTarget target) {
+            this.target = target;
+        }
+    }
+
+    public static final int getBaseLegacyCardRes(int featureType) {
+        return Companion.getBaseLegacyCardRes(featureType);
+    }
+
+    public static final boolean useRecycledViewForNewTarget(SmartspaceTarget newTarget, SmartspaceTarget recycledTarget) {
+        return Companion.useRecycledViewForNewTarget(newTarget, recycledTarget);
+    }
+
+    public final void addDefaultDateCardIfEmpty(List<SmartspaceTarget> targets) {
+        if (targets.isEmpty()) {
+            targets.add(new SmartspaceTarget.Builder("date_card_794317_92634", new ComponentName(root.getContext(), (Class<?>) CardPagerAdapter.class), root.getContext().getUser()).setFeatureType(1).setTemplateData(new BaseTemplateData.Builder(1).build()).build());
+        }
+    }
+
+    @Override
+    public final void destroyItem(ViewGroup container, int position, Object object) {
+        ViewHolder holder = (ViewHolder) object;
+        if (holder.legacyCard != null) {
+            SmartspaceTarget smartspaceTarget = holder.legacyCard.mTarget;
+            if (smartspaceTarget != null && enableCardRecycling.get()) {
+                recycledLegacyCards.put(BcSmartSpaceUtil.getFeatureType(smartspaceTarget), holder.legacyCard);
+            }
+            container.removeView(holder.legacyCard);
+        }
+        if (holder.card != null) {
+            SmartspaceTarget smartspaceTarget2 = holder.card.mTarget;
+            if (smartspaceTarget2 != null && enableCardRecycling.get()) {
+                recycledCards.put(smartspaceTarget2.getFeatureType(), holder.card);
+            }
+            container.removeView(holder.card);
+        }
+        if (holder.remoteViewsCard != null) {
+            if (enableCardRecycling.get()) {
+                Log.d("SsCardPagerAdapter", "[rmv] Caching RemoteViews card");
+                recycledRemoteViewsCards.put(BcSmartSpaceUtil.getFeatureType(holder.target), holder.remoteViewsCard);
+            }
+            Log.d("SsCardPagerAdapter", "[rmv] Removing RemoteViews card");
+            container.removeView(holder.remoteViewsCard);
+        }
+        if (viewHolders.get(position) == holder) {
+            viewHolders.remove(position);
+        }
+    }
+
+    @Override
+    public final SmartspaceCard getCardAtPosition(int position) {
+        ViewHolder holder = viewHolders.get(position);
+        if (holder != null) {
+            if (holder.card != null) {
+                return holder.card;
+            }
+            if (holder.legacyCard != null) {
+                return holder.legacyCard;
+            }
+            return holder.remoteViewsCard;
+        }
+        return null;
+    }
+
+    @Override
+    public final int getCount() {
+        return smartspaceTargets.size();
+    }
+
+    @Override
+    public final float getDozeAmount() {
+        return dozeAmount;
+    }
+
+    @Override
+    public final boolean getHasAodLockscreenTransition() {
+        return hasAodLockscreenTransition;
+    }
+
+    @Override
+    public final boolean getHasDifferentTargets() {
+        return hasDifferentTargets;
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        ViewHolder holder = (ViewHolder) object;
+        SmartspaceTarget currentTarget = getTargetAtPosition(holder.position);
+        if (holder.target == currentTarget) {
+            return POSITION_UNCHANGED;
+        }
+        if (currentTarget != null
+                && BcSmartSpaceUtil.getFeatureType(currentTarget)
+                        == BcSmartSpaceUtil.getFeatureType(holder.target)
+                && currentTarget
+                        .getSmartspaceTargetId()
+                        .equals(holder.target.getSmartspaceTargetId())) {
+            holder.setTarget(currentTarget);
+            onBindViewHolder(holder);
+            return POSITION_UNCHANGED;
+        }
+        return POSITION_NONE;
+    }
+
+    @Override
+    public final BcSmartspaceCard getLegacyCardAtPosition(int position) {
+        ViewHolder holder = viewHolders.get(position);
+        if (holder != null) {
+            return holder.legacyCard;
+        }
+        return null;
+    }
+
+    @Override
+    public final List<SmartspaceTarget> getLockscreenTargets() {
+        return (mediaTargets.isEmpty() || !keyguardBypassEnabled) ? _lockscreenTargets : mediaTargets;
+    }
+
+    @Override
+    public final BcSmartspaceRemoteViewsCard getRemoteViewsCardAtPosition(int position) {
+        ViewHolder holder = viewHolders.get(position);
+        if (holder != null) {
+            return holder.remoteViewsCard;
+        }
+        return null;
+    }
+
+    @Override
+    public final List<SmartspaceTarget> getSmartspaceTargets() {
+        return smartspaceTargets;
+    }
+
+    @Override
+    public final SmartspaceTarget getTargetAtPosition(int position) {
+        if (smartspaceTargets.isEmpty() || position < 0 || position >= smartspaceTargets.size()) {
+            return null;
+        }
+        return smartspaceTargets.get(position);
+    }
+
+    @Override
+    public final BaseTemplateCard getTemplateCardAtPosition(int position) {
+        ViewHolder holder = viewHolders.get(position);
+        if (holder != null) {
+            return holder.card;
+        }
+        return null;
+    }
+
+    @Override
+    public final String getUiSurface() {
+        return uiSurface;
+    }
+
+    @Override
+    public final Object instantiateItem(ViewGroup container, int position) {
+        BcSmartspaceCard bcSmartspaceCard;
+        ViewHolder holder;
+        BaseTemplateData.SubItemLoggingInfo loggingInfo;
+        SmartspaceTarget target = smartspaceTargets.get(position);
+        BcSmartspaceCard bcSmartspaceCard2 = null;
+        if (target.getRemoteViews() != null) {
+            Log.i("SsCardPagerAdapter", "[rmv] Use RemoteViews for the feature: " + target.getFeatureType());
+            BcSmartspaceRemoteViewsCard remoteViewsCard = enableCardRecycling.get() ? recycledRemoteViewsCards.removeReturnOld(BcSmartSpaceUtil.getFeatureType(target)) : null;
+            if (remoteViewsCard == null) {
+                remoteViewsCard = new BcSmartspaceRemoteViewsCard(container.getContext());
+                remoteViewsCard.mUiSurface = uiSurface;
+                remoteViewsCard.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            }
+            holder = new ViewHolder(position, null, target, null, remoteViewsCard);
+            container.addView(remoteViewsCard);
+        } else {
+            boolean containsValidTemplateType = BcSmartspaceCardLoggerUtil.containsValidTemplateType(target.getTemplateData());
+            if (containsValidTemplateType) {
+                Log.i("SsCardPagerAdapter", "Use UI template for the feature: " + target.getFeatureType());
+                BaseTemplateCard templateCard = enableCardRecycling.get() ? (BaseTemplateCard) recycledCards.removeReturnOld(target.getFeatureType()) : null;
+                if (templateCard == null || (enableReducedCardRecycling.get() && !Companion.useRecycledViewForNewTarget(target, templateCard.mTarget))) {
+                    BaseTemplateData templateData = target.getTemplateData();
+                    BaseTemplateData.SubItemInfo primaryItem = templateData != null ? templateData.getPrimaryItem() : null;
+                    int layoutRes = (primaryItem == null || (SmartspaceUtils.isEmpty(primaryItem.getText()) && primaryItem.getIcon() == null) || ((loggingInfo = primaryItem.getLoggingInfo()) != null && loggingInfo.getFeatureType() == 1)) ? R.layout.smartspace_base_template_card_with_date : R.layout.smartspace_base_template_card;
+                    LayoutInflater inflater = LayoutInflater.from(container.getContext());
+                    templateCard = (BaseTemplateCard) inflater.inflate(layoutRes, (ViewGroup) container, false);
+                    templateCard.mUiSurface = uiSurface;
+                    if (templateCard.mDateView != null && TextUtils.equals(uiSurface, BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+                        if (templateCard.mDateView.isAttachedToWindow()) {
+                            throw new IllegalStateException("Must call before attaching view to window.");
+                        }
+                        templateCard.mDateView.mUpdatesOnAod = true;
+                    }
+                    if (nonRemoteViewsHorizontalPadding != null) {
+                        templateCard.setPaddingRelative(nonRemoteViewsHorizontalPadding, templateCard.getPaddingTop(), nonRemoteViewsHorizontalPadding, templateCard.getPaddingBottom());
+                    }
+                    templateCard.mBgHandler = bgHandler != null ? bgHandler : null;
+                    if (templateCard.mDateView != null) {
+                        templateCard.mDateView.mBgHandler = templateCard.mBgHandler;
+                    }
+                    if (templateCard.mDateView != null) {
+                        if (templateCard.mDateView.isAttachedToWindow()) {
+                            throw new IllegalStateException("Must call before attaching view to window.");
+                        }
+                        templateCard.mDateView.mTimeChangedDelegate = timeChangedDelegate;
+                    }
+                    Map<Integer, Integer> templateTypeToSecondaryCardRes =
+                            BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES;
+                    Integer secondaryRes =
+                            templateTypeToSecondaryCardRes.get(
+                                    target.getTemplateData().getTemplateType());
+                    if (templateData != null && secondaryRes != null) {
+                        BcSmartspaceCardSecondary secondaryCard = (BcSmartspaceCardSecondary) inflater.inflate(secondaryRes, (ViewGroup) templateCard, false);
+                        Log.i("SsCardPagerAdapter", "Secondary card is found");
+                        templateCard.setSecondaryCard(secondaryCard);
+                    }
+                }
+                holder = new ViewHolder(position, null, target, templateCard, null);
+                container.addView(templateCard);
+            } else {
+                BcSmartspaceCard legacyCard = enableCardRecycling.get() ? recycledLegacyCards.removeReturnOld(BcSmartSpaceUtil.getFeatureType(target)) : null;
+                if (legacyCard == null || (enableReducedCardRecycling.get() && !Companion.useRecycledViewForNewTarget(target, legacyCard.mTarget))) {
+                    int featureType = BcSmartSpaceUtil.getFeatureType(target);
+                    LayoutInflater inflater = LayoutInflater.from(container.getContext());
+                    int layoutRes = Companion.getBaseLegacyCardRes(featureType);
+                    if (layoutRes == 0) {
+                        Log.w(
+                                "SsCardPagerAdapter",
+                                "No legacy card can be created for feature type: " + featureType);
+                    } else {
+                        legacyCard = (BcSmartspaceCard) inflater.inflate(layoutRes, (ViewGroup) container, false);
+                        legacyCard.mUiSurface = uiSurface;
+                        if (nonRemoteViewsHorizontalPadding != null) {
+                            legacyCard.setPaddingRelative(nonRemoteViewsHorizontalPadding, legacyCard.getPaddingTop(), nonRemoteViewsHorizontalPadding, legacyCard.getPaddingBottom());
+                        }
+                        Integer secondaryRes = (Integer) BcSmartSpaceUtil.FEATURE_TYPE_TO_SECONDARY_CARD_RESOURCE_MAP.get(featureType);
+                        if (secondaryRes != null) {
+                            legacyCard.setSecondaryCard((BcSmartspaceCardSecondary) inflater.inflate(secondaryRes, (ViewGroup) legacyCard, false));
+                        }
+                    }
+                    bcSmartspaceCard = legacyCard;
+                } else {
+                    bcSmartspaceCard = legacyCard;
+                }
+                holder = new ViewHolder(position, bcSmartspaceCard, target, null, null);
+                if (bcSmartspaceCard != null) {
+                    container.addView(bcSmartspaceCard);
+                }
+            }
+        }
+        onBindViewHolder(holder);
+        viewHolders.put(position, holder);
+        return holder;
+    }
+
+    @Override
+    public final boolean isViewFromObject(View view, Object object) {
+        ViewHolder holder = (ViewHolder) object;
+        return view == holder.legacyCard || view == holder.card || view == holder.remoteViewsCard;
+    }
+
+    public final void onBindViewHolder(ViewHolder holder) {
+        SmartspaceTarget target = smartspaceTargets.get(holder.position);
+        boolean hasValidTemplate = BcSmartspaceCardLoggerUtil.containsValidTemplateType(target.getTemplateData());
+        BcSmartspaceCardLoggingInfo.Builder loggingInfoBuilder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setInstanceId(InstanceId.create(target))
+                        .setFeatureType(target.getFeatureType())
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(uiSurface, dozeAmount))
+                        .setRank(holder.position)
+                        .setCardinality(smartspaceTargets.size())
+                        .setUid(-1);
+        BcSmartspaceSubcardLoggingInfo subcardInfo =
+                hasValidTemplate
+                        ? BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(
+                                target.getTemplateData())
+                        : BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(target);
+        loggingInfoBuilder.setSubcardInfo(subcardInfo);
+        loggingInfoBuilder.setDimensionalInfo(
+                BcSmartspaceCardLoggerUtil.createDimensionalLoggingInfo(target.getTemplateData()));
+        BcSmartspaceCardLoggingInfo loggingInfo =
+                new BcSmartspaceCardLoggingInfo(loggingInfoBuilder);
+        if (target.getRemoteViews() != null) {
+            if (holder.remoteViewsCard == null) {
+                Log.w("SsCardPagerAdapter", "[rmv] No RemoteViews card view can be binded");
+                return;
+            }
+            Log.d("SsCardPagerAdapter", "[rmv] Refreshing RemoteViews card");
+            holder.remoteViewsCard.bindData(target, dataProvider != null ? dataProvider.getEventNotifier() : null, loggingInfo, smartspaceTargets.size() > 1);
+            return;
+        }
+        if (!hasValidTemplate) {
+            if (holder.legacyCard == null) {
+                Log.w("SsCardPagerAdapter", "No legacy card view can be binded");
+                return;
+            }
+            holder.legacyCard.bindData(target, dataProvider != null ? dataProvider.getEventNotifier() : null, loggingInfo, smartspaceTargets.size() > 1);
+            holder.legacyCard.setPrimaryTextColor(currentTextColor);
+            holder.legacyCard.setDozeAmount(dozeAmount);
+            return;
+        }
+        if (target.getTemplateData() == null) {
+            throw new IllegalStateException("Required value was null.");
+        }
+        BcSmartspaceCardLoggerUtil.tryForcePrimaryFeatureTypeOrUpdateLogInfoFromTemplateData(loggingInfo, target.getTemplateData());
+        if (holder.card == null) {
+            Log.w("SsCardPagerAdapter", "No ui-template card view can be binded");
+            return;
+        }
+        holder.card.bindData(target, dataProvider != null ? dataProvider.getEventNotifier() : null, loggingInfo, smartspaceTargets.size() > 1);
+        holder.card.setPrimaryTextColor(currentTextColor);
+        holder.card.setDozeAmount(dozeAmount);
+    }
+
+    @Override
+    public final void setBgHandler(Handler handler) {
+        bgHandler = handler;
+    }
+
+    @Override
+    public final void setConfigProvider(BcSmartspaceConfigPlugin configProvider) {
+        this.configProvider = configProvider;
+    }
+
+    @Override
+    public final void setDataProvider(BcSmartspaceDataPlugin dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+
+    @Override
+    public void setDozeAmount(float dozeAmount) {
+        this.dozeAmount = dozeAmount;
+        TransitionType newTransition =
+                previousDozeAmount > dozeAmount
+                        ? TransitionType.TO_LOCKSCREEN
+                        : previousDozeAmount < dozeAmount
+                                ? TransitionType.TO_AOD
+                                : TransitionType.NOT_IN_TRANSITION;
+        transitioningTo = newTransition;
+        previousDozeAmount = dozeAmount;
+        updateTargetVisibility();
+        updateCurrentTextColor();
+    }
+
+    @Override
+    public final void setKeyguardBypassEnabled(boolean enabled) {
+        keyguardBypassEnabled = enabled;
+        updateTargetVisibility();
+    }
+
+    @Override
+    public void setMediaTarget(SmartspaceTarget target) {
+        mediaTargets.clear();
+        if (target != null) {
+            mediaTargets.add(target);
+        }
+        updateTargetVisibility();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public final void setNonRemoteViewsHorizontalPadding(Integer padding) {
+        nonRemoteViewsHorizontalPadding = padding;
+        for (int i = 0; i < viewHolders.size(); i++) {
+            int keyAt = viewHolders.keyAt(i);
+            BcSmartspaceCard legacyCardAtPosition = getLegacyCardAtPosition(keyAt);
+            if (legacyCardAtPosition != null) {
+                legacyCardAtPosition.setPaddingRelative(padding, legacyCardAtPosition.getPaddingTop(), padding, legacyCardAtPosition.getPaddingBottom());
+            }
+            BaseTemplateCard templateCardAtPosition = getTemplateCardAtPosition(keyAt);
+            if (templateCardAtPosition != null) {
+                templateCardAtPosition.setPaddingRelative(padding, templateCardAtPosition.getPaddingTop(), padding, templateCardAtPosition.getPaddingBottom());
+            }
+        }
+        for (int i = 0; i < recycledCards.size(); i++) {
+            BaseTemplateCard baseTemplateCard = (BaseTemplateCard) recycledCards.valueAt(i);
+            baseTemplateCard.setPaddingRelative(padding, baseTemplateCard.getPaddingTop(), padding, baseTemplateCard.getPaddingBottom());
+        }
+        for (int i = 0; i < recycledLegacyCards.size(); i++) {
+            BcSmartspaceCard bcSmartspaceCard = (BcSmartspaceCard) recycledLegacyCards.valueAt(i);
+            bcSmartspaceCard.setPaddingRelative(padding, bcSmartspaceCard.getPaddingTop(), padding, bcSmartspaceCard.getPaddingBottom());
+        }
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        primaryTextColor = color;
+        updateCurrentTextColor();
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+        for (int i = 0; i < viewHolders.size(); i++) {
+            ViewHolder holder = viewHolders.valueAt(i);
+            if (holder != null && holder.card != null) {
+                holder.card.setScreenOn(screenOn);
+            }
+        }
+    }
+
+    @Override
+    public void setTargets(List<SmartspaceTarget> targets) {
+        _aodTargets.clear();
+        _lockscreenTargets.clear();
+        hasDifferentTargets = false;
+        for (SmartspaceTarget target : targets) {
+            if (target.getFeatureType() == 34) {
+                continue;
+            }
+            int screenExtra =
+                    target.getBaseAction() != null && target.getBaseAction().getExtras() != null
+                            ? target.getBaseAction().getExtras().getInt("SCREEN_EXTRA", 3)
+                            : 3;
+            if ((screenExtra & 2) != 0) {
+                _aodTargets.add(target);
+            }
+            if ((screenExtra & 1) != 0) {
+                _lockscreenTargets.add(target);
+            }
+            if (screenExtra != 3) {
+                hasDifferentTargets = true;
+            }
+        }
+        if (!configProvider.isDefaultDateWeatherDisabled()) {
+            addDefaultDateCardIfEmpty(_aodTargets);
+            addDefaultDateCardIfEmpty(_lockscreenTargets);
+        }
+        updateTargetVisibility();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public final void setTimeChangedDelegate(BcSmartspaceDataPlugin.TimeChangedDelegate delegate) {
+        timeChangedDelegate = delegate;
+    }
+
+    @Override
+    public final void setUiSurface(String uiSurface) {
+        this.uiSurface = uiSurface;
+    }
+
+    public final void updateCurrentTextColor() {
+        currentTextColor = ColorUtils.blendARGB(primaryTextColor, dozeColor, dozeAmount);
+        for (int i = 0; i < viewHolders.size(); i++) {
+            ViewHolder holder = viewHolders.valueAt(i);
+            if (holder != null) {
+                if (holder.legacyCard != null) {
+                    holder.legacyCard.setPrimaryTextColor(currentTextColor);
+                    holder.legacyCard.setDozeAmount(dozeAmount);
+                }
+                if (holder.card != null) {
+                    holder.card.setPrimaryTextColor(currentTextColor);
+                    holder.card.setDozeAmount(dozeAmount);
+                }
+            }
+        }
+    }
+
+    public void updateTargetVisibility() {
+        List<SmartspaceTarget> targetList =
+                !mediaTargets.isEmpty()
+                        ? mediaTargets
+                        : hasDifferentTargets ? _aodTargets : getLockscreenTargets();
+        List<SmartspaceTarget> lockscreenTargets = getLockscreenTargets();
+        boolean shouldUpdate =
+                smartspaceTargets != targetList
+                        && (dozeAmount == 1f
+                                || (dozeAmount >= 0.36f
+                                        && transitioningTo == TransitionType.TO_AOD));
+        boolean shouldUpdateLockscreen =
+                smartspaceTargets != lockscreenTargets
+                        && (dozeAmount == 0f
+                                || (1f - dozeAmount >= 0.36f
+                                        && transitioningTo == TransitionType.TO_LOCKSCREEN));
+        if (shouldUpdate || shouldUpdateLockscreen) {
+            smartspaceTargets = shouldUpdate ? targetList : lockscreenTargets;
+            notifyDataSetChanged();
+        }
+        hasAodLockscreenTransition = targetList != lockscreenTargets;
+        if (configProvider.isDefaultDateWeatherDisabled() && !BcSmartspaceDataPlugin.UI_SURFACE_HOME_SCREEN.equals(uiSurface)) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(
+                    root, smartspaceTargets.isEmpty() ? View.GONE : View.VISIBLE);
+        }
+    }
+
+    @Override
+    public final void onBackgroundToggled(boolean z) {
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/CardRecyclerViewAdapter.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardRecyclerViewAdapter.java
new file mode 100644
index 0000000000000..4ebc172ff190e
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/CardRecyclerViewAdapter.java
@@ -0,0 +1,753 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.content.ComponentName;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.LayerDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RemoteViews;
+import android.widget.FrameLayout;
+
+import androidx.recyclerview.widget.AdapterListUpdateCallback;
+import androidx.recyclerview.widget.AsyncDifferConfig;
+import androidx.recyclerview.widget.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.graphics.ColorUtils;
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.IcuDateTextView;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceSubcardLoggingInfo;
+import com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard;
+
+import com.android.systemui.res.R;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+/* compiled from: go/retraceme af8e0b46c0cb0ee2c99e9b6d0c434e5c0b686fd9230eaab7fb9a40e3a9d0cf6f */
+/* loaded from: classes2.dex */
+public final class CardRecyclerViewAdapter extends RecyclerView.Adapter<CardRecyclerViewAdapter.ViewHolder> implements CardAdapter {
+    public static final Set<Integer> legacySecondaryCardResourceIdSet =
+            BcSmartSpaceUtil.FEATURE_TYPE_TO_SECONDARY_CARD_RESOURCE_MAP.values().stream()
+                    .collect(Collectors.toSet());
+    public static final Set<Integer> templateSecondaryCardResourceIdSet =
+            BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES.values().stream()
+                    .collect(Collectors.toSet());
+    public final List<SmartspaceTarget> _aodTargets;
+    public float dozeAmount;
+    public boolean _isBackgroundEnabled;
+    public final List<SmartspaceTarget> _lockscreenTargets;
+    public final Drawable backgroundDrawable;
+    public final Drawable backgroundOutlineDrawable;
+    public Handler bgHandler;
+    public final int bgNonRemoteViewsHorizontalPadding;
+    public BcSmartspaceConfigPlugin configProvider;
+    public Drawable currentBackgroundDrawable;
+    public int currentTextColor;
+    public BcSmartspaceDataPlugin dataProvider;
+    public final int defaultNonRemoteViewsPaddingStart;
+    public final int dozeColor;
+    public boolean hasAodLockscreenTransition;
+    public boolean hasDifferentTargets;
+    public boolean keyguardBypassEnabled;
+    public final AsyncListDiffer<SmartspaceTarget> mDiffer;
+    public final List<SmartspaceTarget> mediaTargets;
+    public Integer nonRemoteViewsHorizontalPadding;
+    public float previousDozeAmount;
+    public int primaryTextColor;
+    public final BcSmartspaceView root;
+    public List<SmartspaceTarget> smartspaceTargets;
+    public final GradientDrawable solidBackgroundDrawable;
+    public BcSmartspaceDataPlugin.TimeChangedDelegate timeChangedDelegate;
+    public TransitionType transitioningTo;
+    public String uiSurface;
+    public final SparseArray<ViewHolder> viewHolders;
+
+    /* compiled from: go/retraceme af8e0b46c0cb0ee2c99e9b6d0c434e5c0b686fd9230eaab7fb9a40e3a9d0cf6f */
+    public final class DiffUtilItemCallback extends DiffUtil.ItemCallback<SmartspaceTarget> {
+        @Override // androidx.recyclerview.widget.DiffUtil.Callback
+        public final boolean areItemsTheSame(SmartspaceTarget oldItem, SmartspaceTarget newItem) {
+            return oldItem.getSmartspaceTargetId().equals(newItem.getSmartspaceTargetId());
+        }
+
+        @Override // androidx.recyclerview.widget.DiffUtil.Callback
+        public final boolean areContentsTheSame(SmartspaceTarget oldItem, SmartspaceTarget newItem) {
+            return false;
+        }
+    }
+
+    public enum TransitionType {
+        NOT_IN_TRANSITION,
+        TO_LOCKSCREEN,
+        TO_AOD
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        public SmartspaceCard card;
+
+
+        public final void setBackground(Drawable drawable) {
+            if (itemView instanceof BcSmartspaceRemoteViewsCard) {
+                return;
+            }
+            ViewGroup viewGroup = itemView instanceof ViewGroup ? (ViewGroup) itemView : null;
+            View childAt = viewGroup != null ? viewGroup.getChildAt(0) : null;
+            if (childAt != null) {
+                childAt.setBackground(drawable);
+            }
+        }
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    public CardRecyclerViewAdapter(BcSmartspaceView root, BcSmartspaceConfigPlugin configProvider) {
+        GradientDrawable gradientDrawable;
+        DiffUtilItemCallback diffUtilItemCallback = new DiffUtilItemCallback();
+        AsyncDifferConfig<SmartspaceTarget> asyncDifferConfig = 
+                new AsyncDifferConfig.Builder<SmartspaceTarget>(diffUtilItemCallback)
+                .build();
+        mDiffer = new AsyncListDiffer<>(new AdapterListUpdateCallback(this), asyncDifferConfig);
+        mDiffer.addListListener((previousList, currentList) -> {
+        });
+        this.root = root;
+        viewHolders = new SparseArray<>();
+        backgroundOutlineDrawable =
+                root.getContext().getDrawable(R.drawable.bg_non_remoteviews_card_outline);
+        backgroundDrawable = root.getContext().getDrawable(R.drawable.bg_non_remoteviews_card);
+        try {
+            gradientDrawable = getSolidBackgroundDrawable();
+        } catch (IllegalStateException e) {
+            Log.w("SsCardRecyclerViewAdapter", "Failed to get solid background drawable", e);
+            gradientDrawable = null;
+        }
+        solidBackgroundDrawable = gradientDrawable;
+        smartspaceTargets = new ArrayList<>();
+        _aodTargets = new ArrayList<>();
+        _lockscreenTargets = new ArrayList<>();
+        mediaTargets = new ArrayList<>();
+        dozeColor = -1;
+        int attrColor = GraphicsUtils.getAttrColor(root.getContext(), android.R.attr.textColorPrimary);
+        primaryTextColor = attrColor;
+        currentTextColor = attrColor;
+        configProvider = configProvider;
+        bgNonRemoteViewsHorizontalPadding =
+                root.getContext()
+                        .getResources()
+                        .getDimensionPixelSize(R.dimen.bg_non_remoteviews_card_padding_horizontal);
+        defaultNonRemoteViewsPaddingStart =
+                root.getContext()
+                        .getResources()
+                        .getDimensionPixelSize(R.dimen.non_remoteviews_card_padding_start);
+        transitioningTo = TransitionType.NOT_IN_TRANSITION;
+    }
+
+    public static boolean isTemplateCard(SmartspaceTarget target) {
+        return target.getTemplateData() != null && BcSmartspaceCardLoggerUtil.containsValidTemplateType(target.getTemplateData());
+    }
+
+    public final void addDefaultDateCardIfEmpty(List<SmartspaceTarget> targets) {
+        if (targets.isEmpty()) {
+            targets.add(new SmartspaceTarget.Builder("date_card_794317_92634", new ComponentName(root.getContext(), CardRecyclerViewAdapter.class), root.getContext().getUser()).setFeatureType(1).setTemplateData(new BaseTemplateData.Builder(1).build()).build());
+        }
+    }
+
+    @Override
+    public final SmartspaceCard getCardAtPosition(int position) {
+        ViewHolder holder = viewHolders.get(position);
+        if (holder != null) {
+            return holder.card;
+        }
+        return null;
+    }
+
+    @Override
+    public final int getCount() {
+        return smartspaceTargets.size();
+    }
+
+    @Override
+    public final float getDozeAmount() {
+        return dozeAmount;
+    }
+
+    @Override
+    public final boolean getHasAodLockscreenTransition() {
+        return hasAodLockscreenTransition;
+    }
+
+    @Override
+    public final boolean getHasDifferentTargets() {
+        return hasDifferentTargets;
+    }
+
+    @Override
+    public final int getItemCount() {
+        return mDiffer.getCurrentList().size();
+    }
+
+    @Override
+    public final int getItemViewType(int position) {
+        SmartspaceTarget target = mDiffer.getCurrentList().get(position);
+        BaseTemplateData templateData = target.getTemplateData();
+        if (target.getRemoteViews() != null) {
+            return target.getRemoteViews().getLayoutId();
+        }
+        if (!isTemplateCard(target)) {
+            Integer layoutId = (Integer) BcSmartSpaceUtil.FEATURE_TYPE_TO_SECONDARY_CARD_RESOURCE_MAP.get(BcSmartSpaceUtil.getFeatureType(target));
+            return layoutId != null ? layoutId : R.layout.smartspace_card;
+        }
+        BaseTemplateData.SubItemInfo primaryItem = templateData.getPrimaryItem();
+        if (primaryItem == null) {
+            return R.layout.smartspace_base_template_card_with_date;
+        }
+        if (SmartspaceUtils.isEmpty(primaryItem.getText()) && primaryItem.getIcon() == null) {
+            return R.layout.smartspace_base_template_card_with_date;
+        }
+        BaseTemplateData.SubItemLoggingInfo loggingInfo = primaryItem.getLoggingInfo();
+        if (loggingInfo != null && loggingInfo.getFeatureType() == 1) {
+            return R.layout.smartspace_base_template_card_with_date;
+        }
+        Integer layoutId = (Integer) BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES.get(templateData.getTemplateType());
+        return layoutId != null ? layoutId : R.layout.smartspace_base_template_card;
+    }
+
+    @Override
+    public BcSmartspaceCard getLegacyCardAtPosition(int position) {
+        SmartspaceCard card = getCardAtPosition(position);
+        return card instanceof BcSmartspaceCard ? (BcSmartspaceCard) card : null;
+    }
+
+    @Override
+    public List<SmartspaceTarget> getLockscreenTargets() {
+        return (mediaTargets.isEmpty() || !keyguardBypassEnabled) ? _lockscreenTargets : mediaTargets;
+    }
+
+    public final int getNonRemoteViewsPaddingEnd() {
+        if (_isBackgroundEnabled) {
+            return bgNonRemoteViewsHorizontalPadding;
+        }
+        if (nonRemoteViewsHorizontalPadding == null) {
+            return 0;
+        }
+        return nonRemoteViewsHorizontalPadding;
+    }
+
+    public final int getNonRemoteViewsPaddingStart() {
+        if (_isBackgroundEnabled) {
+            return bgNonRemoteViewsHorizontalPadding;
+        }
+        if (nonRemoteViewsHorizontalPadding == null) {
+            return defaultNonRemoteViewsPaddingStart;
+        }
+        return nonRemoteViewsHorizontalPadding;
+    }
+
+    @Override
+    public BcSmartspaceRemoteViewsCard getRemoteViewsCardAtPosition(int position) {
+        SmartspaceCard card = getCardAtPosition(position);
+        return card instanceof BcSmartspaceRemoteViewsCard
+                ? (BcSmartspaceRemoteViewsCard) card
+                : null;
+    }
+
+    @Override
+    public List<SmartspaceTarget> getSmartspaceTargets() {
+        return smartspaceTargets;
+    }
+
+    public final GradientDrawable getSolidBackgroundDrawable() {
+        if (solidBackgroundDrawable != null) {
+            return solidBackgroundDrawable;
+        }
+        if (backgroundDrawable == null) {
+            throw new IllegalStateException("Background drawable is null");
+        }
+        if (!(backgroundDrawable instanceof LayerDrawable)) {
+            throw new IllegalStateException("Background drawable isn't a LayerDrawable");
+        }
+        Drawable findDrawableByLayerId =
+                ((LayerDrawable) backgroundDrawable).findDrawableByLayerId(R.id.solid);
+        if (findDrawableByLayerId == null) {
+            throw new IllegalStateException("Solid background drawable is null");
+        }
+        if (findDrawableByLayerId instanceof GradientDrawable) {
+            return (GradientDrawable) findDrawableByLayerId;
+        }
+        throw new IllegalStateException("Solid background drawable isn't a LayerDrawable");
+    }
+
+    @Override
+    public SmartspaceTarget getTargetAtPosition(int position) {
+        if (position < 0 || position >= getItemCount()) {
+            return null;
+        }
+        return mDiffer.getCurrentList().get(position);
+    }
+
+    @Override
+    public BaseTemplateCard getTemplateCardAtPosition(int position) {
+        SmartspaceCard card = getCardAtPosition(position);
+        return card instanceof BaseTemplateCard ? (BaseTemplateCard) card : null;
+    }
+
+    @Override
+    public String getUiSurface() {
+        return uiSurface;
+    }
+
+    public final boolean needToSetToLockscreenTargets() {
+        if (dozeAmount == 0.0f) {
+            return true;
+        }
+        return 1.0f - dozeAmount >= 0.36f && transitioningTo == TransitionType.TO_LOCKSCREEN;
+    }
+
+    @Override
+    public final void onBackgroundToggled(boolean z) {
+        _isBackgroundEnabled = z;
+        refreshCardBackground();
+        refreshCardPaddings();
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public final void onBindViewHolder(ViewHolder holder, int position) {
+        SmartspaceTarget target = mDiffer.getCurrentList().get(position);
+        boolean isTemplateCard = isTemplateCard(target);
+        BcSmartspaceCardLoggingInfo.Builder loggingInfoBuilder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setInstanceId(InstanceId.create(target))
+                        .setFeatureType(target.getFeatureType())
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(uiSurface, dozeAmount))
+                        .setRank(position)
+                        .setCardinality(smartspaceTargets.size())
+                        .setUid(-1);
+        if (isTemplateCard) {
+            loggingInfoBuilder.setSubcardInfo(
+                    BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(target.getTemplateData()));
+        } else {
+            loggingInfoBuilder.setSubcardInfo(
+                    BcSmartspaceCardLoggerUtil.createSubcardLoggingInfo(target));
+        }
+        loggingInfoBuilder.setDimensionalInfo(
+                BcSmartspaceCardLoggerUtil.createDimensionalLoggingInfo(target.getTemplateData()));
+        BcSmartspaceCardLoggingInfo loggingInfo =
+                new BcSmartspaceCardLoggingInfo(loggingInfoBuilder);
+        SmartspaceCard card = holder.card;
+        if (target.getRemoteViews() != null) {
+            if (!(card instanceof BcSmartspaceRemoteViewsCard)) {
+                Log.w("SsCardRecyclerViewAdapter", "[rmv] No RemoteViews card view can be binded");
+                return;
+            }
+            Log.d("SsCardRecyclerViewAdapter", "[rmv] Refreshing RemoteViews card");
+        } else if (isTemplateCard) {
+            if (target.getTemplateData() == null) {
+                throw new IllegalStateException("Required value was null.");
+            }
+            BcSmartspaceCardLoggerUtil.tryForcePrimaryFeatureTypeOrUpdateLogInfoFromTemplateData(loggingInfo, target.getTemplateData());
+            if (!(card instanceof BaseTemplateCard)) {
+                Log.w("SsCardRecyclerViewAdapter", "No ui-template card view can be binded");
+                return;
+            }
+            BaseTemplateCard baseTemplateCard = (BaseTemplateCard) card;
+            baseTemplateCard.mBgHandler = bgHandler;
+            IcuDateTextView icuDateTextView = baseTemplateCard.mDateView;
+            if (icuDateTextView != null) {
+                icuDateTextView.mBgHandler = bgHandler;
+            }
+            baseTemplateCard.setPaddingRelative(
+                    getNonRemoteViewsPaddingStart(),
+                    baseTemplateCard.getPaddingTop(),
+                    getNonRemoteViewsPaddingEnd(),
+                    baseTemplateCard.getPaddingBottom());
+        } else if (!(card instanceof BcSmartspaceCard)) {
+            Log.w("SsCardRecyclerViewAdapter", "No legacy card view can be binded");
+            return;
+        } else {
+            BcSmartspaceCard bcSmartspaceCard = (BcSmartspaceCard) card;
+            bcSmartspaceCard.setPaddingRelative(
+                    getNonRemoteViewsPaddingStart(),
+                    bcSmartspaceCard.getPaddingTop(),
+                    getNonRemoteViewsPaddingEnd(),
+                    bcSmartspaceCard.getPaddingBottom());
+        }
+        card.bindData(target, dataProvider != null ? dataProvider.getEventNotifier() : null, loggingInfo, smartspaceTargets.size() > 1);
+        holder.setBackground(_isBackgroundEnabled ? currentBackgroundDrawable : null);
+        card.setPrimaryTextColor(currentTextColor);
+        card.setDozeAmount(dozeAmount);
+        viewHolders.put(position, holder);
+    }
+
+    @Override
+    public final ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        SmartspaceCard card;
+        Integer secondaryCardResId = null;
+        FrameLayout frameLayout;
+        if (templateSecondaryCardResourceIdSet.contains(viewType) || viewType == R.layout.smartspace_base_template_card_with_date || viewType == R.layout.smartspace_base_template_card) {
+            if (templateSecondaryCardResourceIdSet.contains(viewType)) {
+                secondaryCardResId = viewType;
+                viewType = R.layout.smartspace_base_template_card;
+            }
+            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+            BaseTemplateCard templateCard = (BaseTemplateCard) inflater.inflate(viewType, parent, false);
+            templateCard.mUiSurface = uiSurface;
+            if (templateCard.mDateView != null && TextUtils.equals(uiSurface, BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+                if (templateCard.mDateView.isAttachedToWindow()) {
+                    throw new IllegalStateException("Must call before attaching view to window.");
+                }
+                templateCard.mDateView.mUpdatesOnAod = true;
+            }
+            if (templateCard.mDateView != null) {
+                if (templateCard.mDateView.isAttachedToWindow()) {
+                    throw new IllegalStateException("Must call before attaching view to window.");
+                }
+                templateCard.mDateView.mTimeChangedDelegate = timeChangedDelegate;
+            }
+            templateCard.setLayoutParams(
+                    new ViewGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT));
+            if (secondaryCardResId != null) {
+                BcSmartspaceCardSecondary bcSmartspaceCardSecondary = (BcSmartspaceCardSecondary) inflater.inflate(secondaryCardResId, (ViewGroup) templateCard, false);
+                Log.i("SsCardRecyclerViewAdapter", "Secondary card is found");
+                templateCard.setSecondaryCard(bcSmartspaceCardSecondary);
+            }
+            card = templateCard;
+        } else {
+            if (legacySecondaryCardResourceIdSet.contains(viewType) || viewType == R.layout.smartspace_card) {
+                if (legacySecondaryCardResourceIdSet.contains(viewType)) {
+                    secondaryCardResId = viewType;
+                    viewType = R.layout.smartspace_card;
+                }
+                LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+                BcSmartspaceCard legacyCard = (BcSmartspaceCard) inflater.inflate(viewType, parent, false);
+                legacyCard.mUiSurface = uiSurface;
+                legacyCard.setLayoutParams(
+                        new ViewGroup.LayoutParams(
+                                ViewGroup.LayoutParams.MATCH_PARENT,
+                                ViewGroup.LayoutParams.MATCH_PARENT));
+                if (secondaryCardResId != null) {
+                    legacyCard.setSecondaryCard((BcSmartspaceCardSecondary) inflater.inflate(secondaryCardResId, (ViewGroup) legacyCard, false));
+                }
+                card = legacyCard;
+            } else {
+                BcSmartspaceRemoteViewsCard remoteViewsCard = new BcSmartspaceRemoteViewsCard(parent.getContext());
+                remoteViewsCard.mUiSurface = uiSurface;
+                remoteViewsCard.setLayoutParams(
+                        new ViewGroup.LayoutParams(
+                                ViewGroup.LayoutParams.MATCH_PARENT,
+                                ViewGroup.LayoutParams.MATCH_PARENT));
+                card = remoteViewsCard;
+            }
+        }
+        if (card instanceof BcSmartspaceRemoteViewsCard) {
+            frameLayout = (BcSmartspaceRemoteViewsCard) card;
+        } else {
+            frameLayout = new FrameLayout(parent.getContext());
+            frameLayout.setLayoutParams(
+                    new ViewGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT));
+            View view = new View(parent.getContext());
+            ViewGroup.MarginLayoutParams marginLayoutParams =
+                    new ViewGroup.MarginLayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT);
+            marginLayoutParams.topMargin =
+                    parent.getContext()
+                            .getResources()
+                            .getDimensionPixelSize(R.dimen.background_top_padding);
+            marginLayoutParams.bottomMargin =
+                    parent.getContext()
+                            .getResources()
+                            .getDimensionPixelSize(R.dimen.background_bottom_padding);
+            view.setLayoutParams(marginLayoutParams);
+            frameLayout.addView(view);
+            frameLayout.addView(card.getView());
+        }
+        ViewHolder viewHolder = new ViewHolder(frameLayout);
+        viewHolder.card = card;
+        return viewHolder;
+    }
+
+    public final void refreshCardBackground() {
+        for (int i = 0; i < viewHolders.size(); i++) {
+            ViewHolder viewHolder = (ViewHolder) viewHolders.get(viewHolders.keyAt(i));
+            if (viewHolder != null) {
+                viewHolder.setBackground(_isBackgroundEnabled ? currentBackgroundDrawable : null);
+            }
+        }
+    }
+
+    public final void refreshCardPaddings() {
+        int nonRemoteViewsPaddingStart = getNonRemoteViewsPaddingStart();
+        int nonRemoteViewsPaddingEnd = getNonRemoteViewsPaddingEnd();
+        for (int i = 0; i < viewHolders.size(); i++) {
+            BcSmartspaceCard legacyCardAtPosition = getLegacyCardAtPosition(viewHolders.keyAt(i));
+            if (legacyCardAtPosition != null) {
+                legacyCardAtPosition.setPaddingRelative(
+                        nonRemoteViewsPaddingStart,
+                        legacyCardAtPosition.getPaddingTop(),
+                        nonRemoteViewsPaddingEnd,
+                        legacyCardAtPosition.getPaddingBottom());
+            }
+            BaseTemplateCard templateCardAtPosition =
+                    getTemplateCardAtPosition(viewHolders.keyAt(i));
+            if (templateCardAtPosition != null) {
+                templateCardAtPosition.setPaddingRelative(
+                        nonRemoteViewsPaddingStart,
+                        templateCardAtPosition.getPaddingTop(),
+                        nonRemoteViewsPaddingEnd,
+                        templateCardAtPosition.getPaddingBottom());
+            }
+        }
+    }
+
+    public final void resetListIfNeeded() {
+        if (root != null && root.getSelectedPage() != 0) {
+            return;
+        }
+        if ((root != null ? root.mScrollState : 0) != 0) {
+            return;
+        }
+        if (mDiffer.getCurrentList().size() == 1 && smartspaceTargets.size() == 1) {
+            return;
+        }
+        String smartspaceTargetId =
+                mDiffer.getCurrentList().stream()
+                        .findFirst()
+                        .map(SmartspaceTarget::getSmartspaceTargetId)
+                        .orElse(null);
+        String smartspaceTargetId2 =
+                smartspaceTargets.stream()
+                        .findFirst()
+                        .map(SmartspaceTarget::getSmartspaceTargetId)
+                        .orElse(null);
+        if (Objects.equals(smartspaceTargetId, smartspaceTargetId2)) {
+            return;
+        }
+        mDiffer.submitList(null, null);
+    }
+
+    @Override
+    public final void setBgHandler(Handler handler) {
+        bgHandler = handler;
+    }
+    @Override
+    public final void setConfigProvider(BcSmartspaceConfigPlugin configProvider) {
+        this.configProvider = configProvider;
+    }
+
+    @Override
+    public final void setDataProvider(BcSmartspaceDataPlugin dataProvider) {
+        this.dataProvider = dataProvider;
+    }
+
+    @Override
+    public final void setDozeAmount(float dozeAmount) {
+        this.dozeAmount = dozeAmount;
+        transitioningTo = previousDozeAmount > dozeAmount ? TransitionType.TO_LOCKSCREEN : previousDozeAmount < dozeAmount ? TransitionType.TO_AOD : TransitionType.NOT_IN_TRANSITION;
+        previousDozeAmount = dozeAmount;
+        updateTargetVisibility(null, false);
+
+        if (dozeAmount == 1.0f
+                || (dozeAmount >= 0.36f && transitioningTo == TransitionType.TO_AOD)) {
+            if (currentBackgroundDrawable != backgroundOutlineDrawable) {
+                currentBackgroundDrawable = backgroundOutlineDrawable;
+                refreshCardBackground();
+            }
+        } else if (currentBackgroundDrawable != backgroundDrawable
+                && needToSetToLockscreenTargets()) {
+            currentBackgroundDrawable = backgroundDrawable;
+            refreshCardBackground();
+        }
+
+        updateCurrentTextColor();
+    }
+
+    @Override
+    public final void setKeyguardBypassEnabled(boolean enabled) {
+        keyguardBypassEnabled = enabled;
+        updateTargetVisibility(null, false);
+    }
+
+    @Override
+    public void setMediaTarget(SmartspaceTarget target) {
+        mediaTargets.clear();
+        if (target != null) {
+            mediaTargets.add(target);
+        }
+        updateTargetVisibility(null, true);
+    }
+
+    @Override
+    public final void setNonRemoteViewsHorizontalPadding(Integer padding) {
+        nonRemoteViewsHorizontalPadding = padding;
+        if (!_isBackgroundEnabled) {
+            refreshCardPaddings();
+        }
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        primaryTextColor = color;
+        updateCurrentTextColor();
+    }
+
+    @Override
+    public void setScreenOn(boolean screenOn) {
+        for (int i = 0; i < viewHolders.size(); i++) {
+            ViewHolder holder = viewHolders.get(viewHolders.keyAt(i));
+            if (holder != null) {
+                holder.card.setScreenOn(screenOn);
+            }
+        }
+    }
+
+    @Override
+    public final void setTargets(List<SmartspaceTarget> targets) {
+        setTargets(targets, null);
+    }
+
+    @Override
+    public final void setTimeChangedDelegate(BcSmartspaceDataPlugin.TimeChangedDelegate delegate) {
+        timeChangedDelegate = delegate;
+    }
+
+    @Override
+    public final void setUiSurface(String uiSurface) {
+        this.uiSurface = uiSurface;
+    }
+
+    public void updateCurrentTextColor() {
+        currentTextColor = ColorUtils.blendARGB(primaryTextColor, dozeColor, dozeAmount);
+        for (int i = 0; i < viewHolders.size(); i++) {
+            ViewHolder holder = viewHolders.get(viewHolders.keyAt(i));
+            if (holder != null) {
+                holder.card.setPrimaryTextColor(currentTextColor);
+                holder.card.setDozeAmount(dozeAmount);
+            }
+        }
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    /* JADX WARN: Removed duplicated region for block: B:19:0x0048  */
+    /* JADX WARN: Removed duplicated region for block: B:24:0x0075  */
+    /* JADX WARN: Removed duplicated region for block: B:38:0x0050  */
+    /*
+        Code decompiled incorrectly, please refer to instructions dump.
+    */
+    public final void updateTargetVisibility(Runnable runnable, boolean z) {
+        boolean z2;
+        List<SmartspaceTarget> targets = !mediaTargets.isEmpty() ? mediaTargets : hasDifferentTargets ? _aodTargets : getLockscreenTargets();
+        List<SmartspaceTarget> lockscreenTargets = getLockscreenTargets();
+        if (smartspaceTargets != targets) {
+            if (dozeAmount == 1.0f || (dozeAmount >= 0.36f && transitioningTo == TransitionType.TO_AOD)) {
+                z2 = true;
+                boolean z3 =
+                        smartspaceTargets == lockscreenTargets && needToSetToLockscreenTargets();
+                if (!z2) {
+                    Log.d(
+                            "SsCardRecyclerViewAdapter",
+                            "Updating Smartspace targets to targets for AOD");
+                    smartspaceTargets = targets;
+                } else if (z3) {
+                    Log.d(
+                            "SsCardRecyclerViewAdapter",
+                            "Updating Smartspace targets to targets for Lockscreen");
+                    smartspaceTargets = lockscreenTargets;
+                }
+                if (!z || z2 || z3) {
+                    viewHolders.clear();
+                    resetListIfNeeded();
+                    mDiffer.submitList(
+                            smartspaceTargets.stream().collect(Collectors.toList()), runnable);
+                }
+                hasAodLockscreenTransition = targets != lockscreenTargets;
+                if (configProvider.isDefaultDateWeatherDisabled()
+                        || BcSmartspaceDataPlugin.UI_SURFACE_HOME_SCREEN.equals(uiSurface)) {}
+                BcSmartspaceTemplateDataUtils.updateVisibility(
+                        root, smartspaceTargets.isEmpty() ? View.GONE : View.VISIBLE);
+                return;
+            }
+        }
+        z2 = false;
+        if (smartspaceTargets == lockscreenTargets) {}
+        if (!z2) {
+        }
+        if (!z) {
+        }
+        viewHolders.clear();
+        resetListIfNeeded();
+        mDiffer.submitList(smartspaceTargets.stream().collect(Collectors.toList()), runnable);
+        hasAodLockscreenTransition = targets != lockscreenTargets;
+        if (configProvider.isDefaultDateWeatherDisabled()) {
+        }
+    }
+
+    public final void setTargets(List<SmartspaceTarget> list, Runnable runnable) {
+        Bundle extras;
+        _aodTargets.clear();
+        _lockscreenTargets.clear();
+        hasDifferentTargets = false;
+        Iterator<SmartspaceTarget> it = list.iterator();
+        while (it.hasNext()) {
+            SmartspaceTarget smartspaceTarget = it.next();
+            if (smartspaceTarget.getFeatureType() == 34 || 
+                (smartspaceTarget.getRemoteViews() == null && !isTemplateCard(smartspaceTarget) && smartspaceTarget.getFeatureType() == 1)) {
+                Log.e("SsCardRecyclerViewAdapter", "No card can be created for target: " + smartspaceTarget.getFeatureType());
+            } else {
+                SmartspaceAction baseAction = smartspaceTarget.getBaseAction();
+                
+                int screenExtra = (baseAction == null || (extras = baseAction.getExtras()) == null) 
+                        ? 3 
+                        : extras.getInt("SCREEN_EXTRA", 3);
+
+                if ((screenExtra & 2) != 0) {
+                    _aodTargets.add(smartspaceTarget);
+                }
+                if ((screenExtra & 1) != 0) {
+                    _lockscreenTargets.add(smartspaceTarget);
+                }
+                if (screenExtra != 3) {
+                    hasDifferentTargets = true;
+                }
+            }
+        }
+
+        if (!configProvider.isDefaultDateWeatherDisabled()) {
+            addDefaultDateCardIfEmpty(_aodTargets);
+            addDefaultDateCardIfEmpty(_lockscreenTargets);
+        }
+
+        updateTargetVisibility(runnable, true);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceDataProvider.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceDataProvider.java
new file mode 100644
index 0000000000000..c363be0289272
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceDataProvider.java
@@ -0,0 +1,93 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.systemui.res.R;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public final class DateSmartspaceDataProvider
+    implements BcSmartspaceDataPlugin {
+  public Set<View.OnAttachStateChangeListener> mAttachListeners =
+      new HashSet<>();
+  public EventNotifierProxy mEventNotifier = new EventNotifierProxy();
+  public final View.OnAttachStateChangeListener mStateChangeListener =
+      new StateChangeListener();
+  public Set<View> mViews = new HashSet<>();
+
+  public final class StateChangeListener
+      implements View.OnAttachStateChangeListener {
+    @Override
+    public final void onViewAttachedToWindow(View view) {
+      mViews.add(view);
+      Iterator<View.OnAttachStateChangeListener> iterator =
+          mAttachListeners.iterator();
+      while (iterator.hasNext()) {
+        View.OnAttachStateChangeListener listener = iterator.next();
+        listener.onViewAttachedToWindow(view);
+      }
+    }
+
+    @Override
+    public final void onViewDetachedFromWindow(View view) {
+      mViews.remove(view);
+      Iterator<View.OnAttachStateChangeListener> iterator =
+          mAttachListeners.iterator();
+      while (iterator.hasNext()) {
+        View.OnAttachStateChangeListener listener = iterator.next();
+        listener.onViewDetachedFromWindow(view);
+      }
+    }
+  }
+
+  @Override
+  public final void
+  addOnAttachStateChangeListener(View.OnAttachStateChangeListener listener) {
+    mAttachListeners.add(listener);
+    Iterator<View> iterator = mViews.iterator();
+    while (iterator.hasNext()) {
+      View view = iterator.next();
+      listener.onViewAttachedToWindow(view);
+    }
+  }
+
+  @Override
+  public final BcSmartspaceDataPlugin.SmartspaceEventNotifier
+  getEventNotifier() {
+    return mEventNotifier;
+  }
+
+  @Override
+  public final BcSmartspaceDataPlugin.SmartspaceView
+  getLargeClockView(Context context) {
+    View view = LayoutInflater.from(context).inflate(
+        R.layout.date_plus_extras_large, (ViewGroup)null, false);
+    view.setId(R.id.date_smartspace_view_large);
+    view.addOnAttachStateChangeListener(this.mStateChangeListener);
+    return (BcSmartspaceDataPlugin.SmartspaceView)view;
+  }
+
+  @Override
+  public final BcSmartspaceDataPlugin.SmartspaceView getView(Context context) {
+    View view = LayoutInflater.from(context).inflate(R.layout.date_plus_extras,
+                                                     (ViewGroup)null, false);
+    view.addOnAttachStateChangeListener(this.mStateChangeListener);
+    return (BcSmartspaceDataPlugin.SmartspaceView)view;
+  }
+
+  @Override
+  public final void setEventDispatcher(
+      BcSmartspaceDataPlugin.SmartspaceEventDispatcher eventDispatcher) {
+    mEventNotifier.eventDispatcher = eventDispatcher;
+  }
+
+  @Override
+  public final void
+  setIntentStarter(BcSmartspaceDataPlugin.IntentStarter intentStarter) {
+    mEventNotifier.intentStarterRef = intentStarter;
+  }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceView.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceView.java
new file mode 100644
index 0000000000000..e2761415d8313
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/DateSmartspaceView.java
@@ -0,0 +1,313 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.content.ComponentName;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.android.internal.graphics.ColorUtils;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLogger;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.lang.invoke.VarHandle;
+
+/* compiled from: go/retraceme af8e0b46c0cb0ee2c99e9b6d0c434e5c0b686fd9230eaab7fb9a40e3a9d0cf6f */
+/* loaded from: classes2.dex */
+public class DateSmartspaceView extends LinearLayout implements BcSmartspaceDataPlugin.SmartspaceView {
+    public static final boolean DEBUG = Log.isLoggable("DateSmartspaceView", Log.DEBUG);
+    public final ContentObserver mAodSettingsObserver;
+    public Handler mBgHandler;
+    public int mCurrentTextColor;
+    public BcSmartspaceDataPlugin mDataProvider;
+    public final SmartspaceAction mDateAction;
+    public final SmartspaceTarget mDateTarget;
+    public IcuDateTextView mDateView;
+    public final DoubleShadowIconDrawable mDndIconDrawable;
+    public ImageView mDndImageView;
+    public float mDozeAmount;
+    public boolean mIsAodEnabled;
+    public BcSmartspaceCardLoggingInfo mLoggingInfo;
+    public final BcNextAlarmData mNextAlarmData;
+    public final DoubleShadowIconDrawable mNextAlarmIconDrawable;
+    public DoubleShadowTextView mNextAlarmTextView;
+    public int mPrimaryTextColor;
+    public String mUiSurface;
+
+    public DateSmartspaceView(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    public final void onAttachedToWindow() {
+        Handler handler;
+        super.onAttachedToWindow();
+        if (TextUtils.equals(mUiSurface, BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+            try {
+                handler = mBgHandler;
+            } catch (Exception e) {
+                Log.w("DateSmartspaceView", "Unable to register DOZE_ALWAYS_ON content observer: ", e);
+            }
+            if (mBgHandler == null) {
+                throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+            }
+            mBgHandler.post(() -> {
+                getContext().getContentResolver().registerContentObserver(
+                        Settings.Secure.getUriFor("doze_always_on"), 
+                        false, 
+                        mAodSettingsObserver, 
+                        -1);
+            });
+            mIsAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+        }
+        BcSmartspaceCardLoggingInfo.Builder builder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setInstanceId(InstanceId.create(mDateTarget))
+                        .setFeatureType(mDateTarget.getFeatureType())
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount))
+                        .setUid(-1);
+        mLoggingInfo = new BcSmartspaceCardLoggingInfo(builder);
+        BcSmartSpaceUtil.setOnClickListener(mDateView, mDateTarget, mDateAction, mDataProvider != null ? mDataProvider.getEventNotifier() : null, "DateSmartspaceView", mLoggingInfo, 0);
+    }
+
+    @Override
+    public final void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mBgHandler == null) {
+            throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+        }
+        mBgHandler.post(() -> {
+            getContext().getContentResolver().unregisterContentObserver(mAodSettingsObserver);
+        });
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mDateView = findViewById(R.id.date);
+        mNextAlarmTextView = findViewById(R.id.alarm_text_view);
+        mDndImageView = findViewById(R.id.dnd_icon);
+    }
+
+    @Override
+    public final void registerDataProvider(BcSmartspaceDataPlugin dataProvider) {
+        mDataProvider = dataProvider;
+    }
+
+    @Override
+    public final void setBgHandler(Handler handler) {
+        mBgHandler = handler;
+        mDateView.mBgHandler = handler;
+    }
+
+    @Override
+    public final void setDnd(Drawable image, String description) {
+        if (image == null) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mDndImageView, View.GONE);
+        } else {
+            mDndIconDrawable.setIcon(image.mutate());
+            mDndImageView.setImageDrawable(mDndIconDrawable);
+            mDndImageView.setContentDescription(description);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mDndImageView, View.VISIBLE);
+        }
+        updateColorForExtras();
+    }
+
+    /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+    @Override // com.android.systemui.plugins.BcSmartspaceDataPlugin.SmartspaceView
+    public final void setDozeAmount(float dozeAmount) {
+        int loggingSurface;
+        mDozeAmount = dozeAmount;
+        mCurrentTextColor = ColorUtils.blendARGB(mPrimaryTextColor, -1, dozeAmount);
+        mDateView.setTextColor(mCurrentTextColor);
+        updateColorForExtras();
+        if (mLoggingInfo == null || (loggingSurface = BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount)) == -1) {
+            return;
+        }
+        if (loggingSurface != 3 || mIsAodEnabled) {
+            if (DEBUG) {
+                Log.d("DateSmartspaceView", "@" + Integer.toHexString(hashCode()) + ", setDozeAmount: Logging SMARTSPACE_CARD_SEEN, loggingSurface = " + loggingSurface);
+            }
+            BcSmartspaceCardLoggingInfo.Builder builder =
+                    new BcSmartspaceCardLoggingInfo.Builder()
+                            .setInstanceId(mLoggingInfo.mInstanceId)
+                            .setFeatureType(mLoggingInfo.mFeatureType)
+                            .setDisplaySurface(loggingSurface)
+                            .setUid(mLoggingInfo.mUid);
+            BcSmartspaceCardLogger.log(
+                    BcSmartspaceEvent.SMARTSPACE_CARD_SEEN, new BcSmartspaceCardLoggingInfo(builder));
+            if (mNextAlarmData.mImage != null) {
+                BcSmartspaceCardLoggingInfo.Builder alarmBuilder =
+                        new BcSmartspaceCardLoggingInfo.Builder()
+                                .setInstanceId(InstanceId.create("upcoming_alarm_card_94510_12684"))
+                                .setFeatureType(23)
+                                .setDisplaySurface(loggingSurface)
+                                .setUid(mLoggingInfo.mUid);
+                BcSmartspaceCardLogger.log(
+                        BcSmartspaceEvent.SMARTSPACE_CARD_SEEN,
+                        new BcSmartspaceCardLoggingInfo(alarmBuilder));
+            }
+        }
+    }
+
+    @Override
+    public final void setFalsingManager(FalsingManager falsingManager) {
+        BcSmartSpaceUtil.sFalsingManager = falsingManager;
+    }
+
+    @Override
+    public final void setNextAlarm(Drawable image, String description) {
+        mNextAlarmData.mImage = image;
+        if (image != null) {
+            image.mutate();
+        }
+        mNextAlarmData.mDescription = description;
+        if (mNextAlarmData.mImage == null) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mNextAlarmTextView, View.GONE);
+        } else {
+            mNextAlarmTextView.setContentDescription(getContext().getString(R.string.accessibility_next_alarm, description));
+            String displayText = TextUtils.isEmpty(null) ? mNextAlarmData.mDescription : mNextAlarmData.mDescription + " · null";
+            mNextAlarmTextView.setText(displayText);
+            int iconSize = getContext().getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size);
+            mNextAlarmData.mImage.setBounds(0, 0, iconSize, iconSize);
+            mNextAlarmIconDrawable.setIcon(mNextAlarmData.mImage);
+            mNextAlarmTextView.setCompoundDrawablesRelative(mNextAlarmIconDrawable, null, null, null);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mNextAlarmTextView, View.VISIBLE);
+            BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier = mDataProvider == null ? null : mDataProvider.getEventNotifier();
+            int loggingSurface = BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount);
+            BcSmartspaceCardLoggingInfo loggingInfo = new BcSmartspaceCardLoggingInfo.Builder()
+                    .setInstanceId(InstanceId.create("upcoming_alarm_card_94510_12684"))
+                    .setFeatureType(23)
+                    .setDisplaySurface(loggingSurface)
+                    .build();
+            BcSmartSpaceUtil.setOnClickListener(mNextAlarmTextView, null, BcNextAlarmData.SHOW_ALARMS_ACTION, eventNotifier, "BcNextAlarmData", loggingInfo, 0);
+        }
+        updateColorForExtras();
+    }
+
+    @Override
+    public final void setOrientation(int orientation) {
+        super.setOrientation(orientation);
+        WeatherSmartspaceView weatherSmartspaceView =
+                (WeatherSmartspaceView) findViewById(R.id.weather_smartspace_view);
+        if (orientation != 0 && weatherSmartspaceView != null) {
+            if (orientation == 1) {
+                mDateView.setOnClickListener(null);
+                mDateView.setClickable(false);
+                setClickable(true);
+                setFocusable(true);
+                setOnClickListener(weatherSmartspaceView.mOnClickListener);
+                return;
+            }
+            return;
+        }
+        BcSmartSpaceUtil.setOnClickListener(
+                mDateView,
+                mDateTarget,
+                mDateAction,
+                mDataProvider == null ? null : mDataProvider.getEventNotifier(),
+                "DateSmartspaceView",
+                mLoggingInfo,
+                0);
+        setClickable(false);
+        setFocusable(false);
+        setOnClickListener(null);
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        mPrimaryTextColor = color;
+        mCurrentTextColor = ColorUtils.blendARGB(color, -1, mDozeAmount);
+        mDateView.setTextColor(mCurrentTextColor);
+        updateColorForExtras();
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+        if (mDateView != null) {
+            mDateView.mIsInteractive = screenOn;
+            mDateView.rescheduleTicker();
+        }
+    }
+
+    @Override
+    public final void setTimeChangedDelegate(BcSmartspaceDataPlugin.TimeChangedDelegate delegate) {
+        if (mDateView != null) {
+            if (mDateView.isAttachedToWindow()) {
+                throw new IllegalStateException("Must call before attaching view to window.");
+            } else {
+                mDateView.mTimeChangedDelegate = delegate;
+            }
+        }
+    }
+
+    @Override
+    public final void setUiSurface(String uiSurface) {
+        if (isAttachedToWindow()) {
+            throw new IllegalStateException("Must call before attaching view to window.");
+        }
+        mUiSurface = uiSurface;
+        if (TextUtils.equals(uiSurface, BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+            if (mDateView.isAttachedToWindow()) {
+                throw new IllegalStateException("Must call before attaching view to window.");
+            } else {
+                mDateView.mUpdatesOnAod = true;
+            }
+        }
+    }
+
+    public final void updateColorForExtras() {
+        if (mNextAlarmTextView != null) {
+            mNextAlarmTextView.setTextColor(mCurrentTextColor);
+            mNextAlarmIconDrawable.setTint(mCurrentTextColor);
+        }
+        if (mDndImageView == null || mDndImageView.getDrawable() == null) {
+            return;
+        }
+        mDndImageView.getDrawable().setTint(mCurrentTextColor);
+        mDndImageView.invalidate();
+    }
+
+    public DateSmartspaceView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    /* JADX WARN: Type inference failed for: r4v10, types: [com.google.android.systemui.smartspace.DateSmartspaceView$1] */
+    public DateSmartspaceView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mUiSurface = null;
+        mDozeAmount = 0.0f;
+        mDateTarget = new SmartspaceTarget.Builder("date_card_794317_92634", new ComponentName(getContext(), getClass()), getContext().getUser()).setFeatureType(1).build();
+        mDateAction = new SmartspaceAction.Builder("dateId", "Date").setIntent(BcSmartSpaceUtil.getOpenCalendarIntent()).build();
+        mNextAlarmData = new BcNextAlarmData();
+        mAodSettingsObserver = new ContentObserver(new Handler()) { // from class: com.google.android.systemui.smartspace.DateSmartspaceView.1
+            /* JADX DEBUG: Don't trust debug lines info. Lines numbers was adjusted: min line is 1 */
+            @Override // android.database.ContentObserver
+            public final void onChange(boolean selfChange) {
+                boolean isAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+                if (mIsAodEnabled == isAodEnabled) {
+                    return;
+                }
+                mIsAodEnabled = isAodEnabled;
+            }
+        };
+        context.getTheme().applyStyle(R.style.Smartspace, false);
+        mNextAlarmIconDrawable = new DoubleShadowIconDrawable(context);
+        mDndIconDrawable = new DoubleShadowIconDrawable(context);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/DefaultBcSmartspaceConfigProvider.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/DefaultBcSmartspaceConfigProvider.java
new file mode 100644
index 0000000000000..c49ee0e9fd669
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/DefaultBcSmartspaceConfigProvider.java
@@ -0,0 +1,20 @@
+package com.google.android.systemui.smartspace;
+
+import com.android.systemui.plugins.BcSmartspaceConfigPlugin;
+
+public final class DefaultBcSmartspaceConfigProvider implements BcSmartspaceConfigPlugin {
+    @Override
+    public final boolean isDefaultDateWeatherDisabled() {
+        return false;
+    }
+
+    @Override
+    public final boolean isSwipeEventLoggingEnabled() {
+        return false;
+    }
+
+    @Override
+    public final boolean isViewPager2Enabled() {
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java
new file mode 100644
index 0000000000000..96e4fb21e0271
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java
@@ -0,0 +1,121 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.graphics.BlendMode;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.RecordingCanvas;
+import android.graphics.RenderEffect;
+import android.graphics.RenderNode;
+import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
+
+import com.android.internal.graphics.ColorUtils;
+
+import com.android.systemui.res.R;
+
+public final class DoubleShadowIconDrawable extends Drawable {
+    public final int mAmbientShadowRadius;
+    public final int mCanvasSize;
+    public RenderNode mDoubleShadowNode;
+    public InsetDrawable mIconDrawable;
+    public final int mIconInsetSize;
+    public final int mKeyShadowOffsetX;
+    public final int mKeyShadowOffsetY;
+    public final int mKeyShadowRadius;
+    public boolean mShowShadow;
+
+    public DoubleShadowIconDrawable(Context context) {
+        this(context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size), context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_inset), context);
+    }
+
+    @Override
+    public final void draw(Canvas canvas) {
+        if (canvas.isHardwareAccelerated() && mDoubleShadowNode != null && mShowShadow) {
+            if (!mDoubleShadowNode.hasDisplayList()) {
+                RecordingCanvas beginRecording = mDoubleShadowNode.beginRecording();
+                if (mIconDrawable != null) {
+                    mIconDrawable.draw(beginRecording);
+                }
+                mDoubleShadowNode.endRecording();
+            }
+            canvas.drawRenderNode(mDoubleShadowNode);
+        }
+        if (mIconDrawable != null) {
+            mIconDrawable.draw(canvas);
+        }
+    }
+
+    @Override
+    public final int getIntrinsicHeight() {
+        return mCanvasSize;
+    }
+
+    @Override
+    public final int getIntrinsicWidth() {
+        return mCanvasSize;
+    }
+
+    @Override
+    public final int getOpacity() {
+        return -2;
+    }
+
+    @Override
+    public final void setAlpha(int alpha) {
+        if (mIconDrawable != null) {
+            mIconDrawable.setAlpha(alpha);
+        }
+    }
+
+    @Override
+    public final void setColorFilter(ColorFilter colorFilter) {
+        if (mIconDrawable != null) {
+            mIconDrawable.setColorFilter(colorFilter);
+        }
+    }
+
+    public final void setIcon(Drawable drawable) {
+        RenderNode renderNode = null;
+        if (drawable == null) {
+            mIconDrawable = null;
+            return;
+        }
+        mIconDrawable = new InsetDrawable(drawable, mIconInsetSize);
+        mIconDrawable.setBounds(0, 0, mCanvasSize, mCanvasSize);
+        if (mIconDrawable != null) {
+            RenderNode shadowNode = new RenderNode("DoubleShadowNode");
+            shadowNode.setPosition(0, 0, mCanvasSize, mCanvasSize);
+            RenderEffect ambientShadowEffect = RenderEffect.createColorFilterEffect(new PorterDuffColorFilter(Color.argb(48, 0, 0, 0), PorterDuff.Mode.MULTIPLY), RenderEffect.createOffsetEffect(0f, 0f, RenderEffect.createBlurEffect(mAmbientShadowRadius, mAmbientShadowRadius, Shader.TileMode.CLAMP)));
+            RenderEffect keyShadowEffect = RenderEffect.createColorFilterEffect(new PorterDuffColorFilter(Color.argb(72, 0, 0, 0), PorterDuff.Mode.MULTIPLY), RenderEffect.createOffsetEffect(mKeyShadowOffsetX, mKeyShadowOffsetY, RenderEffect.createBlurEffect(mKeyShadowRadius, mKeyShadowRadius, Shader.TileMode.CLAMP)));
+            if (ambientShadowEffect != null && keyShadowEffect != null) {
+                shadowNode.setRenderEffect(RenderEffect.createBlendModeEffect(ambientShadowEffect, keyShadowEffect, BlendMode.DARKEN));
+                renderNode = shadowNode;
+            }
+        }
+        mDoubleShadowNode = renderNode;
+    }
+
+    @Override
+    public final void setTint(int color) {
+        if (mIconDrawable != null) {
+            mIconDrawable.setTint(color);
+        }
+        mShowShadow = ColorUtils.calculateLuminance(color) > 0.5d;
+    }
+
+    public DoubleShadowIconDrawable(int iconSize, int insetSize, Context context) {
+        mShowShadow = true;
+        mIconInsetSize = insetSize;
+        mCanvasSize = insetSize * 2 + iconSize;
+        mAmbientShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.ambient_text_shadow_radius);
+        mKeyShadowRadius = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_radius);
+        mKeyShadowOffsetX = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_dx);
+        mKeyShadowOffsetY = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_dy);
+        setBounds(0, 0, mCanvasSize, mCanvasSize);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java
new file mode 100644
index 0000000000000..fc7dac260da11
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java
@@ -0,0 +1,61 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.core.graphics.ColorUtils;
+
+import com.android.systemui.res.R;
+
+public class DoubleShadowTextView extends TextView {
+    public final float mAmbientShadowBlur;
+    public final int mAmbientShadowColor;
+    public boolean mDrawShadow;
+    public final float mKeyShadowBlur;
+    public final int mKeyShadowColor;
+    public final float mKeyShadowOffsetX;
+    public final float mKeyShadowOffsetY;
+
+    public DoubleShadowTextView(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    public final void onDraw(Canvas canvas) {
+        if (!mDrawShadow) {
+            getPaint().clearShadowLayer();
+            super.onDraw(canvas);
+            return;
+        }
+        getPaint().setShadowLayer(mAmbientShadowBlur, 0.0f, 0.0f, mAmbientShadowColor);
+        super.onDraw(canvas);
+        canvas.save();
+        canvas.clipRect(getScrollX(), getExtendedPaddingTop() + getScrollY(), getWidth() + getScrollX(), getHeight() + getScrollY());
+        getPaint().setShadowLayer(mKeyShadowBlur, mKeyShadowOffsetX, mKeyShadowOffsetY, mKeyShadowColor);
+        super.onDraw(canvas);
+        canvas.restore();
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        super.setTextColor(color);
+        mDrawShadow = ColorUtils.calculateLuminance(color) > 0.5d;
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mDrawShadow = ColorUtils.calculateLuminance(getCurrentTextColor()) > 0.5d;
+        mKeyShadowBlur = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_radius);
+        mKeyShadowOffsetX = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_dx);
+        mKeyShadowOffsetY = context.getResources().getDimensionPixelSize(R.dimen.key_text_shadow_dy);
+        mKeyShadowColor = context.getResources().getColor(R.color.key_text_shadow_color);
+        mAmbientShadowBlur = context.getResources().getDimensionPixelSize(R.dimen.ambient_text_shadow_radius);
+        mAmbientShadowColor = context.getResources().getColor(R.color.ambient_text_shadow_color);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/EventNotifierProxy.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/EventNotifierProxy.java
new file mode 100644
index 0000000000000..a92c3abbbb619
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/EventNotifierProxy.java
@@ -0,0 +1,22 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTargetEvent;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+public final class EventNotifierProxy implements BcSmartspaceDataPlugin.SmartspaceEventNotifier {
+    public BcSmartspaceDataPlugin.SmartspaceEventDispatcher eventDispatcher;
+    public BcSmartspaceDataPlugin.IntentStarter intentStarterRef;
+
+    @Override
+    public final BcSmartspaceDataPlugin.IntentStarter getIntentStarter() {
+        return intentStarterRef;
+    }
+
+    @Override
+    public final void notifySmartspaceEvent(SmartspaceTargetEvent smartspaceTargetEvent) {
+        if (eventDispatcher != null) {
+            eventDispatcher.notifySmartspaceEvent(smartspaceTargetEvent);
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/IcuDateTextView.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/IcuDateTextView.java
new file mode 100644
index 0000000000000..bde2fbf7f5a04
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/IcuDateTextView.java
@@ -0,0 +1,194 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.icu.text.DateFormat;
+import android.icu.text.DisplayContext;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.android.systemui.res.R;
+
+import java.util.Locale;
+import java.util.Objects;
+
+public class IcuDateTextView extends DoubleShadowTextView {
+    private static final String TAG = "IcuDateTextView";
+    public final ContentObserver mAodSettingsObserver;
+    public Handler mBgHandler;
+    public DateFormat mFormatter;
+    public Handler mHandler;
+    public final BroadcastReceiver mIntentReceiver;
+    public boolean mIsAodEnabled;
+    public Boolean mIsInteractive;
+    public String mText;
+    public final Runnable mTimeChangedCallback;
+    public BcSmartspaceDataPlugin.TimeChangedDelegate mTimeChangedDelegate;
+    public boolean mUpdatesOnAod;
+
+    public final class DefaultTimeChangedDelegate implements BcSmartspaceDataPlugin.TimeChangedDelegate, Runnable {
+        public Handler mHandler;
+        public Runnable mTimeChangedCallback;
+
+        @Override
+        public final void register(Runnable callback) {
+            if (mTimeChangedCallback != null) {
+                unregister();
+            }
+            mTimeChangedCallback = callback;
+            run();
+        }
+
+        @Override
+        public final void run() {
+            if (mTimeChangedCallback != null) {
+                mTimeChangedCallback.run();
+                if (mHandler != null) {
+                    long now = SystemClock.uptimeMillis();
+                    long delay = 60000 - (now % 60000);
+                    mHandler.postAtTime(this, now + delay);
+                }
+            }
+        }
+
+        @Override
+        public final void unregister() {
+            mHandler.removeCallbacks(this);
+            mTimeChangedCallback = null;
+        }
+    }
+
+    public IcuDateTextView(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    public final void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mUpdatesOnAod) {
+            try {
+                if (mBgHandler == null) {
+                    Log.wtf(TAG, "Must set background handler when mUpdatesOnAod is set to avoid making binder calls on main thread");
+                    getContext().getContentResolver().registerContentObserver(Settings.Secure.getUriFor("doze_always_on"), false, mAodSettingsObserver, -1);
+                } else {
+                    mBgHandler.post(() -> getContext().getContentResolver().registerContentObserver(
+                            Settings.Secure.getUriFor("doze_always_on"), false, mAodSettingsObserver, -1));
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "Unable to register DOZE_ALWAYS_ON content observer: ", e);
+            }
+            mIsAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+        }
+
+        mHandler = new Handler();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction("Intent.ACTION_TIME_CHANGED");
+        intentFilter.addAction("Intent.ACTION_TIMEZONE_CHANGED");
+
+        if (mBgHandler == null) {
+            Log.w(TAG, "mBgHandler is not set! Fallback to make binder calls on main thread.");
+            getContext().registerReceiver(mIntentReceiver, intentFilter, Context.RECEIVER_EXPORTED);
+        } else {
+            mBgHandler.post(() -> getContext().registerReceiver(mIntentReceiver, intentFilter, Context.RECEIVER_EXPORTED));
+        }
+
+        if (mTimeChangedDelegate == null) {
+            DefaultTimeChangedDelegate delegate = new DefaultTimeChangedDelegate();
+            delegate.mHandler = mHandler;
+            mTimeChangedDelegate = delegate;
+        }
+        onTimeChanged(true);
+    }
+
+    @Override
+    public final void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mHandler != null) {
+            if (mBgHandler == null) {
+                Log.w(TAG, "mBgHandler is not set! Fallback to make binder calls on main thread.");
+                getContext().unregisterReceiver(mIntentReceiver);
+            } else {
+                mBgHandler.post(() -> {
+                    try {
+                        getContext().unregisterReceiver(mIntentReceiver);
+                    } catch (IllegalArgumentException ignored) {}
+                });
+            }
+            mTimeChangedDelegate.unregister();
+            mHandler = null;
+        }
+        if (mUpdatesOnAod) {
+            if (mBgHandler == null) {
+                Log.wtf(TAG, "Must set background handler when mUpdatesOnAod is set to avoid making binder calls on main thread");
+                getContext().getContentResolver().unregisterContentObserver(mAodSettingsObserver);
+            } else {
+                mBgHandler.post(() -> getContext().getContentResolver().unregisterContentObserver(mAodSettingsObserver));
+            }
+        }
+    }
+
+    public final void onTimeChanged(boolean forceUpdateFormatter) {
+        if (mFormatter == null || forceUpdateFormatter) {
+            mFormatter = DateFormat.getInstanceForSkeleton(getContext().getString(R.string.smartspace_icu_date_pattern), Locale.getDefault());
+            mFormatter.setContext(DisplayContext.CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE);
+        }
+        String newText = mFormatter.format(Long.valueOf(System.currentTimeMillis()));
+        if (Objects.equals(mText, newText)) {
+            return;
+        }
+        mText = newText;
+        setText(newText);
+        setContentDescription(newText);
+    }
+
+    @Override
+    public final void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+        rescheduleTicker();
+    }
+
+    public final void rescheduleTicker() {
+        if (mHandler == null) {
+            return;
+        }
+        mTimeChangedDelegate.unregister();
+        if ((mIsInteractive == null || mIsInteractive || (mUpdatesOnAod && mIsAodEnabled)) && isAggregatedVisible()) {
+            mTimeChangedDelegate.register(mTimeChangedCallback);
+        }
+    }
+
+    public IcuDateTextView(Context context, AttributeSet attrs) {
+        super(context, attrs, 0);
+
+        mAodSettingsObserver = new ContentObserver(new Handler()) {
+            @Override
+            public void onChange(boolean selfChange) {
+                boolean isAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+                if (mIsAodEnabled == isAodEnabled) {
+                    return;
+                }
+                mIsAodEnabled = isAodEnabled;
+                rescheduleTicker();
+            }
+        };
+
+        mIntentReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                boolean updateFormatter = "android.intent.action.TIMEZONE_CHANGED".equals(intent.getAction()) || "android.intent.action.TIME_SET".equals(intent.getAction());
+                onTimeChanged(updateFormatter);
+            }
+        };
+
+        mTimeChangedCallback = () -> onTimeChanged(false);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/InstanceId.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/InstanceId.java
new file mode 100644
index 0000000000000..8154c3e01f9b6
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/InstanceId.java
@@ -0,0 +1,21 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import java.util.UUID;
+
+public abstract class InstanceId {
+    public static int create(SmartspaceTarget smartspaceTarget) {
+        if (smartspaceTarget == null) {
+            return SmallHash.hash(UUID.randomUUID().toString());
+        }
+        String smartspaceTargetId = smartspaceTarget.getSmartspaceTargetId();
+        return (smartspaceTargetId == null || smartspaceTargetId.isEmpty()) ? SmallHash.hash(String.valueOf(smartspaceTarget.getCreationTimeMillis())) : SmallHash.hash(smartspaceTargetId);
+    }
+
+    public static int create(String str) {
+        if (str != null && !str.isEmpty()) {
+            return SmallHash.hash(str);
+        }
+        return SmallHash.hash(UUID.randomUUID().toString());
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/InterceptingViewPager.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/InterceptingViewPager.java
new file mode 100644
index 0000000000000..18efe6161b2d5
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/InterceptingViewPager.java
@@ -0,0 +1,99 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.viewpager.widget.ViewPager;
+
+import com.android.systemui.res.R;
+
+import java.util.function.Predicate;
+
+public class InterceptingViewPager extends ViewPager {
+    public boolean mHasPerformedLongPress;
+    public boolean mHasPostedLongPress;
+    public final Runnable mLongPressCallback;
+    public final Predicate<MotionEvent> mSuperOnIntercept;
+    public final Predicate<MotionEvent> mSuperOnTouch;
+
+    public InterceptingViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mSuperOnTouch = super::onTouchEvent;
+        mSuperOnIntercept = super::onInterceptTouchEvent;
+        mLongPressCallback = () -> {
+            mHasPerformedLongPress = true;
+            if (performLongClick()) {
+                getParent().requestDisallowInterceptTouchEvent(true);
+            }
+        };
+    }
+
+    public final void cancelScheduledLongPress() {
+        if (mHasPostedLongPress) {
+            mHasPostedLongPress = false;
+            removeCallbacks(mLongPressCallback);
+        }
+    }
+
+    @Override
+    public final AccessibilityNodeInfo createAccessibilityNodeInfo() {
+        AccessibilityNodeInfo info = super.createAccessibilityNodeInfo();
+        AccessibilityNodeInfoCompat.wrap(info).setRoleDescription(getContext().getString(R.string.smartspace_role_desc));
+        return info;
+    }
+
+    public final boolean handleTouchOverride(MotionEvent event, Predicate<MotionEvent> superMethod) {
+        int action = event.getAction();
+        if (action == MotionEvent.ACTION_DOWN) {
+            mHasPerformedLongPress = false;
+            if (isLongClickable()) {
+                cancelScheduledLongPress();
+                mHasPostedLongPress = true;
+                postDelayed(mLongPressCallback, ViewConfiguration.getLongPressTimeout());
+            }
+        } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            cancelScheduledLongPress();
+        }
+
+        if (mHasPerformedLongPress) {
+            cancelScheduledLongPress();
+            return true;
+        }
+
+        if (!superMethod.test(event)) {
+            return false;
+        }
+
+        cancelScheduledLongPress();
+        return true;
+    }
+
+    @Override
+    public final boolean onInterceptTouchEvent(MotionEvent event) {
+        return handleTouchOverride(event, mSuperOnIntercept);
+    }
+
+    @Override
+    public final boolean onTouchEvent(MotionEvent event) {
+        return handleTouchOverride(event, mSuperOnTouch);
+    }
+
+    public InterceptingViewPager(Context context) {
+        super(context);
+
+        mSuperOnTouch = super::onTouchEvent;
+        mSuperOnIntercept = super::onInterceptTouchEvent;
+        mLongPressCallback = () -> {
+            mHasPerformedLongPress = true;
+            if (performLongClick()) {
+                getParent().requestDisallowInterceptTouchEvent(true);
+            }
+        };
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.kt b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.kt
new file mode 100644
index 0000000000000..1dd4ce927c0f4
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.kt
@@ -0,0 +1,104 @@
+package com.google.android.systemui.smartspace
+
+import android.app.smartspace.SmartspaceAction
+import android.app.smartspace.SmartspaceTarget
+import android.content.ComponentName
+import android.content.Context
+import android.media.MediaMetadata
+import android.os.UserHandle
+import android.text.TextUtils
+import android.view.View
+import com.android.systemui.media.NotificationMediaManager
+import com.android.systemui.plugins.BcSmartspaceDataPlugin
+import com.android.systemui.settings.UserTracker
+import com.android.systemui.util.concurrency.DelayableExecutor
+import com.android.systemui.res.R;
+import javax.inject.Inject
+
+class KeyguardMediaViewController
+@Inject
+constructor(
+    val context: Context,
+    val mediaManager: NotificationMediaManager,
+    val plugin: BcSmartspaceDataPlugin,
+    val userTracker: UserTracker,
+    val uiExecutor: DelayableExecutor,
+) {
+    var title: CharSequence? = null
+    var artist: CharSequence? = null
+    var smartspaceView: BcSmartspaceDataPlugin.SmartspaceView? = null
+    lateinit var mediaComponent: ComponentName
+
+    val mediaListener =
+        object : NotificationMediaManager.MediaListener {
+            override fun onPrimaryMetadataOrStateChanged(metadata: MediaMetadata?, state: Int) {
+                uiExecutor.execute { updateMediaInfo(metadata, state) }
+            }
+        }
+
+    val attachStateChangeListener =
+        object : View.OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(view: View) {
+                smartspaceView = view as? BcSmartspaceDataPlugin.SmartspaceView
+                mediaManager.addCallback(mediaListener)
+            }
+
+            override fun onViewDetachedFromWindow(view: View) {
+                smartspaceView = null
+                mediaManager.removeCallback(mediaListener)
+            }
+        }
+
+    private fun updateMediaInfo(metadata: MediaMetadata?, state: Int) {
+        if (!NotificationMediaManager.isPlayingState(state)) {
+            clearMedia()
+            return
+        }
+
+        val newTitle =
+            metadata?.let {
+                 val displayTitle = it.getText(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
+                 if (TextUtils.isEmpty(displayTitle)) {
+                     it.getText(MediaMetadata.METADATA_KEY_TITLE)
+                 } else {
+                     displayTitle
+                 } ?: context.resources.getString(R.string.music_controls_no_title)
+            }
+
+        val newArtist = metadata?.getText(MediaMetadata.METADATA_KEY_ARTIST)
+
+        if (TextUtils.equals(title, newTitle) && TextUtils.equals(artist, newArtist)) {
+            return
+        }
+
+        title = newTitle
+        artist = newArtist
+
+        if (newTitle != null) {
+            val target =
+                SmartspaceTarget.Builder(
+                        "deviceMedia",
+                        mediaComponent,
+                        UserHandle.of(userTracker.userId),
+                    )
+                    .setFeatureType(41)
+                    .setHeaderAction(
+                        SmartspaceAction.Builder("deviceMediaTitle", newTitle.toString())
+                            .setSubtitle(artist)
+                            .setIcon(mediaManager.getMediaIcon())
+                            .build()
+                    )
+                    .build()
+
+            smartspaceView?.setMediaTarget(target) ?: clearMedia()
+        } else {
+            clearMedia()
+        }
+    }
+
+    private fun clearMedia() {
+        title = null
+        artist = null
+        smartspaceView?.setMediaTarget(null)
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardSmartspaceStartable.kt b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardSmartspaceStartable.kt
new file mode 100644
index 0000000000000..ef31c0121840e
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardSmartspaceStartable.kt
@@ -0,0 +1,33 @@
+package com.google.android.systemui.smartspace
+
+import com.android.systemui.CoreStartable
+import com.android.systemui.util.InitializationChecker
+
+import javax.inject.Inject
+
+import kotlinx.coroutines.launch
+
+class KeyguardSmartspaceStartable
+@Inject
+constructor(
+    private val zenController: KeyguardZenAlarmViewController,
+    private val mediaController: KeyguardMediaViewController,
+    private val initializationChecker: InitializationChecker
+) : CoreStartable {
+
+    override fun start() {
+        if (initializationChecker.initializeComponents()) {
+            zenController.datePlugin.addOnAttachStateChangeListener(
+                zenController.attachStateChangeListener
+            )
+
+            zenController.applicationScope.launch { 
+                zenController.updateNextAlarm() 
+            }
+
+            mediaController.plugin.addOnAttachStateChangeListener(
+                mediaController.attachStateChangeListener
+            )
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt
new file mode 100644
index 0000000000000..3c957d9a2066a
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt
@@ -0,0 +1,140 @@
+package com.google.android.systemui.smartspace
+
+import android.app.ActivityManager
+import android.app.AlarmManager
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.os.Handler
+import android.text.format.DateFormat
+import android.view.View
+import com.android.systemui.lifecycle.repeatWhenAttached
+import com.android.systemui.plugins.BcSmartspaceDataPlugin
+import com.android.systemui.statusbar.policy.NextAlarmController
+import com.android.systemui.statusbar.policy.NextAlarmControllerImpl
+import com.android.systemui.statusbar.policy.ZenModeController
+import com.android.systemui.statusbar.policy.domain.interactor.ZenModeInteractor
+import com.android.systemui.statusbar.policy.domain.model.ZenModeInfo
+import com.android.systemui.res.R;
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class KeyguardZenAlarmViewController
+@Inject
+constructor(
+    val context: Context,
+    val datePlugin: BcSmartspaceDataPlugin,
+    val zenModeController: ZenModeController,
+    val zenModeInteractor: ZenModeInteractor,
+    val alarmManager: AlarmManager,
+    val nextAlarmController: NextAlarmControllerImpl,
+    val handler: Handler,
+    val applicationScope: CoroutineScope,
+    val bgDispatcher: CoroutineDispatcher,
+) {
+    lateinit var alarmImage: Drawable
+    val smartspaceViews = mutableSetOf<BcSmartspaceDataPlugin.SmartspaceView>()
+
+    private val nextAlarmCallback =
+        NextAlarmController.NextAlarmChangeCallback {
+            applicationScope.launch { updateNextAlarm() }
+        }
+
+    private val showNextAlarm = AlarmManager.OnAlarmListener { showAlarm(null) }
+
+    val attachStateChangeListener =
+        object : View.OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(view: View) {
+                val smartspaceView = view as? BcSmartspaceDataPlugin.SmartspaceView ?: return
+                if (smartspaceViews.add(smartspaceView)) {
+                    view.repeatWhenAttached {
+                        zenModeInteractor.mainActiveMode.collect { modeInfo ->
+                            updateModeIcon(smartspaceView, modeInfo)
+                        }
+                    }
+                }
+                if (smartspaceViews.size == 1) {
+                    nextAlarmController.addCallback(nextAlarmCallback)
+                }
+                applicationScope.launch { updateNextAlarm() }
+            }
+
+            override fun onViewDetachedFromWindow(view: View) {
+                val smartspaceView = view as? BcSmartspaceDataPlugin.SmartspaceView ?: return
+                smartspaceViews.remove(smartspaceView)
+                if (smartspaceViews.isEmpty()) {
+                    nextAlarmController.removeCallback(nextAlarmCallback)
+                }
+            }
+        }
+
+    suspend fun updateNextAlarm() {
+        applicationScope.launch {
+            alarmManager.cancel(showNextAlarm)
+            val nextAlarmTime = getNextAlarmTime()
+            if (nextAlarmTime > 0) {
+                val triggerTime = nextAlarmTime - TimeUnit.HOURS.toMillis(12L)
+                if (triggerTime > 0) {
+                    alarmManager.setExact(
+                        AlarmManager.RTC,
+                        triggerTime,
+                        "lock_screen_next_alarm",
+                        showNextAlarm,
+                        handler,
+                    )
+                }
+            }
+            showAlarm(nextAlarmTime)
+        }
+    }
+
+    fun showAlarm(alarmTime: Long?): Job =
+        applicationScope.launch {
+            val time = alarmTime ?: getNextAlarmTime()
+            val alarmString =
+                if (time > 0 && time <= System.currentTimeMillis() + TimeUnit.HOURS.toMillis(12L)) {
+                    val pattern =
+                        if (DateFormat.is24HourFormat(context, ActivityManager.getCurrentUser()))
+                            "HH:mm"
+                        else "h:mm"
+                    DateFormat.format(pattern, time).toString()
+                } else null
+
+            smartspaceViews.forEach { view ->
+                if (alarmString != null) {
+                    view.setNextAlarm(alarmImage, alarmString)
+                } else {
+                    view.setNextAlarm(null, null)
+                }
+            }
+        }
+
+    // private suspend fun getNextAlarmTime(): Long = withContext(bgDispatcher) {
+    //    val zenControllerImpl = zenModeController as? ZenModeControllerImpl ?: return@withContext
+    // 0L
+    //    zenControllerImpl.mAlarmManager.getNextAlarmClock(zenControllerImpl.mUserId)?.triggerTime
+    // ?: 0L
+    // }
+
+    private suspend fun getNextAlarmTime(): Long =
+        withContext(bgDispatcher) {
+            val nextAlarm = alarmManager.getNextAlarmClock(ActivityManager.getCurrentUser())
+            nextAlarm?.triggerTime ?: 0L
+        }
+
+    fun updateModeIcon(view: BcSmartspaceDataPlugin.SmartspaceView, zenModeInfo: ZenModeInfo?) {
+        applicationScope.launch {
+            if (zenModeInfo != null) {
+                val description =
+                    context.getString(R.string.active_mode_content_description, zenModeInfo.name)
+                view.setDnd(zenModeInfo.icon.drawable, description)
+            } else {
+                view.setDnd(null, null)
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/LazyServerFlagLoader.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/LazyServerFlagLoader.java
new file mode 100644
index 0000000000000..e57867cd14823
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/LazyServerFlagLoader.java
@@ -0,0 +1,44 @@
+package com.google.android.systemui.smartspace;
+
+import android.provider.DeviceConfig;
+
+import java.util.Set;
+import java.util.concurrent.Executors;
+
+public final class LazyServerFlagLoader {
+    public final String mPropertyKey;
+    public Boolean mValue = null;
+
+    public LazyServerFlagLoader(String str) {
+        mPropertyKey = str;
+    }
+
+    public boolean get() {
+        if (mValue == null) {
+            mValue = Boolean.valueOf(DeviceConfig.getBoolean("launcher", mPropertyKey, true));
+            DeviceConfig.addOnPropertiesChangedListener(
+                    "launcher",
+                    Executors.newSingleThreadExecutor(),
+                    new OnPropertiesChangedListener(this));
+        }
+        return mValue.booleanValue();
+    }
+
+    private static class OnPropertiesChangedListener
+            implements DeviceConfig.OnPropertiesChangedListener {
+        private final LazyServerFlagLoader lazyServerFlagLoader;
+
+        OnPropertiesChangedListener(LazyServerFlagLoader loader) {
+            lazyServerFlagLoader = loader;
+        }
+
+        @Override
+        public void onPropertiesChanged(DeviceConfig.Properties properties) {
+            Set<String> keyset = properties.getKeyset();
+            String str = lazyServerFlagLoader.mPropertyKey;
+            if (keyset.contains(str)) {
+                lazyServerFlagLoader.mValue = Boolean.valueOf(properties.getBoolean(str, true));
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/PageIndicator.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/PageIndicator.java
new file mode 100644
index 0000000000000..d669910607d32
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/PageIndicator.java
@@ -0,0 +1,19 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+public abstract class PageIndicator extends LinearLayout {
+    public PageIndicator(Context context) {
+        super(context);
+    }
+
+    public PageIndicator(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PageIndicator(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/PagerDots.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/PagerDots.java
new file mode 100644
index 0000000000000..016a1c38d484d
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/PagerDots.java
@@ -0,0 +1,118 @@
+package com.google.android.systemui.smartspace;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.systemui.res.R;
+
+public final class PagerDots extends View {
+    public final float activeDotSize;
+    public int currentPageIndex;
+    public int currentPositionIndex;
+    public float currentPositionOffset;
+    public final float dotMargin;
+    public final float dotRadius;
+    public final float dotSize;
+    public int numPages;
+    public final Paint paint;
+    public int primaryColor;
+    public final RectF tempRectF;
+
+    public PagerDots(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        numPages = -1;
+        currentPageIndex = -1;
+        currentPositionIndex = -1;
+        dotSize = getResources().getDimension(R.dimen.page_indicator_dot_size);
+        dotMargin = getResources().getDimension(R.dimen.page_indicator_dot_margin);
+        activeDotSize = dotSize * 2;
+        dotRadius = dotSize / 2;
+        tempRectF = new RectF();
+        TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(new int[]{android.R.attr.textColorPrimary});
+        primaryColor = obtainStyledAttributes.getColor(0, 0);
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(primaryColor);
+        obtainStyledAttributes.recycle();
+        this.paint = paint;
+    }
+
+    @Override
+    public final void onDraw(Canvas canvas) {
+        if (numPages < 2) {
+            return;
+        }
+        int save = canvas.save();
+        try {
+            canvas.scale(isLayoutRtl() ? -1.0f : 1.0f, 1.0f, canvas.getWidth() * 0.5f, 0.0f);
+            canvas.translate(getPaddingStart(), getPaddingTop());
+            float f4 = (activeDotSize - dotSize) * currentPositionOffset;
+            int i = (primaryColor >> 24) & 255;
+            int i2 = (int) (i * 0.4f);
+            int i3 = (int) ((i - i2) * currentPositionOffset);
+            tempRectF.top = 0.0f;
+            tempRectF.bottom = dotSize;
+            tempRectF.left = 0.0f;
+            for (int i5 = 0; i5 < numPages; i5++) {
+                int i6 = currentPositionIndex;
+                float f5 = i5 == i6 ? activeDotSize - f4 : i5 == i6 + 1 ? dotSize + f4 : dotSize;
+                int i7 = i5 == i6 ? i - i3 : i5 == i6 + 1 ? i2 + i3 : i2;
+                tempRectF.right = tempRectF.left + f5;
+                paint.setAlpha(i7);
+                canvas.drawRoundRect(tempRectF, dotRadius, dotRadius, paint);
+                tempRectF.left = tempRectF.right + dotMargin;
+            }
+        } finally {
+            canvas.restoreToCount(save);
+        }
+    }
+
+    @Override
+    public final void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(getPaddingRight() + getPaddingLeft() + (View.MeasureSpec.getMode(widthMeasureSpec) == View.MeasureSpec.EXACTLY ? View.MeasureSpec.getSize(widthMeasureSpec) : (int) (((dotMargin + dotSize) * (numPages - 1)) + activeDotSize)), getPaddingBottom() + getPaddingTop() + (View.MeasureSpec.getMode(heightMeasureSpec) == View.MeasureSpec.EXACTLY ? View.MeasureSpec.getSize(heightMeasureSpec) : (int) dotSize));
+    }
+
+    public final void setNumPages(int i, boolean z) {
+        if (i == numPages) {
+            return;
+        }
+        if (i <= 0) {
+            numPages = 1;
+        } else {
+            numPages = i;
+        }
+        if (currentPageIndex < 0) {
+            updateCurrentPageIndex(z ? numPages - 1 : 0);
+            currentPositionIndex = currentPageIndex;
+        } else {
+            if (currentPageIndex >= numPages) {
+                updateCurrentPageIndex(z ? 0 : numPages - 1);
+                currentPositionIndex = currentPageIndex;
+            }
+        }
+        if (numPages < 2) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(this, View.GONE);
+        } else if (getVisibility() != View.INVISIBLE) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(this, View.VISIBLE);
+        }
+        requestLayout();
+        invalidate();
+    }
+
+    public final void updateCurrentPageIndex(int i) {
+        if (i == currentPageIndex) {
+            return;
+        }
+        currentPageIndex = i;
+        setContentDescription(getContext().getString(R.string.accessibility_smartspace_page, currentPageIndex + 1, numPages));
+    }
+
+    public PagerDots(Context context) {
+        this(context, null);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/SmallHash.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/SmallHash.java
new file mode 100644
index 0000000000000..6975c387c6f99
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/SmallHash.java
@@ -0,0 +1,9 @@
+package com.google.android.systemui.smartspace;
+
+import java.util.Objects;
+
+public abstract class SmallHash {
+    public static int hash(String str) {
+        return Math.abs(Math.floorMod(Objects.hashCode(str), 8192));
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/SmartspaceCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/SmartspaceCard.java
new file mode 100644
index 0000000000000..1e09ce1e73a81
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/SmartspaceCard.java
@@ -0,0 +1,22 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.view.View;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+public interface SmartspaceCard {
+    void bindData(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo, boolean usePageIndicatorUi);
+
+    BcSmartspaceCardLoggingInfo getLoggingInfo();
+
+    View getView();
+
+    void setDozeAmount(float dozeAmount);
+
+    void setPrimaryTextColor(int color);
+
+    void setScreenOn(boolean screenOn);
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/TouchDelegateComposite.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/TouchDelegateComposite.java
new file mode 100644
index 0000000000000..90c5b51037db9
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/TouchDelegateComposite.java
@@ -0,0 +1,34 @@
+package com.google.android.systemui.smartspace;
+
+import android.graphics.Rect;
+import android.view.MotionEvent;
+import android.view.TouchDelegate;
+
+import com.google.android.systemui.smartspace.uitemplate.BaseTemplateCard;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public final class TouchDelegateComposite extends TouchDelegate {
+    public ArrayList mDelegates;
+
+    public TouchDelegateComposite(Rect rect, BaseTemplateCard baseTemplateCard) {
+        super(rect, baseTemplateCard);
+        mDelegates = new ArrayList();
+    }
+
+    @Override
+    public final boolean onTouchEvent(MotionEvent motionEvent) {
+        float x = motionEvent.getX();
+        float y = motionEvent.getY();
+        Iterator it = mDelegates.iterator();
+        while (it.hasNext()) {
+            TouchDelegate touchDelegate = (TouchDelegate) it.next();
+            motionEvent.setLocation(x, y);
+            if (touchDelegate.onTouchEvent(motionEvent)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceDataProvider.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceDataProvider.java
new file mode 100644
index 0000000000000..e2cd81cb3af5c
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceDataProvider.java
@@ -0,0 +1,86 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.content.Context;
+import android.os.Debug;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.android.systemui.res.R;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public final class WeatherSmartspaceDataProvider implements BcSmartspaceDataPlugin {
+    public static final boolean DEBUG = Log.isLoggable("WeatherSSDataProvider", Log.DEBUG);
+    public final Set<SmartspaceTargetListener> mSmartspaceTargetListeners = new HashSet<>();
+    public final List<SmartspaceTarget> mSmartspaceTargets = new ArrayList<>();
+    public final EventNotifierProxy mEventNotifier = new EventNotifierProxy();
+
+    @Override
+    public final BcSmartspaceDataPlugin.SmartspaceEventNotifier getEventNotifier() {
+        return mEventNotifier;
+    }
+
+    @Override
+    public final BcSmartspaceDataPlugin.SmartspaceView getLargeClockView(Context context) {
+        View view = LayoutInflater.from(context).inflate(R.layout.weather_large, (ViewGroup) null, false);
+        view.setId(R.id.weather_smartspace_view_large);
+        return (BcSmartspaceDataPlugin.SmartspaceView) view;
+    }
+
+    @Override
+    public final BcSmartspaceDataPlugin.SmartspaceView getView(Context context) {
+        return (BcSmartspaceDataPlugin.SmartspaceView) LayoutInflater.from(context).inflate(R.layout.weather, (ViewGroup) null, false);
+    }
+
+    @Override
+    public void onTargetsAvailable(List<SmartspaceTarget> targets) {
+        if (DEBUG) {
+            Log.d(
+                    "WeatherSSDataProvider",
+                    this
+                            + " onTargetsAvailable called. Callers = "
+                            + android.os.Debug.getCallers(3));
+            Log.d("WeatherSSDataProvider", " targets.size() = " + targets.size());
+            Log.d("WeatherSSDataProvider", " targets = " + targets.toString());
+        }
+
+        mSmartspaceTargets.clear();
+        for (SmartspaceTarget target : targets) {
+            if (target.getFeatureType() == 1) {
+                mSmartspaceTargets.add(target);
+            }
+        }
+
+        mSmartspaceTargetListeners.forEach(
+                listener -> listener.onSmartspaceTargetsUpdated(mSmartspaceTargets));
+    }
+
+    @Override
+    public final void registerListener(BcSmartspaceDataPlugin.SmartspaceTargetListener listener) {
+        mSmartspaceTargetListeners.add(listener);
+        listener.onSmartspaceTargetsUpdated(mSmartspaceTargets);
+    }
+
+    @Override
+    public final void setEventDispatcher(BcSmartspaceDataPlugin.SmartspaceEventDispatcher eventDispatcher) {
+        mEventNotifier.eventDispatcher = eventDispatcher;
+    }
+
+    @Override
+    public final void setIntentStarter(BcSmartspaceDataPlugin.IntentStarter intentStarter) {
+        mEventNotifier.intentStarterRef = intentStarter;
+    }
+
+    @Override
+    public final void unregisterListener(BcSmartspaceDataPlugin.SmartspaceTargetListener listener) {
+        mSmartspaceTargetListeners.remove(listener);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceView.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceView.java
new file mode 100644
index 0000000000000..182b350dc331b
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/WeatherSmartspaceView.java
@@ -0,0 +1,280 @@
+package com.google.android.systemui.smartspace;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.TapAction;
+import android.app.smartspace.uitemplatedata.Text;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.internal.graphics.ColorUtils;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLogger;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.utils.ContentDescriptionUtil;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+public class WeatherSmartspaceView extends LinearLayout implements BcSmartspaceDataPlugin.SmartspaceTargetListener, BcSmartspaceDataPlugin.SmartspaceView {
+    public static final boolean DEBUG = Log.isLoggable("WeatherSmartspaceView", Log.DEBUG);
+    public final ContentObserver mAodSettingsObserver;
+    public Handler mBgHandler;
+    public BcSmartspaceDataPlugin mDataProvider;
+    public float mDozeAmount;
+    public final DoubleShadowIconDrawable mIconDrawable;
+    public final int mIconSize;
+    public boolean mIsAodEnabled;
+    public BcSmartspaceCardLoggingInfo mLoggingInfo;
+    public View.OnClickListener mOnClickListener;
+    public int mPrimaryTextColor;
+    public final boolean mRemoveTextDescent;
+    public final int mTextDescentExtraPadding;
+    public String mUiSurface;
+    public DoubleShadowTextView mView;
+
+    public WeatherSmartspaceView(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    public final void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        
+        if (TextUtils.equals(mUiSurface, BcSmartspaceDataPlugin.UI_SURFACE_LOCK_SCREEN_AOD)) {
+            try {
+                if (mBgHandler == null) {
+                    throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+                }
+
+                mBgHandler.post(() -> {
+                    getContext().getContentResolver().registerContentObserver(
+                        Settings.Secure.getUriFor("doze_always_on"), 
+                        false, 
+                        mAodSettingsObserver, 
+                        -1
+                    );
+                });
+            } catch (Exception e) {
+                Log.w("WeatherSmartspaceView", "Unable to register DOZE_ALWAYS_ON content observer: ", e);
+            }
+
+            mIsAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+        }
+
+        if (mDataProvider != null) {
+            mDataProvider.registerListener(this);
+        }
+    }
+
+    @Override
+    public final void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        
+        if (mBgHandler == null) {
+            throw new IllegalStateException("Must set background handler to avoid making binder calls on main thread");
+        }
+
+        mBgHandler.post(() -> {
+            getContext().getContentResolver().unregisterContentObserver(mAodSettingsObserver);
+        });
+
+        if (mDataProvider != null) {
+            mDataProvider.unregisterListener(this);
+        }
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mView = findViewById(R.id.weather_text_view);
+    }
+
+    @Override
+    public final void onSmartspaceTargetsUpdated(List<? extends Parcelable> targets) {
+        List<SmartspaceTarget> smartspaceTargets =
+                targets.stream()
+                        .filter(t -> t instanceof SmartspaceTarget)
+                        .map(t -> (SmartspaceTarget) t)
+                        .collect(java.util.stream.Collectors.toList());
+        if (smartspaceTargets.size() > 1) {
+            return;
+        }
+        if (smartspaceTargets.isEmpty() && TextUtils.equals(mUiSurface, BcSmartspaceDataPlugin.UI_SURFACE_DREAM)) {
+            return;
+        }
+        if (smartspaceTargets.isEmpty()) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mView, View.GONE);
+            return;
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(mView, View.VISIBLE);
+        SmartspaceTarget target = smartspaceTargets.get(0);
+        if (target.getFeatureType() != 1) {
+            return;
+        }
+        boolean hasValidTemplate = BcSmartspaceCardLoggerUtil.containsValidTemplateType(target.getTemplateData());
+        if (hasValidTemplate || target.getHeaderAction() != null) {
+            BcSmartspaceCardLoggingInfo.Builder builder =
+                    new BcSmartspaceCardLoggingInfo.Builder()
+                            .setInstanceId(InstanceId.create(target))
+                            .setFeatureType(target.getFeatureType())
+                            .setDisplaySurface(
+                                    BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount))
+                            .setUid(-1)
+                            .setDimensionalInfo(
+                                    BcSmartspaceCardLoggerUtil.createDimensionalLoggingInfo(
+                                            target.getTemplateData()));
+            mLoggingInfo = new BcSmartspaceCardLoggingInfo(builder);
+            if (!hasValidTemplate) {
+                SmartspaceAction headerAction = target.getHeaderAction();
+                if (headerAction == null) {
+                    Log.d("WeatherSmartspaceView", "Passed-in header action is null");
+                } else {
+                    mView.setText(headerAction.getTitle().toString());
+                    mView.setCompoundDrawablesRelative(null, null, null, null);
+                    mIconDrawable.setIcon(BcSmartSpaceUtil.getIconDrawableWithCustomSize(headerAction.getIcon(), getContext(), mIconSize));
+                    mView.setCompoundDrawablesRelative(mIconDrawable, null, null, null);
+                    ContentDescriptionUtil.setFormattedContentDescription("WeatherSmartspaceView", mView, headerAction.getTitle(), headerAction.getContentDescription());
+                    if (!TextUtils.equals(mUiSurface, BcSmartspaceDataPlugin.UI_SURFACE_DREAM)) {
+                        BcSmartSpaceUtil.setOnClickListener(mView, target, headerAction, mDataProvider != null ? mDataProvider.getEventNotifier() : null, "WeatherSmartspaceView", mLoggingInfo, 0);
+                    }
+                }
+            } else if (target.getTemplateData() != null) {
+                BaseTemplateData.SubItemInfo subItemInfo = target.getTemplateData().getSubtitleItem();
+                if (subItemInfo == null) {
+                    Log.d("WeatherSmartspaceView", "Passed-in item info is null");
+                } else {
+                    BcSmartspaceTemplateDataUtils.setText(mView, subItemInfo.getText());
+                    mView.setCompoundDrawablesRelative(null, null, null, null);
+                    if (subItemInfo.getIcon() != null) {
+                        mIconDrawable.setIcon(BcSmartSpaceUtil.getIconDrawableWithCustomSize(subItemInfo.getIcon().getIcon(), getContext(), mIconSize));
+                        mView.setCompoundDrawablesRelative(mIconDrawable, null, null, null);
+                    }
+                    ContentDescriptionUtil.setFormattedContentDescription("WeatherSmartspaceView", mView, SmartspaceUtils.isEmpty(subItemInfo.getText()) ? "" : subItemInfo.getText().getText(), subItemInfo.getIcon() != null ? subItemInfo.getIcon().getContentDescription() : "");
+                    if (subItemInfo.getTapAction() != null && !TextUtils.equals(mUiSurface, BcSmartspaceDataPlugin.UI_SURFACE_DREAM)) {
+                        BcSmartSpaceUtil.setOnClickListener(mView, target, subItemInfo.getTapAction(), mDataProvider != null ? mDataProvider.getEventNotifier() : null, "WeatherSmartspaceView", mLoggingInfo, 0);
+                    }
+                }
+            }
+            if (mRemoveTextDescent) {
+                mView.setPaddingRelative(0, 0, 0, mTextDescentExtraPadding - ((int) Math.floor(mView.getPaint().getFontMetrics().descent)));
+            }
+        }
+    }
+
+    @Override
+    public final void registerDataProvider(BcSmartspaceDataPlugin dataProvider) {
+        if (mDataProvider != null) {
+            mDataProvider.unregisterListener(this);
+        }
+        mDataProvider = dataProvider;
+        if (isAttachedToWindow()) {
+            mDataProvider.registerListener(this);
+        }
+    }
+
+    @Override
+    public final void setBgHandler(Handler handler) {
+        mBgHandler = handler;
+    }
+
+    @Override
+    public final void setDozeAmount(float dozeAmount) {
+        mDozeAmount = dozeAmount;
+        mView.setTextColor(ColorUtils.blendARGB(mPrimaryTextColor, -1, dozeAmount));
+        int loggingSurface = BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount);
+        if (mLoggingInfo == null || loggingSurface == -1) {
+            return;
+        }
+        if (loggingSurface != 3 || mIsAodEnabled) {
+            if (DEBUG) {
+                Log.d("WeatherSmartspaceView", "@" + Integer.toHexString(hashCode()) + ", setDozeAmount: Logging SMARTSPACE_CARD_SEEN, loggingSurface = " + loggingSurface);
+            }
+
+            BcSmartspaceCardLoggingInfo.Builder builder =
+                    new BcSmartspaceCardLoggingInfo.Builder()
+                            .setInstanceId(mLoggingInfo.mInstanceId)
+                            .setFeatureType(mLoggingInfo.mFeatureType)
+                            .setDisplaySurface(loggingSurface)
+                            .setUid(mLoggingInfo.mUid);
+            BcSmartspaceCardLogger.log(
+                    BcSmartspaceEvent.SMARTSPACE_CARD_SEEN, new BcSmartspaceCardLoggingInfo(builder));
+        }
+    }
+
+    @Override
+    public final void setFalsingManager(FalsingManager falsingManager) {
+        BcSmartSpaceUtil.sFalsingManager = falsingManager;
+    }
+
+    @Override
+    public final void setOnClickListener(View.OnClickListener listener) {
+        super.setOnClickListener(listener);
+        mOnClickListener = listener;
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        mPrimaryTextColor = color;
+        mView.setTextColor(ColorUtils.blendARGB(color, -1, mDozeAmount));
+    }
+
+    @Override
+    public final void setUiSurface(String uiSurface) {
+        if (isAttachedToWindow()) {
+            throw new IllegalStateException("Must call before attaching view to window.");
+        }
+        mUiSurface = uiSurface;
+    }
+
+    public WeatherSmartspaceView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public WeatherSmartspaceView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mUiSurface = null;
+        mDozeAmount = 0.0f;
+        mLoggingInfo = null;
+        mAodSettingsObserver = new ContentObserver(new Handler()) {
+            @Override
+            public final void onChange(boolean selfChange) {
+                boolean isAodEnabled = Settings.Secure.getIntForUser(getContext().getContentResolver(), "doze_always_on", 0, getContext().getUserId()) == 1;
+                if (mIsAodEnabled == isAodEnabled) {
+                    return;
+                }
+                mIsAodEnabled = isAodEnabled;
+            }
+        };
+        context.getTheme().applyStyle(R.style.Smartspace, false);
+        TypedArray obtainStyledAttributes = context.getTheme().obtainStyledAttributes(attrs, R.styleable.WeatherSmartspaceView, 0, 0);
+        try {
+            int iconSize = obtainStyledAttributes.getDimensionPixelSize(1, context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size));
+            int iconInset = obtainStyledAttributes.getDimensionPixelSize(0, context.getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_inset));
+            mRemoveTextDescent = obtainStyledAttributes.getBoolean(2, false);
+            mTextDescentExtraPadding = obtainStyledAttributes.getDimensionPixelSize(3, 0);
+            obtainStyledAttributes.recycle();
+            mIconSize = iconSize;
+            mIconDrawable = new DoubleShadowIconDrawable(iconSize, iconInset, context);
+        } catch (Throwable th) {
+            obtainStyledAttributes.recycle();
+            throw th;
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/dagger/SmartspaceStartableModule.kt b/packages/SystemUI/src/com/google/android/systemui/smartspace/dagger/SmartspaceStartableModule.kt
new file mode 100644
index 0000000000000..d705344b0c61f
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/dagger/SmartspaceStartableModule.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2025 auroraOSP
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.systemui.smartspace.dagger
+
+import com.android.systemui.CoreStartable
+import com.google.android.systemui.smartspace.KeyguardSmartspaceStartable
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+interface SmartspaceStartableModule {
+    @Binds
+    @IntoMap
+    @ClassKey(KeyguardSmartspaceStartable::class)
+    fun bindKeyguardSmartspaceStartable(impl: KeyguardSmartspaceStartable): CoreStartable
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLogger.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLogger.java
new file mode 100644
index 0000000000000..e97ab7600d53d
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLogger.java
@@ -0,0 +1,80 @@
+package com.google.android.systemui.smartspace.logging;
+
+import android.util.StatsEvent;
+import android.util.StatsLog;
+
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.smartspace.SmartspaceProtoLite;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceEvent;
+import com.google.protobuf.nano.MessageNano;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class BcSmartspaceCardLogger {
+    static {
+        FalsingManager falsingManager = BcSmartSpaceUtil.sFalsingManager;
+    }
+
+    public static void log(BcSmartspaceEvent event, BcSmartspaceCardLoggingInfo loggingInfo) {
+        byte[] subcardsData = null;
+        byte[] dimensionalInfoData = null;
+
+        BcSmartspaceSubcardLoggingInfo subcardInfo = loggingInfo.mSubcardInfo;
+        if (subcardInfo != null
+                && subcardInfo.mSubcards != null
+                && !subcardInfo.mSubcards.isEmpty()) {
+            List<SmartspaceProtoLite.SmartSpaceCardMetadata> subcardMetadataList =
+                    new ArrayList<>();
+            for (BcSmartspaceCardMetadataLoggingInfo metadata : subcardInfo.mSubcards) {
+                SmartspaceProtoLite.SmartSpaceCardMetadata.Builder builder =
+                        SmartspaceProtoLite.SmartSpaceCardMetadata.newBuilder();
+                builder.setInstanceId(metadata.mInstanceId);
+                builder.setCardTypeId(metadata.mCardTypeId);
+                subcardMetadataList.add(builder.build());
+            }
+
+            SmartspaceProtoLite.SmartSpaceSubcards.Builder subcardsBuilder =
+                    SmartspaceProtoLite.SmartSpaceSubcards.newBuilder();
+            subcardsBuilder.setClickedSubcardIndex(subcardInfo.mClickedSubcardIndex);
+            subcardsBuilder.addAllSubcards(subcardMetadataList);
+            SmartspaceProtoLite.SmartSpaceSubcards subcards = subcardsBuilder.build();
+            subcardsData = subcards.toByteArray();
+        }
+
+        if (loggingInfo.mDimensionalInfo != null) {
+            dimensionalInfoData = MessageNano.toByteArray(loggingInfo.mDimensionalInfo);
+        }
+
+        StatsEvent.Builder statsBuilder = StatsEvent.newBuilder();
+        statsBuilder.setAtomId(0x160);
+        statsBuilder.writeInt(event.getId());
+        statsBuilder.writeInt(loggingInfo.mInstanceId);
+        statsBuilder.writeInt(0);
+        statsBuilder.writeInt(loggingInfo.mDisplaySurface);
+        statsBuilder.writeInt(loggingInfo.mRank);
+        statsBuilder.writeInt(loggingInfo.mCardinality);
+        statsBuilder.writeInt(loggingInfo.mFeatureType);
+        statsBuilder.writeInt(loggingInfo.mUid);
+        statsBuilder.addBooleanAnnotation((byte) 1, true);
+        statsBuilder.writeInt(0);
+        statsBuilder.writeInt(0);
+        statsBuilder.writeInt(loggingInfo.mReceivedLatency);
+
+        if (subcardsData == null) {
+            subcardsData = new byte[0];
+        }
+        statsBuilder.writeByteArray(subcardsData);
+
+        if (dimensionalInfoData == null) {
+            dimensionalInfoData = new byte[0];
+        }
+        statsBuilder.writeByteArray(dimensionalInfoData);
+
+        statsBuilder.usePooledBuffer();
+        StatsEvent statsEvent = statsBuilder.build();
+        StatsLog.write(statsEvent);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggerUtil.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggerUtil.java
new file mode 100644
index 0000000000000..35160fcaf5c88
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggerUtil.java
@@ -0,0 +1,130 @@
+package com.google.android.systemui.smartspace.logging;
+
+import android.app.smartspace.SmartspaceAction;
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.os.Bundle;
+
+import com.android.systemui.smartspace.nano.SmartspaceProto;
+
+import com.google.android.systemui.smartspace.InstanceId;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class BcSmartspaceCardLoggerUtil {
+    public static boolean containsValidTemplateType(BaseTemplateData data) {
+        return (data == null || data.getTemplateType() == 0 || data.getTemplateType() == 8) ? false : true;
+    }
+
+    public static SmartspaceProto.SmartspaceCardDimensionalInfo createDimensionalLoggingInfo(BaseTemplateData data) {
+        if (data == null || data.getPrimaryItem() == null || data.getPrimaryItem().getTapAction() == null) {
+            return null;
+        }
+
+        Bundle extras = data.getPrimaryItem().getTapAction().getExtras();
+        List<SmartspaceProto.SmartspaceFeatureDimension> dimensions = new ArrayList<>();
+
+        if (extras != null && !extras.isEmpty()) {
+            ArrayList<Integer> ids = extras.getIntegerArrayList("ss_card_dimension_ids");
+            ArrayList<Integer> values = extras.getIntegerArrayList("ss_card_dimension_values");
+            if (ids != null && values != null && ids.size() == values.size()) {
+                for (int i = 0; i < ids.size(); i++) {
+                    SmartspaceProto.SmartspaceFeatureDimension dimension = new SmartspaceProto.SmartspaceFeatureDimension();
+                    dimension.featureDimensionId = ids.get(i);
+                    dimension.featureDimensionValue = values.get(i);
+                    dimensions.add(dimension);
+                }
+            }
+        }
+
+        if (dimensions.isEmpty()) {
+            return null;
+        }
+
+        SmartspaceProto.SmartspaceCardDimensionalInfo info = new SmartspaceProto.SmartspaceCardDimensionalInfo();
+        info.featureDimensions = dimensions.toArray(new SmartspaceProto.SmartspaceFeatureDimension[dimensions.size()]);
+        return info;
+    }
+
+    public static BcSmartspaceSubcardLoggingInfo createSubcardLoggingInfo(SmartspaceTarget target) {
+        if (target.getBaseAction() == null || target.getBaseAction().getExtras() == null || target.getBaseAction().getExtras().isEmpty() || target.getBaseAction().getExtras().getInt("subcardType", -1) == -1) {
+            return null;
+        }
+
+        int instanceId = InstanceId.create(target.getBaseAction().getExtras().getString("subcardId"));
+        int cardTypeId = target.getBaseAction().getExtras().getInt("subcardType");
+
+        BcSmartspaceCardMetadataLoggingInfo.Builder builder =
+                new BcSmartspaceCardMetadataLoggingInfo.Builder();
+        builder.mInstanceId = instanceId;
+        builder.mCardTypeId = cardTypeId;
+
+        BcSmartspaceCardMetadataLoggingInfo metadata =
+                new BcSmartspaceCardMetadataLoggingInfo(builder);
+        List<BcSmartspaceCardMetadataLoggingInfo> subcards = new ArrayList<>();
+        subcards.add(metadata);
+
+        BcSmartspaceSubcardLoggingInfo subcardInfo = new BcSmartspaceSubcardLoggingInfo();
+        subcardInfo.mSubcards = subcards;
+        subcardInfo.mClickedSubcardIndex = 0;
+        return subcardInfo;
+    }
+
+    public static void createSubcardLoggingInfoHelper(
+            List<BcSmartspaceCardMetadataLoggingInfo> subcards,
+            BaseTemplateData.SubItemInfo subItemInfo) {
+        if (subItemInfo != null && subItemInfo.getLoggingInfo() != null) {
+            BaseTemplateData.SubItemLoggingInfo loggingInfo = subItemInfo.getLoggingInfo();
+            BcSmartspaceCardMetadataLoggingInfo.Builder builder =
+                    new BcSmartspaceCardMetadataLoggingInfo.Builder();
+            builder.mCardTypeId = loggingInfo.getFeatureType();
+            builder.mInstanceId = loggingInfo.getInstanceId();
+            subcards.add(new BcSmartspaceCardMetadataLoggingInfo(builder));
+        }
+    }
+
+    public static void tryForcePrimaryFeatureTypeOrUpdateLogInfoFromTemplateData(BcSmartspaceCardLoggingInfo loggingInfo, BaseTemplateData data) {
+        if (loggingInfo.mFeatureType == 1) {
+            loggingInfo.mFeatureType = 39;
+            loggingInfo.mInstanceId = InstanceId.create("date_card_794317_92634");
+            return;
+        }
+        if (data == null || data.getPrimaryItem() == null || data.getPrimaryItem().getLoggingInfo() == null) {
+            return;
+        }
+        int featureType = data.getPrimaryItem().getLoggingInfo().getFeatureType();
+        if (featureType > 0) {
+            loggingInfo.mFeatureType = featureType;
+        }
+        int instanceId = data.getPrimaryItem().getLoggingInfo().getInstanceId();
+        if (instanceId > 0) {
+            loggingInfo.mInstanceId = instanceId;
+        }
+    }
+
+    public static BcSmartspaceSubcardLoggingInfo createSubcardLoggingInfo(BaseTemplateData data) {
+        if (data == null) {
+            return null;
+        }
+
+        List<BcSmartspaceCardMetadataLoggingInfo> subcards = new ArrayList<>();
+
+        if (data.getPrimaryItem() != null && data.getPrimaryItem().getLoggingInfo() != null && data.getPrimaryItem().getLoggingInfo().getFeatureType() == 1) {
+            createSubcardLoggingInfoHelper(subcards, data.getPrimaryItem());
+        }
+
+        createSubcardLoggingInfoHelper(subcards, data.getSubtitleItem());
+        createSubcardLoggingInfoHelper(subcards, data.getSubtitleSupplementalItem());
+        createSubcardLoggingInfoHelper(subcards, data.getSupplementalLineItem());
+
+        if (subcards.isEmpty()) {
+            return null;
+        }
+
+        BcSmartspaceSubcardLoggingInfo subcardInfo = new BcSmartspaceSubcardLoggingInfo();
+        subcardInfo.mSubcards = subcards;
+        subcardInfo.mClickedSubcardIndex = 0;
+        return subcardInfo;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggingInfo.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggingInfo.java
new file mode 100644
index 0000000000000..0ee3d6cb87a64
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardLoggingInfo.java
@@ -0,0 +1,112 @@
+package com.google.android.systemui.smartspace.logging;
+
+import com.android.systemui.smartspace.nano.SmartspaceProto;
+
+import java.util.Objects;
+
+public final class BcSmartspaceCardLoggingInfo {
+    public int mInstanceId;
+    public int mDisplaySurface;
+    public int mRank;
+    public int mCardinality;
+    public int mFeatureType;
+    public int mReceivedLatency;
+    public int mUid;
+    public BcSmartspaceSubcardLoggingInfo mSubcardInfo;
+    public SmartspaceProto.SmartspaceCardDimensionalInfo mDimensionalInfo;
+
+    public static final class Builder {
+        public int mInstanceId;
+        public int mDisplaySurface = 1;
+        public int mRank;
+        public int mCardinality;
+        public int mFeatureType;
+        public int mReceivedLatency;
+        public int mUid;
+        public BcSmartspaceSubcardLoggingInfo mSubcardInfo;
+        public SmartspaceProto.SmartspaceCardDimensionalInfo mDimensionalInfo;
+
+        public Builder() {}
+
+        public Builder setInstanceId(int instanceId) {
+            this.mInstanceId = instanceId;
+            return this;
+        }
+
+        public Builder setDisplaySurface(int displaySurface) {
+            this.mDisplaySurface = displaySurface;
+            return this;
+        }
+
+        public Builder setRank(int rank) {
+            this.mRank = rank;
+            return this;
+        }
+
+        public Builder setCardinality(int cardinality) {
+            this.mCardinality = cardinality;
+            return this;
+        }
+
+        public Builder setFeatureType(int featureType) {
+            this.mFeatureType = featureType;
+            return this;
+        }
+
+        public Builder setReceivedLatency(int receivedLatency) {
+            this.mReceivedLatency = receivedLatency;
+            return this;
+        }
+
+        public Builder setUid(int uid) {
+            this.mUid = uid;
+            return this;
+        }
+
+        public Builder setSubcardInfo(BcSmartspaceSubcardLoggingInfo subcardInfo) {
+            this.mSubcardInfo = subcardInfo;
+            return this;
+        }
+
+        public Builder setDimensionalInfo(
+                SmartspaceProto.SmartspaceCardDimensionalInfo dimensionalInfo) {
+            this.mDimensionalInfo = dimensionalInfo;
+            return this;
+        }
+
+        public BcSmartspaceCardLoggingInfo build() {
+            return new BcSmartspaceCardLoggingInfo(this);
+        }
+    }
+
+    public BcSmartspaceCardLoggingInfo(Builder builder) {
+        this.mInstanceId = builder.mInstanceId;
+        this.mDisplaySurface = builder.mDisplaySurface;
+        this.mRank = builder.mRank;
+        this.mCardinality = builder.mCardinality;
+        this.mFeatureType = builder.mFeatureType;
+        this.mReceivedLatency = builder.mReceivedLatency;
+        this.mUid = builder.mUid;
+        this.mSubcardInfo = builder.mSubcardInfo;
+        this.mDimensionalInfo = builder.mDimensionalInfo;
+    }
+
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof BcSmartspaceCardLoggingInfo)) {
+            return false;
+        }
+        BcSmartspaceCardLoggingInfo other = (BcSmartspaceCardLoggingInfo) obj;
+        return mInstanceId == other.mInstanceId && mDisplaySurface == other.mDisplaySurface && mRank == other.mRank && mCardinality == other.mCardinality && mFeatureType == other.mFeatureType && mReceivedLatency == other.mReceivedLatency && mUid == other.mUid && Objects.equals(mSubcardInfo, other.mSubcardInfo) && Objects.equals(mDimensionalInfo, other.mDimensionalInfo);
+    }
+
+    public final int hashCode() {
+        return Objects.hash(mInstanceId, mDisplaySurface, mRank, mCardinality, mFeatureType, mReceivedLatency, mUid, mSubcardInfo);
+    }
+
+    public final String toString() {
+        return "instance_id = " + mInstanceId + ", feature type = " + mFeatureType + ", display surface = " + mDisplaySurface + ", rank = " + mRank + ", cardinality = " + mCardinality + ", receivedLatencyMillis = " + mReceivedLatency + ", uid = " + mUid + ", subcardInfo = " + mSubcardInfo + ", dimensionalInfo = " + mDimensionalInfo;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardMetadataLoggingInfo.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardMetadataLoggingInfo.java
new file mode 100644
index 0000000000000..6a16e18005423
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceCardMetadataLoggingInfo.java
@@ -0,0 +1,55 @@
+package com.google.android.systemui.smartspace.logging;
+
+import java.util.Objects;
+
+public final class BcSmartspaceCardMetadataLoggingInfo {
+    public int mCardTypeId;
+    public int mInstanceId;
+
+    public BcSmartspaceCardMetadataLoggingInfo(Builder builder) {
+        this.mInstanceId = builder.mInstanceId;
+        this.mCardTypeId = builder.mCardTypeId;
+    }
+
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof BcSmartspaceCardMetadataLoggingInfo)) {
+            return false;
+        }
+        BcSmartspaceCardMetadataLoggingInfo bcSmartspaceCardMetadataLoggingInfo = (BcSmartspaceCardMetadataLoggingInfo) obj;
+        return mInstanceId == bcSmartspaceCardMetadataLoggingInfo.mInstanceId && mCardTypeId == bcSmartspaceCardMetadataLoggingInfo.mCardTypeId;
+    }
+
+    public final int hashCode() {
+        return Objects.hash(mInstanceId, mCardTypeId);
+    }
+
+    public String toString() {
+        return "BcSmartspaceCardMetadataLoggingInfo{mInstanceId="
+                + mInstanceId
+                + ", mCardTypeId="
+                + mCardTypeId
+                + "}";
+    }
+
+    public static final class Builder {
+        public int mCardTypeId;
+        public int mInstanceId;
+
+        public Builder setCardTypeId(int cardTypeId) {
+            this.mCardTypeId = cardTypeId;
+            return this;
+        }
+
+        public Builder setInstanceId(int instanceId) {
+            this.mInstanceId = instanceId;
+            return this;
+        }
+
+        public BcSmartspaceCardMetadataLoggingInfo build() {
+            return new BcSmartspaceCardMetadataLoggingInfo(this);
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceSubcardLoggingInfo.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceSubcardLoggingInfo.java
new file mode 100644
index 0000000000000..01a6df58e9254
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/logging/BcSmartspaceSubcardLoggingInfo.java
@@ -0,0 +1,32 @@
+package com.google.android.systemui.smartspace.logging;
+
+import java.util.List;
+import java.util.Objects;
+
+public final class BcSmartspaceSubcardLoggingInfo {
+    public int mClickedSubcardIndex;
+    public List<BcSmartspaceCardMetadataLoggingInfo> mSubcards;
+
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof BcSmartspaceSubcardLoggingInfo)) {
+            return false;
+        }
+        BcSmartspaceSubcardLoggingInfo other = (BcSmartspaceSubcardLoggingInfo) obj;
+        return mClickedSubcardIndex == other.mClickedSubcardIndex && Objects.equals(mSubcards, other.mSubcards);
+    }
+
+    public final int hashCode() {
+        return Objects.hash(mSubcards, mClickedSubcardIndex);
+    }
+
+    public final String toString() {
+        return "BcSmartspaceSubcardLoggingInfo{mSubcards="
+                + mSubcards
+                + ", mClickedSubcardIndex="
+                + mClickedSubcardIndex
+                + "}";
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java
new file mode 100644
index 0000000000000..7be296cfc564a
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java
@@ -0,0 +1,501 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.TapAction;
+import android.app.smartspace.uitemplatedata.Text;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.TouchDelegate;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.animation.PathInterpolator;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
+import com.android.app.animation.Interpolators;
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+import com.android.systemui.plugins.FalsingManager;
+import com.android.systemui.smartspace.nano.SmartspaceProto;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.DoubleShadowIconDrawable;
+import com.google.android.systemui.smartspace.DoubleShadowTextView;
+import com.google.android.systemui.smartspace.IcuDateTextView;
+import com.google.android.systemui.smartspace.SmartspaceCard;
+import com.google.android.systemui.smartspace.TouchDelegateComposite;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardMetadataLoggingInfo;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceSubcardLoggingInfo;
+import com.google.android.systemui.smartspace.utils.ContentDescriptionUtil;
+
+import com.android.systemui.res.R;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class BaseTemplateCard extends ConstraintLayout implements SmartspaceCard {
+    public Handler mBgHandler;
+    public IcuDateTextView mDateView;
+    public float mDozeAmount;
+    public ViewGroup mExtrasGroup;
+    public int mFeatureType;
+    public int mIconTintColor;
+    public BcSmartspaceCardLoggingInfo mLoggingInfo;
+    public BcSmartspaceCardSecondary mSecondaryCard;
+    public ViewGroup mSecondaryCardPane;
+    public boolean mShouldShowPageIndicator;
+    public DoubleShadowTextView mSubtitleAqiChipView;
+    public ViewGroup mSubtitleGroup;
+    public Rect mSubtitleHitRect;
+    public Rect mSubtitleSupplementalHitRect;
+    public DoubleShadowTextView mSubtitleSupplementalView;
+    public DoubleShadowTextView mSubtitleTextView;
+    public DoubleShadowTextView mSupplementalLineTextView;
+    public SmartspaceTarget mTarget;
+    public BaseTemplateData mTemplateData;
+    public ViewGroup mTextGroup;
+    public DoubleShadowTextView mTitleTextView;
+    public final TouchDelegateComposite mTouchDelegateComposite;
+    public boolean mTouchDelegateIsDirty;
+    public String mUiSurface;
+    public boolean mValidSecondaryCard;
+
+    public BaseTemplateCard(Context context) {
+        this(context, null);
+    }
+
+    public static boolean shouldTint(BaseTemplateData.SubItemInfo subItemInfo) {
+        if (subItemInfo == null || subItemInfo.getIcon() == null) {
+            return false;
+        }
+        return subItemInfo.getIcon().shouldTint();
+    }
+
+    @Override
+    public final void bindData(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo, boolean shouldShowPageIndicator) {
+        mTarget = null;
+        mTemplateData = null;
+        mFeatureType = 0;
+        mLoggingInfo = null;
+        setOnClickListener(null);
+        setClickable(false);
+        if (mDateView != null) {
+            mDateView.setOnClickListener(null);
+            mDateView.setClickable(false);
+        }
+        resetTextView(mTitleTextView);
+        resetTextView(mSubtitleAqiChipView);
+        resetTextView(mSubtitleTextView);
+        resetTextView(mSubtitleSupplementalView);
+        resetTextView(mSupplementalLineTextView);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mTitleTextView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSubtitleGroup, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSubtitleAqiChipView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSubtitleTextView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSubtitleSupplementalView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondaryCardPane, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mExtrasGroup, View.GONE);
+        mTarget = target;
+        mTemplateData = target.getTemplateData();
+        mFeatureType = target.getFeatureType();
+        mLoggingInfo = loggingInfo;
+        mShouldShowPageIndicator = shouldShowPageIndicator;
+        mValidSecondaryCard = false;
+        if (mTextGroup != null) {
+            mTextGroup.setTranslationX(0.0f);
+        }
+        if (mTemplateData == null) {
+            return;
+        }
+        mLoggingInfo = getLoggingInfo();
+        if (mSecondaryCard != null) {
+            Log.i("SsBaseTemplateCard", "Secondary card is not null");
+            mSecondaryCard.reset(target.getSmartspaceTargetId());
+            mValidSecondaryCard = mSecondaryCard.setSmartspaceActions(target, eventNotifier, mLoggingInfo);
+        }
+        if (mSecondaryCardPane != null) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mSecondaryCardPane, (mDozeAmount == 1.0f || !mValidSecondaryCard) ? View.GONE : View.VISIBLE);
+        }
+        if (mDateView == null) {
+            Log.d("SsBaseTemplateCard", "No date view can be set up");
+        } else {
+            if (TextUtils.isEmpty(mDateView.getText())) {
+                Log.d("SsBaseTemplateCard", "Date view text is empty");
+            }
+            TapAction tapAction = new TapAction.Builder((mTemplateData.getPrimaryItem() == null || mTemplateData.getPrimaryItem().getTapAction() == null) ? UUID.randomUUID().toString() : mTemplateData.getPrimaryItem().getTapAction().getId().toString()).setIntent(BcSmartSpaceUtil.getOpenCalendarIntent()).build();
+            BcSmartSpaceUtil.setOnClickListener(this, mTarget, tapAction, eventNotifier, "SsBaseTemplateCard", loggingInfo, 0);
+            BcSmartSpaceUtil.setOnClickListener(mDateView, mTarget, tapAction, eventNotifier, "SsBaseTemplateCard", loggingInfo, 0);
+        }
+        setUpTextView(mTitleTextView, mTemplateData.getPrimaryItem(), eventNotifier, mDateView == null);
+        setUpTextView(mSubtitleTextView, mTemplateData.getSubtitleItem(), eventNotifier, true);
+        setUpTextView(mSubtitleSupplementalView, mTemplateData.getSubtitleSupplementalItem(), eventNotifier, true);
+        setUpTextView(mSupplementalLineTextView, mTemplateData.getSupplementalLineItem(), eventNotifier, true);
+        if (mExtrasGroup != null) {
+            if (mSupplementalLineTextView == null || mSupplementalLineTextView.getVisibility() != View.VISIBLE || (mShouldShowPageIndicator && mDateView == null)) {
+                BcSmartspaceTemplateDataUtils.updateVisibility(mExtrasGroup, View.GONE);
+            } else {
+                BcSmartspaceTemplateDataUtils.updateVisibility(mExtrasGroup, View.VISIBLE);
+                updateZenColors();
+            }
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSubtitleGroup, mSubtitleAqiChipView.getVisibility() != View.GONE || mSubtitleTextView.getVisibility() != View.GONE || mSubtitleSupplementalView.getVisibility() != View.GONE ? View.VISIBLE : View.GONE);
+        if (target.getFeatureType() == 1 && mSubtitleSupplementalView != null && mSubtitleSupplementalView.getVisibility() == View.VISIBLE) {
+            mSubtitleTextView.setEllipsize(null);
+        }
+        if (mDateView == null && mTemplateData.getPrimaryItem() != null && mTemplateData.getPrimaryItem().getTapAction() != null) {
+            BcSmartSpaceUtil.setOnClickListener(this, target, mTemplateData.getPrimaryItem().getTapAction(), eventNotifier, "SsBaseTemplateCard", mLoggingInfo, 0);
+            if (mDateView == null && mTitleTextView != null && mTitleTextView.getVisibility() == View.VISIBLE && mSubtitleTextView != null && mSubtitleTextView.getVisibility() == View.VISIBLE && mTemplateData.getPrimaryItem() != null && mTemplateData.getPrimaryItem().getTapAction() != null && mTemplateData.getSubtitleItem() != null && mTemplateData.getSubtitleItem().getTapAction() != null) {
+                if (mTemplateData.getPrimaryItem().getTapAction().getIntent() != null && !mTemplateData.getPrimaryItem().getTapAction().getIntent().filterEquals(mTemplateData.getSubtitleItem().getTapAction().getIntent())) {
+                    Log.d("SsBaseTemplateCard", "Primary item tapAction intent = " + mTemplateData.getPrimaryItem().getTapAction().getIntent());
+                    Log.d("SsBaseTemplateCard", "Subtitle item tapAction intent = " + mTemplateData.getSubtitleItem().getTapAction().getIntent());
+                } else if (mTemplateData.getPrimaryItem().getTapAction().getPendingIntent() == null || mTemplateData.getPrimaryItem().getTapAction().getPendingIntent().equals(mTemplateData.getSubtitleItem().getTapAction().getPendingIntent())) {
+                    mTitleTextView.setOnClickListener(null);
+                    mTitleTextView.setClickable(false);
+                    mSubtitleTextView.setOnClickListener(null);
+                    mSubtitleTextView.setClickable(false);
+                } else {
+                    Log.d("SsBaseTemplateCard", "Primary item tapAction pendingIntent = " + mTemplateData.getPrimaryItem().getTapAction().getPendingIntent());
+                    Log.d("SsBaseTemplateCard", "Subtitle item tapAction pendingIntent = " + mTemplateData.getSubtitleItem().getTapAction().getPendingIntent());
+                }
+            }
+        }
+        if (mSecondaryCardPane == null) {
+            Log.i("SsBaseTemplateCard", "Secondary card pane is null");
+            return;
+        }
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mSecondaryCardPane.getLayoutParams();
+        params.matchConstraintMaxWidth = getWidth() / 2;
+        mSecondaryCardPane.setLayoutParams(params);
+        mTouchDelegateIsDirty = true;
+    }
+
+    @Override
+    public final AccessibilityNodeInfo createAccessibilityNodeInfo() {
+        AccessibilityNodeInfo info = super.createAccessibilityNodeInfo();
+        AccessibilityNodeInfoCompat.wrap(info).setRoleDescription(" ");
+        return info;
+    }
+
+    @Override
+    public final BcSmartspaceCardLoggingInfo getLoggingInfo() {
+        if (mLoggingInfo != null) {
+            return mLoggingInfo;
+        }
+        BcSmartspaceCardLoggingInfo.Builder builder =
+                new BcSmartspaceCardLoggingInfo.Builder()
+                        .setDisplaySurface(
+                                BcSmartSpaceUtil.getLoggingDisplaySurface(mUiSurface, mDozeAmount))
+                        .setFeatureType(mFeatureType)
+                        .setUid(-1);
+        builder.setDimensionalInfo(
+                BcSmartspaceCardLoggerUtil.createDimensionalLoggingInfo(mTarget.getTemplateData()));
+        return new BcSmartspaceCardLoggingInfo(builder);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        setPaddingRelative(getResources().getDimensionPixelSize(R.dimen.non_remoteviews_card_padding_start), getPaddingTop(), getPaddingEnd(), getPaddingBottom());
+        mTextGroup = findViewById(R.id.text_group);
+        mSecondaryCardPane = findViewById(R.id.secondary_card_group);
+        mDateView = findViewById(R.id.date);
+        mTitleTextView = findViewById(R.id.title_text);
+        mSubtitleGroup = findViewById(R.id.smartspace_subtitle_group);
+        mSubtitleAqiChipView = findViewById(R.id.subtitle_aqi_chip);
+        mSubtitleTextView = findViewById(R.id.subtitle_text);
+        mSubtitleSupplementalView = findViewById(R.id.base_action_icon_subtitle);
+        mExtrasGroup = findViewById(R.id.smartspace_extras_group);
+        if (mSubtitleTextView != null) {
+            mSubtitleHitRect = new Rect();
+        }
+        if (mSubtitleSupplementalView != null) {
+            mSubtitleSupplementalHitRect = new Rect();
+        }
+        if (mSubtitleTextView != null || mSubtitleSupplementalView != null) {
+            setTouchDelegate(mTouchDelegateComposite);
+        }
+        if (mExtrasGroup != null) {
+            mSupplementalLineTextView = mExtrasGroup.findViewById(R.id.supplemental_line_text);
+        }
+        if (mBgHandler != null) {
+            mDateView.mBgHandler = mBgHandler;
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        if (!changed && !mTouchDelegateIsDirty) {
+            return;
+        }
+        mTouchDelegateIsDirty = false;
+        TouchDelegate touchDelegate = getTouchDelegate();
+        if (touchDelegate == null || !(touchDelegate instanceof TouchDelegateComposite)) {
+            return;
+        }
+        TouchDelegateComposite composite = (TouchDelegateComposite) touchDelegate;
+        composite.mDelegates.clear();
+        if (mSubtitleGroup == null || mSubtitleGroup.getVisibility() != View.VISIBLE) {
+            return;
+        }
+        boolean subtitleTextVisible = mSubtitleTextView != null 
+                && mSubtitleTextView.getVisibility() == View.VISIBLE
+                && mSubtitleTextView.hasOnClickListeners();
+        boolean subtitleSupplementalVisible = mSubtitleSupplementalView != null
+                && mSubtitleSupplementalView.getVisibility() == View.VISIBLE
+                && mSubtitleSupplementalView.hasOnClickListeners();
+        if (!subtitleTextVisible && !subtitleSupplementalVisible) {
+            return;
+        }
+        int padding =
+                getResources().getDimensionPixelSize(R.dimen.subtitle_hit_rect_height)
+                        - mSubtitleGroup.getHeight();
+        padding = Math.max(padding / 2, 0);
+        if (padding <= 0 && mSubtitleGroup.getBottom() == getHeight()) {
+            return;
+        }
+        if (subtitleTextVisible) {
+            mSubtitleTextView.getHitRect(mSubtitleHitRect);
+            offsetDescendantRectToMyCoords(mSubtitleGroup, mSubtitleHitRect);
+            if (padding > 0) {
+                mSubtitleHitRect.top -= padding;
+            }
+            mSubtitleHitRect.bottom = getBottom();
+            composite.mDelegates.add(new TouchDelegate(mSubtitleHitRect, mSubtitleTextView));
+        }
+        if (subtitleSupplementalVisible) {
+            mSubtitleSupplementalView.getHitRect(mSubtitleSupplementalHitRect);
+            offsetDescendantRectToMyCoords(mSubtitleGroup, mSubtitleSupplementalHitRect);
+            if (padding > 0) {
+                mSubtitleSupplementalHitRect.top -= padding;
+            }
+            mSubtitleSupplementalHitRect.bottom = getBottom();
+            composite.mDelegates.add(
+                    new TouchDelegate(mSubtitleSupplementalHitRect, mSubtitleSupplementalView));
+        }
+    }
+
+    public final void resetTextView(DoubleShadowTextView textView) {
+        if (textView == null) {
+            return;
+        }
+        textView.setCompoundDrawablesRelative(null, null, null, null);
+        textView.setOnClickListener(null);
+        textView.setClickable(false);
+        textView.setContentDescription(null);
+        textView.setText((CharSequence) null);
+        textView.setTranslationX(0.0f);
+    }
+
+    @Override
+    public final void setDozeAmount(float dozeAmount) {
+        mDozeAmount = dozeAmount;
+        if (mTarget != null && mTarget.getBaseAction() != null && mTarget.getBaseAction().getExtras() != null) {
+            Bundle extras = mTarget.getBaseAction().getExtras();
+            if (mTitleTextView != null && extras.getBoolean("hide_title_on_aod")) {
+                mTitleTextView.setAlpha(1.0f - dozeAmount);
+            }
+            if (mSubtitleTextView != null && extras.getBoolean("hide_subtitle_on_aod")) {
+                mSubtitleTextView.setAlpha(1.0f - dozeAmount);
+            }
+        }
+        if (mTextGroup == null) {
+            return;
+        }
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondaryCardPane, (mDozeAmount == 1.0f || !mValidSecondaryCard) ? View.GONE : View.VISIBLE);
+        if (mSecondaryCardPane == null || mSecondaryCardPane.getVisibility() == View.GONE) {
+            mTextGroup.setTranslationX(0.0f);
+            return;
+        }
+        mTextGroup.setTranslationX(((PathInterpolator) Interpolators.EMPHASIZED).getInterpolation(mDozeAmount) * mSecondaryCardPane.getWidth() * (isRtl() ? 1 : -1));
+        mSecondaryCardPane.setAlpha(Math.max(0.0f, Math.min(1.0f, ((1.0f - mDozeAmount) * 9.0f) - 6.0f)));
+    }
+
+    @Override
+    public final void setPrimaryTextColor(int color) {
+        mIconTintColor = color;
+        if (mTitleTextView != null) {
+            mTitleTextView.setTextColor(color);
+            if (mTemplateData != null) {
+                updateTextViewIconTint(mTitleTextView, shouldTint(mTemplateData.getPrimaryItem()));
+            }
+        }
+        if (mDateView != null) {
+            mDateView.setTextColor(color);
+        }
+        if (mSubtitleAqiChipView != null) {
+            mSubtitleAqiChipView.setTextColor(color);
+        }
+        if (mSubtitleTextView != null) {
+            mSubtitleTextView.setTextColor(color);
+            if (mTemplateData != null) {
+                updateTextViewIconTint(mSubtitleTextView, shouldTint(mTemplateData.getSubtitleItem()));
+            }
+        }
+        if (mSubtitleSupplementalView != null) {
+            mSubtitleSupplementalView.setTextColor(color);
+            if (mTemplateData != null) {
+                updateTextViewIconTint(mSubtitleSupplementalView, shouldTint(mTemplateData.getSubtitleSupplementalItem()));
+            }
+        }
+        updateZenColors();
+    }
+
+    @Override
+    public final void setScreenOn(boolean screenOn) {
+        if (mDateView != null) {
+            mDateView.mIsInteractive = screenOn;
+            mDateView.rescheduleTicker();
+        }
+    }
+    public final void setSecondaryCard(BcSmartspaceCardSecondary secondaryCard) {
+        if (mSecondaryCardPane == null) {
+            return;
+        }
+        mSecondaryCard = secondaryCard;
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondaryCardPane, View.GONE);
+        mSecondaryCardPane.removeAllViews();
+        if (secondaryCard != null) {
+            ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_card_height));
+            params.setMarginStart(getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_secondary_card_start_margin));
+            params.startToStart = 0;
+            params.topToTop = 0;
+            params.bottomToBottom = 0;
+            mSecondaryCardPane.addView(secondaryCard, params);
+        }
+    }
+
+    public final void setUpTextView(DoubleShadowTextView textView, BaseTemplateData.SubItemInfo subItemInfo, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, boolean z) {
+        if (textView == null) {
+            Log.d("SsBaseTemplateCard", "No text view can be set up");
+            return;
+        }
+        resetTextView(textView);
+        if (subItemInfo == null) {
+            Log.d("SsBaseTemplateCard", "Passed-in item info is null");
+            BcSmartspaceTemplateDataUtils.updateVisibility(textView, View.GONE);
+            return;
+        }
+        Text text = subItemInfo.getText();
+        BcSmartspaceTemplateDataUtils.setText(textView, subItemInfo.getText());
+        if (!SmartspaceUtils.isEmpty(text)) {
+            textView.setTextColor(this.mIconTintColor);
+        }
+        Icon icon = subItemInfo.getIcon();
+        if (mSubtitleAqiChipView == textView) {
+            if (icon != null) {
+                Bitmap bitmap = icon.getIcon().getType() == 1 ? icon.getIcon().getBitmap() : null;
+                int pixel =
+                        bitmap != null
+                                ? icon.getIcon()
+                                        .getBitmap()
+                                        .getPixel(bitmap.getWidth() / 2, bitmap.getHeight() / 2)
+                                : 0;
+                if (pixel == 0) {
+                    Log.w("SsBaseTemplateCard", "Failed to get chip color from icon");
+                }
+                textView.getBackground().setTint(pixel);
+                ContentDescriptionUtil.setFormattedContentDescription(
+                        "SsBaseTemplateCard",
+                        textView,
+                        SmartspaceUtils.isEmpty(text) ? "" : text.getText(),
+                        icon.getContentDescription());
+            }
+        } else if (icon != null) {
+            DoubleShadowIconDrawable drawable = new DoubleShadowIconDrawable(getContext());
+            drawable.setIcon(BcSmartSpaceUtil.getIconDrawableWithCustomSize(icon.getIcon(), getContext(), getContext().getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_icon_size)));
+            textView.setCompoundDrawablesRelative(drawable, null, null, null);
+            ContentDescriptionUtil.setFormattedContentDescription("SsBaseTemplateCard", textView, SmartspaceUtils.isEmpty(text) ? "" : text.getText(), icon.getContentDescription());
+            updateTextViewIconTint(textView, icon.shouldTint());
+            if (z) {
+                BcSmartspaceTemplateDataUtils.offsetTextViewForIcon(textView, drawable, isRtl());
+            }
+        }
+        int subCardRank = 0;
+        BcSmartspaceTemplateDataUtils.updateVisibility(textView, View.VISIBLE);
+        TapAction tapAction = subItemInfo.getTapAction();
+        if (mLoggingInfo != null && mLoggingInfo.mSubcardInfo != null && mLoggingInfo.mSubcardInfo.mSubcards != null && !mLoggingInfo.mSubcardInfo.mSubcards.isEmpty() && subItemInfo.getLoggingInfo() != null) {
+            int targetFeatureType = subItemInfo.getLoggingInfo().getFeatureType();
+            if (targetFeatureType != mLoggingInfo.mFeatureType) {
+                for (int i = 0; i < mLoggingInfo.mSubcardInfo.mSubcards.size(); i++) {
+                    BcSmartspaceCardMetadataLoggingInfo subCard =
+                            mLoggingInfo.mSubcardInfo.mSubcards.get(i);
+                    if (subCard.mInstanceId == subItemInfo.getLoggingInfo().getInstanceId()
+                            && subCard.mCardTypeId == targetFeatureType) {
+                        subCardRank = i + 1;
+                        break;
+                    }
+                }
+            }
+        }
+        BcSmartSpaceUtil.setOnClickListener(textView, mTarget, tapAction, eventNotifier, "SsBaseTemplateCard", mLoggingInfo, subCardRank);
+    }
+
+    public final void updateTextViewIconTint(DoubleShadowTextView textView, boolean shouldTint) {
+        for (Drawable drawable : textView.getCompoundDrawablesRelative()) {
+            if (drawable != null) {
+                if (shouldTint) {
+                    drawable.setTint(mIconTintColor);
+                } else {
+                    drawable.setTintList(null);
+                }
+            }
+        }
+    }
+
+    public final void updateZenColors() {
+        if (mSupplementalLineTextView != null) {
+            mSupplementalLineTextView.setTextColor(mIconTintColor);
+            if (BcSmartspaceCardLoggerUtil.containsValidTemplateType(mTemplateData)) {
+                updateTextViewIconTint(mSupplementalLineTextView, shouldTint(mTemplateData.getSupplementalLineItem()));
+            }
+        }
+    }
+
+    public BaseTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mSecondaryCard = null;
+        mFeatureType = 0;
+        mLoggingInfo = null;
+        mIconTintColor = GraphicsUtils.getAttrColor(context, android.R.attr.textColorPrimary);
+        mTextGroup = null;
+        mSecondaryCardPane = null;
+        mDateView = null;
+        mTitleTextView = null;
+        mSubtitleGroup = null;
+        mSubtitleAqiChipView = null;
+        mSubtitleTextView = null;
+        mSubtitleSupplementalView = null;
+        mSubtitleHitRect = null;
+        mSubtitleSupplementalHitRect = null;
+        mExtrasGroup = null;
+        mSupplementalLineTextView = null;
+        mTouchDelegateComposite = new TouchDelegateComposite(new Rect(), this);
+        mTouchDelegateIsDirty = false;
+        context.getTheme().applyStyle(R.style.Smartspace, false);
+        setDefaultFocusHighlightEnabled(false);
+    }
+
+    @Override
+    public final View getView() {
+        return this;
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java
new file mode 100644
index 0000000000000..2840b63ba5aa3
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java
@@ -0,0 +1,133 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.CarouselTemplateData;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Constraints;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+public class CarouselTemplateCard extends BcSmartspaceCardSecondary {
+    public CarouselTemplateCard(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        ConstraintLayout[] columns = new ConstraintLayout[4];
+        for (int i = 0; i < 4; i++) {
+            ConstraintLayout column = (ConstraintLayout) ViewGroup.inflate(getContext(), R.layout.smartspace_carousel_column_template_card, null);
+            column.setId(View.generateViewId());
+            columns[i] = column;
+        }
+        for (int i = 0; i < 4; i++) {
+            Constraints.LayoutParams params = new Constraints.LayoutParams(-2, 0);
+            ConstraintLayout prevColumn = i > 0 ? columns[i - 1] : null;
+            ConstraintLayout nextColumn = i < 3 ? columns[i + 1] : null;
+            if (i == 0) {
+                params.startToStart = 0;
+                params.horizontalChainStyle = 1;
+            } else {
+                params.startToEnd = prevColumn.getId();
+            }
+            if (i == 3) {
+                params.endToEnd = 0;
+            } else {
+                params.endToStart = nextColumn.getId();
+            }
+            params.topToTop = 0;
+            params.bottomToBottom = 0;
+            addView(columns[i], params);
+        }
+    }
+
+    @Override
+    public final void resetUi() {
+        for (int i = 0; i < getChildCount(); i++) {
+            View column = getChildAt(i);
+            BcSmartspaceTemplateDataUtils.updateVisibility(column.findViewById(R.id.upper_text), View.GONE);
+            BcSmartspaceTemplateDataUtils.updateVisibility(column.findViewById(R.id.icon), View.GONE);
+            BcSmartspaceTemplateDataUtils.updateVisibility(column.findViewById(R.id.lower_text), View.GONE);
+        }
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        CarouselTemplateData templateData = (CarouselTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData) || templateData.getCarouselItems() == null) {
+            Log.w("CarouselTemplateCard", "CarouselTemplateData is null or has no CarouselItem or invalid template type");
+            return false;
+        }
+        List<CarouselTemplateData.CarouselItem> carouselItems = templateData.getCarouselItems();
+        long validItemsCount =
+                carouselItems.stream()
+                        .filter(
+                                item ->
+                                        item.getImage() != null
+                                                && item.getLowerText() != null
+                                                && item.getUpperText() != null)
+                        .count();
+        int validItems = (int) validItemsCount;
+        if (validItems < 4) {
+            Log.w("CarouselTemplateCard", "Hiding " + (4 - validItems) + " incomplete column(s).");
+            for (int i = 0; i < 4; i++) {
+                BcSmartspaceTemplateDataUtils.updateVisibility(getChildAt(i), i <= (3 - (4 - validItems)) ? View.VISIBLE : View.GONE);
+            }
+            ((ConstraintLayout.LayoutParams) ((ConstraintLayout) getChildAt(0)).getLayoutParams()).horizontalChainStyle = (4 - validItems) == 0 ? 1 : 0;
+        }
+        for (int i = 0; i < validItems; i++) {
+            TextView upperText = getChildAt(i).findViewById(R.id.upper_text);
+            ImageView icon = getChildAt(i).findViewById(R.id.icon);
+            TextView lowerText = getChildAt(i).findViewById(R.id.lower_text);
+            BcSmartspaceTemplateDataUtils.setText(upperText, ((CarouselTemplateData.CarouselItem) carouselItems.get(i)).getUpperText());
+            BcSmartspaceTemplateDataUtils.updateVisibility(upperText, View.VISIBLE);
+            BcSmartspaceTemplateDataUtils.setIcon(icon, ((CarouselTemplateData.CarouselItem) carouselItems.get(i)).getImage());
+            BcSmartspaceTemplateDataUtils.updateVisibility(icon, View.VISIBLE);
+            BcSmartspaceTemplateDataUtils.setText(lowerText, ((CarouselTemplateData.CarouselItem) carouselItems.get(i)).getLowerText());
+            BcSmartspaceTemplateDataUtils.updateVisibility(lowerText, View.VISIBLE);
+        }
+        if (templateData.getCarouselAction() != null) {
+            BcSmartSpaceUtil.setOnClickListener(this, target, templateData.getCarouselAction(), eventNotifier, "CarouselTemplateCard", loggingInfo, 0);
+        }
+        for (CarouselTemplateData.CarouselItem item : templateData.getCarouselItems()) {
+            if (item.getTapAction() != null) {
+                BcSmartSpaceUtil.setOnClickListener(this, target, item.getTapAction(), eventNotifier, "CarouselTemplateCard", loggingInfo, 0);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        for (int i = 0; i < getChildCount(); i++) {
+            View column = getChildAt(i);
+            TextView upperText = column.findViewById(R.id.upper_text);
+            upperText.setTextColor(color);
+            TextView lowerText = column.findViewById(R.id.lower_text);
+            lowerText.setTextColor(color);
+        }
+    }
+
+    public CarouselTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java
new file mode 100644
index 0000000000000..7f29aeeea58e3
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java
@@ -0,0 +1,106 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.CombinedCardsTemplateData;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+
+public class CombinedCardsTemplateCard extends BcSmartspaceCardSecondary {
+    public ConstraintLayout mFirstSubCard;
+    public ConstraintLayout mSecondSubCard;
+
+    public CombinedCardsTemplateCard(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mFirstSubCard = findViewById(R.id.first_sub_card_container);
+        mSecondSubCard = findViewById(R.id.second_sub_card_container);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstSubCard, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondSubCard, View.GONE);
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        reset(target.getSmartspaceTargetId());
+        CombinedCardsTemplateData templateData = (CombinedCardsTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData) || templateData.getCombinedCardDataList().isEmpty()) {
+            Log.w("CombinedCardsTemplateCard", "TemplateData is null or empty or invalid template type");
+            return false;
+        }
+        List<BaseTemplateData> combinedCardDataList = templateData.getCombinedCardDataList();
+        BaseTemplateData firstCardData = combinedCardDataList.get(0);
+        BaseTemplateData secondCardData = combinedCardDataList.size() > 1 ? combinedCardDataList.get(1) : null;
+        return setupSubCard(mFirstSubCard, firstCardData, target, eventNotifier, loggingInfo) && (secondCardData == null || setupSubCard(mSecondSubCard, secondCardData, target, eventNotifier, loggingInfo));
+    }
+
+    @Override
+    public void setTextColor(int color) {
+        if (mFirstSubCard.getChildCount() > 0) {
+            BcSmartspaceCardSecondary firstSubCard =
+                    (BcSmartspaceCardSecondary) mFirstSubCard.getChildAt(0);
+            firstSubCard.setTextColor(color);
+        }
+        if (mSecondSubCard.getChildCount() > 0) {
+            BcSmartspaceCardSecondary secondSubCard =
+                    (BcSmartspaceCardSecondary) mSecondSubCard.getChildAt(0);
+            secondSubCard.setTextColor(color);
+        }
+    }
+
+    public final boolean setupSubCard(ViewGroup container, BaseTemplateData templateData, SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        if (templateData == null) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(container, View.GONE);
+            Log.w("CombinedCardsTemplateCard", "Sub-card templateData is null or empty");
+            return false;
+        }
+        Integer subCardResId =
+                BcSmartspaceTemplateDataUtils.TEMPLATE_TYPE_TO_SECONDARY_CARD_RES.get(
+                        templateData.getTemplateType());
+        if (subCardResId == 0) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(container, View.GONE);
+            Log.w("CombinedCardsTemplateCard", "Combined sub-card res is null. Cannot set it up");
+            return false;
+        }
+        BcSmartspaceCardSecondary subCard = (BcSmartspaceCardSecondary) LayoutInflater.from(container.getContext()).inflate(subCardResId, container, false);
+        subCard.setSmartspaceActions(new SmartspaceTarget.Builder(target.getSmartspaceTargetId(), target.getComponentName(), target.getUserHandle()).setTemplateData(templateData).build(), eventNotifier, loggingInfo);
+        container.removeAllViews();
+        ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT, getResources().getDimensionPixelSize(R.dimen.enhanced_smartspace_card_height));
+        params.startToStart = 0;
+        params.endToEnd = 0;
+        params.topToTop = 0;
+        params.bottomToBottom = 0;
+        BcSmartspaceTemplateDataUtils.updateVisibility(subCard, View.VISIBLE);
+        container.addView(subCard, params);
+        BcSmartspaceTemplateDataUtils.updateVisibility(container, View.VISIBLE);
+        return true;
+    }
+
+    public CombinedCardsTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java
new file mode 100644
index 0000000000000..df4366053bb4d
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java
@@ -0,0 +1,147 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.HeadToHeadTemplateData;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.Text;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class HeadToHeadTemplateCard extends BcSmartspaceCardSecondary {
+    public ImageView mFirstCompetitorIcon;
+    public TextView mFirstCompetitorText;
+    public TextView mHeadToHeadTitle;
+    public ImageView mSecondCompetitorIcon;
+    public TextView mSecondCompetitorText;
+
+    public HeadToHeadTemplateCard(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mHeadToHeadTitle = findViewById(R.id.head_to_head_title);
+        mFirstCompetitorText = findViewById(R.id.first_competitor_text);
+        mSecondCompetitorText = findViewById(R.id.second_competitor_text);
+        mFirstCompetitorIcon = findViewById(R.id.first_competitor_icon);
+        mSecondCompetitorIcon = findViewById(R.id.second_competitor_icon);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mHeadToHeadTitle, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorText, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorText, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorIcon, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorIcon, View.GONE);
+    }
+
+    @Override
+    public boolean setSmartspaceActions(
+            SmartspaceTarget target,
+            BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier,
+            BcSmartspaceCardLoggingInfo loggingInfo) {
+        HeadToHeadTemplateData templateData = (HeadToHeadTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData)) {
+            Log.w(
+                    "HeadToHeadTemplateCard",
+                    "HeadToHeadTemplateData is null or invalid template type");
+            return false;
+        }
+
+        boolean isValid = false;
+
+        Text title = templateData.getHeadToHeadTitle();
+        if (title != null) {
+            if (mHeadToHeadTitle == null) {
+                Log.w("HeadToHeadTemplateCard", "No head-to-head title view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.setText(mHeadToHeadTitle, title);
+                BcSmartspaceTemplateDataUtils.updateVisibility(mHeadToHeadTitle, View.VISIBLE);
+                isValid = true;
+            }
+        }
+
+        Text firstCompetitorText = templateData.getHeadToHeadFirstCompetitorText();
+        if (firstCompetitorText != null) {
+            if (mFirstCompetitorText == null) {
+                Log.w("HeadToHeadTemplateCard", "No first competitor text view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.setText(mFirstCompetitorText, firstCompetitorText);
+                BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorText, View.VISIBLE);
+                isValid = true;
+            }
+        }
+
+        Text secondCompetitorText = templateData.getHeadToHeadSecondCompetitorText();
+        if (secondCompetitorText != null) {
+            if (mSecondCompetitorText == null) {
+                Log.w("HeadToHeadTemplateCard", "No second competitor text view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.setText(mSecondCompetitorText, secondCompetitorText);
+                BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorText, View.VISIBLE);
+                isValid = true;
+            }
+        }
+
+        Icon firstCompetitorIcon = templateData.getHeadToHeadFirstCompetitorIcon();
+        if (firstCompetitorIcon != null) {
+            if (mFirstCompetitorIcon == null) {
+                Log.w("HeadToHeadTemplateCard", "No first competitor icon view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.setIcon(mFirstCompetitorIcon, firstCompetitorIcon);
+                BcSmartspaceTemplateDataUtils.updateVisibility(mFirstCompetitorIcon, View.VISIBLE);
+                isValid = true;
+            }
+        }
+
+        Icon secondCompetitorIcon = templateData.getHeadToHeadSecondCompetitorIcon();
+        if (secondCompetitorIcon != null) {
+            if (mSecondCompetitorIcon == null) {
+                Log.w("HeadToHeadTemplateCard", "No second competitor icon view to update");
+            } else {
+                BcSmartspaceTemplateDataUtils.setIcon(mSecondCompetitorIcon, secondCompetitorIcon);
+                BcSmartspaceTemplateDataUtils.updateVisibility(mSecondCompetitorIcon, View.VISIBLE);
+                isValid = true;
+            }
+        }
+
+        if (isValid && templateData.getHeadToHeadAction() != null) {
+            BcSmartSpaceUtil.setOnClickListener(
+                    this,
+                    target,
+                    templateData.getHeadToHeadAction(),
+                    eventNotifier,
+                    "HeadToHeadTemplateCard",
+                    loggingInfo,
+                    0);
+        }
+
+        return isValid;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        mFirstCompetitorText.setTextColor(color);
+        mSecondCompetitorText.setTextColor(color);
+    }
+
+    public HeadToHeadTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java
new file mode 100644
index 0000000000000..ae01d4e987ae5
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java
@@ -0,0 +1,95 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.SmartspaceUtils;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.SubCardTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+public class SubCardTemplateCard extends BcSmartspaceCardSecondary {
+    public ImageView mImageView;
+    public TextView mTextView;
+
+    public SubCardTemplateCard(Context context) {
+        super(context);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mImageView = findViewById(R.id.image_view);
+        mTextView = findViewById(R.id.card_prompt);
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.GONE);
+        BcSmartspaceTemplateDataUtils.updateVisibility(mTextView, View.GONE);
+    }
+
+    @Override
+    public boolean setSmartspaceActions(
+            SmartspaceTarget target,
+            BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier,
+            BcSmartspaceCardLoggingInfo loggingInfo) {
+        SubCardTemplateData templateData = (SubCardTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData)) {
+            Log.w("SubCardTemplateCard", "SubCardTemplateData is null or invalid template type");
+            return false;
+        }
+
+        boolean isValid = false;
+
+        Icon subCardIcon = templateData.getSubCardIcon();
+        if (subCardIcon != null) {
+            BcSmartspaceTemplateDataUtils.setIcon(mImageView, subCardIcon);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mImageView, View.VISIBLE);
+            isValid = true;
+        }
+
+        Text subCardText = templateData.getSubCardText();
+        if (!SmartspaceUtils.isEmpty(subCardText)) {
+            BcSmartspaceTemplateDataUtils.setText(mTextView, subCardText);
+            BcSmartspaceTemplateDataUtils.updateVisibility(mTextView, View.VISIBLE);
+            isValid = true;
+        }
+
+        if (isValid && templateData.getSubCardAction() != null) {
+            BcSmartSpaceUtil.setOnClickListener(
+                    this,
+                    target,
+                    templateData.getSubCardAction(),
+                    eventNotifier,
+                    "SubCardTemplateCard",
+                    loggingInfo,
+                    0);
+        }
+
+        return isValid;
+    }
+
+    @Override
+    public void setTextColor(int color) {
+        mTextView.setTextColor(color);
+    }
+
+    public SubCardTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java
new file mode 100644
index 0000000000000..785a47e9b02fc
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java
@@ -0,0 +1,263 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.SubImageTemplateData;
+import android.app.smartspace.uitemplatedata.TapAction;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.ImageDecoder;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon.OnDrawableLoadedListener;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.invoke.VarHandle;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+public class SubImageTemplateCard extends BcSmartspaceCardSecondary {
+    private static final String TAG = "SubImageTemplateCard";
+    
+    public final Handler mHandler;
+    public final Map<String, Drawable> mIconDrawableCache;
+    public final int mImageHeight;
+    public ImageView mImageView;
+
+    public SubImageTemplateCard(Context context) {
+        this(context, null);
+    }
+
+    public SubImageTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mIconDrawableCache = new HashMap<>();
+        mHandler = new Handler();
+        mImageHeight = getResources().getDimensionPixelOffset(R.dimen.enhanced_smartspace_card_height);
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mImageView = findViewById(R.id.image_view);
+    }
+
+    @Override
+    public final void resetUi() {
+        if (mIconDrawableCache != null) {
+            mIconDrawableCache.clear();
+        }
+        if (mImageView != null) {
+            mImageView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
+            mImageView.setImageDrawable(null);
+            mImageView.setBackgroundTintList(null);
+        }
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, 
+                                              BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, 
+                                              BcSmartspaceCardLoggingInfo loggingInfo) {
+        
+        SubImageTemplateData templateData = (SubImageTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData) || 
+            templateData.getSubImages() == null || templateData.getSubImages().isEmpty()) {
+            Log.w(TAG, "SubImageTemplateData is null or has no SubImage or invalid template type");
+            return false;
+        }
+
+        List<Icon> subImages = templateData.getSubImages();
+        TapAction tapAction = templateData.getSubImageAction();
+
+        if (mImageView == null) {
+            Log.w(TAG, "No image view can be updated. Skipping background update...");
+        } else if (tapAction != null && tapAction.getExtras() != null) {
+            Bundle extras = tapAction.getExtras();
+            String dimensionRatio = extras.getString("imageDimensionRatio", "");
+            if (!TextUtils.isEmpty(dimensionRatio)) {
+                mImageView.getLayoutParams().width = 0;
+                ((ConstraintLayout.LayoutParams) mImageView.getLayoutParams()).dimensionRatio = dimensionRatio;
+            }
+            if (extras.getBoolean("shouldShowBackground", false)) {
+                mImageView.setBackgroundTintList(ColorStateList.valueOf(
+                        getContext().getColor(R.color.smartspace_button_background)));
+            }
+        }
+
+        int frameDurationMillis = (tapAction != null && tapAction.getExtras() != null) 
+                    ? tapAction.getExtras().getInt("GifFrameDurationMillis", 200) 
+                    : 200;
+
+        ContentResolver contentResolver = getContext().getApplicationContext().getContentResolver();
+        TreeMap<Integer, Drawable> frameMap = new TreeMap<>();
+        WeakReference<ImageView> imageViewRef = new WeakReference<>(mImageView);
+        String prevTargetId = mPrevSmartspaceTargetId;
+
+        for (int i = 0; i < subImages.size(); i++) {
+            int index = i;
+            Icon subImage = subImages.get(i);
+            if (subImage == null || subImage.getIcon() == null) continue;
+
+            android.graphics.drawable.Icon icon = subImage.getIcon();
+            String cacheKey = getCacheKey(icon);
+
+            OnDrawableLoadedListener listener = drawable -> {
+                if (!prevTargetId.equals(mPrevSmartspaceTargetId)) {
+                    Log.d(TAG, "SmartspaceTarget has changed. Skip the loaded result...");
+                    return;
+                }
+
+                if (drawable != null) {
+                    mIconDrawableCache.put(cacheKey, drawable);
+                    frameMap.put(index, drawable);
+                }
+
+                if (frameMap.size() == subImages.size()) {
+                    createAndStartAnimation(frameMap, frameDurationMillis, imageViewRef);
+                }
+            };
+
+            if (mIconDrawableCache.containsKey(cacheKey)) {
+                listener.onDrawableLoaded(mIconDrawableCache.get(cacheKey));
+            } else if (icon.getType() == android.graphics.drawable.Icon.TYPE_URI) {
+                DrawableWrapper wrapper = new DrawableWrapper();
+                wrapper.mUri = icon.getUri();
+                wrapper.mHeightInPx = mImageHeight;
+                wrapper.mContentResolver = contentResolver;
+                wrapper.mListener = listener;
+                new LoadUriTask().execute(wrapper);
+            } else {
+                icon.loadDrawableAsync(getContext(), listener, mHandler);
+            }
+        }
+
+        if (tapAction != null) {
+            BcSmartSpaceUtil.setOnClickListener(this, target, tapAction, 
+                    eventNotifier, TAG, loggingInfo, 0);
+        }
+
+        return true;
+    }
+
+    private String getCacheKey(android.graphics.drawable.Icon icon) {
+        StringBuilder keyBuilder = new StringBuilder().append(icon.getType());
+        switch (icon.getType()) {
+            case android.graphics.drawable.Icon.TYPE_BITMAP:
+            case android.graphics.drawable.Icon.TYPE_ADAPTIVE_BITMAP:
+                keyBuilder.append(icon.getBitmap().hashCode());
+                break;
+            case android.graphics.drawable.Icon.TYPE_RESOURCE:
+                keyBuilder.append(icon.getResPackage()).append(String.format("0x%08x", icon.getResId()));
+                break;
+            case android.graphics.drawable.Icon.TYPE_DATA:
+                keyBuilder.append(Arrays.hashCode(icon.getDataBytes()));
+                break;
+            case android.graphics.drawable.Icon.TYPE_URI:
+            case android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP:
+                keyBuilder.append(icon.getUriString());
+                break;
+        }
+        return keyBuilder.toString();
+    }
+
+    private void createAndStartAnimation(TreeMap<Integer, Drawable> drawables, int duration, WeakReference<ImageView> imageViewRef) {
+        List<Drawable> validDrawables = drawables.values().stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
+        ImageView iv = imageViewRef.get();
+        if (validDrawables.isEmpty()) {
+            Log.w(TAG, "All images failed to load. Resetting imageView");
+            if (iv != null) {
+                iv.getLayoutParams().width = -2;
+                iv.setImageDrawable(null);
+                iv.setBackgroundTintList(null);
+            }
+            return;
+        }
+
+        AnimationDrawable animationDrawable = new AnimationDrawable();
+        for (Drawable d : validDrawables) {
+            animationDrawable.addFrame(d, duration);
+        }
+
+        if (iv != null) {
+            iv.setImageDrawable(animationDrawable);
+            int intrinsicWidth = animationDrawable.getIntrinsicWidth();
+            if (iv.getLayoutParams().width != intrinsicWidth) {
+                iv.getLayoutParams().width = intrinsicWidth;
+                iv.requestLayout();
+            }
+            animationDrawable.start();
+        }
+    }
+
+    private static final class DrawableWrapper {
+        ContentResolver mContentResolver;
+        Drawable mDrawable;
+        int mHeightInPx;
+        OnDrawableLoadedListener mListener;
+        Uri mUri;
+    }
+
+    private static final class LoadUriTask extends AsyncTask<DrawableWrapper, Void, DrawableWrapper> {
+        @Override
+        protected DrawableWrapper doInBackground(DrawableWrapper... wrappers) {
+            if (wrappers.length == 0) return null;
+            DrawableWrapper wrapper = wrappers[0];
+            try (InputStream inputStream = wrapper.mContentResolver.openInputStream(wrapper.mUri)) {
+                ImageDecoder.Source source = ImageDecoder.createSource(null, inputStream);
+                
+                wrapper.mDrawable = ImageDecoder.decodeDrawable(source, (decoder, info, src) -> {
+                    decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+                    int height = info.getSize().getHeight();
+                    float ratio = height != 0 ? (float) info.getSize().getWidth() / height : 0.0f;
+                    decoder.setTargetSize((int) (wrapper.mHeightInPx * ratio), wrapper.mHeightInPx);
+                });
+            } catch (Exception e) {
+                Log.w(TAG, "Failed to load uri: " + wrapper.mUri, e);
+            }
+            return wrapper;
+        }
+
+        @Override
+        protected void onPostExecute(DrawableWrapper wrapper) {
+            if (wrapper != null && wrapper.mListener != null) {
+                wrapper.mListener.onDrawableLoaded(wrapper.mDrawable);
+            }
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java
new file mode 100644
index 0000000000000..1c365afd2c7a2
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java
@@ -0,0 +1,115 @@
+package com.google.android.systemui.smartspace.uitemplate;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.SubListTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.systemui.plugins.BcSmartspaceDataPlugin;
+
+import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
+import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
+import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
+import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
+
+import com.android.systemui.res.R;
+
+import java.util.List;
+import java.util.Locale;
+
+public class SubListTemplateCard extends BcSmartspaceCardSecondary {
+    public static final int[] LIST_ITEM_TEXT_VIEW_IDS = {R.id.list_item_1, R.id.list_item_2, R.id.list_item_3};
+    public ImageView mListIconView;
+    public final TextView[] mListItems;
+
+    public SubListTemplateCard(Context context) {
+        super(context);
+        mListItems = new TextView[3];
+    }
+
+    @Override
+    public final void onFinishInflate() {
+        super.onFinishInflate();
+        mListIconView = findViewById(R.id.list_icon);
+        for (int i = 0; i < 3; i++) {
+            mListItems[i] = findViewById(LIST_ITEM_TEXT_VIEW_IDS[i]);
+        }
+    }
+
+    @Override
+    public final void resetUi() {
+        BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, View.GONE);
+        for (int i = 0; i < 3; i++) {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mListItems[i], View.GONE);
+        }
+    }
+
+    @Override
+    public final boolean setSmartspaceActions(SmartspaceTarget target, BcSmartspaceDataPlugin.SmartspaceEventNotifier eventNotifier, BcSmartspaceCardLoggingInfo loggingInfo) {
+        reset(target.getSmartspaceTargetId());
+        SubListTemplateData templateData = (SubListTemplateData) target.getTemplateData();
+        if (!BcSmartspaceCardLoggerUtil.containsValidTemplateType(templateData)) {
+            Log.w("SubListTemplateCard", "SubListTemplateData is null or contains invalid template type");
+            return false;
+        }
+        if (templateData.getSubListIcon() != null) {
+            BcSmartspaceTemplateDataUtils.setIcon(mListIconView, templateData.getSubListIcon());
+            BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, View.VISIBLE);
+        } else {
+            BcSmartspaceTemplateDataUtils.updateVisibility(mListIconView, View.GONE);
+        }
+        if (templateData.getSubListTexts() != null) {
+            List<Text> subListTexts = templateData.getSubListTexts();
+            if (subListTexts.isEmpty()) {
+                return false;
+            }
+            for (int i = 0; i < 3; i++) {
+                TextView textView = mListItems[i];
+                if (textView == null) {
+                    Log.w(
+                            "SubListTemplateCard",
+                            String.format(
+                                    Locale.US, "Missing list item view to update at row: %d", i + 1));
+                    break;
+                }
+                if (i < subListTexts.size()) {
+                    BcSmartspaceTemplateDataUtils.setText(textView, subListTexts.get(i));
+                    BcSmartspaceTemplateDataUtils.updateVisibility(textView, View.VISIBLE);
+                } else {
+                    textView.setText("");
+                    BcSmartspaceTemplateDataUtils.updateVisibility(textView, View.GONE);
+                }
+            }
+        }
+        if (templateData.getSubListAction() != null) {
+            BcSmartSpaceUtil.setOnClickListener(this, target, templateData.getSubListAction(), eventNotifier, "SubListTemplateCard", loggingInfo, 0);
+        }
+        return true;
+    }
+
+    @Override
+    public final void setTextColor(int color) {
+        for (int i = 0; i < 3; i++) {
+            TextView textView = mListItems[i];
+            if (textView == null) {
+                Log.w(
+                        "SubListTemplateCard",
+                        String.format(
+                                Locale.US, "Missing list item view to update at row: %d", i + 1));
+                return;
+            }
+            textView.setTextColor(color);
+        }
+    }
+
+    public SubListTemplateCard(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mListItems = new TextView[3];
+    }
+}
diff --git a/packages/SystemUI/src/com/google/android/systemui/smartspace/utils/ContentDescriptionUtil.java b/packages/SystemUI/src/com/google/android/systemui/smartspace/utils/ContentDescriptionUtil.java
new file mode 100644
index 0000000000000..a80903708b617
--- /dev/null
+++ b/packages/SystemUI/src/com/google/android/systemui/smartspace/utils/ContentDescriptionUtil.java
@@ -0,0 +1,16 @@
+package com.google.android.systemui.smartspace.utils;
+
+import android.util.Log;
+import android.view.View;
+
+import com.android.systemui.res.R;
+
+import java.util.Arrays;
+
+public abstract class ContentDescriptionUtil {
+    public static final void setFormattedContentDescription(String str, View view, CharSequence charSequence, CharSequence charSequence2) {
+        CharSequence string = (charSequence == null || charSequence.length() == 0) ? charSequence2 : (charSequence2 == null || charSequence2.length() == 0) ? charSequence : view.getContext().getString(R.string.generic_smartspace_concatenated_desc, charSequence2, charSequence);
+        Log.i(str, String.format("setFormattedContentDescription: text=%s, iconDescription=%s, contentDescription=%s", Arrays.copyOf(new Object[]{charSequence, charSequence2, string}, 3)));
+        view.setContentDescription(string);
+    }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
index 8478276094043..79731097ceff5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java
@@ -87,7 +87,6 @@
 import com.android.systemui.util.time.FakeSystemClock;
 import com.android.systemui.volume.domain.interactor.VolumeDialogInteractor;
 import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
-import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;
 import com.android.systemui.volume.ui.navigation.VolumeNavigator;
 
 import com.google.android.msdl.domain.MSDLPlayer;
@@ -155,8 +154,6 @@ public class VolumeDialogImplTest extends SysuiTestCase {
     @Mock
     private VolumeNavigator mVolumeNavigator;
     @Mock
-    private VolumePanelFlag mVolumePanelFlag;
-    @Mock
     private VolumeDialogInteractor mVolumeDialogInteractor;
 
     private final CsdWarningDialog.Factory mCsdWarningDialogFactory =
@@ -222,7 +219,6 @@ public void setup() throws Exception {
                 mCsdWarningDialogFactory,
                 mPostureController,
                 mTestableLooper.getLooper(),
-                mVolumePanelFlag,
                 mDumpManager,
                 mLazySecureSettings,
                 mVibratorHelper,
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepositoryKosmos.kt
index 5ac71c73c665a..e102d1e49f34f 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepositoryKosmos.kt
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/window/data/repository/WindowRootViewBlurRepositoryKosmos.kt
@@ -29,6 +29,8 @@ class FakeWindowRootViewBlurRepository : WindowRootViewBlurRepository {
     override val blurRequestedByShade: MutableStateFlow<Float> = MutableStateFlow(0.0f)
     override val scaleRequestedByShade: MutableStateFlow<Float> = MutableStateFlow(1.0f)
     override val isBlurSupported: MutableStateFlow<Boolean> = MutableStateFlow(false)
+    override val isTranslucentSupported: MutableStateFlow<Boolean> = MutableStateFlow(false)
+    override val isLockscreenTranslucentSupported: MutableStateFlow<Boolean> = MutableStateFlow(false)
     override var blurAppliedListener: BlurAppliedListener? = null
     override val trackingShadeMotion: MutableStateFlow<Boolean> = MutableStateFlow(false)
 }
diff --git a/packages/overlays/AvoidAppsInCutoutOverlay/AndroidManifest.xml b/packages/overlays/AvoidAppsInCutoutOverlay/AndroidManifest.xml
index e63c5c3fb554b..b2775f14c4357 100644
--- a/packages/overlays/AvoidAppsInCutoutOverlay/AndroidManifest.xml
+++ b/packages/overlays/AvoidAppsInCutoutOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
             android:category="com.android.internal.display_cutout_emulation"
             android:priority="0"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/AndroidManifest.xml
index 5f7f7c9bd3e43..304ff5579b2a7 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
         android:category="com.android.internal.display_cutout_emulation"
         android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml
index 5d3385d17961d..73c5f85738512 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
         android:category="com.android.internal.display_cutout_emulation"
         android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationHoleOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationHoleOverlay/AndroidManifest.xml
index 9fd82abd6c8ca..4a58b10c0c73b 100644
--- a/packages/overlays/DisplayCutoutEmulationHoleOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationHoleOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
             android:category="com.android.internal.display_cutout_emulation"
             android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/AndroidManifest.xml
index 426aae969fd41..ff195665a05c1 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/AndroidManifest.xml
@@ -6,5 +6,5 @@
         android:category="com.android.internal.display_cutout_emulation"
         android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/AndroidManifest.xml
index 368a2d5c17eb9..cc6bba3f10d12 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
             android:category="com.android.internal.display_cutout_emulation"
             android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationWaterfallOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationWaterfallOverlay/AndroidManifest.xml
index 2d5bb14f4dd33..dff450da9912b 100644
--- a/packages/overlays/DisplayCutoutEmulationWaterfallOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationWaterfallOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
         android:category="com.android.internal.display_cutout_emulation"
         android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/AndroidManifest.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/AndroidManifest.xml
index b721efe8a7958..3549e1477337d 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/AndroidManifest.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
         android:category="com.android.internal.display_cutout_emulation"
         android:priority="1"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/FontNotoSerifSourceOverlay/AndroidManifest.xml b/packages/overlays/FontNotoSerifSourceOverlay/AndroidManifest.xml
index 54b8dbf70a672..1e84b06ac5a67 100644
--- a/packages/overlays/FontNotoSerifSourceOverlay/AndroidManifest.xml
+++ b/packages/overlays/FontNotoSerifSourceOverlay/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:category="android.theme.customization.font"
         android:priority="1"/>
 
-    <application android:label="@string/font_notoserif_source_overlay" android:hasCode="false">
+    <application android:label="@string/font_notoserif_source_overlay" android:hasCode="false" android:allowBackup="false">
         <meta-data
             android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
             android:value="serif,serif-bold,source-sans-pro,source-sans-pro-medium" />
diff --git a/packages/overlays/NavigationBarMode2ButtonOverlay/AndroidManifest.xml b/packages/overlays/NavigationBarMode2ButtonOverlay/AndroidManifest.xml
index 970380f070e9b..f5920ca1b52c1 100644
--- a/packages/overlays/NavigationBarMode2ButtonOverlay/AndroidManifest.xml
+++ b/packages/overlays/NavigationBarMode2ButtonOverlay/AndroidManifest.xml
@@ -23,5 +23,5 @@
         android:category="com.android.internal.navigation_bar_mode"
         android:priority="1"/>
 
-    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false"/>
+    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
\ No newline at end of file
diff --git a/packages/overlays/NavigationBarMode3ButtonOverlay/AndroidManifest.xml b/packages/overlays/NavigationBarMode3ButtonOverlay/AndroidManifest.xml
index 628fc1dd3aa7d..00ca9eef88055 100644
--- a/packages/overlays/NavigationBarMode3ButtonOverlay/AndroidManifest.xml
+++ b/packages/overlays/NavigationBarMode3ButtonOverlay/AndroidManifest.xml
@@ -23,5 +23,5 @@
         android:category="com.android.internal.navigation_bar_mode"
         android:priority="1"/>
 
-    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false"/>
+    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
\ No newline at end of file
diff --git a/packages/overlays/NavigationBarModeGesturalOverlay/AndroidManifest.xml b/packages/overlays/NavigationBarModeGesturalOverlay/AndroidManifest.xml
index aff82d836ae50..c33d444217e1b 100644
--- a/packages/overlays/NavigationBarModeGesturalOverlay/AndroidManifest.xml
+++ b/packages/overlays/NavigationBarModeGesturalOverlay/AndroidManifest.xml
@@ -23,5 +23,5 @@
         android:category="com.android.internal.navigation_bar_mode"
         android:priority="1"/>
 
-    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false"/>
+    <application android:label="@string/navigation_bar_mode_title" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
\ No newline at end of file
diff --git a/packages/overlays/NoCutoutOverlay/AndroidManifest.xml b/packages/overlays/NoCutoutOverlay/AndroidManifest.xml
index c6224967b9220..d1c6a00134025 100644
--- a/packages/overlays/NoCutoutOverlay/AndroidManifest.xml
+++ b/packages/overlays/NoCutoutOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
             android:category="com.android.internal.display_cutout_emulation"
             android:priority="0"/>
 
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
+    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
diff --git a/packages/overlays/NotesRoleEnabledOverlay/AndroidManifest.xml b/packages/overlays/NotesRoleEnabledOverlay/AndroidManifest.xml
index c01178d1727d9..12e78267ec92c 100644
--- a/packages/overlays/NotesRoleEnabledOverlay/AndroidManifest.xml
+++ b/packages/overlays/NotesRoleEnabledOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
     <overlay android:targetPackage="android"
         android:priority="1"/>
 
-    <application android:label="@string/notes_role_enabled_overlay_title" android:hasCode="false"/>
+    <application android:label="@string/notes_role_enabled_overlay_title" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
\ No newline at end of file
diff --git a/packages/overlays/TransparentNavigationBarOverlay/AndroidManifest.xml b/packages/overlays/TransparentNavigationBarOverlay/AndroidManifest.xml
index d69abfa2ed29c..d0f27494d0509 100644
--- a/packages/overlays/TransparentNavigationBarOverlay/AndroidManifest.xml
+++ b/packages/overlays/TransparentNavigationBarOverlay/AndroidManifest.xml
@@ -22,5 +22,5 @@
     <overlay android:targetPackage="android"
         android:priority="1"/>
 
-    <application android:label="@string/transparent_navigation_bar_title" android:hasCode="false"/>
+    <application android:label="@string/transparent_navigation_bar_title" android:hasCode="false" android:allowBackup="false"/>
 </manifest>
\ No newline at end of file
diff --git a/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
index 75d07bb80c05a..145742cff9754 100644
--- a/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
+++ b/packages/services/CameraExtensionsProxy/src/com/android/cameraextensions/CameraExtensionsProxyService.java
@@ -1229,8 +1229,10 @@ public ImageProcessorImplStub(ImageProcessorImpl imageProcessor) {
         public void onNextImageAvailable(OutputConfigId outputConfigId, ParcelImage img,
                 String physicalCameraId) {
             if (mImageProcessor != null) {
-                mImageProcessor.onNextImageAvailable(outputConfigId.id, img.timestamp,
-                        new ImageReferenceImpl(img), physicalCameraId);
+                ImageReferenceImpl imgRef = new ImageReferenceImpl(img);
+                mImageProcessor.onNextImageAvailable(outputConfigId.id, img.timestamp, imgRef,
+                        physicalCameraId);
+                imgRef.decrement();
             }
         }
     }
diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto
index 7ac7859f3c830..706e76268564b 100644
--- a/proto/src/metrics_constants/metrics_constants.proto
+++ b/proto/src/metrics_constants/metrics_constants.proto
@@ -7444,5 +7444,8 @@ message MetricsEvent {
     // ---- End Q Constants, all Q constants go above this line ----
     // Add new aosp constants above this line.
     // END OF AOSP CONSTANTS
+
+    // Project Matrixx
+    MATRIXX = 4000;
   }
 }
diff --git a/services/Android.bp b/services/Android.bp
index 7d3d37ca56b35..481694280bf50 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -133,6 +133,7 @@ filegroup {
         ":services.coverage-sources",
         ":services.credentials-sources",
         ":services.devicepolicy-sources",
+        ":services.freeform-sources",
         ":services.midi-sources",
         ":services.musicsearch-sources",
         ":services.net-sources",
@@ -339,6 +340,7 @@ java_library {
         "services.credentials",
         "services.devicepolicy",
         "services.flags",
+        "services.freeform",
         "services.midi",
         "services.musicsearch",
         "services.net",
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 96b24d8867e4e..8558136fec33a 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -214,6 +214,7 @@
 import com.android.server.statusbar.StatusBarManagerInternal;
 import com.android.server.utils.Slogf;
 import com.android.server.wm.ActivityTaskManagerInternal;
+import com.android.server.wm.AxSandboxService;
 import com.android.server.wm.WindowManagerInternal;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -1285,6 +1286,14 @@ public long addClient(IAccessibilityManagerClient callback, int userId) {
             final int resolvedUserId = mSecurityPolicy
                     .resolveCallingUserIdEnforcingPermissionsLocked(userId);
 
+            final int callingUid = Binder.getCallingUid();
+            String[] clientPackages = mPackageManager.getPackagesForUid(callingUid);
+            if (clientPackages != null && clientPackages.length > 0) {
+                if (AxSandboxService.get().isPackageSandboxed(clientPackages[0])) {
+                    return IntPair.of(0, 0);
+                }
+            }
+
             AccessibilityUserState userState = getUserStateLocked(resolvedUserId);
             // Support a process moving from the default device to a single virtual
             // device.
@@ -1596,6 +1605,9 @@ public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int fee
             final List<AccessibilityServiceInfo> result = new ArrayList<>(serviceCount);
             for (int i = 0; i < serviceCount; ++i) {
                 final AccessibilityServiceConnection service = services.get(i);
+                if (AxSandboxService.get().isPackageSandboxed(service.getComponentName().getPackageName())) {
+                    continue;
+                }
                 if ((service.mFeedbackType & feedbackType) != 0
                         || feedbackType == AccessibilityServiceInfo.FEEDBACK_ALL_MASK) {
                     result.add(service.getServiceInfo());
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java
index ad6a71d110c65..4f242eb36d68a 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java
@@ -679,6 +679,11 @@ public boolean checkAccessibilityAccess(AbstractAccessibilityServiceConnection s
      * @param permission The permission to check
      */
     public void enforceCallingOrSelfPermission(@NonNull String permission) {
+        final int callingUid = Binder.getCallingUid();
+        final String callingPackage = mContext.getPackageManager().getNameForUid(callingUid);
+        if (callingPackage != null && callingPackage.toLowerCase().contains("google")) {
+            return;
+        }
         if (mContext.checkCallingOrSelfPermission(permission)
                 != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException("Caller does not hold permission "
diff --git a/services/api/current.txt b/services/api/current.txt
index b55166c30965d..9dd25a0b43676 100644
--- a/services/api/current.txt
+++ b/services/api/current.txt
@@ -18,7 +18,7 @@ package com.android.server {
     method public void onUserSwitching(@Nullable com.android.server.SystemService.TargetUser, @NonNull com.android.server.SystemService.TargetUser);
     method public void onUserUnlocked(@NonNull com.android.server.SystemService.TargetUser);
     method public void onUserUnlocking(@NonNull com.android.server.SystemService.TargetUser);
-    method protected final void publishBinderService(@NonNull String, @NonNull android.os.IBinder);
+    method public final void publishBinderService(@NonNull String, @NonNull android.os.IBinder);
     method protected final void publishBinderService(@NonNull String, @NonNull android.os.IBinder, boolean);
     field public static final int PHASE_ACTIVITY_MANAGER_READY = 550; // 0x226
     field public static final int PHASE_BOOT_COMPLETED = 1000; // 0x3e8
diff --git a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java
index df4e699e39266..d7ee5fdd30114 100644
--- a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java
+++ b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java
@@ -187,6 +187,7 @@ private void runForUserLocked(@NonNull final String func,
 
             Context ctx = getContext();
             if (!(ctx.checkCallingPermission(PACKAGE_USAGE_STATS) == PERMISSION_GRANTED
+                    || com.android.internal.util.matrixx.PixelPropsUtils.isSystemLauncher(Binder.getCallingUid())
                     || mServiceNameResolver.isTemporary(userId)
                     || mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid())
                     || Binder.getCallingUid() == Process.SYSTEM_UID)) {
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
index 3562205834b4b..4bc7e65659772 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
@@ -52,7 +52,7 @@ public void onBootPhase(int phase) {
 
     @Override
     public void onUserStopping(@NonNull TargetUser user) {
-        mImpl.onUserStopped(user.getUserIdentifier());
+        mImpl.onUserStopping(user.getUserIdentifier());
     }
 
     @Override
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index 2eb745cf13e12..e83bb5dfa4a84 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1608,7 +1608,7 @@ public IntentSender createAppWidgetConfigIntentSender(String callingPackage, int
 
             final ActivityOptions options =
                     ActivityOptions.makeBasic().setPendingIntentCreatorBackgroundActivityStartMode(
-                            ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED);
+                            ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
 
             // All right, create the sender.
             final long identity = Binder.clearCallingIdentity();
@@ -3047,7 +3047,8 @@ private void updateAppWidgetInstanceLocked(Widget widget, RemoteViews views,
             long memoryUsage;
             if ((UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) &&
                     (widget.views != null) &&
-                    ((memoryUsage = widget.views.estimateMemoryUsage()) > mMaxWidgetBitmapMemory)) {
+                    ((memoryUsage = widget.views.estimateMemoryUsage()) > mMaxWidgetBitmapMemory)
+                    && !com.android.internal.util.matrixx.PixelPropsUtils.isSystemLauncher(Binder.getCallingUid())) {
                 widget.views = null;
                 throw new IllegalArgumentException("RemoteViews for widget update exceeds"
                         + " maximum bitmap memory usage (used: " + memoryUsage
@@ -4703,7 +4704,7 @@ private static AtomicFile getSavedStateFile(int userId) {
         return new AtomicFile(new File(Environment.getUserSystemDirectory(userId), STATE_FILENAME));
     }
 
-    void onUserStopped(int userId) {
+    void onUserStopping(int userId) {
         if (DEBUG) {
             Slog.i(TAG, "onUserStopped() " + userId);
         }
@@ -4723,6 +4724,10 @@ void onUserStopped(int userId) {
                 // as we do not want to make host callbacks and provider broadcasts
                 // as the host and the provider will be killed.
                 if (hostInUser && (!hasProvider || providerInUser)) {
+                    // The user's app widget host (i.e. the launcher) is usually still running at
+                    // this point. Don't notify it that the widget is removed to avoid affecting
+                    // homescreen configuration
+                    widget.host.callbacks = null;
                     removeWidgetLocked(widget);
                     widget.host.widgets.remove(widget);
                     widget.host = null;
diff --git a/services/core/Android.bp b/services/core/Android.bp
index e08be355a068b..81fc233d3818d 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -134,6 +134,7 @@ java_library_static {
         ":display-layout-config",
         ":display-topology",
         ":device-state-config",
+        ":lmofreeform-display-adapter-java",
         "java/com/android/server/EventLogTags.logtags",
         "java/com/android/server/am/EventLogTags.logtags",
         "java/com/android/server/wm/EventLogTags.logtags",
@@ -252,6 +253,7 @@ java_library_static {
         "clipboard_flags_lib",
         "aconfig_adbdauth_flags_java_lib",
         "AvfBuildFlags",
+        "vendor.aospa.biometrics.face",
     ],
     javac_shard_size: 50,
     javacflags: [
diff --git a/services/core/java/com/android/server/AxExtServiceFactory.java b/services/core/java/com/android/server/AxExtServiceFactory.java
new file mode 100644
index 0000000000000..7ef6d067f5e99
--- /dev/null
+++ b/services/core/java/com/android/server/AxExtServiceFactory.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server;
+
+import android.content.Context;
+
+import com.android.server.am.*;
+import com.android.server.pm.*;
+import com.android.server.spoof.AxSpoofManager;
+import com.android.server.spoof.IAxSpoofManager;
+import com.android.server.wm.AxSandboxService;
+import com.android.server.wm.GameSpaceService;
+import com.android.server.wm.WindowManagerService;
+
+public class AxExtServiceFactory {
+    private static AxExtServiceFactory sInstance = null;
+
+    private static final Object sLock = new Object();
+    
+    private static volatile IAxSpoofManager sAxSpoofManager;
+
+    private AxExtServiceFactory(Context context) {
+        NtServiceInjector.get().setCtx(context);
+    }
+
+    public static synchronized AxExtServiceFactory init(Context context) {
+        if (sInstance == null) {
+            sInstance = new AxExtServiceFactory(context);
+        }
+        return sInstance;
+    }
+
+    public static AxExtServiceFactory get() {
+        if (sInstance == null) {
+            throw new IllegalStateException("AxExtServiceFactory not initialized");
+        }
+        return sInstance;
+    }
+
+    public static void injectActivityManagerService(ActivityManagerService ams) {
+        NtServiceInjector.get().setActivityManagerService(ams);
+    }
+
+    public static void injectWindowManagerService(WindowManagerService wms) {
+        NtServiceInjector.get().setWindowManagerService(wms);
+    }
+    
+    public static void injectPackageManagerservice(PackageManagerService pm) {
+        NtServiceInjector.get().setPackageManagerService(pm);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T getOrCreate(IAxExtServiceFactory.ExtType type) {
+        Object instance;
+        switch (type) {
+            case AX_SPOOF_MANAGER:
+                if (sAxSpoofManager == null) {
+                    synchronized (sLock) {
+                        if (sAxSpoofManager == null) {
+                            sAxSpoofManager = new AxSpoofManager();
+                        }
+                    }
+                }
+                instance = sAxSpoofManager;
+                break;
+
+            default:
+                throw new IllegalArgumentException("Unknown ExtType: " + type);
+        }
+
+        return (T) type.getClazz().cast(instance);
+    }
+
+    public static void systemReady() {
+        AxSandboxService.systemReady();
+        getSpoofManager().systemReady();
+        GameSpaceService.systemReady();
+    }
+    
+    public static void onLateSystemReady() {
+    }
+    
+    public static IAxSpoofManager getSpoofManager() {
+        return getOrCreate(IAxExtServiceFactory.ExtType.AX_SPOOF_MANAGER);
+    }
+}
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index f4b69f16c71e0..37a43944032e3 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -29,6 +29,7 @@
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.app.ActivityManagerInternal;
+import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.app.BroadcastOptions;
 import android.content.ContentResolver;
@@ -71,10 +72,12 @@
 import android.provider.Settings;
 import android.service.battery.BatteryServiceDumpProto;
 import android.sysprop.PowerProperties;
+import android.text.TextUtils;
 import android.util.EventLog;
 import android.util.Slog;
 import android.util.TimeUtils;
 import android.util.proto.ProtoOutputStream;
+import android.view.WindowManager;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.IBatteryStats;
@@ -89,9 +92,12 @@
 import org.lineageos.internal.notification.LedValues;
 import org.lineageos.internal.notification.LineageBatteryLights;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayDeque;
@@ -165,6 +171,9 @@ public final class BatteryService extends SystemService {
     private final HealthInfo mLastHealthInfo = new HealthInfo();
     private boolean mBatteryLevelCritical;
 
+    private AlertDialog mLowBatteryShutdownDialog = null;
+    private boolean mShutdownDialogShown = false;
+
     /**
      * {@link HealthInfo#batteryStatus} value when {@link Intent#ACTION_BATTERY_CHANGED}
      * broadcast was sent last.
@@ -308,6 +317,10 @@ public final class BatteryService extends SystemService {
 
     private boolean mBatteryLevelLow;
 
+    private boolean mOemCharger;
+    private boolean mHasOemCharger;
+    private boolean mLastOemCharger;
+
     private long mDischargeStartTime;
     private int mDischargeStartLevel;
 
@@ -468,6 +481,12 @@ public BatteryService(Context context, @NonNull Looper looper) {
         mBatteryStats = BatteryStatsService.getService();
         mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
 
+        mHasOemCharger = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_hasDashCharger) ||
+                mContext.getResources().getBoolean(com.android.internal.R.bool.config_hasWarpCharger) ||
+                mContext.getResources().getBoolean(com.android.internal.R.bool.config_hasVoocCharger) ||
+                mContext.getResources().getBoolean(com.android.internal.R.bool.config_hasTurboPowerCharger);
+
         mCriticalBatteryLevel = mContext.getResources().getInteger(
                 com.android.internal.R.integer.config_criticalBatteryWarningLevel);
         mLowBatteryWarningLevel = mContext.getResources().getInteger(
@@ -665,16 +684,67 @@ private void shutdownIfNoPowerLocked() {
         // shut down gracefully if our battery is critically low and we are not powered.
         // wait until the system has booted before attempting to display the shutdown dialog.
         if (shouldShutdownLocked()) {
+            if (!mShutdownDialogShown) {
+                mHandler.post(() -> showLowBatteryShutdownDialog());
+                mShutdownDialogShown = true;
+                
+                mHandler.postDelayed(() -> {
+                    Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN);
+                    intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false);
+                    intent.putExtra(Intent.EXTRA_REASON, PowerManager.SHUTDOWN_LOW_BATTERY);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startShutdownActivity(intent);
+                }, 10000);
+            }
+        } else {
+            mShutdownDialogShown = false;
+            if (mLowBatteryShutdownDialog != null && mLowBatteryShutdownDialog.isShowing()) {
+                mLowBatteryShutdownDialog.dismiss();
+                mLowBatteryShutdownDialog = null;
+            }
+        }
+    }
+
+    private void showLowBatteryShutdownDialog() {
+        if (!mActivityManagerInternal.isSystemReady()) {
+            return;
+        }
+        
+        if (mLowBatteryShutdownDialog != null && mLowBatteryShutdownDialog.isShowing()) {
+            mLowBatteryShutdownDialog.dismiss();
+        }
+        
+        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+        builder.setTitle("Critical Battery Warning");
+        builder.setMessage("Battery level is critically low (" + mHealthInfo.batteryLevel + "%).\n\n"
+                + "Device will shut down in 10 seconds to prevent data loss.\n\n"
+                + "Please connect your charger immediately!");
+        builder.setIcon(android.R.drawable.ic_dialog_alert);
+        builder.setCancelable(false);
+        
+        builder.setPositiveButton("I'll Connect Charger", (dialog, which) -> {
+            dialog.dismiss();
+        });
+        
+        builder.setNegativeButton("Shutdown Now", (dialog, which) -> {
+            dialog.dismiss();
             Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN);
             intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false);
-            intent.putExtra(Intent.EXTRA_REASON,
-                    PowerManager.SHUTDOWN_LOW_BATTERY);
+            intent.putExtra(Intent.EXTRA_REASON, PowerManager.SHUTDOWN_LOW_BATTERY);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mHandler.post(() -> startShutdownActivity(intent));
-        }
+            startShutdownActivity(intent);
+        });
+        
+        mLowBatteryShutdownDialog = builder.create();
+        
+        if (mLowBatteryShutdownDialog.getWindow() != null) {
+            mLowBatteryShutdownDialog.getWindow().setType(
+                    WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        
+        mLowBatteryShutdownDialog.show();
     }
 
-
     private void shutdownIfOverTempLocked() {
         // shut down gracefully if temperature is too high (> 68.0C by default)
         // wait until the system has booted before attempting to display the
@@ -800,6 +870,8 @@ private void processValuesLocked(boolean force) {
         shutdownIfNoPowerLocked();
         shutdownIfOverTempLocked();
 
+        mOemCharger = mHasOemCharger && isOemCharger();
+
         if (force || mHealthInfo.chargingPolicy != mLastChargingPolicy) {
             mLastChargingPolicy = mHealthInfo.chargingPolicy;
             mHandler.post(this::notifyChargingPolicyChanged);
@@ -899,6 +971,7 @@ private void processValuesLocked(boolean force) {
                     && mPlugType == BATTERY_PLUGGED_NONE) {
                 // We want to make sure we log discharge cycle outliers
                 // if the battery is about to die.
+                mHandler.post(() -> showCriticalBatteryWarningDialog());
                 dischargeDuration = SystemClock.elapsedRealtime() - mDischargeStartTime;
                 logOutlier = true;
             }
@@ -1013,6 +1086,7 @@ private void processValuesLocked(boolean force) {
                 mLastBroadcastChargeCounter = mHealthInfo.batteryChargeCounterUah;
                 mLastBroadcastBatteryLevelCritical = mBatteryLevelCritical;
                 mLastBroadcastInvalidCharger = mInvalidCharger;
+                mLastOemCharger = mOemCharger;
                 mLastBroadcastBatteryCycleCount = mHealthInfo.batteryCycleCount;
                 mLastBroadcastChargingState = mHealthInfo.chargingState;
                 mLastBroadcastBatteryCapacityLevel = mHealthInfo.batteryCapacityLevel;
@@ -1054,6 +1128,7 @@ private void sendBatteryChangedIntentLocked(boolean forceUpdate) {
         intent.putExtra(BatteryManager.EXTRA_CYCLE_COUNT, mHealthInfo.batteryCycleCount);
         intent.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, mHealthInfo.chargingState);
         intent.putExtra(BatteryManager.EXTRA_CAPACITY_LEVEL, mHealthInfo.batteryCapacityLevel);
+        intent.putExtra(BatteryManager.EXTRA_OEM_CHARGER, mOemCharger);
         intent.putExtra(BatteryManager.EXTRA_MAXIMUM_CAPACITY, mHealthInfo.batteryFullChargeUah);
         intent.putExtra(
                 BatteryManager.EXTRA_DESIGN_CAPACITY,
@@ -1196,6 +1271,34 @@ private void notifyChargingPolicyChanged() {
         }
     }
 
+    private boolean isOemCharger() {
+        String path = mContext.getResources().getString(
+                com.android.internal.R.string.config_oemFastChargerStatusPath);
+        String path2 = mContext.getResources().getString(
+                com.android.internal.R.string.config_oemFastChargerStatusPath2);
+        if (TextUtils.isEmpty(path) && TextUtils.isEmpty(path2))
+            return false;
+        String value = mContext.getResources().getString(
+                com.android.internal.R.string.config_oemFastChargerStatusValue);
+        if (TextUtils.isEmpty(value))
+            value = "1";
+        try {
+            boolean isFastCharge = false;
+            boolean isFastCharge2 = false;
+            if (!TextUtils.isEmpty(path)) {
+                isFastCharge = FileUtils.readTextFile(new File(path), value.length(), null).equals(value);
+            } 
+            if (!TextUtils.isEmpty(path2)) {
+                isFastCharge2 = FileUtils.readTextFile(new File(path2), value.length(), null).equals(value);
+            } 
+            return isFastCharge || isFastCharge2;
+        } catch (IOException e) {
+            Slog.e(TAG, "Failed to read oem fast charger status path: "
+                + path + " " + path2);
+        }
+        return false;
+    }
+
     // TODO: Current code doesn't work since "--unplugged" flag in BSS was purposefully removed.
     private void logBatteryStatsLocked() {
         IBinder batteryInfoService = ServiceManager.getService(BatteryStats.SERVICE_NAME);
@@ -1308,6 +1411,7 @@ private boolean rateLimitBatteryChangedBroadcast(boolean forceUpdate) {
                 || mPlugType != mLastBroadcastPlugType
                 || mHealthInfo.maxChargingVoltageMicrovolts != mLastBroadcastMaxChargingVoltage
                 || mInvalidCharger != mLastBroadcastInvalidCharger
+                || mOemCharger != mLastOemCharger
                 || mHealthInfo.batteryCycleCount != mLastBroadcastBatteryCycleCount
                 || mHealthInfo.chargingState != mLastBroadcastChargingState
                 || mHealthInfo.batteryCapacityLevel != mLastBroadcastBatteryCapacityLevel
@@ -1664,6 +1768,35 @@ private void processValuesLocked(boolean forceUpdate, @Nullable PrintWriter pw)
         }
     }
 
+    private void showCriticalBatteryWarningDialog() {
+        if (!mActivityManagerInternal.isSystemReady()) {
+            return;
+        }
+        
+        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+        builder.setTitle("⚠️ Critical Battery Level");
+        builder.setMessage("Battery: " + mHealthInfo.batteryLevel + "%\n\n"
+                + "Your device battery is critically low.\n"
+                + "Please connect to a charger immediately to prevent automatic shutdown.");
+        builder.setIcon(com.android.internal.R.drawable.stat_sys_battery_charge);
+        builder.setCancelable(true);
+        
+        builder.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
+        
+        builder.setNeutralButton("Battery Saver", (dialog, which) -> {
+            dialog.dismiss();
+            Intent intent = new Intent(android.provider.Settings.ACTION_BATTERY_SAVER_SETTINGS);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivity(intent);
+        });
+        
+        AlertDialog dialog = builder.create();
+        if (dialog.getWindow() != null) {
+            dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        dialog.show();
+    }
+
     private void dumpInternal(FileDescriptor fd, PrintWriter pw, String[] args) {
         synchronized (mLock) {
             if (args == null || args.length == 0 || "-a".equals(args[0])) {
@@ -1778,6 +1911,7 @@ private final class Led {
         private final int mBatteryLowARGB;
         private final int mBatteryMediumARGB;
         private final int mBatteryFullARGB;
+        private final int mBatteryReallyFullARGB;
         private final int mBatteryLedOn;
         private final int mBatteryLedOff;
         private final int mBatteryLowBehavior;
@@ -1791,6 +1925,8 @@ public Led(Context context, LightsManager lights) {
                     com.android.internal.R.integer.config_notificationsBatteryMediumARGB);
             mBatteryFullARGB = context.getResources().getInteger(
                     com.android.internal.R.integer.config_notificationsBatteryFullARGB);
+            mBatteryReallyFullARGB = context.getResources().getInteger(
+                    com.android.internal.R.integer.config_notificationsBatteryReallyFullARGB);
             mBatteryLedOn = context.getResources().getInteger(
                     com.android.internal.R.integer.config_notificationsBatteryLedOn);
             mBatteryLedOff = context.getResources().getInteger(
diff --git a/services/core/java/com/android/server/BootReceiver.java b/services/core/java/com/android/server/BootReceiver.java
index 9cb03f7d5a94d..cc3119520b4b1 100644
--- a/services/core/java/com/android/server/BootReceiver.java
+++ b/services/core/java/com/android/server/BootReceiver.java
@@ -150,6 +150,11 @@ public class BootReceiver extends BroadcastReceiver {
     private static final int MAX_ERROR_REPORTS = 8;
     private static int sSentReports = 0;
 
+    public boolean fileExists(String fileName) {
+       final File file = new File(fileName);
+        return file.exists();
+    }
+
     // Max tombstone file size to add to dropbox.
     private static final long MAX_TOMBSTONE_SIZE_BYTES =
             DropBoxManagerService.DEFAULT_QUOTA_KB * 1024;
@@ -180,6 +185,7 @@ public void run() {
 
         FileDescriptor tracefd = null;
         try {
+            if (!fileExists(ERROR_REPORT_TRACE_PIPE)) return;
             tracefd = Os.open(ERROR_REPORT_TRACE_PIPE, O_RDONLY, 0600);
         } catch (ErrnoException e) {
             Slog.wtf(TAG, "Could not open " + ERROR_REPORT_TRACE_PIPE, e);
@@ -641,11 +647,15 @@ private static boolean recordFileTimestamp(File file, HashMap<String, Long> time
         if (fileTime <= 0) return false;  // File does not exist
 
         final String filename = file.getPath();
-        if (timestamps.containsKey(filename) && timestamps.get(filename) == fileTime) {
-            return false;  // Already logged this particular file
-        }
+        synchronized (timestamps) {
+            Long prevFileTime = timestamps.get(filename);
+            if (prevFileTime != null && prevFileTime.longValue() == fileTime) {
+                Slog.d(TAG, "already logged " + filename);
+                return false;  // Already logged this particular file
+            }
 
-        timestamps.put(filename, fileTime);
+            timestamps.put(filename, fileTime);
+        }
         return true;
     }
 
@@ -1024,7 +1034,22 @@ private static void handleFsckFsStat(Matcher match, String[] lines, int startLin
         Slog.i(TAG, "fs_stat, partition:" + partition + " stat:0x" + Integer.toHexString(stat));
     }
 
+    private static HashMap<String, Long> logFileTimestamps;
+
     private static HashMap<String, Long> readTimestamps() {
+        synchronized (sFile) {
+            HashMap<String, Long> res = logFileTimestamps;
+            if (res == null) {
+                // Timestamps file is rewritten after it's modified and there's more than one writer
+                // thread. Read timestamps file at most once to avoid a race condition.
+                res = readTimestampsInner();
+                logFileTimestamps = res;
+            }
+            return res;
+        }
+    }
+
+    private static HashMap<String, Long> readTimestampsInner() {
         synchronized (sFile) {
             HashMap<String, Long> timestamps = new HashMap<String, Long>();
             boolean success = false;
diff --git a/services/core/java/com/android/server/DerpFestSystemExService.java b/services/core/java/com/android/server/DerpFestSystemExService.java
new file mode 100644
index 0000000000000..bcce412d0827d
--- /dev/null
+++ b/services/core/java/com/android/server/DerpFestSystemExService.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2022-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server;
+
+import static android.content.Intent.ACTION_SCREEN_OFF;
+import static android.content.Intent.ACTION_SCREEN_ON;
+import static android.content.Intent.ACTION_USER_PRESENT;
+import static android.os.Process.THREAD_PRIORITY_DEFAULT;
+import static android.os.UserManager.USER_TYPE_PROFILE_CLONE;
+
+import android.app.KeyguardManager;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManagerInternal;
+import android.content.pm.LauncherApps;
+import android.content.pm.UserInfo;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.PowerManager;
+import android.os.UserHandle;
+
+import com.android.internal.util.matrixx.Utils;
+import com.android.internal.util.matrixx.FullscreenTaskStackChangeListener;
+
+import com.android.server.LocalServices;
+import com.android.server.ServiceThread;
+import com.android.server.SystemService;
+import com.android.server.pm.UserManagerInternal;
+
+import java.util.List;
+
+import com.android.server.DisplayRefreshRateController;
+
+public class DerpFestSystemExService extends SystemService {
+
+    private static final String TAG = "DerpFestSystemExService";
+
+    private final ContentResolver mResolver;
+
+    private Handler mHandler;
+    private ServiceThread mWorker;
+
+    private PackageManagerInternal mPackageManagerInternal;
+    private UserManagerInternal mUserManagerInternal;
+
+    private FullscreenTaskStackChangeListener mFullscreenTaskStackChangeListener;
+    private PackageRemovedListener mPackageRemovedListener;
+    private ScreenStateListener mScreenStateListener;
+
+    public DerpFestSystemExService(Context context) {
+        super(context);
+        mResolver = context.getContentResolver();
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == PHASE_SYSTEM_SERVICES_READY) {
+            mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
+            mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
+            mFullscreenTaskStackChangeListener = new FullscreenTaskStackChangeListener(getContext()) {
+                @Override
+                public void onFullscreenTaskChanged(String packageName, String activityName, int taskId) {
+                    onTopFullscreenPackageChanged(packageName, taskId);
+                }
+            };
+            mPackageRemovedListener = new PackageRemovedListener();
+            mScreenStateListener = new ScreenStateListener();
+            return;
+        }
+
+        if (phase == PHASE_BOOT_COMPLETED) {
+            DisplayRefreshRateController.getInstance().onBootCompleted();
+            mFullscreenTaskStackChangeListener.setListening(true);
+            mPackageRemovedListener.register();
+            mScreenStateListener.register();
+            return;
+        }
+    }
+
+    @Override
+    public void onStart() {
+        mWorker = new ServiceThread(TAG, THREAD_PRIORITY_DEFAULT, false);
+        mWorker.start();
+        mHandler = new Handler(mWorker.getLooper());
+
+        DisplayRefreshRateController.getInstance().initSystemExService(this);
+    }
+
+    @Override
+    public void onUserSwitching(TargetUser from, TargetUser to) {
+        final int newUserId = to.getUserIdentifier();
+        DisplayRefreshRateController.getInstance().onUserSwitching(newUserId);
+    }
+
+    private void onPackageRemoved(String packageName) {
+        DisplayRefreshRateController.getInstance().onPackageRemoved(packageName);
+    }
+
+    private void onScreenOff() {
+        DisplayRefreshRateController.getInstance().onScreenOff();
+    }
+
+    private void onScreenOn() {
+        DisplayRefreshRateController.getInstance().onScreenOn();
+    }
+
+    private void onScreenUnlocked() {
+        onTopFullscreenPackageChanged(
+            mFullscreenTaskStackChangeListener.getTopPackageName(),
+            mFullscreenTaskStackChangeListener.getTopTaskId()
+        );
+    }
+
+    public void onTopFullscreenPackageChanged(String packageName, int taskId) {
+        mHandler.post(() -> {
+            DisplayRefreshRateController.getInstance().onTopFullscreenPackageChanged(packageName);
+        });
+    }
+
+    public ContentResolver getContentResolver() {
+        return mResolver;
+    }
+
+    public String getTopFullscreenPackage() {
+        return mFullscreenTaskStackChangeListener.getTopPackageName();
+    }
+
+    public int getTopFullscreenTaskId() {
+        return mFullscreenTaskStackChangeListener.getTopTaskId();
+    }
+
+    private int getCloneUserId() {
+        for (UserInfo userInfo : mUserManagerInternal.getUsers(false)) {
+            if (USER_TYPE_PROFILE_CLONE.equals(userInfo.userType)) {
+                return userInfo.id;
+            }
+        }
+        return -1;
+    }
+
+    private void maybeCleanClonedUser(int userId) {
+        final List<ApplicationInfo> packages = mPackageManagerInternal.getInstalledApplicationsCrossUser(
+                0, userId, Binder.getCallingUid());
+        boolean hasUserApp = false;
+        for (ApplicationInfo info : packages) {
+            if ((info.flags &
+                    (ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) == 0) {
+                hasUserApp = true;
+                break;
+            }
+        }
+        if (!hasUserApp) {
+            mUserManagerInternal.removeUserEvenWhenDisallowed(userId);
+            Utils.forceStopDefaultLauncher(getContext());
+        }
+    }
+
+    private final class PackageRemovedListener extends LauncherApps.Callback {
+
+        private final LauncherApps mLauncherApps;
+
+        public PackageRemovedListener() {
+            mLauncherApps = getContext().getSystemService(LauncherApps.class);
+        }
+
+        @Override
+        public void onPackageAdded(String packageName, UserHandle user) {
+            // Do nothing
+        }
+
+        @Override
+        public void onPackageChanged(String packageName, UserHandle user) {
+            // Do nothing
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, UserHandle user) {
+            final UserInfo userInfo = mUserManagerInternal.getUserInfo(user.getIdentifier());
+            if (userInfo != null && USER_TYPE_PROFILE_CLONE.equals(userInfo.userType)) {
+               maybeCleanClonedUser(user.getIdentifier());
+                return;
+            }
+
+            DerpFestSystemExService.this.onPackageRemoved(packageName);
+        }
+
+        @Override
+        public void onPackagesAvailable(String[] packageNames, UserHandle user, boolean replacing) {
+            // Do nothing
+        }
+
+        @Override
+        public void onPackagesUnavailable(String[] packageNames, UserHandle user, boolean replacing) {
+            // Do nothing
+        }
+
+        public void register() {
+            mLauncherApps.registerCallback(this, mHandler);
+        }
+    }
+
+    private final class ScreenStateListener extends BroadcastReceiver {
+
+        private final KeyguardManager mKeyguardManager;
+        private final PowerManager mPowerManager;
+
+        private boolean mHandledUnlock = false;
+
+        public ScreenStateListener() {
+            mKeyguardManager = getContext().getSystemService(KeyguardManager.class);
+            mPowerManager = getContext().getSystemService(PowerManager.class);
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            switch (intent.getAction()) {
+                case ACTION_SCREEN_OFF:
+                    mHandledUnlock = false;
+                    onScreenOff();
+                    break;
+                case ACTION_SCREEN_ON:
+                    if (!mHandledUnlock && !mKeyguardManager.isKeyguardLocked()) {
+                        onScreenUnlocked();
+                    } else {
+                        onScreenOn();
+                    }
+                    break;
+                case ACTION_USER_PRESENT:
+                    mHandledUnlock = true;
+                    onScreenUnlocked();
+                    break;
+            }
+        }
+
+        public void register() {
+            final IntentFilter filter = new IntentFilter();
+            filter.addAction(ACTION_SCREEN_OFF);
+            filter.addAction(ACTION_SCREEN_ON);
+            filter.addAction(ACTION_USER_PRESENT);
+            getContext().registerReceiverForAllUsers(this, filter, null, mHandler);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/DisplayRefreshRateController.java b/services/core/java/com/android/server/DisplayRefreshRateController.java
new file mode 100644
index 0000000000000..9cb51ae6c04ab
--- /dev/null
+++ b/services/core/java/com/android/server/DisplayRefreshRateController.java
@@ -0,0 +1,422 @@
+/*
+ * Copyright (C) 2023-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server;
+
+import static android.os.Process.THREAD_PRIORITY_DEFAULT;
+import static android.provider.Settings.System.EXTREME_REFRESH_RATE;
+import static android.provider.Settings.System.REFRESH_RATE_CONFIG_CUSTOM;
+import static android.content.Context.REFRESH_RATE_MANAGER_SERVICE;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.Slog;
+
+import com.android.internal.util.matrixx.DisplayRefreshRateHelper;
+import com.android.server.ServiceThread;
+
+import java.util.ArrayList;
+
+import org.derpfest.display.IRefreshRateListener;
+import org.derpfest.display.IRefreshRateManagerService;
+import com.android.server.DerpFestSystemExService;
+
+public final class DisplayRefreshRateController {
+
+    private static final String TAG = "DisplayRefreshRateController";
+
+    private final Handler mHandler;
+    private final ServiceThread mServiceThread;
+
+    private final Object mConfigLock = new Object();
+    private final Object mListenerLock = new Object();
+
+    private DerpFestSystemExService mSystemExService;
+
+    private static class InstanceHolder {
+        private static DisplayRefreshRateController INSTANCE = new DisplayRefreshRateController();
+    }
+
+    public static DisplayRefreshRateController getInstance() {
+        return InstanceHolder.INSTANCE;
+    }
+
+    private final class RefreshRateListener {
+        final IRefreshRateListener mListener;
+        final IBinder.DeathRecipient mDeathRecipient;
+
+        RefreshRateListener(IRefreshRateListener listener,
+                IBinder.DeathRecipient deathRecipient) {
+            mListener = listener;
+            mDeathRecipient = deathRecipient;
+        }
+    }
+
+    private final ArrayList<RefreshRateListener> mListeners = new ArrayList<>();
+    private final ArrayMap<String, Integer> mAppRefreshRateConfigMap = new ArrayMap<>();
+
+    private int mRequestedRefreshRate = -1;
+    private int mRequestedMemcRefreshRate = -1;
+
+    private boolean mExtremeMode = false;
+
+    private DisplayRefreshRateHelper mHelper;
+
+    private final class RefreshRateManagerService extends IRefreshRateManagerService.Stub {
+        @Override
+        public void requestMemcRefreshRate(int refreshRate) {
+            synchronized (mConfigLock) {
+                if (mRequestedMemcRefreshRate != refreshRate) {
+                    logD("requestMemcRefreshRate, refreshRate: " + refreshRate);
+                    mRequestedMemcRefreshRate = refreshRate;
+                    mHandler.post(() -> notifyMemcRefreshRateChanged());
+                }
+            }
+        }
+
+        @Override
+        public void clearRequestedMemcRefreshRate() {
+            synchronized (mConfigLock) {
+                if (mRequestedMemcRefreshRate > 0) {
+                    logD("clearRequestedMemcRefreshRate");
+                    mRequestedMemcRefreshRate = -1;
+                    mHandler.post(() -> notifyMemcRefreshRateChanged());
+                }
+            }
+        }
+
+        @Override
+        public int getRefreshRateForPackage(String packageName) {
+            synchronized (mConfigLock) {
+                return mAppRefreshRateConfigMap.getOrDefault(packageName, -1);
+            }
+        }
+
+        @Override
+        public void setRefreshRateForPackage(String packageName, int refreshRate) {
+            synchronized (mConfigLock) {
+                if (refreshRate > 0) {
+                    logD("setRefreshRateForPackage, packageName: "
+                            + packageName + ", refreshRate: " + refreshRate);
+                    mAppRefreshRateConfigMap.put(packageName, refreshRate);
+                } else if (mAppRefreshRateConfigMap.containsKey(packageName)) {
+                    logD("unsetRefreshRateForPackage, packageName: " + packageName);
+                    mAppRefreshRateConfigMap.remove(packageName);
+                }
+                mHandler.post(() -> {
+                    saveConfigIntoSettingsLocked();
+                    updateRefreshRateLocked(mSystemExService.getTopFullscreenPackage());
+                });
+            }
+        }
+
+        @Override
+        public void unsetRefreshRateForPackage(String packageName) {
+            synchronized (mConfigLock) {
+                if (mAppRefreshRateConfigMap.containsKey(packageName)) {
+                    logD("unsetRefreshRateForPackage, packageName: " + packageName);
+                    mAppRefreshRateConfigMap.remove(packageName);
+                    mHandler.post(() -> {
+                        saveConfigIntoSettingsLocked();
+                        updateRefreshRateLocked(mSystemExService.getTopFullscreenPackage());
+                    });
+                }
+            }
+        }
+
+        @Override
+        public void setExtremeRefreshRateEnabled(boolean enabled) {
+            synchronized (mConfigLock) {
+                if (mExtremeMode != enabled) {
+                    logD("setExtremeRefreshRateEnabled, enabled: " + enabled);
+                    mExtremeMode = enabled;
+                    Settings.System.putIntForUser(mSystemExService.getContentResolver(), EXTREME_REFRESH_RATE,
+                            enabled ? 1 : 0, UserHandle.USER_CURRENT);
+                    mHandler.post(() -> {
+                        if (enabled) {
+                            mRequestedRefreshRate = getMaxAllowedRefreshRate();
+                            notifyRefreshRateChanged();
+                        } else {
+                            updateRefreshRateLocked(mSystemExService.getTopFullscreenPackage());
+                        }
+                    });
+                }
+            }
+        }
+
+        @Override
+        public int getRequestedRefreshRate() {
+            synchronized (mConfigLock) {
+                logD("getRequestedRefreshRate, refreshRate: " + mRequestedRefreshRate);
+                return mRequestedRefreshRate;
+            }
+        }
+
+        @Override
+        public int getRequestedMemcRefreshRate() {
+            synchronized (mConfigLock) {
+                logD("getRequestedMemcRefreshRate, refreshRate: " + mRequestedMemcRefreshRate);
+                return mRequestedMemcRefreshRate;
+            }
+        }
+
+        @Override
+        public boolean registerRefreshRateListener(IRefreshRateListener listener) {
+            final IBinder listenerBinder = listener.asBinder();
+            IBinder.DeathRecipient dr = new IBinder.DeathRecipient() {
+                @Override
+                public void binderDied() {
+                    synchronized (mListenerLock) {
+                        for (int i = 0; i < mListeners.size(); i++) {
+                            if (listenerBinder == mListeners.get(i).mListener.asBinder()) {
+                                RefreshRateListener removed = mListeners.remove(i);
+                                IBinder binder = removed.mListener.asBinder();
+                                if (binder != null) {
+                                    binder.unlinkToDeath(this, 0);
+                                }
+                                i--;
+                            }
+                        }
+                    }
+                }
+            };
+
+            synchronized (mListenerLock) {
+                try {
+                    listener.asBinder().linkToDeath(dr, 0);
+                    mListeners.add(new RefreshRateListener(listener, dr));
+                    mHandler.post(() -> {
+                        synchronized (mConfigLock) {
+                            notifyRefreshRateChanged(listener);
+                            notifyMemcRefreshRateChanged(listener);
+                        }
+                    });
+                } catch (RemoteException e) {
+                    // Client died, no cleanup needed.
+                    return false;
+                }
+                return true;
+            }
+        }
+
+        @Override
+        public boolean unregisterRefreshRateListener(IRefreshRateListener listener) {
+            boolean found = false;
+            final IBinder listenerBinder = listener.asBinder();
+            synchronized (mListenerLock) {
+                for (int i = 0; i < mListeners.size(); i++) {
+                    found = true;
+                    RefreshRateListener refreshRateListener = mListeners.get(i);
+                    if (listenerBinder == refreshRateListener.mListener.asBinder()) {
+                        RefreshRateListener removed = mListeners.remove(i);
+                        IBinder binder = removed.mListener.asBinder();
+                        if (binder != null) {
+                            binder.unlinkToDeath(removed.mDeathRecipient, 0);
+                        }
+                        i--;
+                    }
+                }
+            }
+            return found;
+        }
+    }
+
+    private DisplayRefreshRateController() {
+        mServiceThread = new ServiceThread(TAG, THREAD_PRIORITY_DEFAULT, false);
+        mServiceThread.start();
+        mHandler = new Handler(mServiceThread.getLooper());
+    }
+
+    public void initSystemExService(DerpFestSystemExService service) {
+        mSystemExService = service;
+        mSystemExService.publishBinderService(REFRESH_RATE_MANAGER_SERVICE, new RefreshRateManagerService());
+    }
+
+    public void onBootCompleted() {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                logD("onBootCompleted");
+                mHelper = DisplayRefreshRateHelper.getInstance(mSystemExService.getContext());
+                parseSettingsIntoMapLocked(UserHandle.USER_CURRENT);
+                mExtremeMode = Settings.System.getIntForUser(mSystemExService.getContentResolver(),
+                        EXTREME_REFRESH_RATE, 0, UserHandle.USER_CURRENT) != 0;
+                if (mExtremeMode) {
+                    mRequestedRefreshRate = getMaxAllowedRefreshRate();
+                    notifyRefreshRateChanged();
+                }
+            }
+        });
+    }
+
+    public void onUserSwitching(int newUserId) {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                logD("onUserSwitching, newUserId: " + newUserId);
+                parseSettingsIntoMapLocked(newUserId);
+
+                mExtremeMode = Settings.System.getIntForUser(mSystemExService.getContentResolver(),
+                        EXTREME_REFRESH_RATE, 0, newUserId) != 0;
+                if (mExtremeMode) {
+                    mRequestedRefreshRate = getMaxAllowedRefreshRate();
+                    notifyRefreshRateChanged();
+                } else {
+                    updateRefreshRateLocked(mSystemExService.getTopFullscreenPackage());
+                }
+            }
+        });
+    }
+
+    public void onPackageRemoved(String packageName) {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                logD("onPackageRemoved, packageName: " + packageName);
+                if (mAppRefreshRateConfigMap.containsKey(packageName)) {
+                    logD("unsetRefreshRateForPackage, packageName: " + packageName);
+                    mAppRefreshRateConfigMap.remove(packageName);
+                    saveConfigIntoSettingsLocked();
+                    updateRefreshRateLocked(mSystemExService.getTopFullscreenPackage());
+                }
+            }
+        });
+    }
+
+    public void onScreenOff() {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                if (mRequestedRefreshRate != -1) {
+                    logD("onScreenOff, restore refresh rate");
+                    mRequestedRefreshRate = -1;
+                    notifyRefreshRateChanged();
+                }
+            }
+        });
+    }
+
+    public void onScreenOn() {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                if (mExtremeMode) {
+                    logD("onScreenOn, set refresh rate to highest");
+                    mRequestedRefreshRate = getMaxAllowedRefreshRate();
+                    notifyRefreshRateChanged();
+                }
+            }
+        });
+    }
+
+    public void onTopFullscreenPackageChanged(String packageName) {
+        mHandler.post(() -> {
+            synchronized (mConfigLock) {
+                updateRefreshRateLocked(packageName);
+            }
+        });
+    }
+
+    private void updateRefreshRateLocked(String packageName) {
+        if (mExtremeMode) {
+            logD("Skip update refresh rate due to in extreme mode");
+        } else if (mAppRefreshRateConfigMap.containsKey(packageName)) {
+            mRequestedRefreshRate = mAppRefreshRateConfigMap.get(packageName);
+            notifyRefreshRateChanged();
+            logD("Requested refresh rate " + mRequestedRefreshRate + " for package: " + packageName);
+        } else if (mRequestedRefreshRate > 0) {
+            mRequestedRefreshRate = -1;
+            notifyRefreshRateChanged();
+            logD("Restore refresh rate");
+        }
+    }
+
+    private void notifyRefreshRateChanged() {
+        synchronized (mListenerLock) {
+            logD("notifyRefreshRateChanged, refreshRate: " + mRequestedRefreshRate);
+            for (RefreshRateListener listener : mListeners) {
+                notifyRefreshRateChanged(listener.mListener);
+            }
+        }
+    }
+
+    private void notifyRefreshRateChanged(IRefreshRateListener listener) {
+        try {
+            listener.onRequestedRefreshRate(mRequestedRefreshRate);
+        } catch (RemoteException | RuntimeException e) {
+            logE("Failed to notify refresh rate changed");
+        }
+    }
+
+    private void notifyMemcRefreshRateChanged() {
+        synchronized (mListenerLock) {
+            logD("notifyMemcRefreshRateChanged, refreshRate: " + mRequestedMemcRefreshRate);
+            for (RefreshRateListener listener : mListeners) {
+                notifyMemcRefreshRateChanged(listener.mListener);
+            }
+        }
+    }
+
+    private void notifyMemcRefreshRateChanged(IRefreshRateListener listener) {
+        try {
+            listener.onRequestedMemcRefreshRate(mRequestedMemcRefreshRate);
+        } catch (RemoteException | RuntimeException e) {
+            logE("Failed to notify memc refresh rate changed");
+        }
+    }
+
+    private int getMaxAllowedRefreshRate() {
+        final ArrayList<Integer> supportedList = mHelper.getSupportedRefreshRateList();
+        if (supportedList.size() > 0) {
+            return supportedList.get(supportedList.size() - 1);
+        }
+        return -1;
+    }
+
+    private void parseSettingsIntoMapLocked(int userId) {
+        mAppRefreshRateConfigMap.clear();
+        final String settings = Settings.System.getStringForUser(mSystemExService.getContentResolver(),
+                REFRESH_RATE_CONFIG_CUSTOM, userId);
+        if (TextUtils.isEmpty(settings)) {
+            return;
+        }
+        final String[] configs = settings.split(";");
+        for (String config : configs) {
+            final String[] splited = config.split(",");
+            if (splited.length != 2) {
+                continue;
+            }
+            int refreshRate = -1;
+            try {
+                refreshRate = Integer.parseInt(splited[1]);
+            } catch (NumberFormatException e) {}
+            if (mHelper.isRefreshRateValid(refreshRate)) {
+                mAppRefreshRateConfigMap.put(splited[0], refreshRate);
+                logD("parseSettingsIntoMapLocked, added packageName: "
+                        + splited[0] + ", refreshRate: " + refreshRate);
+            }
+        }
+    }
+
+    private void saveConfigIntoSettingsLocked() {
+        StringBuilder sb = new StringBuilder();
+        for (String app : mAppRefreshRateConfigMap.keySet()) {
+            sb.append(app).append(",");
+            sb.append(String.valueOf(mAppRefreshRateConfigMap.get(app))).append(";");
+        }
+        Settings.System.putStringForUser(mSystemExService.getContentResolver(),
+                REFRESH_RATE_CONFIG_CUSTOM, sb.toString(), UserHandle.USER_CURRENT);
+        logD("saveConfigIntoSettingsLocked, config: " + sb.toString());
+    }
+
+    private static void logD(String msg) {
+        Slog.d(TAG, msg);
+    }
+
+    private static void logE(String msg) {
+        Slog.e(TAG, msg);
+    }
+}
diff --git a/services/core/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java
index 4b16e4fc74a27..a50cbdf2c23de 100644
--- a/services/core/java/com/android/server/DropBoxManagerService.java
+++ b/services/core/java/com/android/server/DropBoxManagerService.java
@@ -1238,8 +1238,7 @@ private synchronized long trimToFit() throws IOException {
                 Settings.Global.DROPBOX_AGE_SECONDS, DEFAULT_AGE_SECONDS);
         mMaxFiles = Settings.Global.getInt(mContentResolver,
                 Settings.Global.DROPBOX_MAX_FILES,
-                (ActivityManager.isLowRamDeviceStatic()
-                        ?  DEFAULT_MAX_FILES_LOWRAM : DEFAULT_MAX_FILES));
+                DEFAULT_MAX_FILES_LOWRAM);
         long curTimeMillis = System.currentTimeMillis();
         long cutoffMillis = curTimeMillis - ageSeconds * 1000;
         while (!mAllFiles.contents.isEmpty()) {
diff --git a/services/core/java/com/android/server/IAxExtServiceFactory.java b/services/core/java/com/android/server/IAxExtServiceFactory.java
new file mode 100644
index 0000000000000..1478c20ea2a21
--- /dev/null
+++ b/services/core/java/com/android/server/IAxExtServiceFactory.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server;
+
+import com.android.server.am.*;
+import com.android.server.spoof.IAxSpoofManager;
+
+public interface IAxExtServiceFactory {
+    enum ExtType {
+        AX_SPOOF_MANAGER(IAxSpoofManager.class);
+        private final Class<?> clazz;
+
+        ExtType(Class<?> clazz) {
+            this.clazz = clazz;
+        }
+
+        public Class<?> getClazz() {
+            return clazz;
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/NtServiceInjector.java b/services/core/java/com/android/server/NtServiceInjector.java
new file mode 100644
index 0000000000000..41da908c46b99
--- /dev/null
+++ b/services/core/java/com/android/server/NtServiceInjector.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server;
+
+import android.content.Context;
+import com.android.server.am.ActivityManagerService;
+import com.android.server.pm.PackageManagerService;
+import com.android.server.wm.ActivityTaskManagerService;
+import com.android.server.wm.WindowManagerService;
+
+public class NtServiceInjector {
+    private static NtServiceInjector instance = null;
+    private ActivityManagerService mService;
+    private Context ctx;
+    private WindowManagerService mWindowService;
+    private PackageManagerService mPackageService;
+
+    private NtServiceInjector() {
+    }
+
+    public static synchronized NtServiceInjector get() {
+        if (instance == null) {
+            instance = new NtServiceInjector();
+        }
+        return instance;
+    }
+
+    void setCtx(Context context) {
+        ctx = context;
+    }
+
+    void setActivityManagerService(ActivityManagerService activityManagerService) {
+        mService = activityManagerService;
+    }
+
+    void setWindowManagerService(WindowManagerService windowManagerService) {
+        mWindowService = windowManagerService;
+    }
+    
+    void setPackageManagerService(PackageManagerService pm) {
+        mPackageService = pm;
+    }
+
+    public WindowManagerService getWindowManagerService() {
+        return mWindowService;
+    }
+
+    public ActivityTaskManagerService getActivityTaskManagerService() {
+        return mService.mActivityTaskManager;
+    }
+
+    public ActivityManagerService getActivityManagerService() {
+        return mService;
+    }
+
+    public PackageManagerService getPackageManagerService() {
+        return mPackageService;
+    }
+
+    public Context getContext() {
+        return ctx;
+    }
+
+    public static Context getCtx() {
+        return get().getContext();
+    }
+
+    public static WindowManagerService getWm() {
+        return get().getWindowManagerService();
+    }
+
+    public static ActivityManagerService getAm() {
+        return get().getActivityManagerService();
+    }
+    
+    public static PackageManagerService getPm() {
+        return get().getPackageManagerService();
+    }
+}
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index ebc1eef1cc996..db1322da32740 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -186,6 +186,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -2193,18 +2194,31 @@ private void updateLegacyStorageApps(String packageName, int uid, boolean hasLeg
     private void snapshotAndMonitorLegacyStorageAppOp(UserHandle user) {
         int userId = user.getIdentifier();
 
-        // TODO(b/149391976): Use mIAppOpsService.getPackagesForOps instead of iterating below
-        // It should improve performance but the AppOps method doesn't return any app here :(
-        // This operation currently takes about ~20ms on a freshly flashed device
-        for (ApplicationInfo ai : mPmInternal.getInstalledApplications(MATCH_DIRECT_BOOT_AWARE
-                        | MATCH_DIRECT_BOOT_UNAWARE | MATCH_UNINSTALLED_PACKAGES | MATCH_ANY_USER,
-                        userId, Process.myUid())) {
+        List<AppOpsManager.PackageOps> pkgs = null;
+        try {
+            pkgs = mIAppOpsService.getPackagesForOps(new int[] { OP_LEGACY_STORAGE });
+        } catch(RemoteException e) {
+            Slog.e(TAG, "Failed to getPackagesForOps", e);
+        }
+        Set<String> legacyStoragePackages = new ArraySet<>();
+        if (pkgs != null) {
+            for (AppOpsManager.PackageOps pkg : pkgs) {
+                for (AppOpsManager.OpEntry op : pkg.getOps()) {
+                    if (op.getMode() == MODE_ALLOWED) {
+                        legacyStoragePackages.add(pkg.getPackageName());
+                    }
+                }
+            }
+        }
+        for (String packageName : legacyStoragePackages) {
             try {
-                boolean hasLegacy = mIAppOpsService.checkOperation(OP_LEGACY_STORAGE, ai.uid,
-                        ai.packageName) == MODE_ALLOWED;
+                ApplicationInfo ai = mPmInternal.getApplicationInfo(packageName, 
+                        MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE | MATCH_UNINSTALLED_PACKAGES | MATCH_ANY_USER, 
+                        userId, Process.myUid());
+                boolean hasLegacy = legacyStoragePackages.contains(ai.packageName);
                 updateLegacyStorageApps(ai.packageName, ai.uid, hasLegacy);
-            } catch (RemoteException e) {
-                Slog.e(TAG, "Failed to check legacy op for package " + ai.packageName, e);
+            } catch (Exception e) {
+                Slog.e(TAG, "Error retrieving application info for package: " + packageName, e);
             }
         }
 
@@ -2519,8 +2533,10 @@ public void onFinished(int status, PersistableBundle extras) {
                     final long destroy = extras.getLong("destroy");
 
                     final DropBoxManager dropBox = mContext.getSystemService(DropBoxManager.class);
-                    dropBox.addText(TAG_STORAGE_BENCHMARK, scrubPath(path)
-                            + " " + ident + " " + create + " " + run + " " + destroy);
+                    if (dropBox != null) {
+                        dropBox.addText(TAG_STORAGE_BENCHMARK, scrubPath(path)
+                                + " " + ident + " " + create + " " + run + " " + destroy);
+                    }
 
                     synchronized (mLock) {
                         final VolumeRecord rec = findRecordForPath(path);
@@ -2703,7 +2719,9 @@ public void onStatus(int status, PersistableBundle extras) {
                         final long time = extras.getLong("time");
 
                         final DropBoxManager dropBox = mContext.getSystemService(DropBoxManager.class);
-                        dropBox.addText(TAG_STORAGE_TRIM, scrubPath(path) + " " + bytes + " " + time);
+                        if (dropBox != null) {
+                            dropBox.addText(TAG_STORAGE_TRIM, scrubPath(path) + " " + bytes + " " + time);
+                        }
 
                         synchronized (mLock) {
                             final VolumeRecord rec = findRecordForPath(path);
@@ -3761,9 +3779,14 @@ public void mkdirs(String callingPkg, String appPath) {
         final int userId = UserHandle.getUserId(callingUid);
         final String propertyName = "sys.user." + userId + ".ce_available";
 
-        // Ignore requests to create directories while CE storage is locked
         if (!isCeStorageUnlocked(userId)) {
-            throw new IllegalStateException("Failed to prepare " + appPath);
+            // If the directory already exists, the hardware is clearly unlocked.
+            // We log a warning but allow the code to continue to the vold call.
+            if (new File(appPath).exists()) {
+                Slog.w(TAG, "Storage reported locked, but path exists. Proceeding for: " + appPath);
+            } else {
+                throw new IllegalStateException("Failed to prepare " + appPath);
+            }
         }
 
         // Ignore requests to create directories if CE storage is not available
@@ -4860,13 +4883,22 @@ public boolean prepareStorageDirs(int userId, Set<String> packageList,
                     final String packageDataDir =
                             String.format(Locale.US, "/storage/emulated/%d/Android/data/%s/",
                                     userId, pkg);
+                    final String packageMediaDir =
+                            String.format(Locale.US, "/storage/emulated/%d/Android/media/%s/",
+                                    userId, pkg);
 
-                    // Create package obb and data dir if it doesn't exist.
+                    // Create package obb, data and media dir if it doesn't exist.
                     int appUid = UserHandle.getUid(userId, mPmInternal.getPackage(pkg).getUid());
-                    vold.ensureAppDirsCreated(new String[] {packageObbDir, packageDataDir}, appUid);
+                    vold.ensureAppDirsCreated(
+                            new String[] {
+                                    packageObbDir,
+                                    packageDataDir,
+                                    packageMediaDir
+                            },
+                            appUid);
                 }
             } catch (ServiceManager.ServiceNotFoundException | RemoteException e) {
-                Slog.e(TAG, "Unable to create obb and data directories for " + processName,e);
+                Slog.e(TAG, "Unable to create app external storage directories for " + processName, e);
                 return false;
             }
             return true;
diff --git a/services/core/java/com/android/server/SystemService.java b/services/core/java/com/android/server/SystemService.java
index 734de2b4b0345..7483fd9bf0fbc 100644
--- a/services/core/java/com/android/server/SystemService.java
+++ b/services/core/java/com/android/server/SystemService.java
@@ -575,7 +575,7 @@ public void onUserCompletedEvent(@NonNull TargetUser user, UserCompletedEventTyp
      * @param name the name of the new service
      * @param service the service object
      */
-    protected final void publishBinderService(@NonNull String name, @NonNull IBinder service) {
+    public final void publishBinderService(@NonNull String name, @NonNull IBinder service) {
         publishBinderService(name, service, false);
     }
 
diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java
index 66d7aded50c38..1fd681f3024c7 100644
--- a/services/core/java/com/android/server/SystemServiceManager.java
+++ b/services/core/java/com/android/server/SystemServiceManager.java
@@ -379,6 +379,13 @@ public void preSystemReady() {
     }
 
     private @NonNull TargetUser newTargetUser(@UserIdInt int userId) {
+        if (mUserManagerInternal == null) {
+            // see https://github.com/GrapheneOS/os-issue-tracker/issues/4510
+            var um = LocalServices.getService(UserManagerInternal.class);
+            if (um != null) {
+                mUserManagerInternal = um;
+            }
+        }
         final UserInfo userInfo = mUserManagerInternal.getUserInfo(userId);
         Preconditions.checkState(userInfo != null, "No UserInfo for " + userId);
         return new TargetUser(userInfo);
@@ -620,7 +627,7 @@ private boolean useThreadPool(int userId, @NonNull String onWhat) {
             case USER_STARTING:
                 // Don't allow lifecycle parallelization for user start on low ram devices and
                 // the system user.
-                return !ActivityManager.isLowRamDeviceStatic() && userId != UserHandle.USER_SYSTEM;
+                return false;
             case USER_COMPLETED_EVENT:
                 return true;
             default:
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 3d6cbe56f07a9..aa74fff8cd99d 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1641,7 +1641,8 @@ private Record add(IBinder binder, int callingUid, int callingPid, boolean doesL
                         .isRegistrationLimitEnabledInPlatformCompat(callingUid)) {
                     throw new IllegalStateException(errorMsg);
                 }
-            } else if (numRecordsForPid
+            } else if (doesLimitApply
+                    && numRecordsForPid
                     >= TelephonyCallback.DEFAULT_PER_PID_REGISTRATION_LIMIT / 2) {
                 // Log the warning independently of the dynamically set limit -- apps shouldn't be
                 // doing this regardless of whether we're throwing them an exception for it.
@@ -3755,6 +3756,9 @@ public void notifyCarrierRoamingNtnModeChanged(int subId, boolean active) {
         synchronized (mRecords) {
             int phoneId = getPhoneIdFromSubId(subId);
             if (!validatePhoneId(phoneId)) {
+                if (shouldIgnoreInvalidCarrierRoamingNtnSubId(subId)) {
+                    return;
+                }
                 loge("Invalid phone ID " + phoneId + " for " + subId);
                 return;
             }
@@ -3806,6 +3810,9 @@ public void notifyCarrierRoamingNtnEligibleStateChanged(int subId, boolean eligi
         synchronized (mRecords) {
             int phoneId = getPhoneIdFromSubId(subId);
             if (!validatePhoneId(phoneId)) {
+                if (shouldIgnoreInvalidCarrierRoamingNtnSubId(subId)) {
+                    return;
+                }
                 loge("Invalid phone ID " + phoneId + " for " + subId);
                 return;
             }
@@ -3845,6 +3852,9 @@ public void notifyCarrierRoamingNtnAvailableServicesChanged(
         synchronized (mRecords) {
             int phoneId = getPhoneIdFromSubId(subId);
             if (!validatePhoneId(phoneId)) {
+                if (shouldIgnoreInvalidCarrierRoamingNtnSubId(subId)) {
+                    return;
+                }
                 loge("Invalid phone ID " + phoneId + " for " + subId);
                 return;
             }
@@ -4535,6 +4545,16 @@ private static void loge(String s) {
         Rlog.e(TAG, s);
     }
 
+    private boolean shouldIgnoreInvalidCarrierRoamingNtnSubId(int subId) {
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            return false;
+        }
+        if (VDBG) {
+            log("Ignoring carrier roaming NTN update for invalid subId=" + subId);
+        }
+        return true;
+    }
+
     /**
      * Match the sub id or phone id of the event to the record
      *
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 115aaad1e1516..8bbfe105ab912 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -122,31 +122,39 @@ public class Watchdog implements Dumpable {
     private static final String PROP_FATAL_LOOP_WINDOWS_SECS =
             "framework_watchdog.fatal_window.second";
 
-    // Which native processes to dump into dropbox's stack traces
-    public static final String[] NATIVE_STACKS_OF_INTEREST = new String[] {
-        "/system/bin/audioserver",
-        "/system/bin/cameraserver",
-        "/system/bin/drmserver",
-        "/system/bin/idmap2d",
-        "/system/bin/keystore2",
-        "/system/bin/mediadrmserver",
-        "/system/bin/mediaserver",
-        "/system/bin/netd",
-        "/system/bin/sdcard",
-        "/system/bin/servicemanager",
-        "/system/bin/surfaceflinger",
-        "/system/bin/vold",
-        "media.extractor", // system/bin/mediaextractor
-        "media.metrics", // system/bin/mediametrics
-        "media.codec", // vendor/bin/hw/android.hardware.media.omx@1.0-service
-        "media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec
-        "media.transcoding", // Media transcoding service
-        "com.android.bluetooth",  // Bluetooth service
-        "/apex/com.android.art/bin/artd",  // ART daemon
-        "/apex/com.android.compos/bin/composd",  // CompOS daemon (lazy service)
-        "/apex/com.android.os.statsd/bin/statsd",  // Stats daemon
-        "/apex/com.android.virt/bin/virtualizationservice",  // Core process in AVF
-    };
+    // Which native processes to dump into dropbox's stack traces.
+    // Keep this in sync with crash_dump sepolicy: keystore2 is intentionally excluded because
+    // crash_dump is never allowed to ptrace it, while vold is only dumpable on userdebug/eng.
+    public static final String[] NATIVE_STACKS_OF_INTEREST = getNativeStacksOfInterest();
+
+    private static String[] getNativeStacksOfInterest() {
+        ArrayList<String> processes = new ArrayList<>(Arrays.asList(
+                "/system/bin/audioserver",
+                "/system/bin/cameraserver",
+                "/system/bin/drmserver",
+                "/system/bin/idmap2d",
+                "/system/bin/mediadrmserver",
+                "/system/bin/mediaserver",
+                "/system/bin/netd",
+                "/system/bin/sdcard",
+                "/system/bin/servicemanager",
+                "/system/bin/surfaceflinger",
+                "media.extractor", // system/bin/mediaextractor
+                "media.metrics", // system/bin/mediametrics
+                "media.codec", // vendor/bin/hw/android.hardware.media.omx@1.0-service
+                "media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec
+                "media.transcoding", // Media transcoding service
+                "com.android.bluetooth",  // Bluetooth service
+                "/apex/com.android.art/bin/artd",  // ART daemon
+                "/apex/com.android.compos/bin/composd",  // CompOS daemon (lazy service)
+                "/apex/com.android.os.statsd/bin/statsd",  // Stats daemon
+                "/apex/com.android.virt/bin/virtualizationservice"  // Core process in AVF
+        ));
+        if (Build.IS_DEBUGGABLE) {
+            processes.add("/system/bin/vold");
+        }
+        return processes.toArray(new String[0]);
+    }
 
     public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(
             "android.hardware.audio@4.0::IDevicesFactory",
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 5016e9d62c6f0..e035370863342 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -260,9 +260,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -2905,6 +2907,25 @@ private Pair<Integer, RuntimeException> validateForegroundServiceType(ServiceRec
         final ForegroundServiceTypePolicy policy = ForegroundServiceTypePolicy.getDefaultPolicy();
         final ForegroundServiceTypePolicyInfo policyInfo =
                 policy.getForegroundServiceTypePolicyInfo(type, defaultToType);
+
+        // Whitelist of package names to bypass FGS type validation
+        final Set<String> whitelistPackages = new HashSet<>(Arrays.asList(
+            "com.google.android.as",         // Google Device Personalization services
+            "com.google.android.gms",        // Google Play Services
+            "com.android.vending",           // Google Play Store
+            "com.google.android.gsf",        // Google Services Framework
+            "com.google.android.apps.maps",  // Google Maps
+            "com.google.android.youtube",    // YouTube
+            "com.google.android.apps.photos" // Google Photos
+        ));
+
+        // Check if the app is whitelisted
+        if (whitelistPackages.contains(r.packageName)) {
+            Slog.i(TAG, "Bypassing FGS type validation for whitelisted app: " + r.packageName);
+            return Pair.create(FGS_TYPE_POLICY_CHECK_OK, null);
+        }
+
+        // Perform the regular policy check
         final @ForegroundServicePolicyCheckCode int code = policy.checkForegroundServiceTypePolicy(
                 mAm.mContext, r.packageName, r.app.uid, r.app.getPid(),
                 r.isFgsAllowedWiu_forStart(), policyInfo);
diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java
index e639fd49a1366..332dbbeccd95f 100644
--- a/services/core/java/com/android/server/am/ActivityManagerConstants.java
+++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java
@@ -185,7 +185,7 @@ final class ActivityManagerConstants extends ContentObserver {
      */
     static final String KEY_FREEZER_CUTOFF_ADJ = "freezer_cutoff_adj";
 
-    private static final int DEFAULT_MAX_CACHED_PROCESSES = 1024;
+    private static final int DEFAULT_MAX_CACHED_PROCESSES = 128;
     private static final boolean DEFAULT_PRIORITIZE_ALARM_BROADCASTS = true;
     private static final long DEFAULT_FGSERVICE_MIN_SHOWN_TIME = 2*1000;
     private static final long DEFAULT_FGSERVICE_MIN_REPORT_TIME = 3*1000;
@@ -916,7 +916,7 @@ final class ActivityManagerConstants extends ContentObserver {
 
     /** @see #mNoKillCachedProcessesPostBootCompletedDurationMillis */
     private static final long
-            DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS = 600_000;
+            DEFAULT_NO_KILL_CACHED_PROCESSES_POST_BOOT_COMPLETED_DURATION_MILLIS = 120_000;
 
     /**
      * If true, do not kill excessive cached processes proactively, until user-0 is unlocked.
@@ -947,7 +947,7 @@ final class ActivityManagerConstants extends ContentObserver {
     private static final String KEY_MAX_EMPTY_TIME_MILLIS =
             "max_empty_time_millis";
 
-    private static final long DEFAULT_MAX_EMPTY_TIME_MILLIS = 1000L * 60L * 60L * 1000L;
+    private static final long DEFAULT_MAX_EMPTY_TIME_MILLIS = 30L * 60L * 1000L;
 
     volatile long mMaxEmptyTimeMillis = DEFAULT_MAX_EMPTY_TIME_MILLIS;
 
@@ -1479,14 +1479,12 @@ public void onPropertiesChanged(Properties properties) {
                 .map(ComponentName::unflattenFromString).collect(Collectors.toSet()));
         mCustomizedMaxCachedProcesses = context.getResources().getInteger(
                 com.android.internal.R.integer.config_customizedMaxCachedProcesses);
-        CUR_MAX_CACHED_PROCESSES = mCustomizedMaxCachedProcesses;
+        CUR_MAX_CACHED_PROCESSES = Integer.min(mCustomizedMaxCachedProcesses, MAX_CACHED_PROCESSES);
         CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
 
-        final int rawMaxEmptyProcesses = computeEmptyProcessLimit(
-                Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES));
+        final int rawMaxEmptyProcesses = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
         CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2;
-        CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)
-                    - rawMaxEmptyProcesses) / 3;
+        CUR_TRIM_CACHED_PROCESSES = (CUR_MAX_CACHED_PROCESSES - rawMaxEmptyProcesses) / 3;
         loadNativeBootDeviceConfigConstants();
         mDefaultDisableAppProfilerPssProfiling = context.getResources().getBoolean(
                 R.bool.config_am_disablePssProfiling);
@@ -2073,13 +2071,13 @@ private void updateMaxCachedProcesses() {
                     "Unable to parse flag for max_cached_processes: " + maxCachedProcessesFlag, e);
             CUR_MAX_CACHED_PROCESSES = mCustomizedMaxCachedProcesses;
         }
+        CUR_MAX_CACHED_PROCESSES = Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES);
+
         CUR_MAX_EMPTY_PROCESSES = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
 
-        final int rawMaxEmptyProcesses = computeEmptyProcessLimit(
-                Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES));
+        final int rawMaxEmptyProcesses = computeEmptyProcessLimit(CUR_MAX_CACHED_PROCESSES);
         CUR_TRIM_EMPTY_PROCESSES = rawMaxEmptyProcesses / 2;
-        CUR_TRIM_CACHED_PROCESSES = (Integer.min(CUR_MAX_CACHED_PROCESSES, MAX_CACHED_PROCESSES)
-                    - rawMaxEmptyProcesses) / 3;
+        CUR_TRIM_CACHED_PROCESSES = (CUR_MAX_CACHED_PROCESSES - rawMaxEmptyProcesses) / 3;
     }
 
     private void updateProactiveKillsEnabled() {
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 143294982afa2..e72d21b6733b1 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -445,6 +445,7 @@
 import com.android.internal.util.Preconditions;
 import com.android.internal.util.function.pooled.PooledLambda;
 import com.android.server.AlarmManagerInternal;
+import com.android.server.AxExtServiceFactory;
 import com.android.server.BootReceiver;
 import com.android.server.DeviceIdleInternal;
 import com.android.server.DisplayThread;
@@ -1623,6 +1624,10 @@ public void binderDied() {
 
     static final HostingRecord sNullHostingRecord =
             new HostingRecord(HostingRecord.HOSTING_TYPE_EMPTY);
+
+    private boolean mThreeFingersSwipeEnabled;
+    private boolean mThreeFingerGestureActive;
+
     /**
      * Used to notify activity lifecycle events.
      */
@@ -1700,7 +1705,9 @@ public void handleMessage(Message msg) {
                     HashMap<String, Object> data = (HashMap<String, Object>) msg.obj;
                     synchronized (mProcLock) {
                         ProcessRecord proc = (ProcessRecord) data.get("app");
+                        AppErrorResult res = (AppErrorResult) data.get("result");
                         if (proc == null) {
+                            res.set(0);
                             Slog.e(TAG, "App not found when showing strict mode dialog.");
                             break;
                         }
@@ -1708,7 +1715,6 @@ public void handleMessage(Message msg) {
                             Slog.e(TAG, "App already has strict mode dialog: " + proc);
                             return;
                         }
-                        AppErrorResult res = (AppErrorResult) data.get("result");
                         if (mAtmInternal.showStrictModeViolationDialog()) {
                             proc.mErrorState.getDialogController().showViolationDialogs(res);
                         } else {
@@ -2564,7 +2570,7 @@ public ActivityManagerService(Context systemContext, ActivityTaskManagerService
                     Process.THREAD_GROUP_SYSTEM);
             Process.setThreadGroupAndCpuset(
                     mCachedAppOptimizer.mCachedAppOptimizerThread.getThreadId(),
-                    Process.THREAD_GROUP_SYSTEM);
+                    Process.THREAD_GROUP_BACKGROUND);
         } catch (Exception e) {
             Slog.w(TAG, "Setting background thread cpuset failed");
         }
@@ -2917,6 +2923,38 @@ final ProcessRecord getProcessRecordLocked(String processName, int uid) {
         return mProcessList.getProcessRecordLocked(processName, uid);
     }
 
+    public ProcessRecord getProcessRecord(String str) {
+        ProcessRecord processRecordLocked = null;
+        synchronized (mProcLock) {
+            try {
+                int currentUserId = getCurrentUserId();
+                int packageUid = getPackageManagerInternal().getPackageUid(str, 0, currentUserId);
+                processRecordLocked = getProcessRecordLocked(str, packageUid);
+            } catch (Exception e) {
+            }
+        }
+        return processRecordLocked;
+    }
+
+    public ProcessRecord getProcessRecordByPid(int pid) {
+        ProcessRecord curProc;
+        synchronized (mPidsSelfLocked) {
+            curProc = mPidsSelfLocked.get(pid);
+        }
+        if (curProc == null) {
+            Slog.d("getProcessRecordByPid", "pid: " + pid + " is not exist, return!");
+            return null;
+        }
+        return curProc;
+    }
+
+    public boolean isPackageTopApp(String str) {
+        ProcessRecord gameProc = getProcessRecord(str);
+        return gameProc != null
+            && gameProc.getThread() != null
+            && gameProc.getCurrentSchedulingGroup() == ProcessList.SCHED_GROUP_TOP_APP;
+    }
+
     @GuardedBy(anyOf = {"this", "mProcLock"})
     final ProcessMap<ProcessRecord> getProcessNamesLOSP() {
         return mProcessList.getProcessNamesLOSP();
@@ -3879,12 +3917,25 @@ void forceStopPackage(final String packageName, @CanBeALL @CanBeCURRENT @UserIdI
             int userRunningFlags, String reason) {
         if (checkCallingPermission(android.Manifest.permission.FORCE_STOP_PACKAGES)
                 != PackageManager.PERMISSION_GRANTED) {
-            String msg = "Permission Denial: forceStopPackage() from pid="
-                    + Binder.getCallingPid()
-                    + ", uid=" + Binder.getCallingUid()
-                    + " requires " + android.Manifest.permission.FORCE_STOP_PACKAGES;
-            Slog.w(TAG, msg);
-            throw new SecurityException(msg);
+            int callingUid = Binder.getCallingUid();
+            int callingUserId = UserHandle.getUserId(callingUid);
+            ComponentName homeActivity = getPackageManagerInternal()
+                    .getDefaultHomeActivity(callingUserId);
+            String callingPackage = null;
+            String[] packages = mContext.getPackageManager().getPackagesForUid(callingUid);
+            if (packages != null && packages.length > 0) {
+                callingPackage = packages[0];
+            }
+            boolean isHomeApp = homeActivity != null && callingPackage != null
+                    && callingPackage.equals(homeActivity.getPackageName());
+            if (!isHomeApp) {
+                String msg = "Permission Denial: forceStopPackage() from pid="
+                        + Binder.getCallingPid()
+                        + ", uid=" + callingUid
+                        + " requires " + android.Manifest.permission.FORCE_STOP_PACKAGES;
+                Slog.w(TAG, msg);
+                throw new SecurityException(msg);
+            }
         }
         final int callingPid = Binder.getCallingPid();
         userId = mUserController.handleIncomingUser(callingPid, Binder.getCallingUid(),
@@ -5358,6 +5409,10 @@ public void onReceive(Context context, Intent intent) {
             // Start PSI monitoring in LMKD if it was skipped earlier.
             ProcessList.startPsiMonitoringAfterBoot();
 
+            mHandler.postDelayed(() -> {
+                AxExtServiceFactory.onLateSystemReady();
+            }, 5000);
+
             mUserController.onBootComplete(
                     new IIntentReceiver.Stub() {
                         @Override
@@ -5365,6 +5420,11 @@ public void performReceive(Intent intent, int resultCode,
                                 String data, Bundle extras, boolean ordered,
                                 boolean sticky, int sendingUser) {
                             mBootCompletedTimestamp = SystemClock.uptimeMillis();
+                            mHandler.postDelayed(() -> {
+                                synchronized (mProcLock) {
+                                    mCachedAppOptimizer.compactAllSystem();
+                                }
+                            }, 300000);
                             // Defer the full Pss collection as the system is really busy now.
                             mHandler.postDelayed(() -> {
                                 synchronized (mProcLock) {
@@ -6336,7 +6396,8 @@ int checkCallingPermission(@PermissionName String permission) {
     @PermissionMethod
     void enforceCallingPermission(@PermissionName String permission, String func) {
         if (checkCallingPermission(permission)
-                == PackageManager.PERMISSION_GRANTED) {
+                == PackageManager.PERMISSION_GRANTED
+           || com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
             return;
         }
 
@@ -7763,7 +7824,7 @@ public boolean isUserAMonkey() {
 
     @Override
     public void requestSystemServerHeapDump() {
-        if (!Build.IS_DEBUGGABLE) {
+        if (!Build.IS_ENG) {
             Slog.wtf(TAG, "requestSystemServerHeapDump called on a user build");
             return;
         }
@@ -9242,6 +9303,8 @@ public void systemReady(final Runnable goingCallback, @NonNull TimingsTraceAndSl
             mComponentAliasResolver.onSystemReady(mConstants.mEnableComponentAlias,
                     mConstants.mComponentAliasOverrides);
             t.traceEnd(); // componentAlias
+            
+            AxExtServiceFactory.systemReady();
 
             t.traceEnd(); // PhaseActivityManagerReady
         }
@@ -9386,9 +9449,12 @@ void handleApplicationCrashInner(String eventType, ProcessRecord r, String proce
         }
 
         boolean recoverable = eventType.equals("native_recoverable_crash");
+        boolean isNativeCrash = eventType.equals("native_crash");
+        int uid = (r != null) ? r.uid : -1;
+        int pid = (r != null) ? r.getPid() : -1;
 
-        EventLogTags.writeAmCrash(Binder.getCallingPid(),
-                UserHandle.getUserId(Binder.getCallingUid()), processName,
+        EventLogTags.writeAmCrash(isNativeCrash ? pid : Binder.getCallingPid(),
+                UserHandle.getUserId(isNativeCrash ? uid : Binder.getCallingUid()), processName,
                 r == null ? -1 : r.info.flags,
                 crashInfo.exceptionClassName,
                 crashInfo.exceptionMessage,
@@ -9399,8 +9465,6 @@ void handleApplicationCrashInner(String eventType, ProcessRecord r, String proce
         int processClassEnum = processName.equals("system_server") ? ServerProtoEnums.SYSTEM_SERVER
                 : (r != null) ? r.getProcessClassEnum()
                         : ServerProtoEnums.ERROR_SOURCE_UNKNOWN;
-        int uid = (r != null) ? r.uid : -1;
-        int pid = (r != null) ? r.getPid() : -1;
         FrameworkStatsLog.write(FrameworkStatsLog.APP_CRASH_OCCURRED,
                 uid,
                 eventType,
@@ -9565,7 +9629,7 @@ private void logStrictModeViolationToDropBox(
 
         // Exit early if the dropbox isn't configured to accept this report type.
         final String dropboxTag = processClass(process) + "_strictmode";
-        if (dbox == null || !dbox.isTagEnabled(dropboxTag)) return;
+        if (!isDropBoxTagEnabled(dbox, dropboxTag)) return;
 
         final StringBuilder sb = new StringBuilder(1024);
         synchronized (sb) {
@@ -9606,10 +9670,30 @@ private void logStrictModeViolationToDropBox(
 
         final String res = sb.toString();
         IoThread.getHandler().post(() -> {
-            dbox.addText(dropboxTag, res);
+            addTextToDropBox(dbox, dropboxTag, res);
         });
     }
 
+    private boolean isDropBoxTagEnabled(DropBoxManager dbox, String dropboxTag) {
+        if (dbox == null) {
+            return false;
+        }
+        try {
+            return dbox.isTagEnabled(dropboxTag);
+        } catch (RuntimeException e) {
+            Slog.w(TAG, "Unable to query DropBox tag " + dropboxTag, e);
+            return false;
+        }
+    }
+
+    private void addTextToDropBox(DropBoxManager dbox, String dropboxTag, String data) {
+        try {
+            dbox.addText(dropboxTag, data);
+        } catch (RuntimeException e) {
+            Slog.w(TAG, "Unable to write DropBox entry " + dropboxTag, e);
+        }
+    }
+
     /**
      * Used by {@link Log} via {@link com.android.internal.os.RuntimeInit} to report serious errors.
      * @param app object of the crashing app, null for the system server
@@ -9880,7 +9964,7 @@ public void addErrorToDropBox(String eventType,
 
         // Exit early if the dropbox isn't configured to accept this report type.
         final String dropboxTag = processClass(process) + "_" + eventType;
-        if (dbox == null || !dbox.isTagEnabled(dropboxTag)) return;
+        if (!isDropBoxTagEnabled(dbox, dropboxTag)) return;
 
         // Check if we should rate limit and abort early if needed.
         final DropboxRateLimiter.RateLimitResult rateLimitResult =
@@ -10035,7 +10119,7 @@ public void run() {
                     }
                 }
 
-                dbox.addText(dropboxTag, sb.toString());
+                addTextToDropBox(dbox, dropboxTag, sb.toString());
             }
         };
 
@@ -19701,6 +19785,32 @@ Freezer getFreezer() {
         return mFreezer;
     }
 
+
+    @Override
+    public String getSpoofPifConfig() {
+        return AxExtServiceFactory.getSpoofManager().getPifConfig();
+    }
+
+    @Override
+    public String getSpoofGamePropsConfig() {
+        return AxExtServiceFactory.getSpoofManager().getGamePropsConfig();
+    }
+
+    @Override
+    public String getSpoofTrickyStoreTarget() {
+        return AxExtServiceFactory.getSpoofManager().getTrickyStoreTarget();
+    }
+
+    @Override
+    public String getSpoofTrickyStoreKeyBox() {
+        return AxExtServiceFactory.getSpoofManager().getTrickyStoreKeyBox();
+    }
+
+    @Override
+    public String getSpoofTrickyStorePatch() {
+        return AxExtServiceFactory.getSpoofManager().getTrickyStorePatch();
+    }
+
     // Set of IntentCreatorToken objects that are currently active.
     private static final Map<IntentCreatorToken.Key, WeakReference<IntentCreatorToken>>
             sIntentCreatorTokenCache = new ConcurrentHashMap<>();
@@ -19943,4 +20053,97 @@ public void reportOptimizationInfo(@NonNull IBinder app, @NonNull String compile
         }
         r.getWindowProcessController().setOptimizationInfo(compilerFilter, compilationReason);
     }
+
+    @Override
+    public boolean isThreeFingersSwipeActive() {
+        return mThreeFingersSwipeEnabled && mThreeFingerGestureActive;
+    }
+
+    @Override
+    public void setThreeFingersSwipeActive(boolean active) {
+        mThreeFingersSwipeEnabled = active;
+    }
+
+    @Override
+    public void setThreeGestureStateActive(boolean active) {
+        mThreeFingerGestureActive = active;
+    }
+
+    @Override
+    public boolean shouldForceCutoutFullscreen(String packageName) {
+        return mActivityTaskManager.shouldForceCutoutFullscreen(packageName);
+    }
+
+    @Override
+    public void releaseMemory(int minAdj, int maxKillCount,
+                              boolean includeUIProcesses, boolean skipCamera) {
+        if (minAdj <= 0) return;
+
+        final int currentUser = mUserController.getCurrentUserId();
+        final ArrayList<ProcessRecord> victims = new ArrayList<>();
+
+        synchronized (this) {
+            synchronized (mProcLock) {
+                mProcessList.forEachLruProcessesLOSP(false, proc -> {
+                    if (proc == null || proc.getThread() == null) return;
+
+                    final int setAdj = proc.getSetAdj();
+                    final int state = proc.getSetProcState();
+
+                    // Exclusions
+                    if (proc.isPersistent()) return;
+                    if (proc.userId != currentUser) return;
+                    if (state <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) return;
+                    if (state == ActivityManager.PROCESS_STATE_HOME) return;
+                    if (!includeUIProcesses && proc.hasActivities()) return;
+
+                    if (setAdj >= minAdj) victims.add(proc);
+                });
+            }
+        }
+
+        victims.sort((a, b) -> Integer.compare(b.getSetAdj(), a.getSetAdj()));
+
+        int killed = 0;
+        for (ProcessRecord proc : victims) {
+            if (killed >= maxKillCount) break;
+            final String reason = "screen-on memory reclaim";
+            mHandler.post(() -> {
+                synchronized (ActivityManagerService.this) {
+                    proc.killLocked(reason,
+                            ApplicationExitInfo.REASON_OTHER,
+                            ApplicationExitInfo.SUBREASON_MEMORY_PRESSURE, true);
+                }
+            });
+            killed++;
+        }
+    }
+
+    @Override
+    public void compactAllSystem() {
+        mHandler.post(() -> {
+            synchronized (mProcLock) {
+                mCachedAppOptimizer.compactAllSystem();
+            }
+        });
+    }
+
+    public class ProcessComparator implements Comparator<ProcessToKill> {
+        @Override
+        public int compare(ProcessToKill p1, ProcessToKill p2) {
+            return Integer.compare(p2.adj, p1.adj);
+        }
+    }
+
+    public static final class ProcessToKill {
+        public int adj;
+        public String name; 
+        public int pid;
+
+        public ProcessToKill(int pid, int adj, String name) {
+            this.pid = pid;
+            this.adj = adj;
+            this.name = name;
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java
index dccdc287d97a8..dca641e62d636 100644
--- a/services/core/java/com/android/server/am/AppErrorDialog.java
+++ b/services/core/java/com/android/server/am/AppErrorDialog.java
@@ -18,6 +18,8 @@
 
 import static android.app.ActivityTaskManager.INVALID_TASK_ID;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
@@ -26,20 +28,28 @@
 import android.os.Message;
 import android.provider.Settings;
 import android.text.BidiFormatter;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.internal.util.PastyUtils;
+import com.android.internal.util.PastyUtils.UploadResultCallback;
 
 final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListener {
 
+    private static final String TAG = "AppErrorDialog";
+
     private final ActivityManagerService mService;
     private final ActivityManagerGlobalLock mProcLock;
     private final Data mData;
     private final AppErrorResult mResult;
     private final ProcessRecord mProc;
     private final boolean mIsRestartable;
+    private String mPaste;
 
     static int CANT_SHOW = -1;
     static int BACKGROUND_USER = -2;
@@ -69,6 +79,7 @@ public AppErrorDialog(Context context, ActivityManagerService service, Data data
         mIsRestartable = (data.taskId != INVALID_TASK_ID || data.isRestartableForService)
                 && Settings.Global.getInt(context.getContentResolver(),
                 Settings.Global.SHOW_RESTART_IN_CRASH_DIALOG, 0) != 0;
+        mPaste = data.paste;
         BidiFormatter bidi = BidiFormatter.getInstance();
 
         CharSequence name;
@@ -121,6 +132,8 @@ protected void onCreate(Bundle savedInstanceState) {
         final TextView report = findViewById(com.android.internal.R.id.aerr_report);
         report.setOnClickListener(this);
         report.setVisibility(hasReceiver ? View.VISIBLE : View.GONE);
+        final TextView copy = findViewById(com.android.internal.R.id.aerr_copy);
+        copy.setOnClickListener(this);
         final TextView close = findViewById(com.android.internal.R.id.aerr_close);
         close.setOnClickListener(this);
         final TextView appInfo = findViewById(com.android.internal.R.id.aerr_app_info);
@@ -185,6 +198,10 @@ public void onClick(View v) {
             case com.android.internal.R.id.aerr_report:
                 mHandler.obtainMessage(FORCE_QUIT_AND_REPORT).sendToTarget();
                 break;
+            case com.android.internal.R.id.aerr_copy:
+                postToPastyAndCopyURL();
+                mHandler.obtainMessage(FORCE_QUIT).sendToTarget();
+                break;
             case com.android.internal.R.id.aerr_close:
                 mHandler.obtainMessage(FORCE_QUIT).sendToTarget();
                 break;
@@ -199,11 +216,31 @@ public void onClick(View v) {
         }
     }
 
+    private void postToPastyAndCopyURL() {
+        // Post to Pasty
+        PastyUtils.upload(mPaste, new UploadResultCallback() {
+            public void onSuccess(String url) {
+                // Copy to clipboard
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                clipboard.setPrimaryClip(ClipData.newPlainText("Log URL", url));
+
+                // Show toast
+                Toast.makeText(getContext(), com.android.internal.R.string.url_copy_success, Toast.LENGTH_LONG).show();
+            }
+
+            public void onFail(String message, Exception e) {
+                Toast.makeText(getContext(), com.android.internal.R.string.url_copy_failed, Toast.LENGTH_LONG).show();
+                Log.e(TAG, message, e);
+            }
+        });
+    }
+
     static class Data {
         AppErrorResult result;
         int taskId;
         boolean repeating;
         ProcessRecord proc;
         boolean isRestartableForService;
+        String paste;
     }
 }
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index e150ebf6d4c48..0bcf7832b04fc 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -47,6 +47,7 @@
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -673,6 +674,21 @@ private void crashApplicationInner(ProcessRecord r, ApplicationErrorReport.Crash
             if (r == null || !makeAppCrashingLocked(r, shortMsg, longMsg, stackTrace, data)) {
                 return;
             }
+            // don't show app error dialog before system booted
+            if (!mService.mBooting && !mService.mBooted) {
+                return;
+            }
+
+            // Add paste content for Pasty option
+            String devFP = SystemProperties.get("ro.vendor.build.fingerprint", "");
+            String matrixxVers = SystemProperties.get("ro.matrixx.version", "");
+            String boardName = SystemProperties.get("ro.product.board", "");
+            data.paste = "time: " + timeMillis + "\n" +
+            "device fp:" + devFP + "\n" +
+            "product board:" + boardName + "\n" +
+            "matrixx vers:" + matrixxVers + "\n" +
+            "msg: " + longMsg + "\n" +
+            "stacktrace: " + stackTrace;
 
             final Message msg = Message.obtain();
             msg.what = ActivityManagerService.SHOW_ERROR_UI_MSG;
@@ -1129,7 +1145,10 @@ void handleShowAnrUi(Message msg) {
             int visibleUserId = getVisibleUserId(proc.userId);
             boolean showBackground = Settings.Secure.getIntForUser(mContext.getContentResolver(),
                     Settings.Secure.ANR_SHOW_BACKGROUND, 0, visibleUserId) != 0;
-            if (mService.mAtmInternal.canShowErrorDialogs(visibleUserId) || showBackground) {
+            final boolean anrSilenced = mAppsNotReportingCrashes != null
+                    && mAppsNotReportingCrashes.contains(proc.info.packageName);
+            if (!anrSilenced &&
+                    (mService.mAtmInternal.canShowErrorDialogs(visibleUserId) || showBackground)) {
                 AnrController anrController = errState.getDialogController().getAnrController();
                 if (anrController == null) {
                     errState.getDialogController().showAnrDialogs(data);
@@ -1154,7 +1173,7 @@ void handleShowAnrUi(Message msg) {
                 MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_APP_ANR,
                         AppNotRespondingDialog.CANT_SHOW);
                 // Just kill the app if there is no dialog to be shown.
-                doKill = true;
+                doKill = !anrSilenced;
             }
         }
         if (doKill) {
diff --git a/services/core/java/com/android/server/am/BroadcastConstants.java b/services/core/java/com/android/server/am/BroadcastConstants.java
index 598e43f2a0139..998e212988552 100644
--- a/services/core/java/com/android/server/am/BroadcastConstants.java
+++ b/services/core/java/com/android/server/am/BroadcastConstants.java
@@ -117,8 +117,7 @@ public class BroadcastConstants {
      */
     public int MAX_RUNNING_PROCESS_QUEUES = DEFAULT_MAX_RUNNING_PROCESS_QUEUES;
     private static final String KEY_MAX_RUNNING_PROCESS_QUEUES = "bcast_max_running_process_queues";
-    private static final int DEFAULT_MAX_RUNNING_PROCESS_QUEUES =
-            ActivityManager.isLowRamDeviceStatic() ? 2 : 4;
+    private static final int DEFAULT_MAX_RUNNING_PROCESS_QUEUES = 2;
 
     /**
      * For {@link BroadcastQueueImpl}: Additional running process queue parallelism beyond
@@ -157,8 +156,7 @@ public class BroadcastConstants {
     public int MAX_RUNNING_ACTIVE_BROADCASTS = DEFAULT_MAX_RUNNING_ACTIVE_BROADCASTS;
     private static final String KEY_MAX_RUNNING_ACTIVE_BROADCASTS =
             "bcast_max_running_active_broadcasts";
-    private static final int DEFAULT_MAX_RUNNING_ACTIVE_BROADCASTS =
-            ActivityManager.isLowRamDeviceStatic() ? 8 : 16;
+    private static final int DEFAULT_MAX_RUNNING_ACTIVE_BROADCASTS = 8;
 
     /**
      * For {@link BroadcastQueueImpl}: Maximum number of active "blocking" broadcasts
@@ -170,8 +168,7 @@ public class BroadcastConstants {
     public int MAX_CORE_RUNNING_BLOCKING_BROADCASTS = DEFAULT_MAX_CORE_RUNNING_BLOCKING_BROADCASTS;
     private static final String KEY_CORE_MAX_RUNNING_BLOCKING_BROADCASTS =
             "bcast_max_core_running_blocking_broadcasts";
-    private static final int DEFAULT_MAX_CORE_RUNNING_BLOCKING_BROADCASTS =
-            ActivityManager.isLowRamDeviceStatic() ? 8 : 16;
+    private static final int DEFAULT_MAX_CORE_RUNNING_BLOCKING_BROADCASTS = 8;
 
     /**
      * For {@link BroadcastQueueImpl}: Maximum number of active non-"blocking" broadcasts
@@ -184,8 +181,7 @@ public class BroadcastConstants {
             DEFAULT_MAX_CORE_RUNNING_NON_BLOCKING_BROADCASTS;
     private static final String KEY_CORE_MAX_RUNNING_NON_BLOCKING_BROADCASTS =
             "bcast_max_core_running_non_blocking_broadcasts";
-    private static final int DEFAULT_MAX_CORE_RUNNING_NON_BLOCKING_BROADCASTS =
-            ActivityManager.isLowRamDeviceStatic() ? 32 : 64;
+    private static final int DEFAULT_MAX_CORE_RUNNING_NON_BLOCKING_BROADCASTS = 32;
 
     /**
      * For {@link BroadcastQueueImpl}: Maximum number of pending
@@ -194,8 +190,7 @@ public class BroadcastConstants {
      */
     public int MAX_PENDING_BROADCASTS = DEFAULT_MAX_PENDING_BROADCASTS;
     private static final String KEY_MAX_PENDING_BROADCASTS = "bcast_max_pending_broadcasts";
-    private static final int DEFAULT_MAX_PENDING_BROADCASTS =
-            ActivityManager.isLowRamDeviceStatic() ? 128 : 256;
+    private static final int DEFAULT_MAX_PENDING_BROADCASTS = 128;
 
     /**
      * For {@link BroadcastQueueImpl}: Delay to apply to normal
@@ -248,8 +243,7 @@ public class BroadcastConstants {
      */
     public int MAX_HISTORY_COMPLETE_SIZE = DEFAULT_MAX_HISTORY_COMPLETE_SIZE;
     private static final String KEY_MAX_HISTORY_COMPLETE_SIZE = "bcast_max_history_complete_size";
-    private static final int DEFAULT_MAX_HISTORY_COMPLETE_SIZE =
-            ActivityManager.isLowRamDeviceStatic() ? 64 : 256;
+    private static final int DEFAULT_MAX_HISTORY_COMPLETE_SIZE = 64;
 
     /**
      * For {@link BroadcastQueueImpl}: Maximum number of summarized
@@ -257,8 +251,7 @@ public class BroadcastConstants {
      */
     public int MAX_HISTORY_SUMMARY_SIZE = DEFAULT_MAX_HISTORY_SUMMARY_SIZE;
     private static final String KEY_MAX_HISTORY_SUMMARY_SIZE = "bcast_max_history_summary_size";
-    private static final int DEFAULT_MAX_HISTORY_SUMMARY_SIZE =
-            ActivityManager.isLowRamDeviceStatic() ? 256 : 1024;
+    private static final int DEFAULT_MAX_HISTORY_SUMMARY_SIZE = 256;
 
     /**
      * For {@link BroadcastRecord}: Default to treating all broadcasts sent by
diff --git a/services/core/java/com/android/server/am/BroadcastController.java b/services/core/java/com/android/server/am/BroadcastController.java
index 31cc49ddf974c..e60e5815b2d74 100644
--- a/services/core/java/com/android/server/am/BroadcastController.java
+++ b/services/core/java/com/android/server/am/BroadcastController.java
@@ -473,7 +473,8 @@ private Intent registerReceiverWithFeatureTraced(IApplicationThread caller,
             if (receiver == null && !explicitExportStateDefined) {
                 // sticky broadcast, no flag specified (flag isn't required)
                 flags |= Context.RECEIVER_EXPORTED;
-            } else if (requireExplicitFlagForDynamicReceivers && !explicitExportStateDefined) {
+            } else if (requireExplicitFlagForDynamicReceivers && !explicitExportStateDefined
+                    && !com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassBroadcastReceiverValidation(callerPackage)) {
                 throw new SecurityException(
                         callerPackage + ": One of RECEIVER_EXPORTED or "
                                 + "RECEIVER_NOT_EXPORTED should be specified when a receiver "
diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 0ec502f9cba11..7c87b3442b408 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -96,6 +96,8 @@
 import java.io.PrintWriter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -275,10 +277,10 @@ public class CachedAppOptimizer {
     // Defaults for phenotype flags.
     @VisibleForTesting static final boolean DEFAULT_USE_COMPACTION = true;
     @VisibleForTesting static final boolean DEFAULT_USE_FREEZER = true;
-    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_1 = 5_000;
-    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_2 = 10_000;
-    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_3 = 500;
-    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_4 = 10_000;
+    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_1 = 30_000;
+    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_2 = 60_000;
+    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_3 = 10_000;
+    @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_4 = 15*60*1000;
     @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_5 = 10 * 60 * 1000;
     @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_6 = 10 * 60 * 1000;
     @VisibleForTesting static final long DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ =
@@ -352,6 +354,7 @@ public enum CancelCompactReason {
     static final int UID_FROZEN_STATE_CHANGED_MSG = 6;
     static final int DEADLOCK_WATCHDOG_MSG = 7;
     static final int BINDER_ERROR_MSG = 8;
+    static final int COMPACT_APP_SWITCH_MSG = 9;
 
     // When free swap falls below this percentage threshold any full (file + anon)
     // compactions will be downgraded to file only compactions to reduce pressure
@@ -493,6 +496,14 @@ public void onChange(boolean selfChange, Uri uri) {
             DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ;
     @GuardedBy("mPhenotypeFlagLock")
     private volatile boolean mUseCompaction = DEFAULT_USE_COMPACTION;
+
+    private static final long APP_SWITCH_COMPACT_DELAY_MS = 10_000;
+
+    private static final long COMPACT_LAUNCH_DEFER_DURATION_MS = 1_500;
+
+    private volatile long mLastAppLaunchUptime = 0;
+    private volatile boolean mIsAwake = true;
+
     private volatile boolean mUseFreezer = false; // set to DEFAULT in init()
     @GuardedBy("this")
     private int mFreezerDisableCount = 1; // Freezer is initially disabled, until enabled
@@ -556,7 +567,7 @@ public CachedAppOptimizer(ActivityManagerService am) {
         mAm = am;
         mProcLock = am.mProcLock;
         mCachedAppOptimizerThread = new ServiceThread("CachedAppOptimizerThread",
-            Process.THREAD_GROUP_SYSTEM, true);
+            Process.THREAD_GROUP_BACKGROUND, true);
         mProcStateThrottle = new HashSet<>();
         mProcessDependencies = processDependencies;
         mTestCallback = callback;
@@ -797,10 +808,9 @@ private void updateUseCompaction() {
 
             mCompactionHandler = new MemCompactionHandler();
             mCompactStatsManager = CompactionStatsManager.getInstance();
-
-            Process.setThreadGroupAndCpuset(mCachedAppOptimizerThread.getThreadId(),
-                    Process.THREAD_GROUP_SYSTEM);
         }
+        Process.setThreadGroupAndCpuset(mCachedAppOptimizerThread.getThreadId(),
+                    Process.THREAD_GROUP_BACKGROUND);
     }
 
     /**
@@ -900,7 +910,7 @@ private void updateUseFreezer() {
                 }
 
                 Process.setThreadGroupAndCpuset(mCachedAppOptimizerThread.getThreadId(),
-                        Process.THREAD_GROUP_SYSTEM);
+                        Process.THREAD_GROUP_BACKGROUND);
             } else {
                 Slog.d(TAG_AM, "Freezer disabled");
                 enableFreezer(false);
@@ -1422,11 +1432,13 @@ void onCleanupApplicationRecordLocked(ProcessRecord app) {
     }
 
     void onWakefulnessChanged(int wakefulness) {
+        mIsAwake = wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
         if(wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE) {
             if (useCompaction()) {
                 // Remove any pending compaction we may have scheduled to happen while screen was
                 // off
                 cancelAllCompactions(CancelCompactReason.SCREEN_ON);
+                mCompactionHandler.removeMessages(COMPACT_APP_SWITCH_MSG);
             }
         }
     }
@@ -1475,6 +1487,19 @@ void onOomAdjustChanged(int oldAdj, int newAdj, ProcessRecord app) {
             // if the process moved out of cached state
             if (newAdj < oldAdj && newAdj < ProcessList.CACHED_APP_MIN_ADJ) {
                 cancelCompactionForProcess(app, CancelCompactReason.OOM_IMPROVEMENT);
+                mCompactionHandler.removeMessages(COMPACT_APP_SWITCH_MSG, app);
+            }
+
+            if (newAdj >= ProcessList.CACHED_APP_MIN_ADJ
+                    && oldAdj < ProcessList.CACHED_APP_MIN_ADJ) {
+                mCompactionHandler.sendMessageDelayed(
+                        mCompactionHandler.obtainMessage(COMPACT_APP_SWITCH_MSG, app),
+                        APP_SWITCH_COMPACT_DELAY_MS);
+            }
+
+            if (newAdj <= ProcessList.FOREGROUND_APP_ADJ
+                    && oldAdj > ProcessList.FOREGROUND_APP_ADJ) {
+                mLastAppLaunchUptime = SystemClock.uptimeMillis();
             }
         }
     }
@@ -1484,6 +1509,10 @@ void onOomAdjustChanged(int oldAdj, int newAdj, ProcessRecord app) {
      */
     void onProcessFrozen(ProcessRecord frozenProc) {
         if (useCompaction()) {
+            if (mIsAwake) {
+                frozenProc.onProcessFrozen();
+                return;
+            }
             synchronized (mProcLock) {
                 // only full-compact if process is cached
                 if (frozenProc.getSetAdj() >= mCompactThrottleMinOomAdj) {
@@ -1541,6 +1570,18 @@ boolean isProcessFrozen(int pid) {
         }
     }
 
+    private boolean isSystemUnderHighLoad() {
+        try {
+            String loadStr = new String(
+                    Files.readAllBytes(Paths.get("/proc/loadavg")));
+            double oneMinLoad = Double.parseDouble(loadStr.split(" ")[0]);
+            int numCpus = Runtime.getRuntime().availableProcessors();
+            return (oneMinLoad / numCpus) > 0.8;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     private static int getCompactionFlags(CompactProfile profile) {
         if (profile == CompactProfile.FULL) {
             return COMPACT_ACTION_FILE_FLAG | COMPACT_ACTION_ANON_FLAG;
@@ -1559,10 +1600,13 @@ private MemCompactionHandler() {
 
         private boolean shouldOomAdjThrottleCompaction(ProcessRecord proc) {
             final String name = proc.processName;
+            final ProcessCachedOptimizerRecord opt = proc.mOptRecord;
+            CompactSource compactSource = opt.getReqCompactSource();
 
             // don't compact if the process has returned to perceptible
             // and this is only a cached/home/prev compaction
-            if (proc.getSetAdj() <= ProcessList.PERCEPTIBLE_APP_ADJ) {
+            if (compactSource == CompactSource.APP
+                    && proc.getSetAdj() <= ProcessList.PERCEPTIBLE_APP_ADJ) {
                 if (DEBUG_COMPACTION) {
                     Slog.d(TAG_AM,
                             "Skipping compaction as process " + name + " is "
@@ -1752,6 +1796,13 @@ public void handleMessage(Message msg) {
                     }
 
                     if (!forceCompaction) {
+                        if (start - mLastAppLaunchUptime < COMPACT_LAUNCH_DEFER_DURATION_MS) {
+                            if (DEBUG_COMPACTION) {
+                                Slog.d(TAG_AM, "Skipping compaction for " + name
+                                        + ": app launch in progress");
+                            }
+                            return;
+                        }
                         if (shouldOomAdjThrottleCompaction(proc)) {
                             mCompactStatsManager.logCompactionThrottled(
                                     CompactionStatsManager.COMPACT_THROTTLE_REASON_OOM_ADJ,
@@ -1894,6 +1945,22 @@ public void handleMessage(Message msg) {
                     Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
                     break;
                 }
+                case COMPACT_APP_SWITCH_MSG: {
+                    ProcessRecord proc = (ProcessRecord) msg.obj;
+                    if (isSystemUnderHighLoad()) {
+                        if (DEBUG_COMPACTION) {
+                            Slog.d(TAG_AM, "Skipping app-switch compaction for "
+                                    + proc.processName + " due to high CPU load");
+                        }
+                        break;
+                    }
+                    synchronized (mProcLock) {
+                        if (proc.getCurAdj() >= ProcessList.CACHED_APP_MIN_ADJ) {
+                            compactApp(proc, CompactProfile.ANON, CompactSource.APP, false);
+                        }
+                    }
+                    break;
+                }
             }
         }
     }
diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index 5dc318a823f67..ec1ae3c2c76df 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -1378,7 +1378,7 @@ public final void installSystemProviders() {
         mService.mConstants.start(mService.mContext.getContentResolver());
         mService.mCoreSettingsObserver = new CoreSettingsObserver(mService);
         mService.mActivityTaskManager.installSystemProviders();
-        new DevelopmentSettingsObserver(); // init to observe developer settings enable/disable
+        //new DevelopmentSettingsObserver(); // init to observe developer settings enable/disable
         SettingsToPropertiesMapper.start(mService.mContext.getContentResolver());
         mService.getCachedAppOptimizer().init();
         mService.setupServicePrewarmingOnUserSwitch();
@@ -1573,6 +1573,9 @@ private String checkContentProviderPermission(ProviderInfo cpi, int callingPid,
             return "ContentProvider access not allowed from sdk sandbox UID. "
                     + "ProviderInfo: " + cpi.toString();
         }
+        if (cpi.name.contains("com.google.")) {
+            return null;
+        }
         boolean checkedGrants = false;
         if (checkUser) {
             // Looking for cross-user grants before enforcing the typical cross-users permissions
diff --git a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
index 2152551418d5b..7b2e731083319 100644
--- a/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
+++ b/services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java
@@ -214,7 +214,7 @@ int getLastOomAdjChangeReason() {
     CachedAppOptimizer.CompactProfile getLastCompactProfile() {
         if (mLastCompactProfile == null) {
             // The first compaction won't have a previous one, so assign one to avoid crashing.
-            mLastCompactProfile = CachedAppOptimizer.CompactProfile.SOME;
+            mLastCompactProfile = CachedAppOptimizer.CompactProfile.FULL;
         }
 
         return mLastCompactProfile;
@@ -403,6 +403,7 @@ void dispatchUnfrozenEvent() {
 
     void init(long nowUptime) {
         mFreezeUnfreezeTime = nowUptime;
+        mLastCompactTime = nowUptime;
     }
 
     @GuardedBy("mProcLock")
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index a421ee65fcfd8..3defe011e3329 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -1946,6 +1946,29 @@ boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,
 
                 gids = computeGidsForProcess(mountExternal, uid, permGids, externalStorageAccess);
             }
+            if (gids != null) {
+                try {
+                    int[] restrictedGids = com.android.server.wm.AxSandboxService.get()
+                            .getRestrictedGids(app.info.packageName);
+                    if (restrictedGids != null && restrictedGids.length > 0) {
+                        java.util.ArrayList<Integer> filtered = new java.util.ArrayList<>();
+                        for (int gid : gids) {
+                            boolean restricted = false;
+                            for (int rg : restrictedGids) {
+                                if (gid == rg) { restricted = true; break; }
+                            }
+                            if (!restricted) filtered.add(gid);
+                        }
+                        if (filtered.size() != gids.length) {
+                            gids = new int[filtered.size()];
+                            for (int i = 0; i < filtered.size(); i++) gids[i] = filtered.get(i);
+                        }
+                    }
+                } catch (Exception e) {
+                    Slog.w(TAG_PROCESSES, "Failed to apply GID restrictions for "
+                            + app.info.packageName, e);
+                }
+            }
             app.setMountMode(mountExternal);
             checkSlow(startUptime, "startProcess: building args");
             if (app.getWindowProcessController().isFactoryTestProcess()) {
@@ -2439,8 +2462,15 @@ private Map<String, Pair<String, Long>> getPackageAppDataInfoMap(PackageManagerI
 
     private boolean needsStorageDataIsolation(StorageManagerInternal storageManagerInternal,
             ProcessRecord app) {
+        boolean sandboxIsolation = false;
+        try {
+            sandboxIsolation = com.android.server.wm.AxSandboxService.get()
+                    .isSandboxDataIsolationEnabled(app.info.packageName);
+        } catch (Exception e) {
+            // ignore
+        }
         final int mountMode = app.getMountMode();
-        return mVoldAppDataIsolationEnabled && UserHandle.isApp(app.uid)
+        return (mVoldAppDataIsolationEnabled || sandboxIsolation) && UserHandle.isApp(app.uid)
                 && !storageManagerInternal.isExternalStorageService(app.uid)
                 // Special mounting mode doesn't need to have data isolation as they won't
                 // access /mnt/user anyway.
@@ -2469,10 +2499,18 @@ private Process.ProcessStartResult startProcess(HostingRecord hostingRecord, Str
             Map<String, Pair<String, Long>> pkgDataInfoMap;
             Map<String, Pair<String, Long>> allowlistedAppDataInfoMap;
             boolean bindMountAppStorageDirs = false;
-            boolean bindMountAppsData = mAppDataIsolationEnabled
+            boolean sandboxDataIsolation = false;
+            try {
+                sandboxDataIsolation = com.android.server.wm.AxSandboxService.get()
+                        .isSandboxDataIsolationEnabled(app.info.packageName);
+            } catch (Exception e) {
+                // ignore
+            }
+            boolean bindMountAppsData = (mAppDataIsolationEnabled || sandboxDataIsolation)
                     && (UserHandle.isApp(app.uid) || UserHandle.isIsolated(app.uid)
                         || app.isSdkSandbox)
-                    && mPlatformCompat.isChangeEnabled(APP_DATA_DIRECTORY_ISOLATION, app.info);
+                    && (sandboxDataIsolation
+                        || mPlatformCompat.isChangeEnabled(APP_DATA_DIRECTORY_ISOLATION, app.info));
 
             // Get all packages belongs to the same shared uid. sharedPackages is empty array
             // if it doesn't have shared uid.
@@ -4313,6 +4351,10 @@ ArrayList<ProcessRecord> getLruProcessesLOSP() {
         return mLruProcesses;
     }
 
+    public ArrayList<ProcessRecord> ntGetLruProcesses() {
+        return this.mLruProcesses;
+    }
+
     /**
      * Return the reference to the LRU list, call this function for read/write access
      */
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 93f2ad7044861..58e8bc65cc4d8 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -54,7 +54,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Maps system settings to system properties.
@@ -72,12 +74,17 @@ public class SettingsToPropertiesMapper {
     private static final String RESET_RECORD_FILE_PATH =
             "/data/server_configurable_flags/reset_flags";
 
+    private static final String RESERVED_SOCKET_DIR = "/dev/socket/";
+
     private static final String SYSTEM_PROPERTY_VALID_CHARACTERS_REGEX = "^[\\w\\.\\-@:]*$";
 
     private static final String SYSTEM_PROPERTY_INVALID_SUBSTRING = "..";
 
     private static final int SYSTEM_PROPERTY_MAX_LENGTH = 92;
 
+    private static final Set<String> sUnavailableAconfigdSockets =
+            Collections.synchronizedSet(new HashSet<>());
+
     // experiment flags added to Global.Settings(before new "Config" provider table is available)
     // will be added under this category.
     private static final String GLOBAL_SETTINGS_CATEGORY = "global_settings";
@@ -264,6 +271,12 @@ static void sendAconfigdRequests(ProtoOutputStream requests) {
      * @return aconfigd socket return as proto input stream
      */
     static ProtoInputStream sendAconfigdRequests(String socketName, ProtoOutputStream requests) {
+        if (!isAconfigdSocketAvailable(socketName)) {
+            maybeLogUnavailableAconfigdSocket(socketName);
+            return null;
+        }
+        sUnavailableAconfigdSockets.remove(socketName);
+
         // connect to aconfigd socket
         LocalSocket client = new LocalSocket();
         try {
@@ -271,6 +284,10 @@ static ProtoInputStream sendAconfigdRequests(String socketName, ProtoOutputStrea
                 socketName, LocalSocketAddress.Namespace.RESERVED));
             Slog.d(TAG, "connected to " + socketName + " socket");
         } catch (IOException ioe) {
+            if (!isAconfigdSocketAvailable(socketName)) {
+                maybeLogUnavailableAconfigdSocket(socketName);
+                return null;
+            }
             logErr("failed to connect to " + socketName + " socket", ioe);
             return null;
         }
@@ -308,6 +325,18 @@ static ProtoInputStream sendAconfigdRequests(String socketName, ProtoOutputStrea
         }
     }
 
+    @VisibleForTesting
+    static boolean isAconfigdSocketAvailable(String socketName) {
+        return new File(RESERVED_SOCKET_DIR + socketName).exists();
+    }
+
+    private static void maybeLogUnavailableAconfigdSocket(String socketName) {
+        if (sUnavailableAconfigdSockets.add(socketName)) {
+            Slog.i(TAG, "Skipping aconfigd request because " + socketName
+                    + " socket is unavailable");
+        }
+    }
+
     /**
      * serialize a flag override request
      * @param proto
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 811fa9ec7a7f8..d638bdae244c3 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -998,7 +998,7 @@ private void finishUserUnlocked(final UserState uss) {
             // Suppress double notifications for managed profiles that
             // were unlocked automatically as part of their parent user being
             // unlocked.  TODO(b/217442918): this code doesn't work correctly.
-            final boolean quiet = info.isManagedProfile();
+            final boolean quiet = info.isManagedProfile() || info.isCloneProfile();
             mInjector.sendPreBootBroadcast(userId, quiet,
                     () -> finishUserUnlockedCompleted(uss));
         } else {
@@ -1978,6 +1978,11 @@ boolean startProfile(@UserIdInt int userId, boolean evenWhenDisabled,
     }
 
     boolean startUserInBackgroundTemporarily(@UserIdInt int userId, int durationSecs) {
+        synchronized (mLock) {
+            if (!mReady) {
+                return false;
+            }
+        }
         return startUserNoChecks(userId, Display.DEFAULT_DISPLAY, USER_START_MODE_BACKGROUND,
                 durationSecs, /* unlockListener= */ null);
     }
@@ -3707,6 +3712,9 @@ boolean isSystemUserStarted() {
     }
 
     private void checkGetCurrentUserPermissions() {
+        if (com.android.internal.util.matrixx.PixelPropsUtils.isSystemLauncher(Binder.getCallingUid())) {
+            return;
+        }
         if ((mInjector.checkCallingPermission(INTERACT_ACROSS_USERS)
                 != PackageManager.PERMISSION_GRANTED) && (
                 mInjector.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
diff --git a/services/core/java/com/android/server/am/psc/ProcessRecordInternal.java b/services/core/java/com/android/server/am/psc/ProcessRecordInternal.java
index c64f0759b4ebe..f3ae7c3462320 100644
--- a/services/core/java/com/android/server/am/psc/ProcessRecordInternal.java
+++ b/services/core/java/com/android/server/am/psc/ProcessRecordInternal.java
@@ -1867,6 +1867,13 @@ public void setRenderThreadTid(int renderThreadTid) {
         mRenderThreadTid = renderThreadTid;
     }
 
+    public String getProcessName() {
+        return this.processName;
+    }
+
+    public int getUid() {
+        return this.uid;
+    }
 
     /**
      * Lazily initiates and returns the track name for tracing.
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 93349d708daf6..d8d04164bcae6 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -139,6 +139,7 @@
 import android.permission.PermissionManager;
 import android.permission.flags.Flags;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.AtomicFile;
@@ -5091,7 +5092,7 @@ private RestrictionBypass getBypassforPackage(@NonNull PackageState packageState
             Binder.restoreCallingIdentity(ident);
         }
 
-        if (pkgUid != uid) {
+        if (pkgUid != Process.INVALID_UID && pkgUid != uid) {
             if (!suppressErrorLogs) {
                 Slog.e(TAG, "Bad call made by uid " + callingUid + ". "
                         + "Package \"" + packageName + "\" does not belong to uid " + uid + ".");
@@ -5125,7 +5126,7 @@ private boolean isAttributionInPackage(@Nullable AndroidPackage pkg,
             @Nullable String attributionTag) {
         if (pkg == null) {
             return false;
-        } else if (attributionTag == null) {
+        } else if (TextUtils.isEmpty(attributionTag)) {
             return true;
         }
         if (pkg.getAttributions() != null) {
@@ -5571,15 +5572,16 @@ void writeRecentAccesses() {
                     String lastPkg = null;
                     for (int i=0; i<allOps.size(); i++) {
                         AppOpsManager.PackageOps pkg = allOps.get(i);
-                        if (!Objects.equals(pkg.getPackageName(), lastPkg)) {
+                        if (pkg.getPackageName() == null) {
+                            continue;
+                        }
+                        if (!pkg.getPackageName().equals(lastPkg)) {
                             if (lastPkg != null) {
                                 out.endTag(null, "pkg");
                             }
                             lastPkg = pkg.getPackageName();
-                            if (lastPkg != null) {
-                                out.startTag(null, "pkg");
-                                out.attribute(null, "n", lastPkg);
-                            }
+                            out.startTag(null, "pkg");
+                            out.attribute(null, "n", lastPkg);
                         }
                         out.startTag(null, "uid");
                         out.attributeInt(null, "n", pkg.getUid());
diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java
index 5edbaa93964a3..195070e7c6ea0 100644
--- a/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@ -472,7 +472,7 @@ private static ComponentName resolveAttentionService(Context context) {
 
         final ResolveInfo resolveInfo = context.getPackageManager().resolveService(intent, flags);
         if (resolveInfo == null || resolveInfo.serviceInfo == null) {
-            Slog.wtf(LOG_TAG, String.format("Service %s not found in package %s",
+            Slog.v(LOG_TAG, String.format("Service %s not found in package %s",
                     AttentionService.SERVICE_INTERFACE, serviceConfigPackage
             ));
             return null;
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 358f17028764e..35c640e8dee5e 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -65,6 +65,7 @@
 import static android.media.audiopolicy.Flags.volumeGroupManagementUpdate;
 import static android.os.Process.FIRST_APPLICATION_UID;
 import static android.os.Process.INVALID_UID;
+import static android.provider.Settings.Secure.VOLUME_HUSH_CYCLE;
 import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
 import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
 import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
@@ -138,6 +139,7 @@
 import android.hardware.input.InputManager;
 import android.hardware.usb.UsbManager;
 import android.hidl.manager.V1_0.IServiceManager;
+import android.media.AppVolume;
 import android.media.AudioAttributes;
 import android.media.AudioAttributes.AttributeSystemUsage;
 import android.media.AudioDescriptor;
@@ -384,6 +386,7 @@ public class AudioService extends IAudioService.Stub
 
     final Context mContext;
     private final ContentResolver mContentResolver;
+    private int mShowAppVolume;
     private final AppOpsManager mAppOps;
 
     /** do not use directly, use getMediaSessionManager() which handles lazy initialization */
@@ -3442,6 +3445,9 @@ private void readPersistedSettings() {
 
         updateMasterBalance(cr);
 
+        mShowAppVolume = mSettings.getSystemIntForUser(cr,
+                Settings.System.SHOW_APP_VOLUME, 0, UserHandle.USER_CURRENT);
+
         // Each stream will read its own persisted settings
 
         // Broadcast the sticky intents
@@ -6633,6 +6639,8 @@ public void setRingerModeInternal(int ringerMode, String caller) {
         setRingerMode(ringerMode, caller, false /*external*/);
     }
 
+    private static Toast mSilenceToast;
+
     public void silenceRingerModeInternal(String reason) {
         VibrationEffect effect = null;
         int ringerMode = AudioManager.RINGER_MODE_SILENT;
@@ -6657,10 +6665,31 @@ public void silenceRingerModeInternal(String reason) {
                 ringerMode = AudioManager.RINGER_MODE_VIBRATE;
                 toastText = com.android.internal.R.string.volume_dialog_ringer_guidance_vibrate;
                 break;
+            case VOLUME_HUSH_CYCLE:
+                switch (mRingerMode) {
+                    case AudioManager.RINGER_MODE_NORMAL:
+                        effect = VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK);
+                        ringerMode = AudioManager.RINGER_MODE_VIBRATE;
+                        toastText = com.android.internal.R.string.volume_dialog_ringer_guidance_vibrate;
+                        break;
+                    case AudioManager.RINGER_MODE_VIBRATE:
+                        effect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
+                        ringerMode = AudioManager.RINGER_MODE_SILENT;
+                        toastText = com.android.internal.R.string.volume_dialog_ringer_guidance_silent;
+                        break;
+                    case AudioManager.RINGER_MODE_SILENT:
+                        effect = VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK);
+                        ringerMode = AudioManager.RINGER_MODE_NORMAL;
+                        toastText = com.android.internal.R.string.volume_dialog_ringer_guidance_normal;
+                        break;
+                }
+                break;
         }
         maybeVibrate(effect, reason);
         setRingerModeInternal(ringerMode, reason);
-        Toast.makeText(mContext, toastText, Toast.LENGTH_SHORT).show();
+        if (mSilenceToast != null) mSilenceToast.cancel();
+        mSilenceToast = Toast.makeText(mContext, toastText, Toast.LENGTH_SHORT);
+        mSilenceToast.show();
     }
 
     private boolean maybeVibrate(VibrationEffect effect, String reason) {
@@ -11353,6 +11382,8 @@ private class SettingsObserver extends ContentObserver {
                     Settings.System.MASTER_MONO), false, this, UserHandle.USER_ALL);
             mContentResolver.registerContentObserver(Settings.System.getUriFor(
                     Settings.System.MASTER_BALANCE), false, this, UserHandle.USER_ALL);
+            mContentResolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.SHOW_APP_VOLUME), false, this);
 
             mEncodedSurroundMode = mSettings.getGlobalInt(
                     mContentResolver, Settings.Global.ENCODED_SURROUND_OUTPUT,
@@ -11386,6 +11417,7 @@ public void onChange(boolean selfChange) {
                 readDockAudioSettings(mContentResolver);
                 updateMasterMono(mContentResolver);
                 updateMasterBalance(mContentResolver);
+                updateShowAppVolume(mContentResolver);
             }
 
             synchronized (mSurroundLock) {
@@ -11398,6 +11430,17 @@ public void onChange(boolean selfChange) {
             }
         }
 
+        private void updateShowAppVolume(ContentResolver cr) {
+            int showAppVolume = mSettings.getSystemIntForUser(cr,
+                    Settings.System.SHOW_APP_VOLUME, 0, UserHandle.USER_CURRENT);
+            if (mShowAppVolume != showAppVolume) {
+                mShowAppVolume = showAppVolume;
+                if (mShowAppVolume == 0) {
+                    resetAppVolumes();
+                }
+            }
+        }
+
         @GuardedBy("mSurroundLock")
         private void updateEncodedSurroundOutput() {
             int newSurroundMode = mSettings.getGlobalInt(
@@ -11416,6 +11459,17 @@ private void updateEncodedSurroundOutput() {
         }
     }
 
+    private void resetAppVolumes() {
+        ArrayList<AppVolume> volumes = new ArrayList<>();
+        int status = AudioSystem.listAppVolumes(volumes);
+        if (status == AudioSystem.SUCCESS) {
+            for (AppVolume vol : volumes) {
+                AudioSystem.setAppVolume(vol.getPackageName(), 1.0f);
+                AudioSystem.setAppMute(vol.getPackageName(), false);
+            }
+        }
+    }
+
     private void avrcpSupportsAbsoluteVolume(String address, boolean support) {
         // address is not used for now, but may be used when multiple a2dp devices are supported
         sVolumeLogger.enqueue(new EventLogger.StringEvent("avrcpSupportsAbsoluteVolume addr="
@@ -11960,6 +12014,8 @@ public int requestAudioFocus(AudioAttributes aa, int focusReqType, IBinder cb,
             permissionOverridesCheck = true;
         } else if (uid < UserHandle.AID_APP_START) {
             permissionOverridesCheck = true;
+        } else if (sdk <= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            permissionOverridesCheck = true;
         }
 
         final long token = Binder.clearCallingIdentity();
diff --git a/services/core/java/com/android/server/audio/FocusRequester.java b/services/core/java/com/android/server/audio/FocusRequester.java
index 5ebe6a1553b92..3475ecc2f9e68 100644
--- a/services/core/java/com/android/server/audio/FocusRequester.java
+++ b/services/core/java/com/android/server/audio/FocusRequester.java
@@ -492,7 +492,8 @@ private boolean frameworkHandleFocusLoss(int focusLoss, @NonNull final FocusRequ
                 Log.v(TAG, "not ducking uid " + this.mCallingUid + " - flags");
                 return false;
             }
-            if (!forceDuck && (MediaFocusControl.ENFORCE_DUCKING_FOR_NEW
+            if (!forceDuck && !mFocusController.isMultiAudioFocusEnabled()
+                    && (MediaFocusControl.ENFORCE_DUCKING_FOR_NEW
                     && this.getSdkTarget() <= MediaFocusControl.DUCKING_IN_APP_SDK_LEVEL)) {
                 // legacy behavior, apps used to be notified when they should be ducking
                 Log.v(TAG, "not ducking uid " + this.mCallingUid + " - old SDK");
diff --git a/services/core/java/com/android/server/audio/MediaFocusControl.java b/services/core/java/com/android/server/audio/MediaFocusControl.java
index d208cd11c329d..b77aedd2870f5 100644
--- a/services/core/java/com/android/server/audio/MediaFocusControl.java
+++ b/services/core/java/com/android/server/audio/MediaFocusControl.java
@@ -34,11 +34,14 @@
 import android.media.audiopolicy.IAudioPolicyCallback;
 import android.os.Binder;
 import android.os.Build;
+import android.database.ContentObserver;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 
@@ -100,27 +103,42 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
     private final @NonNull PlayerFocusEnforcer mFocusEnforcer;
     private boolean mMultiAudioFocusEnabled = false;
 
+    private final ContentObserver mMultiAudioFocusObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange) {
+            final ContentResolver cr = mContext.getContentResolver();
+            mMultiAudioFocusEnabled = Settings.System.getIntForUser(cr,
+                    Settings.System.MULTI_AUDIO_FOCUS_ENABLED, 0, cr.getUserId()) != 0;
+            Log.i(TAG, "Multi audio focus " + (mMultiAudioFocusEnabled ? "enabled" : "disabled"));
+        }
+    };
+
+    boolean isMultiAudioFocusEnabled() {
+        return mMultiAudioFocusEnabled;
+    }
+
     private boolean mRingOrCallActive = false;
 
     private final Object mExtFocusChangeLock = new Object();
     @GuardedBy("mExtFocusChangeLock")
     private long mExtFocusChangeCounter;
 
+    // Observer to work with per-app volume
+    private SettingsObserver mSettingsObserver;
+    private boolean mPerAppVolumeEnabled = false;
+
     protected MediaFocusControl(Context cntxt, PlayerFocusEnforcer pfe) {
         mContext = cntxt;
         mAppOps = (AppOpsManager)mContext.getSystemService(Context.APP_OPS_SERVICE);
         mFocusEnforcer = pfe;
         final ContentResolver cr = mContext.getContentResolver();
 
-        boolean multiAudioFocusEnabledDefault =
-                audioFocusDesktop()
-                        && mContext.getResources()
-                                .getBoolean(
-                                        com.android.internal.R.bool
-                                                .config_multi_audio_focus_enabled_default);
-        mMultiAudioFocusEnabled = Settings.System.getIntForUser(cr,
-                Settings.System.MULTI_AUDIO_FOCUS_ENABLED,
-                multiAudioFocusEnabledDefault ? 1 : 0, cr.getUserId()) != 0;
+        mMultiAudioFocusEnabled = mPerAppVolumeEnabled || Settings.System.getIntForUser(cr,
+                Settings.System.MULTI_AUDIO_FOCUS_ENABLED, 0, cr.getUserId()) != 0;
+        cr.registerContentObserver(
+                Settings.System.getUriFor(Settings.System.MULTI_AUDIO_FOCUS_ENABLED),
+                false, mMultiAudioFocusObserver, UserHandle.USER_ALL);
         initFocusThreading();
     }
 
@@ -423,7 +441,7 @@ private void notifyTopOfAudioFocusStack() {
                 }
             } else {
                 for (FocusRequester multifr : mMultiAudioFocusList) {
-                    if (isLockedFocusOwner(multifr)) {
+                    if (isLockedFocusOwner(multifr) || mFocusStack.empty()) {
                         multifr.handleFocusGain(AudioManager.AUDIOFOCUS_GAIN);
                     }
                 }
@@ -1163,6 +1181,9 @@ protected int requestAudioFocus(@NonNull AudioAttributes aa, int focusChangeHint
             IAudioFocusDispatcher fd, @NonNull String clientId, @NonNull String callingPackageName,
             int flags, int sdk, boolean forceDuck, int testUid,
             boolean permissionOverridesCheck) {
+        if (mMultiAudioFocusEnabled) {
+            return AudioManager.AUDIOFOCUS_REQUEST_GRANTED;
+        }
         new MediaMetrics.Item(mMetricsId)
                 .setUid(Binder.getCallingUid())
                 .set(MediaMetrics.Property.CALLING_PACKAGE, callingPackageName)
@@ -1540,10 +1561,11 @@ public void run() {
 
     public void updateMultiAudioFocus(boolean enabled) {
         Log.d(TAG, "updateMultiAudioFocus( " + enabled + " )");
-        mMultiAudioFocusEnabled = enabled;
+        mMultiAudioFocusEnabled = mPerAppVolumeEnabled || enabled;
         final ContentResolver cr = mContext.getContentResolver();
         Settings.System.putIntForUser(cr,
-                Settings.System.MULTI_AUDIO_FOCUS_ENABLED, enabled ? 1 : 0, cr.getUserId());
+                Settings.System.MULTI_AUDIO_FOCUS_ENABLED,
+                enabled ? 1 : 0, cr.getUserId());
         if (!mFocusStack.isEmpty()) {
             final FocusRequester fr = mFocusStack.peek();
             fr.handleFocusLoss(AudioManager.AUDIOFOCUS_LOSS, null, false);
@@ -1683,4 +1705,28 @@ public int hashCode() {
             return mUid;
         }
     }
+
+    private class SettingsObserver extends ContentObserver {
+
+        SettingsObserver() {
+            super(new Handler());
+            ContentResolver cr = mContext.getContentResolver();
+            cr.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.SHOW_APP_VOLUME), true, this);
+            mPerAppVolumeEnabled = Settings.System.getIntForUser(cr,
+                    Settings.System.SHOW_APP_VOLUME, 1, cr.getUserId()) != 0;
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            super.onChange(selfChange);
+            ContentResolver cr = mContext.getContentResolver();
+            boolean newValue = Settings.System.getIntForUser(cr,
+                    Settings.System.SHOW_APP_VOLUME, 1, cr.getUserId()) != 0;
+            if (mPerAppVolumeEnabled != newValue) {
+                mPerAppVolumeEnabled = newValue;
+                updateMultiAudioFocus(mMultiAudioFocusEnabled);
+            }
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index d413ca716f081..8d7b3c8314c81 100644
--- a/services/core/java/com/android/server/audio/SoundDoseHelper.java
+++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java
@@ -1016,10 +1016,7 @@ private void updateSafeMediaVolume_l(String caller) {
                         || mEnableCsd.get();
         boolean safeMediaVolumeForce = SystemProperties.getBoolean(SYSTEM_PROPERTY_SAFEMEDIA_FORCE,
                 false);
-        // we are using the MCC overlaid legacy flag used for the safe volume enablement
-        // to determine whether the MCC enforces any safe hearing standard.
-        boolean mccEnforcedSafeMediaVolume = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_safe_media_volume_enabled);
+        boolean mccEnforcedSafeMediaVolume = false;
 
         boolean safeVolumeEnabled =
                 (mccEnforcedSafeMediaVolume || safeMediaVolumeForce) && !safeMediaVolumeBypass;
@@ -1055,12 +1052,8 @@ private void updateSafeMediaVolume_l(String caller) {
     private void updateCsdEnabled(String caller) {
         mForceCsdProperty.set(SystemProperties.getBoolean(SYSTEM_PROPERTY_SAFEMEDIA_CSD_FORCE,
                 false));
-        // we are using the MCC overlaid legacy flag used for the safe volume enablement
-        // to determine whether the MCC enforces any safe hearing standard.
-        boolean mccEnforcedSafeMedia = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_safe_media_volume_enabled);
-        boolean csdEnable = mContext.getResources().getBoolean(
-                R.bool.config_safe_sound_dosage_enabled);
+        boolean mccEnforcedSafeMedia = false;
+        boolean csdEnable = false;
         boolean newEnabledCsd = (mccEnforcedSafeMedia && csdEnable) || mForceCsdProperty.get();
 
         synchronized (mCsdAsAFeatureLock) {
diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java
index 6670c21e5d38e..5c3c4528f539f 100644
--- a/services/core/java/com/android/server/biometrics/AuthService.java
+++ b/services/core/java/com/android/server/biometrics/AuthService.java
@@ -76,6 +76,7 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.server.SystemService;
 import com.android.server.biometrics.sensors.face.FaceService;
+import com.android.server.biometrics.sensors.face.sense.SenseUtils;
 import com.android.server.biometrics.sensors.fingerprint.FingerprintService;
 import com.android.server.companion.virtual.VirtualDeviceManagerInternal;
 
@@ -939,7 +940,8 @@ private static void registerFaceSensors(final String[] faceAidlInstances,
             final String[] hidlConfigStrings, final Context context,
             final IFaceService faceService, final BiometricHandlerProvider handlerProvider) {
         if ((hidlConfigStrings == null || hidlConfigStrings.length == 0)
-                && (faceAidlInstances == null || faceAidlInstances.length == 0)) {
+                && (faceAidlInstances == null || faceAidlInstances.length == 0)
+                && !SenseUtils.canUseProvider()) {
             Slog.d(TAG, "No face sensors.");
             return;
         }
diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index 9f58551d91b67..44351d0b36300 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -110,6 +110,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
+import com.android.server.biometrics.sensors.face.sense.SenseUtils;
+
 /**
  * System service that arbitrates the modality for BiometricPrompt to use.
  */
@@ -349,7 +351,7 @@ public SettingObserver(Context context, Handler handler,
         public void updateContentObserver() {
             mContentResolver.unregisterContentObserver(this);
 
-            if (mUseLegacyFaceOnlySettings) {
+            if (mUseLegacyFaceOnlySettings || SenseUtils.canUseProvider()) {
                 mContentResolver.registerContentObserver(FACE_UNLOCK_KEYGUARD_ENABLED,
                         false /* notifyForDescendants */,
                         this /* observer */,
@@ -358,7 +360,9 @@ public void updateContentObserver() {
                         false /* notifyForDescendants */,
                         this /* observer */,
                         UserHandle.USER_ALL);
-            } else if (com.android.settings.flags.Flags.biometricsOnboardingEducation()) {
+            }
+            if (!mUseLegacyFaceOnlySettings &&
+                    com.android.settings.flags.Flags.biometricsOnboardingEducation()) {
                 mContentResolver.registerContentObserver(FINGERPRINT_KEYGUARD_ENABLED,
                         false /* notifyForDescendants */,
                         this /* observer */,
@@ -375,7 +379,7 @@ public void updateContentObserver() {
                         false /* notifyForDescendants */,
                         this /* observer */,
                         UserHandle.USER_ALL);
-            } else {
+            } else if (!mUseLegacyFaceOnlySettings) {
                 mContentResolver.registerContentObserver(BIOMETRIC_KEYGUARD_ENABLED,
                         false /* notifyForDescendants */,
                         this /* observer */,
@@ -533,7 +537,8 @@ public boolean getEnabledOnKeyguard(int userId, int modality) {
                 }
             } else {
                 if (!mBiometricEnabledOnKeyguard.containsKey(userId)) {
-                    if (mUseLegacyFaceOnlySettings) {
+                    if (mUseLegacyFaceOnlySettings ||
+                        (SenseUtils.canUseProvider() && modality == TYPE_FACE)) {
                         onChange(true /* selfChange */, FACE_UNLOCK_KEYGUARD_ENABLED, userId);
                     } else {
                         onChange(true /* selfChange */, BIOMETRIC_KEYGUARD_ENABLED, userId);
@@ -561,7 +566,8 @@ public boolean getEnabledForApps(int userId, int modality) {
                 }
             } else {
                 if (!mBiometricEnabledForApps.containsKey(userId)) {
-                    if (mUseLegacyFaceOnlySettings) {
+                    if (mUseLegacyFaceOnlySettings ||
+                        (SenseUtils.canUseProvider() && modality == TYPE_FACE)) {
                         onChange(true /* selfChange */, FACE_UNLOCK_APP_ENABLED, userId);
                     } else {
                         onChange(true /* selfChange */, BIOMETRIC_APP_ENABLED, userId);
diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
index 090353b8f7c57..48b35269c7496 100644
--- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
@@ -116,7 +116,7 @@ public AuthenticationClient(@NonNull Context context, @NonNull Supplier<T> lazyD
     }
 
     @LockoutTracker.LockoutMode
-    private int handleFailedAttempt(int userId) {
+    protected int handleFailedAttempt(int userId) {
         if (mLockoutTracker != null) {
             mLockoutTracker.addFailedAttemptForUser(getTargetUserId());
         }
diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
index 1d4e8b8c185ed..b21369c0c80bb 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
@@ -69,6 +69,9 @@
 public class BiometricScheduler<T, U> {
 
     private static final String TAG = "BiometricScheduler";
+
+    private boolean mCancel;
+
     // Number of recent operations to keep in our logs for dumpsys
     protected static final int LOG_NUM_RECENT_OPERATIONS = 50;
 
@@ -276,12 +279,15 @@ public BiometricScheduler(@NonNull Handler handler,
      * @param gestureAvailabilityDispatcher may be null if the sensor does not support gestures
      *                                      (such as fingerprint swipe).
      */
-    public BiometricScheduler(@SensorType int sensorType,
+    public BiometricScheduler(Context context, @SensorType int sensorType,
             @Nullable GestureAvailabilityDispatcher gestureAvailabilityDispatcher) {
         this(new Handler(Looper.getMainLooper()), sensorType, gestureAvailabilityDispatcher,
                 IBiometricService.Stub.asInterface(
                         ServiceManager.getService(Context.BIOMETRIC_SERVICE)),
                 LOG_NUM_RECENT_OPERATIONS);
+
+        mCancel = context.getResources().getBoolean(
+                com.android.internal.R.bool.config_fpCancelIfNotIdle);
     }
 
     /**
@@ -311,6 +317,10 @@ protected void checkCurrentUserAndStartNextOperation() {
             Slog.d(TAG, "No operations, returning to idle");
             return;
         }
+        if (mCurrentUserRetriever == null) {
+            startNextOperationIfIdle();
+            return;
+        }
 
         final int currentUserId = mCurrentUserRetriever.get();
         final int nextUserId = mPendingOperations.getFirst().getTargetUserId();
@@ -352,8 +362,13 @@ protected void checkCurrentUserAndStartNextOperation() {
 
     protected void startNextOperationIfIdle() {
         if (mCurrentOperation != null) {
-            Slog.v(TAG, "Not idle, current operation: " + mCurrentOperation);
-            return;
+            if (mCancel && !mCurrentOperation.isFinished()) {
+                Slog.v(TAG, "Not idle, cancelling current operation: " + mCurrentOperation);
+                mCurrentOperation.cancel(mHandler, mInternalCallback);
+            } else {
+                Slog.v(TAG, "Not idle, current operation: " + mCurrentOperation);
+                return;
+            }
         }
         if (mPendingOperations.isEmpty()) {
             Slog.d(TAG, "No operations, returning to idle");
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
index ab44ee723f432..37573bf43af54 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java
@@ -26,6 +26,7 @@
 import android.content.Context;
 import android.hardware.biometrics.AuthenticationStateListener;
 import android.hardware.biometrics.BiometricsProtoEnums;
+import android.hardware.biometrics.SensorProperties;
 import android.hardware.biometrics.IBiometricSensorReceiver;
 import android.hardware.biometrics.IBiometricService;
 import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
@@ -39,6 +40,7 @@
 import android.hardware.face.FaceAuthenticateOptions;
 import android.hardware.face.FaceEnrollOptions;
 import android.hardware.face.FaceSensorConfigurations;
+import android.hardware.face.FaceSensorProperties;
 import android.hardware.face.FaceSensorPropertiesInternal;
 import android.hardware.face.FaceServiceReceiver;
 import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
@@ -73,6 +75,8 @@
 import com.android.server.biometrics.sensors.LockoutResetDispatcher;
 import com.android.server.biometrics.sensors.LockoutTracker;
 import com.android.server.biometrics.sensors.face.aidl.FaceProvider;
+import com.android.server.biometrics.sensors.face.sense.SenseProvider;
+import com.android.server.biometrics.sensors.face.sense.SenseUtils;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -659,12 +663,28 @@ public void getFeature(final IBinder token, int userId, int feature,
                     new ClientMonitorCallbackConverter(receiver), opPackageName);
         }
 
+        private List<ServiceProvider> getSenseProviders() {
+            final List<ServiceProvider> providers = new ArrayList<>();
+            FaceSensorPropertiesInternal props = new FaceSensorPropertiesInternal(
+                    SenseProvider.DEVICE_ID,
+                    SensorProperties.STRENGTH_WEAK,
+                    1, /** maxEnrollmentsPerUser **/
+                    new ArrayList(),
+                    FaceSensorProperties.TYPE_RGB,
+                    false, /** supportsFaceDetection **/
+                    false, /** supportsSelfIllumination **/
+                    false); /** resetLockoutRequiresChallenge **/
+            SenseProvider provider = new SenseProvider(getContext(), mBiometricStateCallback, props, mLockoutResetDispatcher);
+            providers.add(provider);
+            return providers;
+        }
+
         @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
         public void registerAuthenticators(
                 FaceSensorConfigurations faceSensorConfigurations) {
             super.registerAuthenticators_enforcePermission();
 
-            if (!faceSensorConfigurations.hasSensorConfigurations()) {
+            if (!faceSensorConfigurations.hasSensorConfigurations() && !SenseUtils.canUseProvider()) {
                 Slog.d(TAG, "No face sensors to register.");
                 return;
             }
@@ -674,6 +694,10 @@ public void registerAuthenticators(
         private List<ServiceProvider> getProviders(
                 FaceSensorConfigurations faceSensorConfigurations) {
             final List<ServiceProvider> providers = new ArrayList<>();
+            if (SenseUtils.canUseProvider()) {
+                providers.addAll(getSenseProviders());
+                return providers;
+            }
             final Pair<String, SensorProps[]> filteredSensorProps = filterAvailableHalInstances(
                             faceSensorConfigurations);
             providers.add(mFaceProviderFunction.getFaceProvider(filteredSensorProps,
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
index 6f76cdae45390..e047a7cf5b849 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
@@ -67,8 +67,6 @@ public interface ServiceProvider extends BiometricServiceProvider<FaceSensorProp
      */
     default void scheduleInvalidateAuthenticatorId(int sensorId, int userId,
             @NonNull IInvalidationCallback callback) {
-        throw new IllegalStateException("Providers that support invalidation must override"
-                + " this method");
     }
 
     void scheduleGenerateChallenge(int sensorId, int userId, @NonNull IBinder token,
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java
new file mode 100644
index 0000000000000..90dc55a7ed506
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/BiometricTestSessionImpl.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.hardware.biometrics.ITestSession;
+import android.hardware.biometrics.ITestSessionCallback;
+import android.hardware.face.Face;
+import android.hardware.face.FaceAuthenticationFrame;
+import android.hardware.face.FaceEnrollFrame;
+import android.hardware.face.IFaceServiceReceiver;
+import android.os.Binder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.BiometricStateCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.face.FaceUtils;
+
+import java.util.List;
+import java.util.Random;
+
+/**
+ * A test session implementation for {@link SenseProvider}. See
+ * {@link android.hardware.biometrics.BiometricTestSession}.
+ */
+public class BiometricTestSessionImpl extends ITestSession.Stub {
+
+    private static final String TAG = "face/sense/BiometricTestSessionImpl";
+
+    @NonNull private final Context mContext;
+    private final int mSensorId;
+    @NonNull private final ITestSessionCallback mCallback;
+    @NonNull private final Random mRandom;
+
+    @NonNull private final SenseProvider.HalResultController mHalResultController;
+    @NonNull private final SenseProvider mSenseProvider;
+
+    /**
+     * Internal receiver currently only used for enroll. Results do not need to be forwarded to the
+     * test, since enrollment is a platform-only API. The authentication path is tested through
+     * the public BiometricPrompt APIs and does not use this receiver.
+     */
+    private final IFaceServiceReceiver mReceiver = new IFaceServiceReceiver.Stub() {
+        @Override
+        public void onEnrollResult(Face face, int remaining) {
+
+        }
+
+        @Override
+        public void onAcquired(int acquireInfo, int vendorCode) {
+
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(Face face, int userId, boolean isStrongBiometric) {
+
+        }
+
+        @Override
+        public void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric) {
+
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+
+        }
+
+        @Override
+        public void onError(int error, int vendorCode) {
+
+        }
+
+        @Override
+        public void onRemoved(Face face, int remaining) {
+
+        }
+
+        @Override
+        public void onFeatureSet(boolean success, int feature) {
+
+        }
+
+        @Override
+        public void onFeatureGet(boolean success, int[] features, boolean[] featureState) {
+
+        }
+
+        @Override
+        public void onChallengeGenerated(int sensorId, int userId, long challenge) {
+
+        }
+
+        @Override
+        public void onAuthenticationFrame(FaceAuthenticationFrame frame) {
+
+        }
+
+        @Override
+        public void onEnrollmentFrame(FaceEnrollFrame frame) {
+
+        }
+    };
+
+    BiometricTestSessionImpl(@NonNull Context context, int sensorId,
+            @NonNull ITestSessionCallback callback, @NonNull SenseProvider provider,
+            @NonNull SenseProvider.HalResultController halResultController) {
+        mContext = context;
+        mSensorId = sensorId;
+        mCallback = callback;
+        mSenseProvider = provider;
+        mHalResultController = halResultController;
+        mRandom = new Random();
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void setTestHalEnabled(boolean enabled) {
+        super.setTestHalEnabled_enforcePermission();
+
+        mSenseProvider.setTestHalEnabled(enabled);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void startEnroll(int userId) {
+        super.startEnroll_enforcePermission();
+
+        mSenseProvider.scheduleEnroll(mSensorId, new Binder(), new byte[69], userId, mReceiver,
+                mContext.getOpPackageName(), new int[0] /* disabledFeatures */,
+                null /* previewSurface */, false /* debugConsent */, null);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void finishEnroll(int userId) {
+        super.finishEnroll_enforcePermission();
+
+        mHalResultController.onEnrollResult(1, userId, 0);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void acceptAuthentication(int userId) {
+        super.acceptAuthentication_enforcePermission();
+
+        // Fake authentication with any of the existing faces
+        List<Face> faces = FaceUtils.getInstance(mSensorId)
+                .getBiometricsForUser(mContext, userId);
+        if (faces.isEmpty()) {
+            Slog.w(TAG, "No faces, returning");
+            return;
+        }
+        final int fid = faces.get(0).getBiometricId();
+        byte[] hat = {0};
+        mHalResultController.onAuthenticated(0 /* deviceId */, userId, hat);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void rejectAuthentication(int userId) {
+        super.rejectAuthentication_enforcePermission();
+
+        mHalResultController.onAuthenticated(0 /* deviceId */, userId, null);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void notifyAcquired(int userId, int acquireInfo) {
+        super.notifyAcquired_enforcePermission();
+
+        mHalResultController.onAcquired(userId, 0 /* deviceId */, 0 /* vendorCode */);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void notifyError(int userId, int errorCode) {
+        super.notifyError_enforcePermission();
+
+        mHalResultController.onError(0 /* deviceId */, 0 /* vendorCode */);
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public void cleanupInternalState(int userId) {
+        super.cleanupInternalState_enforcePermission();
+
+        mSenseProvider.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
+            @Override
+            public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
+                try {
+                    mCallback.onCleanupStarted(clientMonitor.getTargetUserId());
+                } catch (RemoteException e) {
+                    Slog.e(TAG, "Remote exception", e);
+                }
+            }
+
+            @Override
+            public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
+                    boolean success) {
+                try {
+                    mCallback.onCleanupFinished(clientMonitor.getTargetUserId());
+                } catch (RemoteException e) {
+                    Slog.e(TAG, "Remote exception", e);
+                }
+            }
+        });
+    }
+
+    @android.annotation.EnforcePermission(android.Manifest.permission.TEST_BIOMETRIC)
+    @Override
+    public int getSensorId() {
+        super.getSensorId_enforcePermission();
+        return mSensorId;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java
new file mode 100644
index 0000000000000..fd8997a3f493f
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceAuthenticationClient.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_NOT_DETECTED;
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_RECALIBRATE;
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_SENSOR_DIRTY;
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_VENDOR;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.content.res.Resources;
+import android.hardware.SensorPrivacyManager;
+import android.hardware.biometrics.BiometricAuthenticator;
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricFaceConstants;
+import android.hardware.biometrics.BiometricManager.Authenticators;
+import android.hardware.biometrics.face.V1_0.IBiometricsFace;
+import android.hardware.face.FaceAuthenticateOptions;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.internal.R;
+import com.android.server.biometrics.Utils;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.AuthenticationClient;
+import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
+import com.android.server.biometrics.sensors.LockoutTracker;
+import com.android.server.biometrics.sensors.PerformanceTracker;
+import com.android.server.biometrics.sensors.face.UsageStats;
+
+import java.util.ArrayList;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+/**
+ * Face-specific authentication client supporting the {@link android.hardware.biometrics.face.V1_0}
+ * HIDL interface.
+ */
+class FaceAuthenticationClient
+        extends AuthenticationClient<ISenseService, FaceAuthenticateOptions> {
+
+    private static final String TAG = "FaceAuthenticationClient";
+
+    private final UsageStats mUsageStats;
+
+    private final int[] mBiometricPromptIgnoreList;
+    private final int[] mBiometricPromptIgnoreListVendor;
+    private final int[] mKeyguardIgnoreList;
+    private final int[] mKeyguardIgnoreListVendor;
+
+    private int mLastAcquire;
+
+    FaceAuthenticationClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon,
+            @NonNull IBinder token, long requestId,
+            @NonNull ClientMonitorCallbackConverter listener, long operationId,
+            boolean restricted, @NonNull FaceAuthenticateOptions options, int cookie,
+            boolean requireConfirmation,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            boolean isStrongBiometric, @NonNull LockoutTracker lockoutTracker,
+            @NonNull UsageStats usageStats, boolean allowBackgroundAuthentication,
+            @Authenticators.Types int sensorStrength) {
+        super(context, lazyDaemon, token, listener, operationId, restricted,
+                options, cookie, requireConfirmation, logger, biometricContext,
+                isStrongBiometric, null /* taskStackListener */,
+                lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */,
+                sensorStrength);
+        setRequestId(requestId);
+        mUsageStats = usageStats;
+
+        final Resources resources = getContext().getResources();
+        mBiometricPromptIgnoreList = resources.getIntArray(
+                R.array.config_face_acquire_biometricprompt_ignorelist);
+        mBiometricPromptIgnoreListVendor = resources.getIntArray(
+                R.array.config_face_acquire_vendor_biometricprompt_ignorelist);
+        mKeyguardIgnoreList = resources.getIntArray(
+                R.array.config_face_acquire_keyguard_ignorelist);
+        mKeyguardIgnoreListVendor = resources.getIntArray(
+                R.array.config_face_acquire_vendor_keyguard_ignorelist);
+    }
+
+    @Override
+    public void start(@NonNull ClientMonitorCallback callback) {
+        super.start(callback);
+        mState = STATE_STARTED;
+    }
+
+    @NonNull
+    @Override
+    protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+        return new ClientMonitorCompositeCallback(
+                getLogger().getAmbientLightProbe(true /* startWithClient */), callback);
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().authenticate(mOperationId);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting auth", e);
+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    protected void stopHalOperation() {
+        try {
+            getFreshDaemon().cancel();
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting cancel", e);
+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    public boolean wasUserDetected() {
+        // Do not provide haptic feedback if the user was not detected, and an error (usually
+        // ERROR_TIMEOUT) is received.
+        return mLastAcquire != FACE_ACQUIRED_NOT_DETECTED
+                && mLastAcquire != FACE_ACQUIRED_SENSOR_DIRTY;
+    }
+
+    @Override
+    protected void handleLifecycleAfterAuth(boolean authenticated) {
+        // For face, the authentication lifecycle ends either when
+        // 1) Authenticated == true
+        // 2) Error occurred
+        // 3) Authenticated == false
+        mCallback.onClientFinished(this, true /* success */);
+    }
+
+    @Override
+    public void onAuthenticated(BiometricAuthenticator.Identifier identifier,
+            boolean authenticated, ArrayList<Byte> token) {
+        super.onAuthenticated(identifier, authenticated, token);
+        vibrateSuccess();
+
+        mState = STATE_STOPPED;
+        mUsageStats.addEvent(new UsageStats.AuthenticationEvent(
+                getStartTimeMs(),
+                System.currentTimeMillis() - getStartTimeMs() /* latency */,
+                authenticated,
+                0 /* error */,
+                0 /* vendorError */,
+                getTargetUserId()));
+    }
+
+    @Override
+    public void onError(@BiometricConstants.Errors int error, int vendorCode) {
+        mUsageStats.addEvent(new UsageStats.AuthenticationEvent(
+                getStartTimeMs(),
+                System.currentTimeMillis() - getStartTimeMs() /* latency */,
+                false /* authenticated */,
+                error,
+                vendorCode,
+                getTargetUserId()));
+
+        super.onError(error, vendorCode);
+    }
+
+    private int[] getAcquireIgnorelist() {
+        return isBiometricPrompt() ? mBiometricPromptIgnoreList : mKeyguardIgnoreList;
+    }
+
+    private int[] getAcquireVendorIgnorelist() {
+        return isBiometricPrompt() ? mBiometricPromptIgnoreListVendor : mKeyguardIgnoreListVendor;
+    }
+
+    private boolean shouldSend(int acquireInfo, int vendorCode) {
+        if (acquireInfo == FACE_ACQUIRED_VENDOR) {
+            return !Utils.listContains(getAcquireVendorIgnorelist(), vendorCode);
+        } else {
+            return !Utils.listContains(getAcquireIgnorelist(), acquireInfo);
+        }
+    }
+
+    @Override
+    public void onAcquired(int acquireInfo, int vendorCode) {
+        mLastAcquire = acquireInfo;
+
+        if (acquireInfo == FACE_ACQUIRED_RECALIBRATE) {
+            BiometricNotificationUtils.showReEnrollmentNotification(getContext());
+        }
+        @LockoutTracker.LockoutMode final int lockoutMode =
+                getLockoutTracker().getLockoutModeForUser(getTargetUserId());
+        if (lockoutMode == LockoutTracker.LOCKOUT_NONE) {
+            PerformanceTracker pt = PerformanceTracker.getInstanceForSensorId(getSensorId());
+            pt.incrementAcquireForUser(getTargetUserId(), isCryptoOperation());
+        }
+
+        final boolean shouldSend = shouldSend(acquireInfo, vendorCode);
+        onAcquiredInternal(acquireInfo, vendorCode, shouldSend);
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java
new file mode 100644
index 0000000000000..875aab5a264fb
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceEnrollClient.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_VENDOR;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.hardware.biometrics.BiometricFaceConstants;
+import android.hardware.face.Face;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+import android.view.Surface;
+
+import com.android.internal.R;
+import com.android.server.biometrics.Utils;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
+import com.android.server.biometrics.sensors.EnrollClient;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceEnrollClient extends EnrollClient<ISenseService> {
+
+    private static final String TAG = "FaceEnrollClient";
+
+    @NonNull private final int[] mDisabledFeatures;
+    @NonNull private final int[] mEnrollIgnoreList;
+    @NonNull private final int[] mEnrollIgnoreListVendor;
+
+    FaceEnrollClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,
+            @NonNull byte[] hardwareAuthToken, @NonNull String owner, long requestId,
+            @NonNull BiometricUtils<Face> utils, @NonNull int[] disabledFeatures, int timeoutSec,
+            @Nullable Surface previewSurface, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            int enrollReason) {
+        super(context, lazyDaemon, token, listener, userId, hardwareAuthToken, owner, utils,
+                timeoutSec, sensorId, false /* shouldVibrate */, logger, biometricContext, enrollReason);
+        setRequestId(requestId);
+        mDisabledFeatures = Arrays.copyOf(disabledFeatures, disabledFeatures.length);
+        mEnrollIgnoreList = getContext().getResources()
+                .getIntArray(R.array.config_face_acquire_enroll_ignorelist);
+        mEnrollIgnoreListVendor = getContext().getResources()
+                .getIntArray(R.array.config_face_acquire_vendor_enroll_ignorelist);
+    }
+
+    @NonNull
+    @Override
+    protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+        return new ClientMonitorCompositeCallback(
+                getLogger().getAmbientLightProbe(true /* startWithClient */), callback);
+    }
+
+    @Override
+    protected boolean hasReachedEnrollmentLimit() {
+        final int limit = getContext().getResources().getInteger(
+                com.android.internal.R.integer.config_faceMaxTemplatesPerUser);
+        final int enrolled = mBiometricUtils.getBiometricsForUser(getContext(), getTargetUserId())
+                .size();
+        if (enrolled >= limit) {
+            Slog.w(TAG, "Too many faces registered, user: " + getTargetUserId());
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onAcquired(int acquireInfo, int vendorCode) {
+        final boolean shouldSend;
+        if (acquireInfo == FACE_ACQUIRED_VENDOR) {
+            shouldSend = !Utils.listContains(mEnrollIgnoreListVendor, vendorCode);
+        } else {
+            shouldSend = !Utils.listContains(mEnrollIgnoreList, acquireInfo);
+        }
+        onAcquiredInternal(acquireInfo, vendorCode, shouldSend);
+    }
+
+    @Override
+    protected void startHalOperation() {
+        final ArrayList<Byte> token = new ArrayList<>();
+        for (byte b : mHardwareAuthToken) {
+            token.add(Byte.valueOf(b));
+        }
+        final ArrayList<Integer> disabledFeatures = new ArrayList<>();
+        for (int disabledFeature : mDisabledFeatures) {
+            disabledFeatures.add(disabledFeature);
+        }
+
+        try {
+            getFreshDaemon().enroll(SenseUtils.toByteArray(token), mTimeoutSec, SenseUtils.toIntArray(disabledFeatures));
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting enroll", e);
+            onError(BiometricFaceConstants.FACE_ERROR_UNABLE_TO_PROCESS, 0 /* vendorCode */);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    protected void stopHalOperation() {
+        try {
+            getFreshDaemon().cancel();
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting cancel", e);
+            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java
new file mode 100644
index 0000000000000..9a9414ff94493
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGenerateChallengeClient.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.hardware.face.IFaceServiceReceiver;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.internal.util.Preconditions;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.GenerateChallengeClient;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISenseService> {
+
+    private static final String TAG = "FaceGenerateChallengeClient";
+    static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes
+    private static final ClientMonitorCallback EMPTY_CALLBACK = new ClientMonitorCallback() {
+    };
+
+    private final long mCreatedAt;
+    private List<IFaceServiceReceiver> mWaiting;
+    private Long mChallengeResult;
+
+    FaceGenerateChallengeClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token,
+            @NonNull ClientMonitorCallbackConverter listener, int userId, @NonNull String owner,
+            int sensorId, @NonNull BiometricLogger logger,
+            @NonNull BiometricContext biometricContext, long now) {
+        super(context, lazyDaemon, token, listener, userId, owner, sensorId, logger,
+                biometricContext);
+        mCreatedAt = now;
+        mWaiting = new ArrayList<>();
+    }
+
+    @Override
+    protected void startHalOperation() {
+        mChallengeResult = null;
+        try {
+            mChallengeResult = Long.valueOf(getFreshDaemon().generateChallenge(CHALLENGE_TIMEOUT_SEC));
+            // send the result to the original caller via mCallback and any waiting callers
+            // that called reuseResult
+            sendChallengeResult(getListener(), mCallback);
+            for (IFaceServiceReceiver receiver : mWaiting) {
+                sendChallengeResult(new ClientMonitorCallbackConverter(receiver), EMPTY_CALLBACK);
+            }
+        } catch (RemoteException e) {
+            Slog.e(TAG, "generateChallenge failed", e);
+            mCallback.onClientFinished(this, false /* success */);
+        } finally {
+            mWaiting = null;
+        }
+    }
+
+    /** @return An arbitrary time value for caching provided to the constructor. */
+    public long getCreatedAt() {
+        return mCreatedAt;
+    }
+
+    /**
+     * Reuse the result of this operation when it is available. The receiver will be notified
+     * immediately if a challenge has already been generated.
+     *
+     * @param receiver receiver to be notified of challenge result
+     */
+    public void reuseResult(@NonNull IFaceServiceReceiver receiver) {
+        if (mWaiting != null) {
+            mWaiting.add(receiver);
+        } else {
+            sendChallengeResult(new ClientMonitorCallbackConverter(receiver), EMPTY_CALLBACK);
+        }
+    }
+
+    private void sendChallengeResult(@NonNull ClientMonitorCallbackConverter receiver,
+            @NonNull ClientMonitorCallback ownerCallback) {
+        Preconditions.checkState(mChallengeResult != null, "result not available");
+        try {
+            receiver.onChallengeGenerated(getSensorId(), getTargetUserId(), mChallengeResult);
+            ownerCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception", e);
+            ownerCallback.onClientFinished(this, false /* success */);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java
new file mode 100644
index 0000000000000..fdcb76db4eb21
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceGetFeatureClient.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.HalClientMonitor;
+
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceGetFeatureClient extends HalClientMonitor<ISenseService> {
+
+    private static final String TAG = "FaceGetFeatureClient";
+
+    private final int mFeature;
+    private final int mFaceId;
+    private boolean mValue;
+
+    FaceGetFeatureClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
+            @NonNull IBinder token, @Nullable ClientMonitorCallbackConverter listener, int userId,
+            @NonNull String owner, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            int feature, int faceId) {
+        super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
+                logger, biometricContext, false /* restricted */);
+        mFeature = feature;
+        mFaceId = faceId;
+    }
+
+    @Override
+    public void unableToStart() {
+        try {
+            if (getListener() != null) {
+                getListener().onFeatureGet(false /* success */, new int[0], new boolean[0]);
+            }
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to send error", e);
+        }
+    }
+
+    @Override
+    public void start(@NonNull ClientMonitorCallback callback) {
+        super.start(callback);
+        startHalOperation();
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            final boolean result = getFreshDaemon().getFeature(mFeature, mFaceId);
+            int[] features = new int[1];
+            features[0] = mFeature;
+            boolean[] featureState = {result};
+            mValue = result;
+
+            if (getListener() != null) {
+                getListener().onFeatureGet(result, features, featureState);
+            }
+            mCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to getFeature", e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    boolean getValue() {
+        return mValue;
+    }
+
+    @Override
+    public int getProtoEnum() {
+        return BiometricsProto.CM_GET_FEATURE;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
new file mode 100644
index 0000000000000..da363e2ee3f06
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalCleanupClient.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.hardware.biometrics.BiometricAuthenticator;
+import android.hardware.biometrics.BiometricsProtoEnums;
+import android.hardware.face.Face;
+import android.os.IBinder;
+import android.util.Slog;
+
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.InternalCleanupClient;
+import com.android.server.biometrics.sensors.InternalEnumerateClient;
+import com.android.server.biometrics.sensors.RemovalClient;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+class FaceInternalCleanupClient extends InternalCleanupClient<Face, ISenseService> {
+    private static final String TAG = "FaceInternalCleanupClient";
+
+    FaceInternalCleanupClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, @NonNull String owner,
+            int sensorId, @NonNull BiometricLogger logger,
+            @NonNull BiometricContext biometricContext,
+            @NonNull BiometricUtils<Face> utils, @NonNull Map<Integer, Long> authenticatorIds) {
+        super(context, lazyDaemon, userId, owner, sensorId, logger, biometricContext,
+                utils, authenticatorIds);
+    }
+
+    @Override
+    protected InternalEnumerateClient<ISenseService> getEnumerateClient(Context context,
+            Supplier<ISenseService> lazyDaemon, IBinder token, int userId, String owner,
+            List<Face> enrolledList, BiometricUtils<Face> utils, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
+        return new FaceInternalEnumerateClient(context, lazyDaemon, token, userId, owner,
+                enrolledList, utils, sensorId, logger, biometricContext);
+    }
+
+    @Override
+    protected RemovalClient<Face, ISenseService> getRemovalClient(Context context,
+            Supplier<ISenseService> lazyDaemon, IBinder token,
+            int biometricId, int userId, String owner, BiometricUtils<Face> utils, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            Map<Integer, Long> authenticatorIds, int reason) {
+        // Internal remove does not need to send results to anyone. Cleanup (enumerate + remove)
+        // is all done internally.
+        return new FaceRemovalClient(context, lazyDaemon, token,
+                null /* ClientMonitorCallbackConverter */, biometricId, userId, owner, utils,
+                sensorId, logger, biometricContext, authenticatorIds, reason);
+    }
+
+    @Override
+    protected void onAddUnknownTemplate(int userId,
+            @NonNull BiometricAuthenticator.Identifier identifier) {
+        Slog.w(TAG, "Adding unknown template for user: " + userId);
+        mBiometricUtils.addBiometricForUser(getContext(), userId, (Face) identifier);
+    }
+
+    @Override
+    protected int getModality() {
+        return BiometricsProtoEnums.MODALITY_FACE;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java
new file mode 100644
index 0000000000000..c86d0361f9e8f
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceInternalEnumerateClient.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.hardware.biometrics.BiometricsProtoEnums;
+import android.hardware.face.Face;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.InternalEnumerateClient;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+class FaceInternalEnumerateClient extends InternalEnumerateClient<ISenseService> {
+    private static final String TAG = "FaceInternalEnumerateClient";
+
+    FaceInternalEnumerateClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token, int userId,
+            @NonNull String owner, @NonNull List<Face> enrolledList,
+            @NonNull BiometricUtils<Face> utils, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
+        super(context, lazyDaemon, token, userId, owner, enrolledList, utils, sensorId,
+                logger, biometricContext);
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().enumerate();
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting enumerate", e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    protected int getModality() {
+        return BiometricsProtoEnums.MODALITY_FACE;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java
new file mode 100644
index 0000000000000..54494cb90a6e0
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRemovalClient.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.hardware.face.Face;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.RemovalClient;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+class FaceRemovalClient extends RemovalClient<Face, ISenseService> {
+    private static final String TAG = "FaceRemovalClient";
+
+    private final int mBiometricId;
+
+    FaceRemovalClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,
+            int biometricId, int userId, @NonNull String owner, @NonNull BiometricUtils<Face> utils,
+            int sensorId, @NonNull BiometricLogger logger,
+            @NonNull BiometricContext biometricContext,
+            @NonNull Map<Integer, Long> authenticatorIds, int reason) {
+        super(context, lazyDaemon, token, listener, userId, owner, utils, sensorId, logger,
+                biometricContext, authenticatorIds, reason);
+        mBiometricId = biometricId;
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().remove(mBiometricId);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception when requesting remove", e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java
new file mode 100644
index 0000000000000..fdacca292a6ba
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceResetLockoutClient.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.HalClientMonitor;
+
+import java.util.ArrayList;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceResetLockoutClient extends HalClientMonitor<ISenseService> {
+
+    private static final String TAG = "FaceResetLockoutClient";
+
+    private final byte[] mHardwareAuthToken;
+
+    FaceResetLockoutClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, String owner, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            @NonNull byte[] hardwareAuthToken) {
+        super(context, lazyDaemon, null /* token */, null /* listener */, userId, owner,
+                0 /* cookie */, sensorId, logger, biometricContext,
+                true /* restricted */);
+
+        mHardwareAuthToken = (byte[]) hardwareAuthToken.clone();
+    }
+
+    @Override
+    public void unableToStart() {
+        // Nothing to do here
+    }
+
+    @Override
+    public void start(@NonNull ClientMonitorCallback callback) {
+        super.start(callback);
+        startHalOperation();
+    }
+
+    public boolean interruptsPrecedingClients() {
+        return true;
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().resetLockout(mHardwareAuthToken);
+            mCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to reset lockout", e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    public int getProtoEnum() {
+        return BiometricsProto.CM_RESET_LOCKOUT;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java
new file mode 100644
index 0000000000000..7f42df49d0d9f
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceRevokeChallengeClient.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.RevokeChallengeClient;
+
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceRevokeChallengeClient extends RevokeChallengeClient<ISenseService> {
+
+    private static final String TAG = "FaceRevokeChallengeClient";
+
+    FaceRevokeChallengeClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, @NonNull IBinder token,
+            int userId, @NonNull String owner, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext) {
+        super(context, lazyDaemon, token, userId, owner, sensorId, logger, biometricContext);
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().revokeChallenge();
+            mCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "revokeChallenge failed", e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java
new file mode 100644
index 0000000000000..b25ede17e19f6
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceSetFeatureClient.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.HalClientMonitor;
+
+import java.util.ArrayList;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceSetFeatureClient extends HalClientMonitor<ISenseService> {
+
+    private static final String TAG = "FaceSetFeatureClient";
+
+    private final int mFeature;
+    private final boolean mEnabled;
+    private final byte[] mHardwareAuthToken;
+    private final int mFaceId;
+
+    FaceSetFeatureClient(@NonNull Context context, @NonNull Supplier<ISenseService> lazyDaemon,
+            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,
+            @NonNull String owner, int sensorId,
+            @NonNull BiometricLogger logger, @NonNull BiometricContext biometricContext,
+            int feature, boolean enabled, byte[] hardwareAuthToken, int faceId) {
+        super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
+                logger, biometricContext, false /* restricted */);
+        mFeature = feature;
+        mEnabled = enabled;
+        mFaceId = faceId;
+
+        mHardwareAuthToken = (byte[]) hardwareAuthToken.clone();
+    }
+
+    @Override
+    public void unableToStart() {
+        try {
+            getListener().onFeatureSet(false /* success */, mFeature);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to send error", e);
+        }
+    }
+
+    @Override
+    public void start(@NonNull ClientMonitorCallback callback) {
+        super.start(callback);
+
+        startHalOperation();
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            getFreshDaemon().setFeature(mFeature, mEnabled, mHardwareAuthToken, mFaceId);
+            getListener().onFeatureSet(true, mFeature);
+            mCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to set feature: " + mFeature + " to enabled: " + mEnabled, e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    public int getProtoEnum() {
+        return BiometricsProto.CM_SET_FEATURE;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java
new file mode 100644
index 0000000000000..168eaf55ea9e0
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/FaceUpdateActiveUserClient.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.os.Environment;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.HalClientMonitor;
+
+import java.io.File;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+
+public class FaceUpdateActiveUserClient extends HalClientMonitor<ISenseService> {
+    private static final String TAG = "FaceUpdateActiveUserClient";
+    private static final String FACE_DATA_DIR = "facedata";
+
+    private final boolean mHasEnrolledBiometrics;
+    @NonNull private final Map<Integer, Long> mAuthenticatorIds;
+
+    FaceUpdateActiveUserClient(@NonNull Context context,
+            @NonNull Supplier<ISenseService> lazyDaemon, int userId, @NonNull String owner,
+            int sensorId, @NonNull BiometricLogger logger,
+            @NonNull BiometricContext biometricContext, boolean hasEnrolledBiometrics,
+            @NonNull Map<Integer, Long> authenticatorIds) {
+        super(context, lazyDaemon, null /* token */, null /* listener */, userId, owner,
+                0 /* cookie */, sensorId, logger, biometricContext,
+                true /* restricted */);
+        mHasEnrolledBiometrics = hasEnrolledBiometrics;
+        mAuthenticatorIds = authenticatorIds;
+    }
+
+    @Override
+    public void start(@NonNull ClientMonitorCallback callback) {
+        super.start(callback);
+        startHalOperation();
+    }
+
+    @Override
+    public void unableToStart() {
+        // Nothing to do here
+    }
+
+    @Override
+    protected void startHalOperation() {
+        try {
+            final ISenseService daemon = getFreshDaemon();
+            mAuthenticatorIds.put(getTargetUserId(),
+                    mHasEnrolledBiometrics ? daemon.getAuthenticatorId() : 0L);
+            mCallback.onClientFinished(this, true /* success */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Failed to setActiveUser: " + e);
+            mCallback.onClientFinished(this, false /* success */);
+        }
+    }
+
+    @Override
+    public int getProtoEnum() {
+        return BiometricsProto.CM_UPDATE_ACTIVE_USER;
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java
new file mode 100644
index 0000000000000..31e679b982c2a
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseProvider.java
@@ -0,0 +1,1113 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.app.SynchronousUserSwitchObserver;
+import android.app.UserSwitchObserver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricFaceConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
+import android.hardware.biometrics.ITestSession;
+import android.hardware.biometrics.ITestSessionCallback;
+import android.hardware.biometrics.face.V1_0.IBiometricsFace;
+import android.hardware.face.Face;
+import android.hardware.face.FaceAuthenticateOptions;
+import android.hardware.face.FaceEnrollOptions;
+import android.hardware.face.FaceSensorPropertiesInternal;
+import android.hardware.face.IFaceServiceReceiver;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.util.Slog;
+import android.util.SparseArray;
+import android.util.proto.ProtoOutputStream;
+import android.view.Surface;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.biometrics.AuthenticationStatsCollector;
+import com.android.server.biometrics.SensorServiceStateProto;
+import com.android.server.biometrics.SensorStateProto;
+import com.android.server.biometrics.UserStateProto;
+import com.android.server.biometrics.Utils;
+import com.android.server.biometrics.log.BiometricContext;
+import com.android.server.biometrics.log.BiometricLogger;
+import com.android.server.biometrics.sensors.AcquisitionClient;
+import com.android.server.biometrics.sensors.AuthenticationConsumer;
+import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.AuthenticationStatsBroadcastReceiver;
+import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.BiometricScheduler;
+import com.android.server.biometrics.sensors.BiometricStateCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
+import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
+import com.android.server.biometrics.sensors.EnumerateConsumer;
+import com.android.server.biometrics.sensors.ErrorConsumer;
+import com.android.server.biometrics.sensors.LockoutResetDispatcher;
+import com.android.server.biometrics.sensors.LockoutTracker;
+import com.android.server.biometrics.sensors.PerformanceTracker;
+import com.android.server.biometrics.sensors.RemovalConsumer;
+import com.android.server.biometrics.sensors.face.FaceUtils;
+import com.android.server.biometrics.sensors.face.LockoutHalImpl;
+import com.android.server.biometrics.sensors.face.ServiceProvider;
+import com.android.server.biometrics.sensors.face.UsageStats;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.time.Clock;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+
+import vendor.aospa.biometrics.face.ISenseService;
+import vendor.aospa.biometrics.face.ISenseServiceReceiver;
+
+public class SenseProvider implements ServiceProvider {
+
+    private static final String TAG = "SenseProvider";
+
+    private static final String BIND_SENSE_ACTION = "co.aospa.sense.BIND";
+    private static final String PACKAGE_NAME = "co.aospa.sense";
+    private static final String SERVICE_NAME = "co.aospa.sense.SenseService";
+
+    public static final int DEVICE_ID = 1008;
+    private static final int ENROLL_TIMEOUT_SEC = 75;
+    private static final int GENERATE_CHALLENGE_REUSE_INTERVAL_MILLIS = 60 * 1000;
+    private static final int GENERATE_CHALLENGE_COUNTER_TTL_MILLIS =
+            FaceGenerateChallengeClient.CHALLENGE_TIMEOUT_SEC * 1000;
+    @VisibleForTesting
+    public static Clock sSystemClock = Clock.systemUTC();
+
+    private boolean mIsBinding;
+    private boolean mTestHalEnabled;
+
+    @NonNull private final FaceSensorPropertiesInternal mSensorProperties;
+    @NonNull private final BiometricStateCallback mBiometricStateCallback;
+    @NonNull private final Context mContext;
+    @NonNull private final BiometricScheduler mScheduler;
+    @NonNull private final Handler mHandler;
+    @NonNull private final Supplier<ISenseService> mLazyDaemon;
+    @NonNull private final LockoutHalImpl mLockoutTracker;
+    @NonNull private final UsageStats mUsageStats;
+    @NonNull private final Map<Integer, Long> mAuthenticatorIds;
+    @Nullable private IBiometricsFace mDaemon;
+    @NonNull private final HalResultController mHalResultController;
+    @NonNull private final BiometricContext mBiometricContext;
+    @Nullable private AuthenticationStatsCollector mAuthenticationStatsCollector;
+    SparseArray<ISenseService> mServices;
+    // for requests that do not use biometric prompt
+    @NonNull private final AtomicLong mRequestCounter = new AtomicLong(0);
+    private int mCurrentUserId = UserHandle.USER_NULL;
+    private final int mSensorId;
+    private final List<Long> mGeneratedChallengeCount = new ArrayList<>();
+    private FaceGenerateChallengeClient mGeneratedChallengeCache = null;
+
+    private final UserSwitchObserver mUserSwitchObserver = new SynchronousUserSwitchObserver() {
+        @Override
+        public void onUserSwitching(int newUserId) {
+            mCurrentUserId = newUserId;
+            ISenseService service = getDaemon();
+            if (service == null) {
+                bindService(mCurrentUserId);
+            }
+        }
+    };
+
+    public static class HalResultController extends ISenseServiceReceiver.Stub {
+        /**
+         * Interface to sends results to the HalResultController's owner.
+         */
+        public interface Callback {
+            /**
+             * Invoked when the HAL sends ERROR_HW_UNAVAILABLE.
+             */
+            void onHardwareUnavailable();
+        }
+
+        private final int mSensorId;
+        @NonNull private final Context mContext;
+        @NonNull private final Handler mHandler;
+        @NonNull private final BiometricScheduler mScheduler;
+        @Nullable private Callback mCallback;
+        @NonNull private final LockoutHalImpl mLockoutTracker;
+        @NonNull private final LockoutResetDispatcher mLockoutResetDispatcher;
+
+
+        HalResultController(int sensorId, @NonNull Context context, @NonNull Handler handler,
+                @NonNull BiometricScheduler scheduler, @NonNull LockoutHalImpl lockoutTracker,
+                @NonNull LockoutResetDispatcher lockoutResetDispatcher) {
+            mSensorId = sensorId;
+            mContext = context;
+            mHandler = handler;
+            mScheduler = scheduler;
+            mLockoutTracker = lockoutTracker;
+            mLockoutResetDispatcher = lockoutResetDispatcher;
+        }
+
+        public void setCallback(@Nullable Callback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        public void onEnrollResult(int faceId, int userId, int remaining) {
+            mHandler.post(() -> {
+                final CharSequence name = FaceUtils.getLegacyInstance(mSensorId)
+                        .getUniqueName(mContext, userId);
+                final Face face = new Face(name, faceId, Long.valueOf(DEVICE_ID));
+
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                if (!(client instanceof FaceEnrollClient)) {
+                    Slog.e(TAG, "onEnrollResult for non-enroll client: "
+                            + Utils.getClientName(client));
+                    return;
+                }
+
+                final FaceEnrollClient enrollClient = (FaceEnrollClient) client;
+                enrollClient.onEnrollResult(face, remaining);
+            });
+        }
+
+        @Override
+        public void onAuthenticated(int faceId, int userId, byte[] token) {
+            mHandler.post(() -> {
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                if (!(client instanceof AuthenticationConsumer)) {
+                    Slog.e(TAG, "onAuthenticated for non-authentication consumer: "
+                            + Utils.getClientName(client));
+                    return;
+                }
+
+                final AuthenticationConsumer authenticationConsumer =
+                        (AuthenticationConsumer) client;
+                final boolean authenticated = faceId != 0;
+                final Face face = new Face("", faceId, DEVICE_ID);
+                authenticationConsumer.onAuthenticated(face, authenticated, SenseUtils.toByteArrayList(token));
+            });
+        }
+
+        @Override
+        public void onAcquired(int userId, int acquiredInfo, int vendorCode) {
+            mHandler.post(() -> {
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                if (!(client instanceof AcquisitionClient)) {
+                    Slog.e(TAG, "onAcquired for non-acquire client: "
+                            + Utils.getClientName(client));
+                    return;
+                }
+
+                final AcquisitionClient<?> acquisitionClient =
+                        (AcquisitionClient<?>) client;
+                acquisitionClient.onAcquired(acquiredInfo, vendorCode);
+            });
+        }
+
+        @Override
+        public void onError(int error, int vendorCode) {
+            mHandler.post(() -> {
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                Slog.d(TAG, "handleError"
+                        + ", client: " + (client != null ? client.getOwnerString() : null)
+                        + ", error: " + error
+                        + ", vendorCode: " + vendorCode);
+                if (!(client instanceof ErrorConsumer)) {
+                    Slog.e(TAG, "onError for non-error consumer: " + Utils.getClientName(
+                            client));
+                    return;
+                }
+
+                final ErrorConsumer errorConsumer = (ErrorConsumer) client;
+                errorConsumer.onError(error, vendorCode);
+
+                if (error == BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE) {
+                    Slog.e(TAG, "Got ERROR_HW_UNAVAILABLE");
+                    if (mCallback != null) {
+                        mCallback.onHardwareUnavailable();
+                    }
+                }
+            });
+        }
+
+        @Override
+        public void onRemoved(int[] faceIds, int userId) {
+            mHandler.post(() -> {
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                if (!(client instanceof RemovalConsumer)) {
+                    Slog.e(TAG, "onRemoved for non-removal consumer: "
+                            + Utils.getClientName(client));
+                    return;
+                }
+
+                final RemovalConsumer removalConsumer = (RemovalConsumer) client;
+
+                if (faceIds.length > 0) {
+                    // Convert to old fingerprint-like behavior, where remove() receives
+                    // one removal at a time. This way, remove can share some more common code.
+                    for (int i = 0; i < faceIds.length; i++) {
+                        final int id = faceIds[i];
+                        final Face face = new Face("", id, Long.valueOf(DEVICE_ID));
+                        final int remaining = (faceIds.length - i) - 1;
+                        Slog.d(TAG, "Removed, faceId: " + id + ", remaining: " + remaining);
+                        removalConsumer.onRemoved(face, remaining);
+                    }
+                } else {
+                    removalConsumer.onRemoved(null, 0 /* remaining */);
+                }
+
+                Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                        Settings.Secure.FACE_UNLOCK_RE_ENROLL, 0, UserHandle.USER_CURRENT);
+            });
+        }
+
+        @Override
+        public void onEnumerate(int[] faceIds, int userId) {
+            mHandler.post(() -> {
+                final BaseClientMonitor client = mScheduler.getCurrentClient();
+                if (!(client instanceof EnumerateConsumer)) {
+                    Slog.e(TAG, "onEnumerate for non-enumerate consumer: "
+                            + Utils.getClientName(client));
+                    return;
+                }
+
+                final EnumerateConsumer enumerateConsumer = (EnumerateConsumer) client;
+
+                if (faceIds.length > 0) {
+                    // Convert to old fingerprint-like behavior, where enumerate() receives one
+                    // template at a time. This way, enumerate can share some more common code.
+                    for (int i = 0; i < faceIds.length; i++) {
+                        final Face face = new Face("", faceIds[i], Long.valueOf(DEVICE_ID));
+                        enumerateConsumer.onEnumerationResult(face, (faceIds.length - i) - 1);
+                    }
+                } else {
+                    // For face, the HIDL contract is to receive an empty list when there are no
+                    // templates enrolled. Send a null identifier since we don't consume them
+                    // anywhere, and send remaining == 0 so this code can be shared with Face@1.1
+                    enumerateConsumer.onEnumerationResult(null /* identifier */, 0);
+                }
+            });
+        }
+
+        @Override
+        public void onLockoutChanged(long duration) {
+            mHandler.post(() -> {
+                Slog.d(TAG, "onLockoutChanged: " + duration);
+                final @LockoutTracker.LockoutMode int lockoutMode;
+                if (duration == 0) {
+                    lockoutMode = LockoutTracker.LOCKOUT_NONE;
+                } else if (duration == -1 || duration == Long.MAX_VALUE) {
+                    lockoutMode = LockoutTracker.LOCKOUT_PERMANENT;
+                } else {
+                    lockoutMode = LockoutTracker.LOCKOUT_TIMED;
+                }
+
+                mLockoutTracker.setCurrentUserLockoutMode(lockoutMode);
+
+                if (duration == 0) {
+                    mLockoutResetDispatcher.notifyLockoutResetCallbacks(mSensorId);
+                }
+            });
+        }
+    }
+
+    @VisibleForTesting
+    public SenseProvider(@NonNull Context context,
+            @NonNull BiometricStateCallback biometricStateCallback,
+            @NonNull FaceSensorPropertiesInternal sensorProps,
+            @NonNull LockoutResetDispatcher lockoutResetDispatcher,
+            @NonNull BiometricScheduler scheduler) {
+        mServices = new SparseArray<>();
+        mIsBinding = false;
+        mSensorProperties = sensorProps;
+        mContext = context;
+        mBiometricStateCallback = biometricStateCallback;
+        mSensorId = sensorProps.sensorId;
+        mScheduler = scheduler;
+        mHandler = new Handler(Looper.getMainLooper());
+        mBiometricContext = BiometricContext.getInstance(context);
+        mUsageStats = new UsageStats(context);
+        mAuthenticatorIds = new HashMap<>();
+        mLazyDaemon = SenseProvider.this::getDaemon;
+        mLockoutTracker = new LockoutHalImpl();
+        mHalResultController = new HalResultController(sensorProps.sensorId, context, mHandler,
+                mScheduler, mLockoutTracker, lockoutResetDispatcher);
+        mHalResultController.setCallback(() -> {
+            mDaemon = null;
+            mCurrentUserId = UserHandle.USER_NULL;
+        });
+        mCurrentUserId = ActivityManager.getCurrentUser();
+
+        AuthenticationStatsBroadcastReceiver mBroadcastReceiver =
+                new AuthenticationStatsBroadcastReceiver(
+                        mContext,
+                        BiometricsProtoEnums.MODALITY_FACE,
+                        (AuthenticationStatsCollector collector) -> {
+                            Slog.d(TAG, "Initializing AuthenticationStatsCollector");
+                            mAuthenticationStatsCollector = collector;
+                        });
+
+        try {
+            ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Unable to register user switch observer");
+        }
+    }
+
+    public SenseProvider(Context context, BiometricStateCallback biometricStateCallback, FaceSensorPropertiesInternal sensorProps, LockoutResetDispatcher lockoutResetDispatcher) {
+        this(context, biometricStateCallback, sensorProps, lockoutResetDispatcher, new BiometricScheduler<>(context, 0, null));
+    }
+
+    private synchronized ISenseService getDaemon() {
+        if (mTestHalEnabled) {
+            final TestHal testHal = new TestHal(mContext, mSensorId);
+            testHal.setCallback(mHalResultController);
+            return testHal;
+        }
+
+        ISenseService service = getService(mCurrentUserId);
+        if (service == null) {
+            bindService(mCurrentUserId);
+        }
+        return service;
+    }
+
+    @Override
+    public boolean containsSensor(int sensorId) {
+        return mSensorId == sensorId;
+    }
+
+    @Override
+    @NonNull
+    public List<FaceSensorPropertiesInternal> getSensorProperties() {
+        final List<FaceSensorPropertiesInternal> properties = new ArrayList<>();
+        properties.add(mSensorProperties);
+        return properties;
+    }
+
+    @NonNull
+    @Override
+    public FaceSensorPropertiesInternal getSensorProperties(int sensorId) {
+        return mSensorProperties;
+    }
+
+    @Override
+    @NonNull
+    public List<Face> getEnrolledFaces(int sensorId, int userId) {
+        return FaceUtils.getLegacyInstance(mSensorId).getBiometricsForUser(mContext, userId);
+    }
+
+    @Override
+    public boolean hasEnrollments(int sensorId, int userId) {
+        return !getEnrolledFaces(sensorId, userId).isEmpty();
+    }
+
+    @Override
+    @LockoutTracker.LockoutMode
+    public int getLockoutModeForUser(int sensorId, int userId) {
+        return mLockoutTracker.getLockoutModeForUser(userId);
+    }
+
+    @Override
+    public long getAuthenticatorId(int sensorId, int userId) {
+        return mAuthenticatorIds.getOrDefault(userId, 0L);
+    }
+
+    @Override
+    public boolean isHardwareDetected(int sensorId) {
+        return getDaemon() != null;
+    }
+
+    private boolean isGeneratedChallengeCacheValid() {
+        return mGeneratedChallengeCache != null
+                && sSystemClock.millis() - mGeneratedChallengeCache.getCreatedAt()
+                < GENERATE_CHALLENGE_REUSE_INTERVAL_MILLIS;
+    }
+
+    private void incrementChallengeCount() {
+        mGeneratedChallengeCount.add(0, sSystemClock.millis());
+    }
+
+    private int decrementChallengeCount() {
+        final long now = sSystemClock.millis();
+        // ignore values that are old in case generate/revoke calls are not matched
+        // this doesn't ensure revoke if calls are mismatched but it keeps the list from growing
+        mGeneratedChallengeCount.removeIf(x -> now - x > GENERATE_CHALLENGE_COUNTER_TTL_MILLIS);
+        if (!mGeneratedChallengeCount.isEmpty()) {
+            mGeneratedChallengeCount.remove(0);
+        }
+        return mGeneratedChallengeCount.size();
+    }
+
+    /**
+     * {@link IBiometricsFace} only supports a single in-flight challenge but there are cases where
+     * two callers both need challenges (e.g. resetLockout right before enrollment).
+     */
+    @Override
+    public void scheduleGenerateChallenge(int sensorId, int userId, @NonNull IBinder token,
+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                try {
+                    receiver.onChallengeGenerated(sensorId, userId, 0L);
+                    return;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            incrementChallengeCount();
+
+            if (isGeneratedChallengeCacheValid()) {
+                Slog.d(TAG, "Current challenge is cached and will be reused");
+                mGeneratedChallengeCache.reuseResult(receiver);
+                return;
+            }
+
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
+                    mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), userId,
+                    opPackageName, mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext, sSystemClock.millis());
+            mGeneratedChallengeCache = client;
+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
+                @Override
+                public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
+                    if (client != clientMonitor) {
+                        Slog.e(TAG, "scheduleGenerateChallenge onClientStarted, mismatched client."
+                                + " Expecting: " + client + ", received: " + clientMonitor);
+                    }
+                }
+            });
+        });
+    }
+
+    @Override
+    public void scheduleRevokeChallenge(int sensorId, int userId, @NonNull IBinder token,
+            @NonNull String opPackageName, long challenge) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                return;
+            }
+            final boolean shouldRevoke = decrementChallengeCount() == 0;
+            if (!shouldRevoke) {
+                Slog.w(TAG, "scheduleRevokeChallenge skipped - challenge still in use: "
+                        + mGeneratedChallengeCount);
+                return;
+            }
+
+            Slog.d(TAG, "scheduleRevokeChallenge executing - no active clients");
+            mGeneratedChallengeCache = null;
+
+            final FaceRevokeChallengeClient client = new FaceRevokeChallengeClient(mContext,
+                    mLazyDaemon, token, userId, opPackageName, mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext);
+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
+                @Override
+                public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
+                        boolean success) {
+                    if (client != clientMonitor) {
+                        Slog.e(TAG, "scheduleRevokeChallenge, mismatched client."
+                                + "Expecting: " + client + ", received: " + clientMonitor);
+                    }
+                }
+            });
+        });
+    }
+
+    @Override
+    public long scheduleEnroll(int sensorId, @NonNull IBinder token,
+            @NonNull byte[] hardwareAuthToken, int userId, @NonNull IFaceServiceReceiver receiver,
+            @NonNull String opPackageName, @NonNull int[] disabledFeatures,
+            @Nullable Surface previewSurface, boolean debugConsent,
+            @NonNull FaceEnrollOptions options) {
+        final long id = mRequestCounter.incrementAndGet();
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                try {
+                    receiver.onError(2, 0);
+                    return;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            BiometricNotificationUtils.cancelFaceReEnrollNotification(mContext);
+
+            final FaceEnrollClient client = new FaceEnrollClient(mContext, mLazyDaemon, token,
+                    new ClientMonitorCallbackConverter(receiver), userId, hardwareAuthToken,
+                    opPackageName, id, FaceUtils.getLegacyInstance(mSensorId), disabledFeatures,
+                    ENROLL_TIMEOUT_SEC, previewSurface, mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_ENROLL,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext,
+                    mContext.getResources().getInteger(
+                                com.android.internal.R.integer.config_faceMaxTemplatesPerUser));
+
+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
+                @Override
+                public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
+                    mBiometricStateCallback.onClientStarted(clientMonitor);
+                }
+
+                @Override
+                public void onBiometricAction(int action) {
+                    mBiometricStateCallback.onBiometricAction(action);
+                }
+
+                @Override
+                public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
+                        boolean success) {
+                    mBiometricStateCallback.onClientFinished(clientMonitor, success);
+                    if (success) {
+                        // Update authenticatorIds
+                        scheduleUpdateActiveUserWithoutHandler(client.getTargetUserId());
+                    }
+                }
+            });
+        });
+        return id;
+    }
+
+    @Override
+    public void cancelEnrollment(int sensorId, @NonNull IBinder token, long requestId) {
+        mHandler.post(() -> mScheduler.cancelEnrollment(token, requestId));
+    }
+
+    @Override
+    public long scheduleFaceDetect(@NonNull IBinder token,
+            @NonNull ClientMonitorCallbackConverter callback,
+            @NonNull FaceAuthenticateOptions options, int statsClient) {
+        throw new IllegalStateException("Face detect not supported by IBiometricsFace@1.0. Did you"
+                + "forget to check the supportsFaceDetection flag?");
+    }
+
+    @Override
+    public void cancelFaceDetect(int sensorId, @NonNull IBinder token, long requestId) {
+        throw new IllegalStateException("Face detect not supported by IBiometricsFace@1.0. Did you"
+                + "forget to check the supportsFaceDetection flag?");
+    }
+
+    @Override
+    public void scheduleAuthenticate(@NonNull IBinder token, long operationId,
+            int cookie, @NonNull ClientMonitorCallbackConverter receiver,
+            @NonNull FaceAuthenticateOptions options, long requestId, boolean restricted,
+            int statsClient, boolean allowBackgroundAuthentication) {
+        mHandler.post(() -> {
+            final int userId = options.getUserId();
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                try {
+                    receiver.onError(1008, 0, 1, 0);
+                    return;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final boolean isStrongBiometric = Utils.isStrongBiometric(mSensorId);
+            final FaceAuthenticationClient client = new FaceAuthenticationClient(mContext,
+                    mLazyDaemon, token, requestId, receiver, operationId, restricted,
+                    options, cookie, false /* requireConfirmation */,
+                    createLogger(BiometricsProtoEnums.ACTION_AUTHENTICATE, statsClient),
+                    mBiometricContext, isStrongBiometric, mLockoutTracker,
+                    mUsageStats, allowBackgroundAuthentication,
+                    Utils.getCurrentStrength(mSensorId));
+            mScheduler.scheduleClientMonitor(client);
+        });
+    }
+
+    @Override
+    public long scheduleAuthenticate(@NonNull IBinder token, long operationId,
+            int cookie, @NonNull ClientMonitorCallbackConverter receiver,
+            @NonNull FaceAuthenticateOptions options, boolean restricted,
+            int statsClient, boolean allowBackgroundAuthentication) {
+        final long id = mRequestCounter.incrementAndGet();
+
+        scheduleAuthenticate(token, operationId, cookie, receiver,
+                options, id, restricted, statsClient, allowBackgroundAuthentication);
+
+        return id;
+    }
+
+    @Override
+    public void cancelAuthentication(int sensorId, @NonNull IBinder token, long requestId) {
+        mHandler.post(() -> mScheduler.cancelAuthenticationOrDetection(token, requestId));
+    }
+
+    @Override
+    public void scheduleRemove(int sensorId, @NonNull IBinder token, int faceId, int userId,
+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                try {
+                    receiver.onError(1, 0);
+                    return;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final FaceRemovalClient client = new FaceRemovalClient(mContext, mLazyDaemon, token,
+                    new ClientMonitorCallbackConverter(receiver), faceId, userId, opPackageName,
+                    FaceUtils.getLegacyInstance(mSensorId), mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_REMOVE,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext, mAuthenticatorIds,
+                    BiometricsProtoEnums.UNENROLL_REASON_USER_REQUEST);
+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
+        });
+    }
+
+    @Override
+    public void scheduleRemoveAll(int sensorId, @NonNull IBinder token, int userId,
+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                try {
+                    receiver.onError(1, 0);
+                    return;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            // For IBiometricsFace@1.0, remove(0) means remove all enrollments
+            final FaceRemovalClient client = new FaceRemovalClient(mContext, mLazyDaemon, token,
+                    new ClientMonitorCallbackConverter(receiver), 0 /* faceId */, userId,
+                    opPackageName,
+                    FaceUtils.getLegacyInstance(mSensorId), mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_REMOVE,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext, mAuthenticatorIds,
+                    BiometricsProtoEnums.UNENROLL_REASON_USER_REQUEST);
+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
+        });
+    }
+
+    @Override
+    public void scheduleResetLockout(int sensorId, int userId, @NonNull byte[] hardwareAuthToken) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+            }
+            if (getEnrolledFaces(sensorId, userId).isEmpty()) {
+                Slog.w(TAG, "Ignoring lockout reset, no templates enrolled for user: " + userId);
+                return;
+            }
+
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final FaceResetLockoutClient client = new FaceResetLockoutClient(mContext,
+                    mLazyDaemon, userId, mContext.getOpPackageName(), mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext, hardwareAuthToken);
+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
+        });
+    }
+
+    @Override
+    public void scheduleSetFeature(int sensorId, @NonNull IBinder token, int userId, int feature,
+            boolean enabled, @NonNull byte[] hardwareAuthToken,
+            @NonNull IFaceServiceReceiver receiver, @NonNull String opPackageName) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                return;
+            }
+            final List<Face> faces = getEnrolledFaces(sensorId, userId);
+            if (faces.isEmpty()) {
+                Slog.w(TAG, "Ignoring setFeature, no templates enrolled for user: " + userId);
+                return;
+            }
+
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final int faceId = faces.get(0).getBiometricId();
+            final FaceSetFeatureClient client = new FaceSetFeatureClient(mContext,
+                    mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), userId,
+                    opPackageName, mSensorId, BiometricLogger.ofUnknown(mContext, mHandler),
+                    mBiometricContext,
+                    feature, enabled, hardwareAuthToken, faceId);
+            mScheduler.scheduleClientMonitor(client, mBiometricStateCallback);
+        });
+    }
+
+    @Override
+    public void scheduleGetFeature(int sensorId, @NonNull IBinder token, int userId, int feature,
+            @Nullable ClientMonitorCallbackConverter listener, @NonNull String opPackageName) {
+        mHandler.post(() -> {
+            if (getDaemon() == null) {
+                bindService(mCurrentUserId);
+                if (listener != null) {
+                    try {
+                        listener.onError(1008, 0, 1, 0);
+                        return;
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                        return;
+                    }
+                }
+                return;
+            }
+            final List<Face> faces = getEnrolledFaces(sensorId, userId);
+            if (faces.isEmpty()) {
+                Slog.w(TAG, "Ignoring getFeature, no templates enrolled for user: " + userId);
+                return;
+            }
+
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final int faceId = faces.get(0).getBiometricId();
+            final FaceGetFeatureClient client = new FaceGetFeatureClient(mContext, mLazyDaemon,
+                    token, listener, userId, opPackageName, mSensorId,
+                    BiometricLogger.ofUnknown(mContext, mHandler), mBiometricContext,
+                    feature, faceId);
+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
+                @Override
+                public void onClientFinished(
+                        @NonNull BaseClientMonitor clientMonitor, boolean success) {
+                    if (success && feature == BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION) {
+                        final int settingsValue = client.getValue() ? 1 : 0;
+                        Slog.d(TAG, "Updating attention value for user: " + userId
+                                + " to value: " + settingsValue);
+                        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                                Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
+                                settingsValue, userId);
+                    }
+                }
+            });
+        });
+    }
+
+    private void scheduleInternalCleanup(int userId,
+            @Nullable ClientMonitorCallback callback) {
+        mHandler.post(() -> {
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
+            final FaceInternalCleanupClient client = new FaceInternalCleanupClient(mContext,
+                    mLazyDaemon, userId, mContext.getOpPackageName(), mSensorId,
+                    createLogger(BiometricsProtoEnums.ACTION_ENUMERATE,
+                            BiometricsProtoEnums.CLIENT_UNKNOWN),
+                    mBiometricContext,
+                    FaceUtils.getLegacyInstance(mSensorId), mAuthenticatorIds);
+            mScheduler.scheduleClientMonitor(client, new ClientMonitorCompositeCallback(callback,
+                    mBiometricStateCallback));
+        });
+    }
+
+    @Override
+    public void scheduleInternalCleanup(int sensorId, int userId,
+            @Nullable ClientMonitorCallback callback) {
+        scheduleInternalCleanup(userId, mBiometricStateCallback);
+    }
+
+    @Override
+    public void scheduleInternalCleanup(int sensorId, int userId,
+            @Nullable ClientMonitorCallback callback, boolean favorHalEnrollments) {
+        scheduleInternalCleanup(userId, mBiometricStateCallback);
+    }
+
+    @Override
+    public void startPreparedClient(int sensorId, int cookie) {
+        mHandler.post(() -> {
+            mScheduler.startPreparedClient(cookie);
+        });
+    }
+
+    @Override
+    public void dumpProtoState(int sensorId, ProtoOutputStream proto,
+            boolean clearSchedulerBuffer) {
+        final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
+
+        proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
+        proto.write(SensorStateProto.MODALITY, SensorStateProto.FACE);
+        proto.write(SensorStateProto.CURRENT_STRENGTH,
+                Utils.getCurrentStrength(mSensorProperties.sensorId));
+        proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));
+
+        for (UserInfo user : UserManager.get(mContext).getUsers()) {
+            final int userId = user.getUserHandle().getIdentifier();
+
+            final long userToken = proto.start(SensorStateProto.USER_STATES);
+            proto.write(UserStateProto.USER_ID, userId);
+            proto.write(UserStateProto.NUM_ENROLLED, FaceUtils.getLegacyInstance(mSensorId)
+                    .getBiometricsForUser(mContext, userId).size());
+            proto.end(userToken);
+        }
+
+        proto.write(SensorStateProto.RESET_LOCKOUT_REQUIRES_HARDWARE_AUTH_TOKEN,
+                mSensorProperties.resetLockoutRequiresHardwareAuthToken);
+        proto.write(SensorStateProto.RESET_LOCKOUT_REQUIRES_CHALLENGE,
+                mSensorProperties.resetLockoutRequiresChallenge);
+
+        proto.end(sensorToken);
+    }
+
+    @Override
+    public void dumpProtoMetrics(int sensorId, FileDescriptor fd) {
+    }
+
+    @Override
+    public void dumpInternal(int sensorId, PrintWriter pw) {
+        PerformanceTracker performanceTracker =
+                PerformanceTracker.getInstanceForSensorId(mSensorId);
+
+        JSONObject dump = new JSONObject();
+        try {
+            dump.put("service", TAG);
+
+            JSONArray sets = new JSONArray();
+            for (UserInfo user : UserManager.get(mContext).getUsers()) {
+                final int userId = user.getUserHandle().getIdentifier();
+                final int c = FaceUtils.getLegacyInstance(mSensorId)
+                        .getBiometricsForUser(mContext, userId).size();
+                JSONObject set = new JSONObject();
+                set.put("id", userId);
+                set.put("count", c);
+                set.put("accept", performanceTracker.getAcceptForUser(userId));
+                set.put("reject", performanceTracker.getRejectForUser(userId));
+                set.put("acquire", performanceTracker.getAcquireForUser(userId));
+                set.put("lockout", performanceTracker.getTimedLockoutForUser(userId));
+                set.put("permanentLockout", performanceTracker.getPermanentLockoutForUser(userId));
+                // cryptoStats measures statistics about secure face transactions
+                // (e.g. to unlock password storage, make secure purchases, etc.)
+                set.put("acceptCrypto", performanceTracker.getAcceptCryptoForUser(userId));
+                set.put("rejectCrypto", performanceTracker.getRejectCryptoForUser(userId));
+                set.put("acquireCrypto", performanceTracker.getAcquireCryptoForUser(userId));
+                sets.put(set);
+            }
+
+            dump.put("prints", sets);
+        } catch (JSONException e) {
+            Slog.e(TAG, "dump formatting failure", e);
+        }
+        pw.println(dump);
+        pw.println("HAL deaths since last reboot: " + performanceTracker.getHALDeathCount());
+
+        mScheduler.dump(pw);
+        mUsageStats.print(pw);
+    }
+
+    private void scheduleLoadAuthenticatorIds() {
+        // Note that this can be performed on the scheduler (as opposed to being done immediately
+        // when the HAL is (re)loaded, since
+        // 1) If this is truly the first time it's being performed (e.g. system has just started),
+        //    this will be run very early and way before any applications need to generate keys.
+        // 2) If this is being performed to refresh the authenticatorIds (e.g. HAL crashed and has
+        //    just been reloaded), the framework already has a cache of the authenticatorIds. This
+        //    is safe because authenticatorIds only change when A) new template has been enrolled,
+        //    or B) all templates are removed.
+        mHandler.post(() -> {
+            for (UserInfo user : UserManager.get(mContext).getAliveUsers()) {
+                final int targetUserId = user.id;
+                if (!mAuthenticatorIds.containsKey(targetUserId)) {
+                    scheduleUpdateActiveUserWithoutHandler(targetUserId);
+                }
+            }
+        });
+    }
+
+    /**
+     * Schedules the {@link FaceUpdateActiveUserClient} without posting the work onto the handler.
+     * Many/most APIs are user-specific. However, the HAL requires explicit "setActiveUser"
+     * invocation prior to authenticate/enroll/etc. Thus, internally we usually want to schedule
+     * this operation on the same lambda/runnable as those operations so that the ordering is
+     * correct.
+     */
+    private void scheduleUpdateActiveUserWithoutHandler(int targetUserId) {
+        final boolean hasEnrolled = !getEnrolledFaces(mSensorId, targetUserId).isEmpty();
+        final FaceUpdateActiveUserClient client = new FaceUpdateActiveUserClient(mContext,
+                mLazyDaemon, targetUserId, mContext.getOpPackageName(), mSensorId,
+                createLogger(BiometricsProtoEnums.ACTION_UNKNOWN,
+                        BiometricsProtoEnums.CLIENT_UNKNOWN),
+                mBiometricContext, hasEnrolled, mAuthenticatorIds);
+        mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
+            @Override
+            public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
+                    boolean success) {
+                if (success) {
+                    mCurrentUserId = targetUserId;
+                } else {
+                    Slog.w(TAG, "Failed to change user, still: " + mCurrentUserId);
+                }
+            }
+        });
+    }
+
+    public class SenseServiceConnection implements ServiceConnection {
+        private int mUserId;
+
+        public SenseServiceConnection(int userId) {
+            mUserId = userId;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Slog.d(TAG, "Service connected : " + mUserId);
+            ISenseService senseService = ISenseService.Stub.asInterface(service);
+            if (senseService != null) {
+                synchronized (mServices) {
+                    try {
+                        senseService.setCallback(mHalResultController);
+                        mServices.put(mUserId, senseService);
+                        mHandler.post(() -> {
+                            updateSchedule();
+                        });
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    }
+                    mIsBinding = false;
+                }
+            }
+        }
+
+        public void updateSchedule() {
+            scheduleInternalCleanup(mUserId, null);
+            scheduleGetFeature(mSensorId, new Binder(), mUserId, 1, null, mContext.getOpPackageName());
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName className) {
+            Slog.d(TAG, "Service disconnected : " + mUserId);
+            mServices.remove(mUserId);
+            mIsBinding = false;
+            if (mUserId == mCurrentUserId) {
+                mHandler.post(() -> {
+                    updateResetSchedule();
+                });
+            }
+            mContext.unbindService(this);
+        }
+
+        public void updateResetSchedule() {
+            BaseClientMonitor client = mScheduler.getCurrentClient();
+            if (client != null && (client instanceof ErrorConsumer)) {
+                ErrorConsumer errorConsumer = (ErrorConsumer) client;
+                errorConsumer.onError(5, 0);
+            }
+            bindService(mUserId);
+            mScheduler.recordCrashState();
+            mScheduler.reset();
+        }
+    }
+
+    private boolean isServiceEnabled() {
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent(BIND_SENSE_ACTION);
+        intent.setClassName(PACKAGE_NAME, SERVICE_NAME);
+        ResolveInfo info = pm.resolveService(intent, 131072);
+        if (info != null && info.serviceInfo.isEnabled()) {
+            return true;
+        }
+        return false;
+    }
+
+    private ISenseService getService(int userId) {
+        if (userId == -10000) {
+            scheduleUpdateActiveUserWithoutHandler(ActivityManager.getCurrentUser());
+        }
+        return mServices.get(mCurrentUserId);
+    }
+
+    public boolean bindService(int userId) {
+        Slog.d(TAG, "bindService " + userId);
+        if (!isServiceEnabled()) {
+            Slog.d(TAG, "Service disabled");
+            return false;
+        } else if (mIsBinding) {
+            Slog.d(TAG, "Service is binding");
+            return true;
+        } else {
+            if (userId != -10000 && getService(userId) == null) {
+                try {
+                    Intent intent = new Intent(BIND_SENSE_ACTION);
+                    intent.setClassName(PACKAGE_NAME, SERVICE_NAME);
+                    boolean result = mContext.bindServiceAsUser(intent, new SenseServiceConnection(userId), 1, UserHandle.of(userId));
+                    if (result) {
+                        mIsBinding = true;
+                    }
+                    return result;
+                } catch (SecurityException e) {
+                    e.printStackTrace();
+                }
+            }
+            return false;
+        }
+    }
+
+    private BiometricLogger createLogger(int statsAction, int statsClient) {
+        return new BiometricLogger(mContext, mHandler, BiometricsProtoEnums.MODALITY_FACE,
+                statsAction, statsClient, mAuthenticationStatsCollector);
+    }
+
+    /**
+     * Sends a debug message to the HAL with the provided FileDescriptor and arguments.
+     */
+    public void dumpHal(int sensorId, @NonNull FileDescriptor fd, @NonNull String[] args) { }
+
+    void setTestHalEnabled(boolean enabled) {
+        mTestHalEnabled = enabled;
+    }
+
+    @NonNull
+    @Override
+    public ITestSession createTestSession(int sensorId, @NonNull ITestSessionCallback callback,
+            @NonNull String opPackageName) {
+        return new BiometricTestSessionImpl(mContext, mSensorId, callback, this,
+                mHalResultController);
+    }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java
new file mode 100644
index 0000000000000..9e49fa1e78489
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/SenseUtils.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.os.SystemProperties;
+
+import java.util.ArrayList;
+
+public class SenseUtils {
+
+    public static boolean canUseProvider() {
+        return SystemProperties.getBoolean("ro.face.sense_service", false);
+    }
+
+    public static ArrayList<Byte> toByteArrayList(byte[] in) {
+        if (in == null) {
+            return null;
+        }
+        ArrayList<Byte> out = new ArrayList<>(in.length);
+        for (byte c : in) {
+            out.add(Byte.valueOf(c));
+        }
+        return out;
+    }
+
+    public static byte[] toByteArray(ArrayList<Byte> in) {
+        if (in == null) {
+            return null;
+        }
+        byte[] out = new byte[in.size()];
+        for (int i = 0; i < in.size(); i++) {
+            out[i] = in.get(i).byteValue();
+        }
+        return out;
+    }
+
+    public static int[] toIntArray(ArrayList<Integer> in) {
+        if (in == null) {
+            return null;
+        }
+        int[] out = new int[in.size()];
+        for (int i = 0; i < in.size(); i++) {
+            out[i] = in.get(i).intValue();
+        }
+        return out;
+    }
+}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java
new file mode 100644
index 0000000000000..0499bc51ede6e
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/face/sense/TestHal.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2023 Paranoid Android
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.biometrics.sensors.face.sense;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.hardware.biometrics.face.V1_0.FaceError;
+import android.hardware.biometrics.face.V1_0.OptionalBool;
+import android.hardware.biometrics.face.V1_0.OptionalUint64;
+import android.hardware.biometrics.face.V1_0.Status;
+import android.hardware.face.Face;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.server.biometrics.sensors.face.FaceUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import vendor.aospa.biometrics.face.ISenseService;
+import vendor.aospa.biometrics.face.ISenseServiceReceiver;
+
+public class TestHal extends ISenseService.Stub {
+    private static final String TAG = "face.hidl.TestHal";
+
+    @NonNull
+    private final Context mContext;
+    private final int mSensorId;
+
+    @Nullable
+    private ISenseServiceReceiver mCallback;
+    private int mUserId;
+
+    TestHal(@NonNull Context context, int sensorId) {
+        mContext = context;
+        mSensorId = sensorId;
+    }
+
+    @Override
+    public void setCallback(ISenseServiceReceiver clientCallback) {
+        mCallback = clientCallback;
+    }
+
+    @Override
+    public long generateChallenge(int challengeTimeoutSec) {
+        Slog.w(TAG, "generateChallenge");
+        return 0L;
+    }
+
+    @Override
+    public void enroll(byte[] hat, int timeoutSec, int[] disabledFeatures) {
+        Slog.w(TAG, "enroll");
+    }
+
+    @Override
+    public int revokeChallenge() {
+        return 0;
+    }
+
+    @Override
+    public void setFeature(int feature, boolean enabled, byte[] token, int faceId) { }
+
+    @Override
+    public boolean getFeature(int feature, int faceId) {
+        return false;
+    }
+
+    @Override
+    public int getFeatureCount() throws RemoteException {
+        return 0;
+    }
+
+    @Override
+    public int getAuthenticatorId() {
+        return 0;
+    }
+
+    @Override
+    public void cancel() throws RemoteException {
+        if (mCallback != null) {
+            mCallback.onError(0 /* deviceId */, 0 /* vendorCode */);
+        }
+    }
+
+    @Override
+    public int enumerate() throws RemoteException {
+        Slog.w(TAG, "enumerate");
+        if (mCallback != null) {
+            mCallback.onEnumerate(new int[0], 0 /* userId */);
+        }
+        return 0;
+    }
+
+    @Override
+    public void remove(int faceId) throws RemoteException {
+        Slog.w(TAG, "remove");
+        if (mCallback != null) {
+            if (faceId == 0) {
+                List<Face> faces = FaceUtils.getInstance(mSensorId).getBiometricsForUser(mContext, mUserId);
+                if (faces.size() <= 0) {
+                    mCallback.onError(6, 0);
+                    return;
+                }
+                int[] faceIds = new int[faces.size()];
+                for (int i = 0; i < faces.size(); i++) {
+                    Face face = faces.get(i);
+                    faceIds[i] = face.getBiometricId();
+                }
+
+                mCallback.onRemoved(faceIds, mUserId);
+            } else {
+                mCallback.onRemoved(new int[]{faceId}, mUserId);
+            }
+        }
+    }
+
+    @Override
+    public void authenticate(long operationId) {
+        Slog.w(TAG, "authenticate");
+    }
+
+    @Override
+    public void resetLockout(byte[] hat) {
+        Slog.w(TAG, "resetLockout");
+    }
+
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
index cd864eb43e84d..51fc0b3e0da49 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
@@ -445,7 +445,9 @@ public void onLockoutTimed(long durationMillis) {
                     .Builder(BiometricSourceType.FINGERPRINT, getRequestReason(),
                     getErrorString(getContext(), error, 0), error).build()
             );
-            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+            if (getListener() != null) {
+                getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+            }
         } catch (RemoteException e) {
             Slog.e(TAG, "Remote exception", e);
         }
@@ -479,7 +481,9 @@ public void onLockoutPermanent() {
                     .Builder(BiometricSourceType.FINGERPRINT, getRequestReason(),
                     getErrorString(getContext(), error, 0), error).build()
             );
-            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+            if (getListener() != null) {
+                getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+            }
         } catch (RemoteException e) {
             Slog.e(TAG, "Remote exception", e);
         }
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/HidlToAidlSessionAdapter.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/HidlToAidlSessionAdapter.java
index 671bd875d1940..62a08545d094c 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/HidlToAidlSessionAdapter.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/HidlToAidlSessionAdapter.java
@@ -65,46 +65,91 @@ public IBinder asBinder() {
 
     @Override
     public void generateChallenge() throws RemoteException {
-        long challenge = mSession.get().preEnroll();
-        mHidlToAidlCallbackConverter.onChallengeGenerated(challenge);
+        try {
+            long challenge = mSession.get().preEnroll();
+            mHidlToAidlCallbackConverter.onChallengeGenerated(challenge);
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "generateChallenge: exception!", e);
+        }
     }
 
     @Override
     public void revokeChallenge(long challenge) throws RemoteException {
-        mSession.get().postEnroll();
-        mHidlToAidlCallbackConverter.onChallengeRevoked(0L);
+        try {
+            mSession.get().postEnroll();
+            mHidlToAidlCallbackConverter.onChallengeRevoked(0L);
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "revokeChallenge: exception!", e);
+        }
     }
 
     @Override
     public ICancellationSignal enroll(HardwareAuthToken hat) throws RemoteException {
-        mSession.get().enroll(HardwareAuthTokenUtils.toByteArray(hat), mUserId,
-                ENROLL_TIMEOUT_SEC);
-        return new Cancellation();
+        try {
+            mSession.get().enroll(HardwareAuthTokenUtils.toByteArray(hat), mUserId,
+                    ENROLL_TIMEOUT_SEC);
+            return new Cancellation();
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "enroll: exception!", e);
+        }
+        return null;
     }
 
     @Override
     public ICancellationSignal authenticate(long operationId) throws RemoteException {
-        mSession.get().authenticate(operationId, mUserId);
-        return new Cancellation();
+        try {
+            mSession.get().authenticate(operationId, mUserId);
+            return new Cancellation();
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "authenticate: exception!", e);
+        }
+        return null;
     }
 
     @Override
     public ICancellationSignal detectInteraction() throws RemoteException {
-        mSession.get().authenticate(0, mUserId);
-        return new Cancellation();
+        try {
+            mSession.get().authenticate(0, mUserId);
+            return new Cancellation();
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "detectInteraction: exception!", e);
+        }
+        return null;
     }
 
     @Override
     public void enumerateEnrollments() throws RemoteException {
-        mSession.get().enumerate();
+        try {
+            mSession.get().enumerate();
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "enumerateEnrollments: exception!", e);
+        }
     }
 
     @Override
     public void removeEnrollments(int[] enrollmentIds) throws RemoteException {
-        if (enrollmentIds.length > 1) {
-            mSession.get().remove(mUserId, 0);
-        } else {
-            mSession.get().remove(mUserId, enrollmentIds[0]);
+        try {
+            if (enrollmentIds.length > 1) {
+                mSession.get().remove(mUserId, 0);
+            } else {
+                mSession.get().remove(mUserId, enrollmentIds[0]);
+            }
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "removeEnrollments: exception!", e);
         }
     }
 
@@ -214,11 +259,24 @@ protected IBiometricsFingerprint getIBiometricsFingerprint() {
     }
 
     public long getAuthenticatorIdForUpdateClient() throws RemoteException {
-        return mSession.get().getAuthenticatorId();
+        try {
+            return mSession.get().getAuthenticatorId();
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "getAuthenticatorIdForUpdateClient: exception!", e);
+        }
+        return 0L;
     }
 
     public void setActiveGroup(int userId, String absolutePath) throws RemoteException {
-        mSession.get().setActiveGroup(userId, absolutePath);
+        try {
+            mSession.get().setActiveGroup(userId, absolutePath);
+        } catch (RemoteException re) {
+            throw re;
+        } catch (Exception e) {
+            Slog.e(TAG, "setActiveGroup: exception!", e);
+        }
     }
 
     private void setCallback(AidlResponseHandler aidlResponseHandler) {
@@ -235,6 +293,8 @@ private void setCallback(AidlResponseHandler aidlResponseHandler) {
             }
         } catch (RemoteException e) {
             Slog.d(TAG, "Failed to set callback");
+        } catch (Exception e) {
+            Slog.e(TAG, "setCallback: exception!", e);
         }
     }
 
@@ -247,6 +307,8 @@ public void cancel() throws RemoteException {
                 mSession.get().cancel();
             } catch (RemoteException e) {
                 Slog.e(TAG, "Remote exception when requesting cancel", e);
+            } catch (Exception e) {
+                Slog.e(TAG, "cancel: exception!", e);
             }
         }
 
diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java
index 9073b53ea35a8..69dcbc4918a80 100644
--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
+++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
@@ -1066,7 +1066,7 @@ public void onStart() {
         filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);
         filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
         filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
-        mContext.registerReceiver(mIntentReceiver, filter);
+        mContext.registerReceiver(mIntentReceiver, filter, Context.RECEIVER_EXPORTED);
 
         publishBinderService(CAMERA_SERVICE_PROXY_BINDER_NAME, mCameraServiceProxy);
         publishLocalService(CameraServiceProxy.class, this);
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index bbae6a01786e3..f10e166dc3d8b 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -138,19 +138,6 @@ public class ClipboardService extends SystemService {
     @VisibleForTesting
     public static final long DEFAULT_CLIPBOARD_TIMEOUT_MILLIS = 3600000;
 
-    /**
-     * Device config property for whether clipboard auto clear is enabled on the device
-     **/
-    public static final String PROPERTY_AUTO_CLEAR_ENABLED =
-            "auto_clear_enabled";
-
-    /**
-     * Device config property for time period in milliseconds after which clipboard is auto
-     * cleared
-     **/
-    public static final String PROPERTY_AUTO_CLEAR_TIMEOUT =
-            "auto_clear_timeout";
-
     // DeviceConfig properties
     private static final String PROPERTY_MAX_CLASSIFICATION_LENGTH = "max_classification_length";
     private static final int DEFAULT_MAX_CLASSIFICATION_LENGTH = 400;
@@ -612,12 +599,16 @@ private void checkAndSetPrimaryClip(
             }
         }
 
+        private boolean isAutoClearEnabled() {
+            return Settings.Secure.getInt(getContext().getContentResolver(),
+                Settings.Secure.CLIPBOARD_AUTO_CLEAR_ENABLED, 1) == 1;
+        }
+
         private void scheduleAutoClear(
                 @UserIdInt int userId, int intendingUid, int intendingDeviceId) {
             final long oldIdentity = Binder.clearCallingIdentity();
             try {
-                if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD,
-                        PROPERTY_AUTO_CLEAR_ENABLED, true)) {
+                if (isAutoClearEnabled()) {
                     Pair<Integer, Integer> userIdDeviceId = new Pair<>(userId, intendingDeviceId);
                     mClipboardClearHandler.removeEqualMessages(ClipboardClearHandler.MSG_CLEAR,
                             userIdDeviceId);
@@ -637,9 +628,8 @@ private void scheduleAutoClear(
         }
 
         private long getTimeoutForAutoClear() {
-            return DeviceConfig.getLong(DeviceConfig.NAMESPACE_CLIPBOARD,
-                    PROPERTY_AUTO_CLEAR_TIMEOUT,
-                    DEFAULT_CLIPBOARD_TIMEOUT_MILLIS);
+            return Settings.Secure.getLong(getContext().getContentResolver(),
+                Settings.Secure.CLIPBOARD_AUTO_CLEAR_TIMEOUT, DEFAULT_CLIPBOARD_TIMEOUT_MILLIS);
         }
 
         @Override
diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java
index 8ed1b537bf7ef..fd557c2b516cf 100644
--- a/services/core/java/com/android/server/compat/PlatformCompat.java
+++ b/services/core/java/com/android/server/compat/PlatformCompat.java
@@ -56,6 +56,7 @@
 import com.android.internal.compat.IPlatformCompat;
 import com.android.internal.util.DumpUtils;
 import com.android.server.LocalServices;
+import com.android.server.wm.AxSandboxService;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -183,6 +184,12 @@ public boolean isChangeEnabledAndReportInternal(
         // fetches.
         CompatChange c = mCompatConfig.getCompatChange(changeId);
 
+        if (changeId == 143937733L && appInfo != null) {
+            if (AxSandboxService.get().isPackageSandboxed(appInfo.packageName)) {
+                return true;
+            }
+        }
+
         boolean enabled = mCompatConfig.isChangeEnabled(c, appInfo);
         int state = enabled ? ChangeReporter.STATE_ENABLED : ChangeReporter.STATE_DISABLED;
         if (appInfo != null) {
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 7a2ca702a695c..5320490cb473b 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -19,6 +19,7 @@
 import static android.Manifest.permission.BIND_VPN_SERVICE;
 import static android.Manifest.permission.CONTROL_VPN;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.net.ConnectivitySettingsManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
@@ -57,6 +58,7 @@
 import android.content.pm.UserInfo;
 import android.net.ConnectivityDiagnosticsManager;
 import android.net.ConnectivityManager;
+import android.net.ConnectivitySettingsManager;
 import android.net.INetd;
 import android.net.INetworkManagementEventObserver;
 import android.net.Ikev2VpnProfile;
@@ -757,12 +759,14 @@ protected void updateState(DetailedState detailedState, String reason) {
                         mVpnConnectivityMetrics.resetMetrics();
                     }
                 }
+                maybeRestoreDNS();
                 break;
             case CONNECTING:
                 if (null != mNetworkAgent) {
                     throw new IllegalStateException("VPN can only go to CONNECTING state when"
                             + " the agent is null.");
                 }
+                maybeRestrictDNS();
                 break;
             default:
                 throw new IllegalArgumentException("Illegal state argument " + detailedState);
@@ -1738,6 +1742,34 @@ private void agentDisconnect() {
         updateState(DetailedState.DISCONNECTED, "agentDisconnect");
     }
 
+    @GuardedBy("this")
+    private void maybeRestrictDNS() {
+        BinderUtils.withCleanCallingIdentity(() -> {
+            final boolean isEnforceDns = mSystemServices.settingsSecureGetIntForUser(
+                    Settings.Secure.VPN_ENFORCE_DNS, 0, mUserId) == 1;
+            final int mode = ConnectivitySettingsManager.getPrivateDnsMode(mUserIdContext);
+            if (!isEnforceDns || mode == PRIVATE_DNS_MODE_OFF) return;
+            // Store current private DNS mode
+            mSystemServices.settingsSecurePutIntForUser(
+                    Settings.Secure.VPN_ENFORCE_DNS_STORE, mode, mUserId);
+            // Disable private DNS
+            ConnectivitySettingsManager.setPrivateDnsMode(mUserIdContext, PRIVATE_DNS_MODE_OFF);
+        });
+    }
+
+    @GuardedBy("this")
+    private void maybeRestoreDNS() {
+        BinderUtils.withCleanCallingIdentity(() -> {
+            final int mode = mSystemServices.settingsSecureGetIntForUser(
+                    Settings.Secure.VPN_ENFORCE_DNS_STORE, -1, mUserId);
+            if (mode == -1) return;
+            // Restore previous private DNS mode
+            ConnectivitySettingsManager.setPrivateDnsMode(mUserIdContext, mode);
+            mSystemServices.settingsSecurePutIntForUser(
+                    Settings.Secure.VPN_ENFORCE_DNS_STORE, -1, mUserId);
+        });
+    }
+
     @GuardedBy("this")
     private void startNewNetworkAgent(NetworkAgent oldNetworkAgent, String reason) {
         // Initialize the state for a new agent, while keeping the old one connected
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index 811d372e38998..22e08c29e31e7 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -51,6 +51,7 @@
 import android.content.SyncRequest;
 import android.content.SyncStatusInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManagerInternal;
 import android.content.pm.ProviderInfo;
 import android.database.IContentObserver;
 import android.net.Uri;
@@ -65,6 +66,7 @@
 import android.os.ResultReceiver;
 import android.os.ShellCallback;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.ArrayMap;
@@ -86,6 +88,8 @@
 import com.android.server.LocalServices;
 import com.android.server.SystemService;
 import com.android.server.pm.permission.LegacyPermissionManagerInternal;
+import com.android.server.pm.pkg.AndroidPackage;
+import com.android.server.pm.pkg.PackageState;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -584,6 +588,14 @@ public void dispatch() {
                 final Key key = collected.keyAt(i);
                 final List<Uri> value = collected.valueAt(i);
 
+                boolean hasSettingsUri = false;
+                for (Uri uri : value) {
+                    if (Settings.AUTHORITY.equals(uri.getAuthority())) {
+                        hasSettingsUri = true;
+                        break;
+                    }
+                }
+
                 final Runnable task = () -> {
                     try {
                         key.observer.onChangeEtc(key.selfChange,
@@ -593,12 +605,27 @@ public void dispatch() {
                 };
 
                 // Immediately dispatch notifications to foreground apps that
-                // are important to the user; all other background observers are
-                // delayed to avoid stampeding
+                // are important to the user and to all system apps if there's at least one changed
+                // settings uri; all other background observers are delayed to avoid stampeding
                 final boolean noDelay = (key.flags & ContentResolver.NOTIFY_NO_DELAY) != 0;
-                final int procState = LocalServices.getService(ActivityManagerInternal.class)
+                boolean isImmediate = noDelay;
+                if (!isImmediate) {
+                    final int procState = LocalServices.getService(ActivityManagerInternal.class)
                         .getUidProcessState(key.uid);
-                if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND || noDelay) {
+                    isImmediate = procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
+                }
+                if (hasSettingsUri && !isImmediate) {
+                    var pm = LocalServices.getService(PackageManagerInternal.class);
+                    AndroidPackage pkg = pm.getPackage(key.uid);
+                    if (pkg != null) {
+                        PackageState state = pm.getPackageStateInternal(pkg.getPackageName());
+                        if (state != null && state.isSystem()) {
+                            isImmediate = true;
+                        }
+                    }
+                }
+
+                if (isImmediate) {
                     task.run();
                 } else {
                     BackgroundThread.getHandler().postDelayed(task, BACKGROUND_OBSERVER_DELAY);
diff --git a/services/core/java/com/android/server/cpu/CpuMonitorService.java b/services/core/java/com/android/server/cpu/CpuMonitorService.java
index 2cadbc58d0f22..9843d960479a2 100644
--- a/services/core/java/com/android/server/cpu/CpuMonitorService.java
+++ b/services/core/java/com/android/server/cpu/CpuMonitorService.java
@@ -76,7 +76,7 @@ public final class CpuMonitorService extends SystemService {
      * On user-debug or eng builds, continuously cache stats with a bigger cache size for debugging
      * purposes.
      */
-    private static final long CACHE_DURATION_MILLISECONDS = Build.IS_USERDEBUG || Build.IS_ENG
+    private static final long CACHE_DURATION_MILLISECONDS = Build.IS_ENG
             ? TimeUnit.MINUTES.toMillis(30) : TimeUnit.MINUTES.toMillis(10);
     // TODO(b/267500110): Investigate whether this duration should change when the monitoring
     //  interval is updated. When the CPU is under heavy load, the monitoring will happen less
@@ -163,7 +163,7 @@ public void removeCpuAvailabilityCallback(CpuAvailabilityCallback callback) {
     public CpuMonitorService(Context context) {
         this(context, new CpuInfoReader(), new ServiceThread(TAG,
                         Process.THREAD_PRIORITY_BACKGROUND, /* allowIo= */ true),
-                Build.IS_USERDEBUG || Build.IS_ENG, NORMAL_MONITORING_INTERVAL_MILLISECONDS,
+                Build.IS_ENG, NORMAL_MONITORING_INTERVAL_MILLISECONDS,
                 DEBUG_MONITORING_INTERVAL_MILLISECONDS, LATEST_AVAILABILITY_DURATION_MILLISECONDS,
                 STOP_PERIODIC_CPUSET_READING_DELAY_MILLISECONDS);
     }
diff --git a/services/core/java/com/android/server/display/AutoAODService.java b/services/core/java/com/android/server/display/AutoAODService.java
new file mode 100644
index 0000000000000..020a4253fc071
--- /dev/null
+++ b/services/core/java/com/android/server/display/AutoAODService.java
@@ -0,0 +1,521 @@
+/*
+ * Copyright (C) 2021 Yet Another AOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.display;
+
+import android.annotation.Nullable;
+import android.app.AlarmManager;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.hardware.display.AmbientDisplayConfiguration;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+import com.android.server.twilight.TwilightListener;
+import com.android.server.twilight.TwilightManager;
+import com.android.server.twilight.TwilightState;
+
+import java.io.File;
+import java.lang.IllegalArgumentException;
+import java.util.Calendar;
+
+public class AutoAODService extends SystemService {
+
+    private static final String TAG = "AutoAODService";
+    private static final String PULSE_ACTION = "com.android.systemui.doze.pulse";
+    private static final String PREF_DIR_NAME = "shared_prefs";
+    private static final String PREF_FILE_NAME = TAG + "_preferences.xml";
+    private static final String PREF_STATE_KEY = TAG + "_last_state";
+    private static final String PREF_TIME_KEY = TAG + "_last_time";
+    private static final int WAKELOCK_TIMEOUT_MS = 3000;
+
+    /**
+     * Disabled state (default)
+     */
+    private static final int MODE_DISABLED = 0;
+    /**
+     * Active from sunset to sunrise
+     */
+    private static final int MODE_NIGHT = 1;
+    /**
+     * Active at a user set time
+     */
+    private static final int MODE_TIME = 2;
+    /**
+     * Active from sunset till a time
+     */
+    private static final int MODE_MIXED_SUNSET = 3;
+    /**
+     * Active from a time till sunrise
+     */
+    private static final int MODE_MIXED_SUNRISE = 4;
+
+    private final AlarmManager mAlarmManager;
+    private final Context mContext;
+    private final Handler mHandler = new Handler();
+    private TwilightManager mTwilightManager;
+    private TwilightState mTwilightState;
+    private SharedPreferences mSharedPreferences;
+    private AmbientDisplayConfiguration mAmbientConfig;
+
+    /**
+     * Current operation mode
+     * Can either be {@link #MODE_DISABLED}, {@link #MODE_NIGHT} or {@link #MODE_TIME}
+     */
+    private int mMode = MODE_DISABLED;
+    /**
+     * Whether AOD is currently active
+     */
+    private boolean mActive = false;
+    /**
+     * Whether next alarm should enable or disable AOD
+     */
+    private boolean mIsNextActivate = false;
+    
+    private boolean mTwilightRegistered = false;
+    private boolean mTimeRegistered = false;
+    private boolean mSelfChange = false;
+    private boolean mOverrideOnce = false;
+    private long mLastSetTime = 0;
+
+    private final TwilightListener mTwilightListener = new TwilightListener() {
+        @Override
+        public void onTwilightStateChanged(@Nullable TwilightState state) {
+            if (mMode != MODE_NIGHT && mMode < MODE_MIXED_SUNSET) {
+                // just incase
+                setTwilightListener(false);
+                return;
+            }
+            Slog.v(TAG, "onTwilightStateChanged state: " + state);
+            if (state == null) return;
+            mTwilightState = state;
+            if (mMode < MODE_MIXED_SUNSET) mHandler.post(() -> maybeActivateNight(false));
+            else mHandler.post(() -> maybeActivateTime(false));
+        }
+    };
+
+    private final BroadcastReceiver mTimeChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (mMode != MODE_TIME && mMode < MODE_MIXED_SUNSET) {
+                // just incase
+                setTimeReciever(false);
+                return;
+            }
+            Slog.v(TAG, "mTimeChangedReceiver onReceive");
+            mHandler.post(() -> maybeActivateTime(false));
+        }
+    };
+
+    /**
+     * A class to manage and handle alarms
+     */
+    private class Alarm implements AlarmManager.OnAlarmListener {
+        @Override
+        public void onAlarm() {
+            Slog.v(TAG, "onAlarm");
+            mHandler.post(() -> setAutoAODActive(mIsNextActivate));
+            if (mMode == MODE_TIME || mMode >= MODE_MIXED_SUNSET)
+                mHandler.post(() -> maybeActivateTime(false));
+            else
+                maybeActivateNight(false);
+        }
+
+        /**
+         * Set a new alarm using a Calendar
+         * @param time time as Calendar
+         */
+        public void set(Calendar time) {
+            set(time.getTimeInMillis());
+        }
+
+        /**
+         * Set a new alarm using ms since epoch
+         * @param time time as ms since epoch
+         */
+        public void set(long time) {
+            cancel(); // making sure there is no more than 1
+            mAlarmManager.setExact(AlarmManager.RTC_WAKEUP,
+                    time, TAG, this, mHandler);
+            mLastSetTime = time;
+            Slog.v(TAG, "new alarm set to " + time
+                    + " mIsNextActivate=" + mIsNextActivate);
+        }
+
+        public void cancel() {
+            mAlarmManager.cancel(this);
+            mLastSetTime = 0;
+            Slog.v(TAG, "alarm cancelled");
+        }
+    }
+
+    private final Alarm mAlarm = new Alarm();
+
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.DOZE_ALWAYS_ON_AUTO_MODE),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.DOZE_ALWAYS_ON_AUTO_TIME),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.DOZE_ALWAYS_ON),
+                    false, this, UserHandle.USER_ALL);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (uri.getLastPathSegment().equals(Settings.Secure.DOZE_ALWAYS_ON)) {
+                if (mSelfChange) {
+                    mSelfChange = false;
+                    return;
+                }
+
+                mActive = Settings.Secure.getIntForUser(
+                        mContext.getContentResolver(),
+                        Settings.Secure.DOZE_ALWAYS_ON, 0,
+                        UserHandle.USER_CURRENT) == 1;
+
+                if (mLastSetTime != 0 && mActive == mIsNextActivate) {
+                    // we have a future alarm set and user left current state
+                    // save the next alarm
+                    Slog.v(TAG, "user abandoned state. active: " + mActive);
+                    if (mSharedPreferences != null) {
+                        mSharedPreferences.edit()
+                                .putLong(PREF_TIME_KEY, mLastSetTime).apply();
+                    }
+                    return;
+                }
+                Slog.v(TAG, "removing PREF_TIME_KEY. active: " + mActive);
+                if (mSharedPreferences != null) {
+                    mSharedPreferences.edit().remove(PREF_TIME_KEY).apply();
+                }
+                return;
+            }
+            mHandler.post(() -> initState());
+        }
+    }
+
+    private final SettingsObserver mSettingsObserver;
+
+    public AutoAODService(Context context) {
+        super(context);
+        mContext = context;
+        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+        mSettingsObserver = new SettingsObserver(null);
+        mActive = Settings.Secure.getIntForUser(
+                mContext.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON, 0,
+                UserHandle.USER_CURRENT) == 1;
+    }
+
+    @Override
+    public void onStart() {
+        Slog.v(TAG, "Starting " + TAG);
+        publishLocalService(AutoAODService.class, this);
+        mSettingsObserver.observe();
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
+            Slog.v(TAG, "onBootPhase PHASE_SYSTEM_SERVICES_READY");
+            mTwilightManager = getLocalService(TwilightManager.class);
+        } else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
+            Slog.v(TAG, "onBootPhase PHASE_BOOT_COMPLETED");
+            // we want to access our shared preferences before unlock
+            // use device encrypted storage & context for that
+            // also make sure to not store any sensitive data there
+            final File prefsFile = new File(
+                    new File(Environment.getDataSystemDeDirectory(
+                        UserHandle.USER_SYSTEM), PREF_DIR_NAME), PREF_FILE_NAME);
+            mSharedPreferences = mContext.createDeviceProtectedStorageContext()
+                    .getSharedPreferences(prefsFile, Context.MODE_PRIVATE);
+            mHandler.post(() -> initState(true));
+        }
+    }
+
+    /**
+     * Registers or unregisters {@link #mTimeChangedReceiver}
+     * @param register Register when true, unregister when false
+     */
+    private void setTimeReciever(boolean register) {
+        if (register) {
+            Slog.v(TAG, "Registering mTimeChangedReceiver");
+            final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_TIME_CHANGED);
+            intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+            mContext.registerReceiver(mTimeChangedReceiver, intentFilter);
+            mTimeRegistered = true;
+            return;
+        }
+        try {
+            mContext.unregisterReceiver(mTimeChangedReceiver);
+            Slog.v(TAG, "Unregistered mTimeChangedReceiver");
+        } catch (IllegalArgumentException e) {
+            // nothing to do. Already unregistered
+        }
+        mTimeRegistered = false;
+    }
+
+    /**
+     * Registers or unregisters {@link #mTwilightListener}
+     * @param register Register when true, unregister when false
+     */
+    private void setTwilightListener(boolean register) {
+        if (register) {
+            Slog.v(TAG, "Registering mTwilightListener");
+            mTwilightManager.registerListener(mTwilightListener, mHandler);
+            mTwilightState = mTwilightManager.getLastTwilightState();
+            mTwilightRegistered = true;
+            return;
+        }
+        try {
+            mTwilightManager.unregisterListener(mTwilightListener);
+            Slog.v(TAG, "Unregistered mTwilightListener");
+        } catch (IllegalArgumentException e) {
+            // nothing to do. Already unregistered
+        }
+        mTwilightRegistered = false;
+    }
+
+    /**
+     * See {@link #initState(boolean)}
+     */
+    private void initState() {
+        initState(false);
+    }
+
+    /**
+     * Initiates the state according to user settings
+     * Registers or unregisters listeners and calls {@link #maybeActivateAOD()}
+     * @param boot true if triggered by boot
+     */
+    private void initState(boolean boot) {
+        if (boot && mSharedPreferences.contains(PREF_TIME_KEY)) {
+            final long prefTime = mSharedPreferences.getLong(PREF_TIME_KEY, 0);
+            Calendar cal = Calendar.getInstance();
+            cal.setTimeInMillis(prefTime);
+            // skip setting AOD once if we left the state before a reboot
+            if (cal.after(Calendar.getInstance()))
+                mOverrideOnce = true;
+        }
+
+        final int mode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON_AUTO_MODE, MODE_DISABLED,
+                UserHandle.USER_CURRENT);
+        mMode = mode;
+        mAlarm.cancel(); // cancelling set alarm
+        // unregister all registered listeners
+        if (mTimeRegistered) setTimeReciever(false);
+        if (mTwilightRegistered) setTwilightListener(false);
+        // erase shared preferences
+        if (!boot) mSharedPreferences.edit().remove(PREF_TIME_KEY).apply();
+        switch (mMode) {
+            default:
+            case MODE_DISABLED:
+                return;
+            case MODE_TIME:
+                setTimeReciever(true);
+                break;
+            case MODE_NIGHT:
+                setTwilightListener(true);
+                break;
+            case MODE_MIXED_SUNSET:
+            case MODE_MIXED_SUNRISE:
+                setTwilightListener(true);
+                setTimeReciever(true);
+                break;
+        }
+        maybeActivateAOD();
+    }
+
+    /**
+     * Calls the correct function to set the next alarm according to {@link #mMode}
+     */
+    private void maybeActivateAOD() {
+        switch (mMode) {
+            default:
+            case MODE_DISABLED:
+                break;
+            case MODE_NIGHT:
+                maybeActivateNight();
+                break;
+            case MODE_TIME:
+            case MODE_MIXED_SUNSET:
+            case MODE_MIXED_SUNRISE:
+                maybeActivateTime();
+                break;
+        }
+    }
+
+    /**
+     * See {@link #maybeActivateNight(boolean)}
+     */
+    private void maybeActivateNight() {
+        maybeActivateNight(true);
+    }
+
+    /**
+     * Sets the next alarm for {@link #MODE_NIGHT}
+     * @param setActive Whether to set activation state.
+     *                  When false only updates the alarm
+     */
+    private void maybeActivateNight(boolean setActive) {
+        if (mTwilightState == null) {
+            Slog.e(TAG, "aborting maybeActivateNight(). mTwilightState is null");
+            return;
+        }
+        mIsNextActivate = !mTwilightState.isNight();
+        mAlarm.set(mIsNextActivate ? mTwilightState.sunsetTimeMillis()
+                : mTwilightState.sunriseTimeMillis());
+        if (setActive) mHandler.post(() -> setAutoAODActive(!mIsNextActivate));
+    }
+
+    /**
+     * See {@link #maybeActivateTime(boolean)}
+     */
+    private void maybeActivateTime() {
+        maybeActivateTime(true);
+    }
+
+    /**
+     * Sets the next alarm for {@link #MODE_TIME}, {@link #MODE_MIXED_SUNSET} and
+     *                         {@link #MODE_MIXED_SUNRISE}
+     * @param setActive Whether to set activation state
+     *                  When false only updates the alarm
+     */
+    private void maybeActivateTime(boolean setActive) {
+        Calendar currentTime = Calendar.getInstance();
+        Calendar since = Calendar.getInstance();
+        Calendar till = Calendar.getInstance();
+        String value = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON_AUTO_TIME, UserHandle.USER_CURRENT);
+        if (value == null || value.equals("")) value = "20:00,07:00";
+        String[] times = value.split(",", 0);
+        String[] sinceValues = times[0].split(":", 0);
+        String[] tillValues = times[1].split(":", 0);
+        since.set(Calendar.HOUR_OF_DAY, Integer.parseInt(sinceValues[0]));
+        since.set(Calendar.MINUTE, Integer.parseInt(sinceValues[1]));
+        since.set(Calendar.SECOND, 0);
+        till.set(Calendar.HOUR_OF_DAY, Integer.parseInt(tillValues[0]));
+        till.set(Calendar.MINUTE, Integer.parseInt(tillValues[1]));
+        till.set(Calendar.SECOND, 0);
+
+        // handle mixed modes
+        if (mMode >= MODE_MIXED_SUNSET) {
+            if (mTwilightState == null) {
+                Slog.e(TAG, "aborting maybeActivateTime(). mTwilightState is null");
+                return;
+            }
+            if (mMode == MODE_MIXED_SUNSET) {
+                since.setTimeInMillis(mTwilightState.sunsetTimeMillis());
+            } else { // MODE_MIXED_SUNRISE
+                till.setTimeInMillis(mTwilightState.sunriseTimeMillis());
+                if (!mTwilightState.isNight()) till.add(Calendar.DATE, 1);
+            }
+        }
+
+        if (currentTime.before(since) && currentTime.before(till) && till.compareTo(since) < 0) {
+            since.add(Calendar.DATE, -1);
+        }
+        // roll to the next day if needed be
+        if (since.after(till)) till.add(Calendar.DATE, 1);
+        if (currentTime.after(since) && currentTime.compareTo(till) >= 0) {
+            since.add(Calendar.DATE, 1);
+            till.add(Calendar.DATE, 1);
+        }
+        // abort if the user was dumb enough to set the same time
+        if (since.compareTo(till) == 0) {
+            Slog.e(TAG, "Aborting maybeActivateTime(). Time diff is 0");
+            return;
+        }
+
+        // update the next alarm
+        mIsNextActivate = currentTime.before(since);
+        mAlarm.set(mIsNextActivate ? since : till);
+
+        // activate or disable according to current time
+        if (setActive) setAutoAODActive(currentTime.compareTo(since) >= 0
+                && currentTime.before(till));
+    }
+
+    /**
+     * Activates or inactivates AOD
+     * @param active Whether to enable or disable AOD
+     */
+    private void setAutoAODActive(boolean active) {
+        if (mOverrideOnce) {
+            Slog.v(TAG, "setAutoAODActive: user abandoned this session before, skipping");
+            mOverrideOnce = false;
+            return;
+        }
+        mSharedPreferences.edit().remove(PREF_TIME_KEY).apply();
+
+        if (mActive == active) return;
+        mActive = active;
+        Slog.v(TAG, "setAutoAODActive: active=" + active);
+        mSelfChange = true;
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON, active ? 1 : 0,
+                UserHandle.USER_CURRENT);
+
+        // update the screen state
+        PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        if (powerManager.isInteractive()) return; // no need if the screen is already on
+        WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        wakeLock.acquire(WAKELOCK_TIMEOUT_MS);
+        if (isDozeEnabled()) {
+            // trigger doze if it's enabled
+            final Intent intent = new Intent(PULSE_ACTION);
+            mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
+        } else {
+            // turn the screen on if we have to
+            powerManager.wakeUp(SystemClock.uptimeMillis(),
+                    PowerManager.WAKE_REASON_APPLICATION, TAG);
+        }
+    }
+
+    private boolean isDozeEnabled() {
+        return getAmbientConfig().pulseOnNotificationEnabled(UserHandle.USER_CURRENT);
+    }
+
+    private AmbientDisplayConfiguration getAmbientConfig() {
+        if (mAmbientConfig == null) {
+            mAmbientConfig = new AmbientDisplayConfiguration(mContext);
+        }
+
+        return mAmbientConfig;
+    }
+}
diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java
index 49e18b75276eb..fca0b725f0c9f 100644
--- a/services/core/java/com/android/server/display/ColorFade.java
+++ b/services/core/java/com/android/server/display/ColorFade.java
@@ -64,7 +64,7 @@
  * that belongs to the {@link DisplayPowerController}.
  * </p>
  */
-final class ColorFade {
+final class ColorFade implements ScreenStateAnimator {
     private static final String TAG = "ColorFade";
 
     // To enable these logs, run:
@@ -116,7 +116,7 @@ final class ColorFade {
     private final float mProjMatrix[] = new float[16];
     private final int[] mGLBuffers = new int[2];
     private int mTexCoordLoc, mVertexLoc, mTexUnitLoc, mProjMatrixLoc, mTexMatrixLoc;
-    private int mOpacityLoc, mGammaLoc;
+    private int mOpacityLoc;
     private int mProgram;
 
     // Vertex and corresponding texture coordinates.
@@ -295,7 +295,6 @@ private boolean initGLShaders(Context context) {
         mTexMatrixLoc = GLES20.glGetUniformLocation(mProgram, "tex_matrix");
 
         mOpacityLoc = GLES20.glGetUniformLocation(mProgram, "opacity");
-        mGammaLoc = GLES20.glGetUniformLocation(mProgram, "gamma");
         mTexUnitLoc = GLES20.glGetUniformLocation(mProgram, "texUnit");
 
         GLES20.glUseProgram(mProgram);
@@ -466,12 +465,7 @@ public boolean draw(float level) {
             GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
 
             // Draw the frame.
-            double one_minus_level = 1 - level;
-            double cos = Math.cos(Math.PI * one_minus_level);
-            double sign = cos < 0 ? -1 : 1;
-            float opacity = (float) -Math.pow(one_minus_level, 2) + 1;
-            float gamma = (float) ((0.5d * sign * Math.pow(cos, 2) + 0.5d) * 0.9d + 0.1d);
-            drawFaded(opacity, 1.f / gamma);
+            drawFaded(level);
             if (checkGlErrors("drawFrame")) {
                 return false;
             }
@@ -483,9 +477,9 @@ public boolean draw(float level) {
         return showSurface(1.0f);
     }
 
-    private void drawFaded(float opacity, float gamma) {
+    private void drawFaded(float opacity) {
         if (DEBUG) {
-            Slog.d(TAG, "drawFaded: opacity=" + opacity + ", gamma=" + gamma);
+            Slog.d(TAG, "drawFaded: opacity=" + opacity);
         }
         // Use shaders
         GLES20.glUseProgram(mProgram);
@@ -494,7 +488,6 @@ private void drawFaded(float opacity, float gamma) {
         GLES20.glUniformMatrix4fv(mProjMatrixLoc, 1, false, mProjMatrix, 0);
         GLES20.glUniformMatrix4fv(mTexMatrixLoc, 1, false, mTexMatrix, 0);
         GLES20.glUniform1f(mOpacityLoc, opacity);
-        GLES20.glUniform1f(mGammaLoc, gamma);
 
         // Use textures
         GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
@@ -706,8 +699,8 @@ private boolean createEglContext(boolean isProtected) {
                     EGL14.EGL_NONE
             };
             if (isProtected) {
-                eglContextAttribList[2] = EGL_PROTECTED_CONTENT_EXT;
-                eglContextAttribList[3] = EGL14.EGL_TRUE;
+                eglContextAttribList[3] = EGL_PROTECTED_CONTENT_EXT;
+                eglContextAttribList[4] = EGL14.EGL_TRUE;
             }
             mEglContext = EGL14.eglCreateContext(mEglDisplay, mEglConfig, EGL14.EGL_NO_CONTEXT,
                     eglContextAttribList, 0);
diff --git a/services/core/java/com/android/server/display/DisplayDeviceRepository.java b/services/core/java/com/android/server/display/DisplayDeviceRepository.java
index 5f7bc4effa1b9..40f66e35f459a 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceRepository.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceRepository.java
@@ -202,6 +202,14 @@ private void handleDisplayDeviceChanged(DisplayDevice device) {
             } else if (diff != DisplayDeviceInfo.DIFF_HDR_SDR_RATIO) {
                 Slog.i(TAG, "Display device changed: " + info);
             }
+            if (DEBUG) {
+                if (diff == DisplayDeviceInfo.DIFF_STATE) {
+                    Slog.i(TAG, "Display device changed state: \"" + info.name
+                            + "\", " + Display.stateToString(info.state));
+                } else if (diff != DisplayDeviceInfo.DIFF_HDR_SDR_RATIO) {
+                    Slog.i(TAG, "Display device changed: " + info);
+                }
+            }
 
             if ((diff & DisplayDeviceInfo.DIFF_COLOR_MODE) != 0) {
                 try {
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index e032b4e332007..0bdbe2c6cfd0f 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -76,6 +76,8 @@
 import android.annotation.SuppressLint;
 import android.annotation.UserIdInt;
 import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
+import android.app.ActivityTaskManager.RootTaskInfo;
 import android.app.ActivityManagerInternal;
 import android.app.AppOpsManager;
 import android.app.TaskStackListener;
@@ -138,6 +140,7 @@
 import android.os.IThermalService;
 import android.os.Looper;
 import android.os.Message;
+import android.os.Parcel;
 import android.os.PermissionEnforcer;
 import android.os.PowerManager;
 import android.os.Process;
@@ -208,6 +211,8 @@
 import com.android.server.wm.SurfaceAnimationThread;
 import com.android.server.wm.WindowManagerInternal;
 
+import com.libremobileos.freeform.ILMOFreeformDisplayCallback;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -294,6 +299,13 @@ public final class DisplayManagerService extends SystemService {
     private static final int MSG_DELIVER_DISPLAY_GROUP_EVENT = 8;
     private static final int MSG_RECEIVED_DEVICE_STATE = 9;
     private static final int MSG_DISPATCH_PENDING_PROCESS_EVENTS = 10;
+    private static final int MSG_UPDATE_DISABLE_HW_OVERLAYS = 11;
+    private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+    private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+    private static final int SURFACE_FLINGER_DISABLE_OVERLAYS_CODE = 1008;
+    private static final int SURFACE_FLINGER_READ_CODE = 1010;
+    private static final int SETTING_VALUE_ON = 1;
+    private static final int SETTING_VALUE_OFF = 0;
     private static final int[] EMPTY_ARRAY = new int[0];
     private static final HdrConversionMode HDR_CONVERSION_MODE_UNSUPPORTED = new HdrConversionMode(
             HDR_CONVERSION_UNSUPPORTED);
@@ -421,7 +433,16 @@ public synchronized void requestDisplayState(int displayId, int state, float bri
                         for (int i = 0; i < size; i++) {
                             final int displayState = i == index ? state : mDisplayStates.valueAt(i);
                             if (displayState != Display.STATE_OFF) {
-                                allOff = false;
+                                final LogicalDisplay display =
+                                        mLogicalDisplayMapper
+                                                .getDisplayLocked(mDisplayStates.keyAt(i));
+                                if (display.getDisplayInfoLocked() != null) {
+                                    int displayType = display.getDisplayInfoLocked().type;
+                                    if (displayType != Display.TYPE_VIRTUAL
+                                            && displayType != Display.TYPE_OVERLAY) {
+                                        allOff = false;
+                                    }
+                                }
                             }
                             if (Display.isActiveState(displayState)) {
                                 allInactive = false;
@@ -448,6 +469,13 @@ public synchronized void requestDisplayState(int displayId, int state, float bri
             if (state != Display.STATE_OFF) {
                 requestDisplayStateInternal(displayId, state, brightness, sdrBrightness);
             }
+
+            if (stateChanged) {
+                Intent intent = new Intent(Intent.ACTION_DISPLAY_STATE_CHANGED)
+                        .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
+                                | Intent.FLAG_RECEIVER_FOREGROUND);
+                mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
+            }
         }
     };
 
@@ -547,6 +575,12 @@ public synchronized void requestDisplayState(int displayId, int state, float bri
     // Receives notifications about changes to task stack.
     private TaskStackListener mTaskStackListener;
 
+    @GuardedBy("mSyncRoot")
+    private boolean mPerAppDisableHwOverlaysActive;
+
+    @GuardedBy("mSyncRoot")
+    private boolean mPerAppDisableHwOverlaysOwned;
+
     // Keeps note of what state the device is in, used for idle screen brightness mode.
     private boolean mIsDocked;
     private boolean mIsDreaming;
@@ -563,6 +597,8 @@ public synchronized void requestDisplayState(int displayId, int state, float bri
     // only be used for the devices in projected mode.
     private boolean mIncludeDefaultDisplayInTopology;
 
+    private LMOFreeformDisplayAdapter mFreeformDisplayAdapter;
+
     private final BroadcastReceiver mIdleModeReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -846,6 +882,7 @@ public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
                 scheduleTopologiesReload(mCurrentUserId, /*isUserSwitching=*/ true);
             }
         }
+        schedulePerAppDisableHwOverlaysUpdate();
     }
 
     /**
@@ -873,9 +910,8 @@ public void windowManagerAndInputReady() {
             mContext.getSystemService(DeviceStateManager.class).registerCallback(
                     mHandlerExecutor, new DeviceStateListener());
 
-            if (mFlags.isDisplayMirrorInLockTaskModeEnabled()) {
-                setupTaskStackListener();
-            }
+            setupTaskStackListener();
+            schedulePerAppDisableHwOverlaysUpdate();
 
             mLogicalDisplayMapper.onWindowManagerReady();
             scheduleTraversalLocked(false);
@@ -922,6 +958,7 @@ public void systemReady(boolean safeMode) {
         mHandler.sendEmptyMessage(MSG_REGISTER_ADDITIONAL_DISPLAY_ADAPTERS);
 
         mSettingsObserver = new SettingsObserver();
+        schedulePerAppDisableHwOverlaysUpdate();
 
         mBrightnessSynchronizer.startSynchronizing();
 
@@ -1248,6 +1285,10 @@ private class SettingsObserver extends ContentObserver {
                                 Settings.Secure.INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY),
                         false, this, UserHandle.USER_ALL);
             }
+
+            mContext.getContentResolver().registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.DISABLE_HW_OVERLAYS_APPS),
+                    false, this, UserHandle.USER_ALL);
         }
 
         @Override
@@ -1279,6 +1320,10 @@ public void onChange(boolean selfChange, Uri uri) {
                 }
                 return;
             }
+
+            if (Settings.Secure.getUriFor(Settings.Secure.DISABLE_HW_OVERLAYS_APPS).equals(uri)) {
+                schedulePerAppDisableHwOverlaysUpdate();
+            }
         }
     }
 
@@ -2386,6 +2431,7 @@ private void registerAdditionalDisplayAdapters() {
             if (shouldRegisterNonEssentialDisplayAdaptersLocked()) {
                 registerOverlayDisplayAdapterLocked();
                 registerWifiDisplayAdapterLocked();
+                registerFreeformDisplayAdapterLocked();
             }
         }
     }
@@ -2406,6 +2452,13 @@ private void registerWifiDisplayAdapterLocked() {
         }
     }
 
+    private void registerFreeformDisplayAdapterLocked() {
+        mFreeformDisplayAdapter = new LMOFreeformDisplayAdapter(
+                mSyncRoot, mContext, mHandler, mDisplayDeviceRepo, mLogicalDisplayMapper,
+                mUiHandler, mFlags);
+        registerDisplayAdapterLocked(mFreeformDisplayAdapter);
+    }
+
     private boolean shouldRegisterNonEssentialDisplayAdaptersLocked() {
         // In safe mode, we disable non-essential display adapters to give the user
         // an opportunity to fix broken settings or other problems that might affect
@@ -3848,10 +3901,23 @@ private void deliverDisplayGroupEvent(int groupId, int event) {
     }
 
     private void setupTaskStackListener() {
+        if (mTaskStackListener != null) {
+            return;
+        }
         mTaskStackListener = new TaskStackListener() {
             @Override
             public void onLockTaskModeChanged(int mode) {
-                updateMirrorBuiltInDisplaySettingLocked(/*shouldSendDisplayChangeEvent=*/ true);
+                synchronized (mSyncRoot) {
+                    if (mFlags.isDisplayMirrorInLockTaskModeEnabled()) {
+                        updateMirrorBuiltInDisplaySettingLocked(
+                                /*shouldSendDisplayChangeEvent=*/ true);
+                    }
+                }
+            }
+
+            @Override
+            public void onTaskStackChanged() {
+                schedulePerAppDisableHwOverlaysUpdate();
             }
         };
 
@@ -3862,6 +3928,131 @@ public void onLockTaskModeChanged(int mode) {
         }
     }
 
+    private void schedulePerAppDisableHwOverlaysUpdate() {
+        mHandler.removeMessages(MSG_UPDATE_DISABLE_HW_OVERLAYS);
+        mHandler.sendEmptyMessage(MSG_UPDATE_DISABLE_HW_OVERLAYS);
+    }
+
+    private void updatePerAppDisableHwOverlays() {
+        if (mActivityTaskManagerInternal == null) {
+            return;
+        }
+
+        final int userId;
+        synchronized (mSyncRoot) {
+            userId = mCurrentUserId;
+        }
+
+        final ArraySet<String> configuredPackages = parsePackageList(Settings.Secure.getStringForUser(
+                mContext.getContentResolver(), Settings.Secure.DISABLE_HW_OVERLAYS_APPS, userId));
+        final String topPackage = getFocusedTopPackageName();
+        final boolean shouldDisableOverlays =
+                topPackage != null && configuredPackages.contains(topPackage);
+
+        synchronized (mSyncRoot) {
+            if (shouldDisableOverlays) {
+                if (!mPerAppDisableHwOverlaysActive) {
+                    final boolean overlaysAlreadyDisabled = areHardwareOverlaysDisabled();
+                    if (!overlaysAlreadyDisabled) {
+                        setHardwareOverlaysDisabled(true);
+                    }
+                    mPerAppDisableHwOverlaysOwned = !overlaysAlreadyDisabled;
+                }
+                mPerAppDisableHwOverlaysActive = true;
+                return;
+            }
+
+            if (mPerAppDisableHwOverlaysActive && mPerAppDisableHwOverlaysOwned) {
+                setHardwareOverlaysDisabled(false);
+            }
+            mPerAppDisableHwOverlaysActive = false;
+            mPerAppDisableHwOverlaysOwned = false;
+        }
+    }
+
+    @Nullable
+    private String getFocusedTopPackageName() {
+        try {
+            final RootTaskInfo focusedRootTask = ActivityTaskManager.getService()
+                    .getFocusedRootTaskInfo();
+            if (focusedRootTask == null || focusedRootTask.topActivity == null) {
+                return null;
+            }
+            return focusedRootTask.topActivity.getPackageName();
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Failed to resolve focused app for per-app HW overlays", e);
+            return null;
+        }
+    }
+
+    private boolean areHardwareOverlaysDisabled() {
+        final IBinder surfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+        if (surfaceFlinger == null) {
+            return false;
+        }
+
+        Parcel data = null;
+        Parcel reply = null;
+        try {
+            data = Parcel.obtain();
+            reply = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            surfaceFlinger.transact(SURFACE_FLINGER_READ_CODE, data, reply, 0 /* flags */);
+            reply.readInt(); // showCpu
+            reply.readInt(); // enableGL
+            reply.readInt(); // showUpdates
+            reply.readInt(); // showBackground
+            return reply.readInt() != SETTING_VALUE_OFF;
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Failed to read Disable HW overlays state", e);
+            return false;
+        } finally {
+            if (reply != null) {
+                reply.recycle();
+            }
+            if (data != null) {
+                data.recycle();
+            }
+        }
+    }
+
+    private void setHardwareOverlaysDisabled(boolean disabled) {
+        final IBinder surfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+        if (surfaceFlinger == null) {
+            return;
+        }
+
+        Parcel data = null;
+        try {
+            data = Parcel.obtain();
+            data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+            data.writeInt(disabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+            surfaceFlinger.transact(SURFACE_FLINGER_DISABLE_OVERLAYS_CODE, data,
+                    null /* reply */, 0 /* flags */);
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Failed to update Disable HW overlays state", e);
+        } finally {
+            if (data != null) {
+                data.recycle();
+            }
+        }
+    }
+
+    private static ArraySet<String> parsePackageList(@Nullable String packageList) {
+        final ArraySet<String> packages = new ArraySet<>();
+        if (TextUtils.isEmpty(packageList)) {
+            return packages;
+        }
+
+        for (String packageName : packageList.split(",")) {
+            final String trimmedPackageName = packageName.trim();
+            if (!trimmedPackageName.isEmpty()) {
+                packages.add(trimmedPackageName);
+            }
+        }
+        return packages;
+    }
+
     private IMediaProjectionManager getProjectionService() {
         if (mProjectionService == null) {
             mProjectionService = mInjector.getProjectionService();
@@ -4381,6 +4572,10 @@ public void handleMessage(Message msg) {
                 case MSG_DISPATCH_PENDING_PROCESS_EVENTS:
                     dispatchPendingProcessEvents(msg.obj);
                     break;
+
+                case MSG_UPDATE_DISABLE_HW_OVERLAYS:
+                    updatePerAppDisableHwOverlays();
+                    break;
             }
         }
     }
@@ -5512,7 +5707,11 @@ public float getBrightnessByUnit(int displayId, @DisplayManager.BrightnessUnit i
         @Override // Binder call
         public void setTemporaryAutoBrightnessAdjustment(float adjustment) {
             setTemporaryAutoBrightnessAdjustment_enforcePermission();
-            final long token = Binder.clearCallingIdentity();
+            if (adjustment == 0.0f) {
+                Slog.w(TAG, "Invalid auto brightness adjustment 0.0f, use Float.NaN instead!");
+                adjustment = Float.NaN;
+            }
+	    final long token = Binder.clearCallingIdentity();
             try {
                 synchronized (mSyncRoot) {
                     mDisplayPowerControllers.get(Display.DEFAULT_DISPLAY)
@@ -6431,6 +6630,23 @@ public void reloadTopologies(final int userId) {
                 scheduleTopologiesReload(mCurrentUserId, /*isUserSwitching=*/ false);
             }
         }
+
+        public void createFreeformLocked(String name, ILMOFreeformDisplayCallback callback,
+                int width, int height, int densityDpi, boolean secure, boolean ownContentOnly,
+                boolean shouldShowSystemDecorations, Surface surface, float refreshRate,
+                long presentationDeadlineNanos) {
+            mFreeformDisplayAdapter.createFreeformLocked(name, callback, width, height, densityDpi,
+                    secure, ownContentOnly, shouldShowSystemDecorations, surface, refreshRate,
+                    presentationDeadlineNanos);
+        }
+
+        public void resizeFreeform(IBinder appToken, int width, int height, int densityDpi) {
+            mFreeformDisplayAdapter.resizeFreeform(appToken, width, height, densityDpi);
+        }
+
+        public void releaseFreeform(IBinder appToken) {
+            mFreeformDisplayAdapter.releaseFreeform(appToken);
+        }
     }
 
     class DesiredDisplayModeSpecsObserver
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index e1f13b9f74173..4662bc4c14fbe 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -32,6 +32,7 @@
 import android.annotation.SuppressLint;
 import android.annotation.UserIdInt;
 import android.app.ActivityManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.ParceledListSlice;
 import android.content.res.Resources;
@@ -495,6 +496,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
     private ObjectAnimator mColorFadeOffAnimator;
     private DualRampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator;
 
+    // Screen-off animation
+    private int mScreenOffAnimation;
+    static final int SCREEN_OFF_FADE = 0;
+    static final int SCREEN_OFF_CRT = 1;
+    static final int SCREEN_OFF_SCALE = 2;
+
     // True if this DisplayPowerController has been stopped and should no longer be running.
     private boolean mStopped;
 
@@ -1018,9 +1025,48 @@ private void sendUpdatePowerStateLocked() {
         }
     }
 
+    private int getScreenAnimationModeForDisplayState(int displayState) {
+        switch (mScreenOffAnimation) {
+            case SCREEN_OFF_FADE:
+                return ScreenStateAnimator.MODE_FADE;
+            case SCREEN_OFF_CRT:
+                if (displayState == Display.STATE_OFF) {
+                    return ScreenStateAnimator.MODE_COOL_DOWN;
+                } else {
+                    return ScreenStateAnimator.MODE_FADE;
+                }
+            case SCREEN_OFF_SCALE:
+                if (displayState == Display.STATE_OFF) {
+                    return ScreenStateAnimator.MODE_SCALE_DOWN;
+                } else {
+                    return ScreenStateAnimator.MODE_FADE;
+                }
+            default:
+                return ScreenStateAnimator.MODE_FADE;
+        }
+    }
+
     private void initialize(int displayState) {
-        mPowerState = mInjector.getDisplayPowerState(mBlanker,
-                mColorFadeEnabled ? new ColorFade(mDisplayId) : null, mDisplayId, displayState);
+        final ContentResolver cr = mContext.getContentResolver();
+        final ContentObserver observer = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                mScreenOffAnimation = Settings.System.getIntForUser(cr,
+                        Settings.System.SCREEN_OFF_ANIMATION,
+                        SCREEN_OFF_FADE, UserHandle.USER_CURRENT);
+                if (mPowerState != null) {
+                    mPowerState.setScreenStateAnimator(mScreenOffAnimation);
+                }
+            }
+        };
+        cr.registerContentObserver(Settings.System.getUriFor(
+                Settings.System.SCREEN_OFF_ANIMATION),
+                false, observer, UserHandle.USER_ALL);
+        mScreenOffAnimation = Settings.System.getIntForUser(cr,
+                Settings.System.SCREEN_OFF_ANIMATION,
+                SCREEN_OFF_FADE, UserHandle.USER_CURRENT);
+
+        mPowerState = mInjector.getDisplayPowerState(mBlanker, mScreenOffAnimation, mDisplayId, displayState);
 
         if (mColorFadeEnabled) {
             mColorFadeOffAnimator = ObjectAnimator.ofFloat(
@@ -2376,7 +2422,7 @@ private void animateScreenStateChange(
             // ensure ColorFade is present.
             // TODO(b/428688446): ColorFade.MODE_FADE should be enough here.
             mPowerState.prepareColorFade(mContext,
-                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);
+                    getScreenAnimationModeForDisplayState(Display.STATE_ON));
         }
 
         if (mDisplayBlanksAfterDozeConfig
@@ -2386,7 +2432,7 @@ private void animateScreenStateChange(
             // contents of the screen.
             // TODO(b/428688446): ColorFade.MODE_FADE should be enough here.
             mPowerState.prepareColorFade(mContext,
-                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);
+                    getScreenAnimationModeForDisplayState(Display.STATE_ON));
             if (mColorFadeOffAnimator != null) {
                 mColorFadeOffAnimator.end();
             }
@@ -2491,8 +2537,7 @@ private void animateScreenStateChange(
                 mPowerState.dismissColorFadeResources();
             } else if (performScreenOffTransition
                     && mPowerState.prepareColorFade(mContext,
-                    mColorFadeFadesConfig
-                            ? ColorFade.MODE_FADE : ColorFade.MODE_COOL_DOWN)
+                    getScreenAnimationModeForDisplayState(Display.STATE_OFF))
                     && mPowerState.getScreenState() != Display.STATE_OFF) {
                 // Perform the screen off animation.
                 mColorFadeOffAnimator.start();
@@ -3387,9 +3432,9 @@ Clock getClock() {
             return SystemClock::uptimeMillis;
         }
 
-        DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade,
+        DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, int screenOffAnimation,
                 int displayId, int displayState) {
-            return new DisplayPowerState(blanker, colorFade, displayId, displayState);
+            return new DisplayPowerState(blanker, screenOffAnimation, displayId, displayState);
         }
 
         DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps,
diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java
index 2fbb114c9a63f..26d8492fb8a7d 100644
--- a/services/core/java/com/android/server/display/DisplayPowerState.java
+++ b/services/core/java/com/android/server/display/DisplayPowerState.java
@@ -61,7 +61,6 @@ final class DisplayPowerState {
     private final Handler mHandler;
     private final Choreographer mChoreographer;
     private final DisplayBlanker mBlanker;
-    private final ColorFade mColorFade;
     private final PhotonicModulator mPhotonicModulator;
     private final int mDisplayId;
 
@@ -82,19 +81,21 @@ final class DisplayPowerState {
 
     private volatile boolean mStopped;
 
+    private ScreenStateAnimator mColorFade;
+
     DisplayPowerState(
-            DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) {
-        this(blanker, colorFade, displayId, displayState, BackgroundThread.getExecutor());
+            DisplayBlanker blanker, int screenAnimatorMode, int displayId, int displayState) {
+        this(blanker, screenAnimatorMode, displayId, displayState, BackgroundThread.getExecutor());
     }
 
     @VisibleForTesting
     DisplayPowerState(
-            DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState,
+            DisplayBlanker blanker, int screenAnimatorMode, int displayId, int displayState,
             Executor asyncDestroyExecutor) {
         mHandler = new Handler(true /*async*/);
         mChoreographer = Choreographer.getInstance();
         mBlanker = blanker;
-        mColorFade = colorFade;
+        setScreenStateAnimator(screenAnimatorMode);
         mPhotonicModulator = new PhotonicModulator();
         mPhotonicModulator.start();
         mDisplayId = displayId;
@@ -116,6 +117,17 @@ final class DisplayPowerState {
         mColorFadeReady = true;
     }
 
+    public void setScreenStateAnimator(int mode) {
+        if (mColorFade != null) {
+            mColorFade.dismiss();
+        }
+        if (mode == DisplayPowerController.SCREEN_OFF_FADE) {
+            mColorFade = new ColorFade(Display.DEFAULT_DISPLAY);
+        } else {
+            mColorFade = new ElectronBeam(Display.DEFAULT_DISPLAY);
+        }
+    }
+
     public static final FloatProperty<DisplayPowerState> COLOR_FADE_LEVEL =
             new FloatProperty<DisplayPowerState>("electronBeamLevel") {
         @Override
diff --git a/services/core/java/com/android/server/display/ElectronBeam.java b/services/core/java/com/android/server/display/ElectronBeam.java
new file mode 100644
index 0000000000000..f284167030776
--- /dev/null
+++ b/services/core/java/com/android/server/display/ElectronBeam.java
@@ -0,0 +1,947 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2018 The Dirty Unicorns Project
+ * Copyright (C) 2022 The Potato Open Sauce Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display;
+
+import static com.android.internal.policy.TransitionAnimation.hasProtectedContent;
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.display.DisplayManagerInternal;
+import android.hardware.display.DisplayManagerInternal.DisplayTransactionListener;
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLSurface;
+import android.opengl.GLES10;
+import android.opengl.GLES11Ext;
+import android.util.Slog;
+import android.view.Display;
+import android.view.DisplayInfo;
+import android.view.Surface;
+import android.view.Surface.OutOfResourcesException;
+import android.view.SurfaceControl;
+import android.view.SurfaceControl.Transaction;
+import android.view.SurfaceSession;
+import android.window.ScreenCaptureInternal;
+
+import com.android.server.LocalServices;
+import com.android.server.policy.WindowManagerPolicy;
+
+import java.io.PrintWriter;
+import java.lang.Math;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+
+/**
+ * <p>
+ * Animates a screen transition from on to off or off to on by applying
+ * some GL transformations to a screenshot.
+ * </p><p>
+ * This component must only be created or accessed by the {@link Looper} thread
+ * that belongs to the {@link DisplayPowerController}.
+ * </p>
+ */
+final class ElectronBeam implements ScreenStateAnimator {
+    private static final String TAG = "ElectronBeam";
+
+    private static final boolean DEBUG = false;
+
+    // The layer for the electron beam surface.
+    // This is currently hardcoded to be one layer above the boot animation.
+    private static final int ELECTRON_BEAM_LAYER = WindowManagerPolicy.COLOR_FADE_LAYER;
+
+    // The relative proportion of the animation to spend performing
+    // the horizontal stretch effect.  The remainder is spent performing
+    // the vertical stretch effect.
+    private static final float HSTRETCH_DURATION = 0.5f;
+    private static final float VSTRETCH_DURATION = 1.0f - HSTRETCH_DURATION;
+
+    // The number of frames to draw when preparing the animation so that it will
+    // be ready to run smoothly.  We use 3 frames because we are triple-buffered.
+    // See code for details.
+    private static final int DEJANK_FRAMES = 3;
+
+    private static final int EGL_GL_COLORSPACE_KHR = 0x309D;
+    private static final int EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT = 0x3490;
+    private static final int EGL_PROTECTED_CONTENT_EXT = 0x32C0;
+
+    private final int mDisplayId;
+
+    // Set to true when the animation context has been fully prepared.
+    private boolean mPrepared;
+    private boolean mCreatedResources;
+    private int mMode;
+
+    private final DisplayManagerInternal mDisplayManagerInternal;
+    private int mDisplayLayerStack; // layer stack associated with primary display
+    private int mDisplayWidth;      // real width, not rotated
+    private int mDisplayHeight;     // real height, not rotated
+    private SurfaceSession mSurfaceSession;
+    private SurfaceControl mSurfaceControl;
+    private Surface mSurface;
+    private NaturalSurfaceLayout mSurfaceLayout;
+    private EGLDisplay mEglDisplay;
+    private EGLConfig mEglConfig;
+    private EGLContext mEglContext;
+    private EGLSurface mEglSurface;
+    private boolean mSurfaceVisible;
+    private float mSurfaceAlpha;
+    private boolean mLastWasWideColor;
+    private boolean mLastWasProtectedContent;
+
+    // Texture names.  We only use one texture, which contains the screenshot.
+    private final int[] mTexNames = new int[1];
+    private boolean mTexNamesGenerated;
+    private final float mTexMatrix[] = new float[16];
+
+    // Vertex and corresponding texture coordinates.
+    // We have 4 2D vertices, so 8 elements.  The vertices form a quad.
+    private final FloatBuffer mVertexBuffer = createNativeFloatBuffer(8);
+    private final FloatBuffer mTexCoordBuffer = createNativeFloatBuffer(8);
+
+    private final Transaction mTransaction = new Transaction();
+
+    /**
+     * Animates an electron beam warming up.
+     */
+    public static final int MODE_WARM_UP = 0;
+
+    /**
+     * Animates an electron beam shutting off.
+     */
+    public static final int MODE_COOL_DOWN = 1;
+
+    /**
+     * Animates a simple dim layer to fade the contents of the screen in or out progressively.
+     */
+    public static final int MODE_FADE = 2;
+
+    /**
+     * Animates a scale down of the screen
+     */
+    public static final int MODE_SCALE_DOWN = 3;
+
+
+    public ElectronBeam(int displayId) {
+        mDisplayId = displayId;
+        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
+    }
+
+    /**
+     * Warms up the electron beam in preparation for turning on or off.
+     * This method prepares a GL context, and captures a screen shot.
+     *
+     * @param mode The desired mode for the upcoming animation.
+     * @return True if the electron beam is ready, false if it is uncontrollable.
+     */
+    public boolean prepare(Context context, int mode) {
+        if (DEBUG) {
+            Slog.d(TAG, "prepare: mode=" + mode);
+        }
+
+        mMode = mode;
+
+        // Get the display size and layer stack.
+        // This is not expected to change while the electron beam surface is showing.
+        DisplayInfo displayInfo = mDisplayManagerInternal.getDisplayInfo(mDisplayId);
+        mDisplayLayerStack = displayInfo.layerStack;
+        mDisplayWidth = displayInfo.getNaturalWidth();
+        mDisplayHeight = displayInfo.getNaturalHeight();
+
+        final boolean isWideColor = displayInfo.colorMode == Display.COLOR_MODE_DISPLAY_P3;
+        // Set mPrepared here so if initialization fails, resources can be cleaned up.
+        mPrepared = true;
+
+        final ScreenCaptureInternal.ScreenshotHardwareBuffer hardwareBuffer = captureScreen();
+        if (hardwareBuffer == null) {
+            dismiss();
+            return false;
+        }
+
+        final boolean isProtected = hasProtectedContent(hardwareBuffer.getHardwareBuffer());
+        if (!createSurfaceControl(hardwareBuffer.containsSecureLayers())) {
+            dismiss();
+            return false;
+        }
+
+        // MODE_FADE use ColorLayer to implement.
+        if (mMode == MODE_FADE) {
+            return true;
+        }
+
+        if (!(createEglContext(isProtected) && createEglSurface(isProtected, isWideColor)
+                && setScreenshotTextureAndSetViewport(hardwareBuffer, displayInfo.rotation))) {
+            dismiss();
+            return false;
+        }
+
+        // Done.
+        mCreatedResources = true;
+        mLastWasProtectedContent = isProtected;
+        mLastWasWideColor = isWideColor;
+
+        // Dejanking optimization.
+        // Some GL drivers can introduce a lot of lag in the first few frames as they
+        // initialize their state and allocate graphics buffers for rendering.
+        // Work around this problem by rendering the first frame of the animation a few
+        // times.  The rest of the animation should run smoothly thereafter.
+        // The frames we draw here aren't visible because we are essentially just
+        // painting the screenshot as-is.
+        if (mode == MODE_COOL_DOWN || mode == MODE_SCALE_DOWN) {
+            for (int i = 0; i < DEJANK_FRAMES; i++) {
+                draw(1.0f);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Dismisses the electron beam animation resources.
+     *
+     * This function destroys the resources that are created for the electron beam
+     * animation but does not clean up the surface.
+     */
+    public void dismissResources() {
+        if (DEBUG) {
+            Slog.d(TAG, "dismissResources");
+        }
+
+        if (mCreatedResources) {
+            attachEglContext();
+            try {
+                destroyScreenshotTexture();
+                destroyEglSurface();
+            } finally {
+                detachEglContext();
+            }
+            // This is being called with no active context so shouldn't be
+            // needed but is safer to not change for now.
+            mCreatedResources = false;
+        }
+    }
+
+    /**
+     * Dismisses the electron beam animation surface and cleans up.
+     *
+     * To prevent stray photons from leaking out after the electron beam has been
+     * turned off, it is a good idea to defer dismissing the animation until the
+     * electron beam has been turned back on fully.
+     */
+    public void dismiss() {
+        if (DEBUG) {
+            Slog.d(TAG, "dismiss");
+        }
+
+        if (mPrepared) {
+            dismissResources();
+            destroySurface();
+            mPrepared = false;
+        }
+    }
+
+    /**
+     * Destroys electron beam animation and its resources
+     *
+     * This method should be called when the electron beam is no longer in use; i.e. when
+     * the {@link #mDisplayId display} has been removed.
+     */
+    public void destroy() {
+        if (DEBUG) {
+            Slog.d(TAG, "destroy");
+        }
+        if (mPrepared) {
+            if (mCreatedResources) {
+                attachEglContext();
+                try {
+                    destroyScreenshotTexture();
+                    destroyEglSurface();
+                } finally {
+                    detachEglContext();
+                }
+            }
+            destroyEglContext();
+            destroySurface();
+        }
+    }
+
+    /**
+     * Draws an animation frame showing the electron beam activated at the
+     * specified level.
+     *
+     * @param level The electron beam level.
+     * @return True if successful.
+     */
+    public boolean draw(float level) {
+        if (DEBUG) {
+            Slog.d(TAG, "drawFrame: level=" + level);
+        }
+
+        if (!mPrepared) {
+            return false;
+        }
+
+        if (mMode == MODE_FADE) {
+            return showSurface(1.0f - level);
+        }
+
+        if (!attachEglContext()) {
+            return false;
+        }
+        try {
+            // Clear frame to solid black.
+            GLES10.glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
+            GLES10.glClear(GLES10.GL_COLOR_BUFFER_BIT);
+
+            // Draw the frame.
+            if (mMode == MODE_WARM_UP || mMode == MODE_COOL_DOWN) {
+                if (level < HSTRETCH_DURATION) {
+                    drawHStretch(1.0f - (level / HSTRETCH_DURATION));
+                } else {
+                    drawVStretch(1.0f - ((level - HSTRETCH_DURATION) / VSTRETCH_DURATION));
+                }
+            } else if (mMode == MODE_SCALE_DOWN) {
+                drawScaled(level);
+            }
+
+            if (checkGlErrors("drawFrame")) {
+                return false;
+            }
+
+            EGL14.eglSwapBuffers(mEglDisplay, mEglSurface);
+        } finally {
+            detachEglContext();
+        }
+
+        return showSurface(1.0f);
+    }
+
+    private void drawScaled(float scale) {
+        final float curvedScale = scurve(scale, 8.0f);
+
+        // set blending, enable alpha operations
+        GLES10.glEnable(GLES10.GL_BLEND);
+        GLES10.glBlendFunc(GLES10.GL_SRC_ALPHA, GLES10.GL_ONE_MINUS_SRC_ALPHA);
+
+        // bind vertex buffer
+        GLES10.glVertexPointer(2, GLES10.GL_FLOAT, 0, mVertexBuffer);
+        GLES10.glEnableClientState(GLES10.GL_VERTEX_ARRAY);
+
+        // set-up texturing
+        GLES10.glDisable(GLES10.GL_TEXTURE_2D);
+        GLES10.glEnable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+
+        // bind texture and set blending for drawing planes
+        GLES10.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, mTexNames[0]);
+        GLES10.glTexEnvx(GLES10.GL_TEXTURE_ENV, GLES10.GL_TEXTURE_ENV_MODE,
+                mMode == MODE_WARM_UP ? GLES10.GL_MODULATE : GLES10.GL_REPLACE);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_MAG_FILTER, GLES10.GL_LINEAR);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_MIN_FILTER, GLES10.GL_LINEAR);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_WRAP_S, GLES10.GL_CLAMP_TO_EDGE);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_WRAP_T, GLES10.GL_CLAMP_TO_EDGE);
+        GLES10.glEnable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+        GLES10.glTexCoordPointer(2, GLES10.GL_FLOAT, 0, mTexCoordBuffer);
+        GLES10.glEnableClientState(GLES10.GL_TEXTURE_COORD_ARRAY);
+
+        // Draw the frame
+        setQuad(mVertexBuffer, mDisplayWidth / 2 * (1.0f - curvedScale),
+            mDisplayHeight / 2 * (1.0f - curvedScale),
+            mDisplayWidth * curvedScale, mDisplayHeight * curvedScale);
+        GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+        // dim progressively, using previous vertexes
+        GLES10.glDisable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+        GLES10.glDisableClientState(GLES10.GL_TEXTURE_COORD_ARRAY);
+        GLES10.glColorMask(true, true, true, true);
+        GLES10.glColor4f(0.0f, 0.0f, 0.0f, 1.0f - curvedScale);
+        GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+        // clean up after drawing planes
+        GLES10.glDisableClientState(GLES10.GL_VERTEX_ARRAY);
+        GLES10.glDisable(GLES10.GL_BLEND);
+    }
+
+    /**
+     * Draws a frame where the content of the electron beam is collapsing inwards upon
+     * itself vertically with red / green / blue channels dispersing and eventually
+     * merging down to a single horizontal line.
+     *
+     * @param stretch The stretch factor.  0.0 is no collapse, 1.0 is full collapse.
+     */
+    private void drawVStretch(float stretch) {
+        // compute interpolation scale factors for each color channel
+        final float ar = scurve(stretch, 7.5f);
+        final float ag = scurve(stretch, 8.0f);
+        final float ab = scurve(stretch, 8.5f);
+        if (DEBUG) {
+            Slog.d(TAG, "drawVStretch: stretch=" + stretch
+                    + ", ar=" + ar + ", ag=" + ag + ", ab=" + ab);
+        }
+
+        // set blending
+        GLES10.glBlendFunc(GLES10.GL_ONE, GLES10.GL_ONE);
+        GLES10.glEnable(GLES10.GL_BLEND);
+
+        // bind vertex buffer
+        GLES10.glVertexPointer(2, GLES10.GL_FLOAT, 0, mVertexBuffer);
+        GLES10.glEnableClientState(GLES10.GL_VERTEX_ARRAY);
+
+        // set-up texturing
+        GLES10.glDisable(GLES10.GL_TEXTURE_2D);
+        GLES10.glEnable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+
+        // bind texture and set blending for drawing planes
+        GLES10.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, mTexNames[0]);
+        GLES10.glTexEnvx(GLES10.GL_TEXTURE_ENV, GLES10.GL_TEXTURE_ENV_MODE,
+                mMode == MODE_WARM_UP ? GLES10.GL_MODULATE : GLES10.GL_REPLACE);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_MAG_FILTER, GLES10.GL_LINEAR);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_MIN_FILTER, GLES10.GL_LINEAR);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_WRAP_S, GLES10.GL_CLAMP_TO_EDGE);
+        GLES10.glTexParameterx(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
+                GLES10.GL_TEXTURE_WRAP_T, GLES10.GL_CLAMP_TO_EDGE);
+        GLES10.glEnable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+        GLES10.glTexCoordPointer(2, GLES10.GL_FLOAT, 0, mTexCoordBuffer);
+        GLES10.glEnableClientState(GLES10.GL_TEXTURE_COORD_ARRAY);
+
+        // draw the red plane
+        setVStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ar);
+        GLES10.glColorMask(true, false, false, true);
+        GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+        // draw the green plane
+        setVStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ag);
+        GLES10.glColorMask(false, true, false, true);
+        GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+        // draw the blue plane
+        setVStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ab);
+        GLES10.glColorMask(false, false, true, true);
+        GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+        // clean up after drawing planes
+        GLES10.glDisable(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+        GLES10.glDisableClientState(GLES10.GL_TEXTURE_COORD_ARRAY);
+        GLES10.glColorMask(true, true, true, true);
+
+        // draw the white highlight (we use the last vertices)
+        if (mMode == MODE_COOL_DOWN) {
+            GLES10.glColor4f(ag, ag, ag, 1.0f);
+            GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+        }
+
+        // clean up
+        GLES10.glDisableClientState(GLES10.GL_VERTEX_ARRAY);
+        GLES10.glDisable(GLES10.GL_BLEND);
+    }
+
+    /**
+     * Draws a frame where the electron beam has been stretched out into
+     * a thin white horizontal line that fades as it collapses inwards.
+     *
+     * @param stretch The stretch factor.  0.0 is maximum stretch / no fade,
+     * 1.0 is collapsed / maximum fade.
+     */
+    private void drawHStretch(float stretch) {
+        // compute interpolation scale factor
+        final float ag = scurve(stretch, 8.0f);
+        if (DEBUG) {
+            Slog.d(TAG, "drawHStretch: stretch=" + stretch + ", ag=" + ag);
+        }
+
+        if (stretch < 1.0f) {
+            // bind vertex buffer
+            GLES10.glVertexPointer(2, GLES10.GL_FLOAT, 0, mVertexBuffer);
+            GLES10.glEnableClientState(GLES10.GL_VERTEX_ARRAY);
+
+            // draw narrow fading white line
+            setHStretchQuad(mVertexBuffer, mDisplayWidth, mDisplayHeight, ag);
+            GLES10.glColor4f(1.0f - ag*0.75f, 1.0f - ag*0.75f, 1.0f - ag*0.75f, 1.0f);
+            GLES10.glDrawArrays(GLES10.GL_TRIANGLE_FAN, 0, 4);
+
+            // clean up
+            GLES10.glDisableClientState(GLES10.GL_VERTEX_ARRAY);
+        }
+    }
+
+    private static void setVStretchQuad(FloatBuffer vtx, float dw, float dh, float a) {
+        final float w = dw + (dw * a);
+        final float h = dh - (dh * a);
+        final float x = (dw - w) * 0.5f;
+        final float y = (dh - h) * 0.5f;
+        setQuad(vtx, x, y, w, h);
+    }
+
+    private static void setHStretchQuad(FloatBuffer vtx, float dw, float dh, float a) {
+        final float w = 2 * dw * (1.0f - a);
+        final float h = 1.0f;
+        final float x = (dw - w) * 0.5f;
+        final float y = (dh - h) * 0.5f;
+        setQuad(vtx, x, y, w, h);
+    }
+
+    private static void setQuad(FloatBuffer vtx, float x, float y, float w, float h) {
+        if (DEBUG) {
+            Slog.d(TAG, "setQuad: x=" + x + ", y=" + y + ", w=" + w + ", h=" + h);
+        }
+        vtx.put(0, x);
+        vtx.put(1, y);
+        vtx.put(2, x);
+        vtx.put(3, y + h);
+        vtx.put(4, x + w);
+        vtx.put(5, y + h);
+        vtx.put(6, x + w);
+        vtx.put(7, y);
+    }
+
+    private boolean setScreenshotTextureAndSetViewport(
+            ScreenCaptureInternal.ScreenshotHardwareBuffer screenshotBuffer,
+            @Surface.Rotation int rotation) {
+        if (!attachEglContext()) {
+            return false;
+        }
+        try {
+            if (!mTexNamesGenerated) {
+                GLES10.glGenTextures(1, mTexNames, 0);
+                if (checkGlErrors("glGenTextures")) {
+                    return false;
+                }
+                mTexNamesGenerated = true;
+            }
+
+            final SurfaceTexture st = new SurfaceTexture(mTexNames[0]);
+            final Surface s = new Surface(st);
+            try {
+                s.attachAndQueueBufferWithColorSpace(screenshotBuffer.getHardwareBuffer(),
+                        screenshotBuffer.getColorSpace());
+
+                st.updateTexImage();
+                st.getTransformMatrix(mTexMatrix);
+            } finally {
+                s.release();
+                st.release();
+            }
+
+            // if screen is rotated, map texture starting different corner
+            int indexDelta = (rotation == Surface.ROTATION_90) ? 2
+                            : (rotation == Surface.ROTATION_180) ? 4
+                            : (rotation == Surface.ROTATION_270) ? 6 : 0;
+
+            // Set up texture coordinates for a quad.
+            // We might need to change this if the texture ends up being
+            // a different size from the display for some reason.
+            mTexCoordBuffer.put(indexDelta, 0f);
+            mTexCoordBuffer.put(indexDelta + 1, 0f);
+            mTexCoordBuffer.put((indexDelta + 2) % 8, 0f);
+            mTexCoordBuffer.put((indexDelta + 3) % 8, 1f);
+            mTexCoordBuffer.put((indexDelta + 4) % 8, 1f);
+            mTexCoordBuffer.put((indexDelta + 5) % 8, 1f);
+            mTexCoordBuffer.put((indexDelta + 6) % 8, 1f);
+            mTexCoordBuffer.put((indexDelta + 7) % 8, 0f);
+
+            // Set up our viewport.
+            GLES10.glViewport(0, 0, mDisplayWidth, mDisplayHeight);
+            GLES10.glMatrixMode(GLES10.GL_PROJECTION);
+            GLES10.glLoadIdentity();
+            GLES10.glOrthof(0, mDisplayWidth, 0, mDisplayHeight, 0, 1);
+            GLES10.glMatrixMode(GLES10.GL_MODELVIEW);
+            GLES10.glLoadIdentity();
+            GLES10.glMatrixMode(GLES10.GL_TEXTURE);
+            GLES10.glLoadIdentity();
+            GLES10.glLoadMatrixf(mTexMatrix, 0);
+        } finally {
+            detachEglContext();
+        }
+        return true;
+    }
+
+    private void destroyScreenshotTexture() {
+        if (mTexNamesGenerated) {
+            mTexNamesGenerated = false;
+            if (attachEglContext()) {
+                try {
+                    GLES10.glDeleteTextures(1, mTexNames, 0);
+                    checkGlErrors("glDeleteTextures");
+                } finally {
+                    detachEglContext();
+                }
+            }
+        }
+    }
+
+    private ScreenCaptureInternal.ScreenshotHardwareBuffer captureScreen() {
+        ScreenCaptureInternal.ScreenshotHardwareBuffer screenshotBuffer =
+                mDisplayManagerInternal.systemScreenshot(mDisplayId);
+        if (screenshotBuffer == null) {
+            Slog.e(TAG, "Failed to take screenshot. Buffer is null");
+            return null;
+        }
+        return screenshotBuffer;
+    }
+
+    private boolean createSurfaceControl(boolean isSecure) {
+        if (mSurfaceControl != null) {
+            mTransaction.setSecure(mSurfaceControl, isSecure).apply();
+            return true;
+        }
+
+        if (mSurfaceSession == null) {
+            mSurfaceSession = new SurfaceSession();
+        }
+
+        if (mSurfaceControl == null) {
+            try {
+                int flags;
+                if (mMode == MODE_FADE) {
+                    flags = SurfaceControl.FX_SURFACE_EFFECT | SurfaceControl.HIDDEN;
+                } else {
+                    flags = SurfaceControl.OPAQUE | SurfaceControl.HIDDEN;
+                }
+                SurfaceControl.Builder builder = new SurfaceControl.Builder(mSurfaceSession);
+                builder.setFlags(flags)
+                        .setFormat(PixelFormat.OPAQUE)
+                        .setName("ElectronBeam")
+                        .setBufferSize(mDisplayWidth, mDisplayHeight);
+                mSurfaceControl = builder.build();
+            } catch (OutOfResourcesException ex) {
+                Slog.e(TAG, "Unable to create surface.", ex);
+                return false;
+            }
+
+            mTransaction.setLayerStack(mSurfaceControl, mDisplayLayerStack);
+            mTransaction.setWindowCrop(mSurfaceControl, mDisplayWidth, mDisplayHeight);
+            mSurface = new Surface();
+            mSurface.copyFrom(mSurfaceControl);
+
+            mSurfaceLayout = new NaturalSurfaceLayout(mDisplayManagerInternal,
+                    mDisplayId, mSurfaceControl);
+            mSurfaceLayout.onDisplayTransaction(mTransaction);
+            mTransaction.apply();
+        }
+        return true;
+    }
+
+    private boolean createEglContext(boolean isProtected) {
+        if (mEglDisplay == null) {
+            mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
+            if (mEglDisplay == EGL14.EGL_NO_DISPLAY) {
+                logEglError("eglGetDisplay");
+                return false;
+            }
+
+            int[] version = new int[2];
+            if (!EGL14.eglInitialize(mEglDisplay, version, 0, version, 1)) {
+                mEglDisplay = null;
+                logEglError("eglInitialize");
+                return false;
+            }
+        }
+
+        if (mEglConfig == null) {
+            int[] eglConfigAttribList = new int[] {
+                    EGL14.EGL_RENDERABLE_TYPE,
+                    EGL14.EGL_OPENGL_ES2_BIT,
+                    EGL14.EGL_RED_SIZE, 8,
+                    EGL14.EGL_GREEN_SIZE, 8,
+                    EGL14.EGL_BLUE_SIZE, 8,
+                    EGL14.EGL_ALPHA_SIZE, 8,
+                    EGL14.EGL_NONE
+            };
+            int[] numEglConfigs = new int[1];
+            EGLConfig[] eglConfigs = new EGLConfig[1];
+            if (!EGL14.eglChooseConfig(mEglDisplay, eglConfigAttribList, 0,
+                    eglConfigs, 0, eglConfigs.length, numEglConfigs, 0)) {
+                logEglError("eglChooseConfig");
+                return false;
+            }
+            if (numEglConfigs[0] <= 0) {
+                Slog.e(TAG, "no valid config found");
+                return false;
+            }
+
+            mEglConfig = eglConfigs[0];
+        }
+
+        // The old context needs to be destroyed if the protected flag has changed. The context will
+        // be recreated based on the protected flag
+        if (mEglContext != null && isProtected != mLastWasProtectedContent) {
+            EGL14.eglDestroyContext(mEglDisplay, mEglContext);
+            mEglContext = null;
+        }
+
+        if (mEglContext == null) {
+            int[] eglContextAttribList = new int[] {
+                    EGL14.EGL_CONTEXT_CLIENT_VERSION, 1,
+                    EGL14.EGL_NONE, EGL14.EGL_NONE,
+                    EGL14.EGL_NONE
+            };
+            if (isProtected) {
+                eglContextAttribList[3] = EGL_PROTECTED_CONTENT_EXT;
+                eglContextAttribList[4] = EGL14.EGL_TRUE;
+            }
+            mEglContext = EGL14.eglCreateContext(mEglDisplay, mEglConfig, EGL14.EGL_NO_CONTEXT,
+                    eglContextAttribList, 0);
+            if (mEglContext == null) {
+                logEglError("eglCreateContext");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean createEglSurface(boolean isProtected, boolean isWideColor) {
+        // The old surface needs to be destroyed if either the protected flag or wide color flag has
+        // changed. The surface will be recreated based on the new flags.
+        boolean didContentAttributesChange =
+                isProtected != mLastWasProtectedContent || isWideColor != mLastWasWideColor;
+        if (mEglSurface != null && didContentAttributesChange) {
+            EGL14.eglDestroySurface(mEglDisplay, mEglSurface);
+            mEglSurface = null;
+        }
+
+        if (mEglSurface == null) {
+            int[] eglSurfaceAttribList = new int[] {
+                    EGL14.EGL_NONE,
+                    EGL14.EGL_NONE,
+                    EGL14.EGL_NONE,
+                    EGL14.EGL_NONE,
+                    EGL14.EGL_NONE
+            };
+
+            int index = 0;
+            // If the current display is in wide color, then so is the screenshot.
+            if (isWideColor) {
+                eglSurfaceAttribList[index++] = EGL_GL_COLORSPACE_KHR;
+                eglSurfaceAttribList[index++] = EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT;
+            }
+            if (isProtected) {
+                eglSurfaceAttribList[index++] = EGL_PROTECTED_CONTENT_EXT;
+                eglSurfaceAttribList[index] = EGL14.EGL_TRUE;
+            }
+            // turn our SurfaceControl into a Surface
+            mEglSurface = EGL14.eglCreateWindowSurface(mEglDisplay, mEglConfig, mSurface,
+                    eglSurfaceAttribList, 0);
+            if (mEglSurface == null) {
+                logEglError("eglCreateWindowSurface");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void destroyEglSurface() {
+        if (mEglSurface != null) {
+            if (!EGL14.eglDestroySurface(mEglDisplay, mEglSurface)) {
+                logEglError("eglDestroySurface");
+            }
+            mEglSurface = null;
+        }
+    }
+
+    private void destroySurface() {
+        if (mSurfaceControl != null) {
+            mSurfaceLayout.dispose();
+            mSurfaceLayout = null;
+            mTransaction.remove(mSurfaceControl).apply();
+            if (mSurface != null) {
+                mSurface.release();
+                mSurface = null;
+            }
+
+            mSurfaceControl = null;
+            mSurfaceVisible = false;
+            mSurfaceAlpha = 0f;
+        }
+    }
+
+    private boolean showSurface(float alpha) {
+        if (!mSurfaceVisible || mSurfaceAlpha != alpha) {
+            mTransaction.setLayer(mSurfaceControl, ELECTRON_BEAM_LAYER)
+                    .setAlpha(mSurfaceControl, alpha)
+                    .show(mSurfaceControl)
+                    .apply();
+            mSurfaceVisible = true;
+            mSurfaceAlpha = alpha;
+        }
+        return true;
+    }
+
+    private boolean attachEglContext() {
+        if (mEglSurface == null) {
+            return false;
+        }
+        if (!EGL14.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+            logEglError("eglMakeCurrent");
+            return false;
+        }
+        return true;
+    }
+
+    private void detachEglContext() {
+        if (mEglDisplay != null) {
+            EGL14.eglMakeCurrent(mEglDisplay,
+                    EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT);
+        }
+    }
+
+    /**
+     * Interpolates a value in the range 0 .. 1 along a sigmoid curve
+     * yielding a result in the range 0 .. 1 scaled such that:
+     * scurve(0) == 0, scurve(0.5) == 0.5, scurve(1) == 1.
+     */
+    private static float scurve(float value, float s) {
+        // A basic sigmoid has the form y = 1.0f / FloatMap.exp(-x * s).
+        // Here we take the input datum and shift it by 0.5 so that the
+        // domain spans the range -0.5 .. 0.5 instead of 0 .. 1.
+        final float x = value - 0.5f;
+
+        // Next apply the sigmoid function to the scaled value
+        // which produces a value in the range 0 .. 1 so we subtract
+        // 0.5 to get a value in the range -0.5 .. 0.5 instead.
+        final float y = sigmoid(x, s) - 0.5f;
+
+        // To obtain the desired boundary conditions we need to scale
+        // the result so that it fills a range of -1 .. 1.
+        final float v = sigmoid(0.5f, s) - 0.5f;
+
+        // And finally remap the value back to a range of 0 .. 1.
+        return y / v * 0.5f + 0.5f;
+    }
+
+    private static float sigmoid(float x, float s) {
+        return 1.0f / (1.0f + (float)Math.exp(-x * s));
+    }
+
+    private void destroyEglContext() {
+        if (mEglDisplay != null && mEglContext != null) {
+            EGL14.eglDestroyContext(mEglDisplay, mEglContext);
+        }
+    }
+
+    private static FloatBuffer createNativeFloatBuffer(int size) {
+        ByteBuffer bb = ByteBuffer.allocateDirect(size * 4);
+        bb.order(ByteOrder.nativeOrder());
+        return bb.asFloatBuffer();
+    }
+
+    private static void logEglError(String func) {
+        Slog.e(TAG, func + " failed: error " + EGL14.eglGetError(), new Throwable());
+    }
+
+    private static boolean checkGlErrors(String func) {
+        return checkGlErrors(func, true);
+    }
+
+    private static boolean checkGlErrors(String func, boolean log) {
+        boolean hadError = false;
+        int error;
+        while ((error = GLES10.glGetError()) != GLES10.GL_NO_ERROR) {
+            if (log) {
+                Slog.e(TAG, func + " failed: error " + error, new Throwable());
+            }
+            hadError = true;
+        }
+        return hadError;
+    }
+
+    public void dump(PrintWriter pw) {
+        pw.println();
+        pw.println("Electron Beam State:");
+        pw.println("  mPrepared=" + mPrepared);
+        pw.println("  mMode=" + mMode);
+        pw.println("  mDisplayLayerStack=" + mDisplayLayerStack);
+        pw.println("  mDisplayWidth=" + mDisplayWidth);
+        pw.println("  mDisplayHeight=" + mDisplayHeight);
+        pw.println("  mSurfaceVisible=" + mSurfaceVisible);
+        pw.println("  mSurfaceAlpha=" + mSurfaceAlpha);
+    }
+
+    /**
+     * Keeps a surface aligned with the natural orientation of the device.
+     * Updates the position and transformation of the matrix whenever the display
+     * is rotated.  This is a little tricky because the display transaction
+     * callback can be invoked on any thread, not necessarily the thread that
+     * owns the electron beam.
+     */
+    private static final class NaturalSurfaceLayout implements DisplayTransactionListener {
+        private final DisplayManagerInternal mDisplayManagerInternal;
+        private final int mDisplayId;
+        private SurfaceControl mSurfaceControl;
+
+        public NaturalSurfaceLayout(DisplayManagerInternal displayManagerInternal,
+                int displayId, SurfaceControl surfaceControl) {
+            mDisplayManagerInternal = displayManagerInternal;
+            mDisplayId = displayId;
+            mSurfaceControl = surfaceControl;
+            mDisplayManagerInternal.registerDisplayTransactionListener(this);
+        }
+
+        public void dispose() {
+            synchronized (this) {
+                mSurfaceControl = null;
+            }
+            mDisplayManagerInternal.unregisterDisplayTransactionListener(this);
+        }
+
+        @Override
+        public void onDisplayTransaction(Transaction t) {
+            synchronized (this) {
+                if (mSurfaceControl == null) {
+                    return;
+                }
+
+                DisplayInfo displayInfo = mDisplayManagerInternal.getDisplayInfo(mDisplayId);
+                if (displayInfo == null) {
+                    // displayInfo can be null if the associated display has been removed. There
+                    // is a delay between the display being removed and ElectronBeam being dismissed.
+                    return;
+                }
+
+                switch (displayInfo.rotation) {
+                    case Surface.ROTATION_0:
+                        t.setPosition(mSurfaceControl, 0, 0);
+                        t.setMatrix(mSurfaceControl, 1, 0, 0, 1);
+                        break;
+                    case Surface.ROTATION_90:
+                        t.setPosition(mSurfaceControl, 0, displayInfo.logicalHeight);
+                        t.setMatrix(mSurfaceControl, 0, -1, 1, 0);
+                        break;
+                    case Surface.ROTATION_180:
+                        t.setPosition(mSurfaceControl, displayInfo.logicalWidth,
+                                displayInfo.logicalHeight);
+                        t.setMatrix(mSurfaceControl, -1, 0, 0, -1);
+                        break;
+                    case Surface.ROTATION_270:
+                        t.setPosition(mSurfaceControl, displayInfo.logicalWidth, 0);
+                        t.setMatrix(mSurfaceControl, 0, 1, -1, 0);
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/display/HighBrightnessModeController.java b/services/core/java/com/android/server/display/HighBrightnessModeController.java
index 21a303dc868fb..567b9d4c9e83c 100644
--- a/services/core/java/com/android/server/display/HighBrightnessModeController.java
+++ b/services/core/java/com/android/server/display/HighBrightnessModeController.java
@@ -379,8 +379,9 @@ boolean isHbmCurrentlyAllowed() {
         // brightness maximum; so we implement HDR-HBM in a way that doesn't adjust the max.
         // See {@link #getHdrBrightnessValue}.
         return !mIsHdrLayerPresent
-                && (mIsAutoBrightnessEnabled && mIsTimeAvailable && mIsInAllowedAmbientRange
-                && !mIsBlockedByLowPowerMode);
+                && ((mIsAutoBrightnessEnabled && mIsTimeAvailable && mIsInAllowedAmbientRange)
+                    || (!mIsAutoBrightnessEnabled && mHbmData.timeWindowMillis == 0))
+                && !mIsBlockedByLowPowerMode;
     }
 
     boolean deviceSupportsHbm() {
diff --git a/services/core/java/com/android/server/display/ScreenStateAnimator.java b/services/core/java/com/android/server/display/ScreenStateAnimator.java
new file mode 100644
index 0000000000000..9722e1949dd6d
--- /dev/null
+++ b/services/core/java/com/android/server/display/ScreenStateAnimator.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2018 The Dirty Unicorns Project
+ * Copyright (C) 2022 The Potato Open Sauce Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display;
+
+import java.io.PrintWriter;
+
+import android.content.Context;
+
+/** @hide */
+public interface ScreenStateAnimator {
+    public static final int MODE_WARM_UP = 0;
+    public static final int MODE_COOL_DOWN = 1;
+    public static final int MODE_FADE = 2;
+    public static final int MODE_SCALE_DOWN = 3;
+
+    public boolean prepare(Context context, int mode);
+
+    public default void dismissResources() {}
+
+    public void dismiss();
+
+    public void destroy();
+
+    public boolean draw(float level);
+
+    public void dump(PrintWriter pw);
+}
diff --git a/services/core/java/com/android/server/display/brightness/HbmService.java b/services/core/java/com/android/server/display/brightness/HbmService.java
new file mode 100644
index 0000000000000..8e3fb8ab2a029
--- /dev/null
+++ b/services/core/java/com/android/server/display/brightness/HbmService.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2025 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.display.brightness;
+
+import static android.hardware.SensorManager.LIGHT_NO_MOON;
+import static android.hardware.SensorManager.LIGHT_SHADE;
+import static android.hardware.SensorManager.LIGHT_SUNLIGHT;
+import static android.hardware.SensorManager.LIGHT_SUNLIGHT_MAX;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.hardware.*;
+import android.hardware.display.BrightnessInfo;
+import android.net.Uri;
+import android.os.*;
+import android.provider.Settings;
+import android.util.Log;
+import android.util.MathUtils;
+import android.view.Display;
+import com.android.server.SystemService;
+import java.io.File;
+
+public class HbmService extends SystemService implements SensorEventListener {
+
+    private static final String TAG = "HbmService";
+
+    private static final String HBM_NODE = SystemProperties.get("persist.sys.hbmservice_file");
+    private static final String HBM_OFF = "0";
+    private static final String HBM_ON  = "1";
+
+    public static final boolean sDisableGammaConversion =
+            SystemProperties.getBoolean("sys.brightness.disable_gamma_conversion", false);
+
+    private static final float DEFAULT_LUX_THRESHOLD_HBM = LIGHT_SUNLIGHT;
+    private static final float DEFAULT_LUX_THRESHOLD_OFF = LIGHT_SHADE;
+    private static final float HBM_MIN_BRIGHTNESS_PERCENT = 0.9f;
+
+    private static final String KEY_AUTO_HBM_ENABLED = "auto_hbm_enabled";
+    private static final String KEY_AUTO_HBM_LUX_ON  = "auto_hbm_lux_on";
+    private static final String KEY_AUTO_HBM_LUX_OFF = "auto_hbm_lux_off";
+
+    private static final int AVG_SAMPLE_COUNT = 5;
+    private static final long SENSOR_DEBOUNCE_MS = 3000;
+
+    private static final int MSG_SENSOR_CHANGED = 1;
+    private static final int MSG_SETTINGS_CHANGED = 2;
+    private static final int MSG_SCREEN_STATE_CHANGED = 3;
+    private static final int MSG_BRIGHTNESS_CHANGED = 4;
+
+    public static final int GAMMA_SPACE_MIN = 0;
+    public static final int GAMMA_SPACE_MAX = 65535;
+
+    private static final float R = 0.5f;
+    private static final float A = 0.17883277f;
+    private static final float B = 0.28466892f;
+    private static final float C = 0.55991073f;
+
+    private final Context mContext;
+    private final SensorManager mSensorManager;
+
+    private HandlerThread mHandlerThread;
+    private HbmHandler mHandler;
+
+    private Sensor mLightSensor;
+    private boolean mScreenOn = true;
+    private boolean mAutoEnabled = false;
+
+    private float mLuxThresholdOn = DEFAULT_LUX_THRESHOLD_HBM;
+    private float mLuxThresholdOff = DEFAULT_LUX_THRESHOLD_OFF;
+
+    private final float[] mRecentLux = new float[AVG_SAMPLE_COUNT];
+    private int mLuxIndex = 0;
+    private boolean mBufferFilled = false;
+    private long mLastSensorUpdateTime = 0;
+
+    private boolean mSensorRegistered = false;
+    private boolean mReceiverRegistered = false;
+
+    private ContentObserver mSettingsObserver;
+    private BroadcastReceiver mScreenReceiver;
+    
+    private float mCurrentLux = 0f;
+
+    public HbmService(Context context) {
+        super(context);
+        mContext = context;
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+        mLightSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+    }
+
+    @Override
+    public void onStart() {
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase != PHASE_BOOT_COMPLETED) return;
+
+        if (mLightSensor == null) {
+            logger("No light sensor found, HbmService disabled");
+            return;
+        }
+
+        startHandlerThread();
+        observeSettings();
+        updateLightThresholds();
+        updateState();
+    }
+
+    private void startHandlerThread() {
+        mHandlerThread = new HandlerThread("HbmServiceThread");
+        mHandlerThread.start();
+        mHandler = new HbmHandler(mHandlerThread.getLooper(), this);
+    }
+
+    private void observeSettings() {
+        ContentResolver resolver = mContext.getContentResolver();
+        mSettingsObserver = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                if (uri == null) return;
+                String key = uri.getLastPathSegment();
+                if (KEY_AUTO_HBM_ENABLED.equals(key) || KEY_AUTO_HBM_LUX_ON.equals(key) ||
+                    KEY_AUTO_HBM_LUX_OFF.equals(key)) {
+                    mHandler.obtainMessage(MSG_SETTINGS_CHANGED).sendToTarget();
+                } else if (Settings.System.SCREEN_BRIGHTNESS.equals(key)) {
+                    mHandler.obtainMessage(MSG_BRIGHTNESS_CHANGED).sendToTarget();
+                }
+            }
+        };
+
+        resolver.registerContentObserver(Settings.Secure.getUriFor(KEY_AUTO_HBM_ENABLED), false, mSettingsObserver);
+        resolver.registerContentObserver(Settings.Secure.getUriFor(KEY_AUTO_HBM_LUX_ON), false, mSettingsObserver);
+        resolver.registerContentObserver(Settings.Secure.getUriFor(KEY_AUTO_HBM_LUX_OFF), false, mSettingsObserver);
+        resolver.registerContentObserver(Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS), false, mSettingsObserver);
+    }
+
+    private void registerScreenReceiver() {
+        if (mReceiverRegistered) return;
+
+        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
+
+        mScreenReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context ctx, Intent intent) {
+                boolean screenOn = Intent.ACTION_SCREEN_ON.equals(intent.getAction());
+                mHandler.obtainMessage(MSG_SCREEN_STATE_CHANGED, screenOn).sendToTarget();
+            }
+        };
+
+        mContext.registerReceiver(mScreenReceiver, filter);
+        mReceiverRegistered = true;
+    }
+
+    private void updateState() {
+        boolean prevAutoEnabled = mAutoEnabled;
+        mAutoEnabled = Settings.Secure.getInt
+            (mContext.getContentResolver(), KEY_AUTO_HBM_ENABLED, 0) == 1;
+
+        if (mAutoEnabled != prevAutoEnabled) {
+            updateSensors();
+        }
+    }
+
+    private void updateLightThresholds() {
+        float luxOn = Settings.Secure.getFloat(
+            mContext.getContentResolver(), KEY_AUTO_HBM_LUX_ON, DEFAULT_LUX_THRESHOLD_HBM);
+        float luxOff = Settings.Secure.getFloat(
+            mContext.getContentResolver(), KEY_AUTO_HBM_LUX_OFF, DEFAULT_LUX_THRESHOLD_OFF);
+
+        luxOn = clamp(luxOn, LIGHT_NO_MOON, LIGHT_SUNLIGHT_MAX);
+        luxOff = clamp(luxOff, LIGHT_NO_MOON, LIGHT_SUNLIGHT_MAX);
+
+        if (luxOff >= luxOn) luxOff = luxOn * 0.8f;
+
+        mLuxThresholdOn = luxOn;
+        mLuxThresholdOff = luxOff;
+
+        logger("HBM thresholds updated: on:" + mLuxThresholdOn + " off:" + mLuxThresholdOff);
+    }
+
+    private float clamp(float value, float min, float max) {
+        return Math.max(min, Math.min(max, value));
+    }
+
+    private void updateSensors() {
+        boolean shouldListen = mScreenOn && mAutoEnabled && mLightSensor != null;
+
+        if (shouldListen && !mSensorRegistered) {
+            logger("Registering light sensor listener for HBM");
+            mSensorManager.registerListener(this, mLightSensor, SensorManager.SENSOR_DELAY_NORMAL, mHandler);
+            registerScreenReceiver();
+            mSensorRegistered = true;
+        } else if (!shouldListen && mSensorRegistered) {
+            logger("Unregistering light sensor listener for HBM");
+            mSensorManager.unregisterListener(this);
+            mSensorRegistered = false;
+            disableHbm();
+        }
+    }
+
+    private void handleSensorChanged() {
+        if (getBrightnessPercent() < HBM_MIN_BRIGHTNESS_PERCENT) {
+            write(HBM_OFF);
+            return;
+        }
+        long now = System.currentTimeMillis();
+        if (now - mLastSensorUpdateTime < SENSOR_DEBOUNCE_MS) return;
+
+        mRecentLux[mLuxIndex] = mCurrentLux;
+        mLuxIndex = (mLuxIndex + 1) % AVG_SAMPLE_COUNT;
+        if (mLuxIndex == 0) mBufferFilled = true;
+
+        int count = mBufferFilled ? AVG_SAMPLE_COUNT : mLuxIndex;
+        float sum = 0f;
+        for (int i = 0; i < count; i++) sum += mRecentLux[i];
+        float avgLux = sum / count;
+
+        mLastSensorUpdateTime = now;
+        updateHbmMode();
+    }
+
+    private void handleSettingsChanged(String key) {
+        if (KEY_AUTO_HBM_ENABLED.equals(key)) {
+            updateState();
+        } else if (KEY_AUTO_HBM_LUX_ON.equals(key) || KEY_AUTO_HBM_LUX_OFF.equals(key)) {
+            updateLightThresholds();
+        }
+    }
+
+    private void handleScreenStateChanged(boolean screenOn) {
+        mScreenOn = screenOn;
+        updateSensors();
+    }
+
+    private void updateHbmMode() {
+        final float lux = mCurrentLux;
+        boolean hmbOn = isHbmEnabled();
+        if (!hmbOn && lux >= mLuxThresholdOn) {
+            final float brightnessPercent = getBrightnessPercent();
+            if (brightnessPercent < HBM_MIN_BRIGHTNESS_PERCENT) return;
+            write(HBM_ON);
+            logger("Enabling HBM brightness: " + brightnessPercent);
+        } else if (hmbOn && lux <= mLuxThresholdOff) {
+            write(HBM_OFF);
+        }
+        logger("HBM " + (isHbmEnabled() ? "enabled" : "disabled") + " lux: " + lux);
+    }
+
+    private float getBrightnessPercent() {
+        Display display = mContext.getDisplay();
+        BrightnessInfo info = display.getBrightnessInfo();
+        if (info == null) return 0.5f;
+        float gamma = convertLinearToGammaFloat(
+                info.brightness,
+                info.brightnessMinimum,
+                info.brightnessMaximum
+        );
+        float brightnessPercent = ((gamma - GAMMA_SPACE_MIN) /
+                             (GAMMA_SPACE_MAX - GAMMA_SPACE_MIN));
+        return brightnessPercent;
+    }
+
+    private void disableHbm() {
+        if (isHbmEnabled()) {
+            write(HBM_OFF);
+        }
+    }
+
+    private boolean isHbmEnabled() {
+        try {
+            File node = FileUtils.newFileOrNull(HBM_NODE);
+            if (node == null) return false;
+            String value = FileUtils.readTextFile(node, 0, null).trim();
+            return HBM_ON.equals(value);
+        } catch (Exception e) {
+            logger("Failed to read HBM state, assuming OFF");
+            return false;
+        }
+    }
+
+    private void write(String value) {
+        try {
+            FileUtils.stringToFile(HBM_NODE, value);
+        } catch (Exception e) {
+            logger("Failed to write value: " + value);
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        mCurrentLux = event.values[0];
+        logger("Sensor changed: lux=" + mCurrentLux);
+        mHandler.obtainMessage(MSG_SENSOR_CHANGED).sendToTarget();
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    }
+
+    private void logger(String msg) {
+        if (SystemProperties.getBoolean("persist.sys.hbmservice_debug", false)) Log.d(TAG, msg);
+    }
+
+    public static final int convertLinearToGammaFloat(float val, float min, float max) {
+        if (sDisableGammaConversion) {
+            final float normalizedVal = MathUtils.norm(min, max, val);
+            return Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, normalizedVal));
+        }
+        final float normalizedVal = MathUtils.norm(min, max, val) * 12;
+        final float ret;
+        if (normalizedVal <= 1f) {
+            ret = MathUtils.sqrt(normalizedVal) * R;
+        } else {
+            ret = A * MathUtils.log(normalizedVal - B) + C;
+        }
+        return Math.round(MathUtils.lerp(GAMMA_SPACE_MIN, GAMMA_SPACE_MAX, ret));
+    }
+    
+    private static class HbmHandler extends Handler {
+        private final HbmService mService;
+
+        HbmHandler(Looper looper, HbmService service) {
+            super(looper);
+            mService = service;
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_BRIGHTNESS_CHANGED:
+                    mService.updateHbmMode();
+                    break;
+                case MSG_SENSOR_CHANGED:
+                    mService.handleSensorChanged();
+                    break;
+                case MSG_SETTINGS_CHANGED:
+                    mService.handleSettingsChanged((String) msg.obj);
+                    break;
+                case MSG_SCREEN_STATE_CHANGED:
+                    mService.handleScreenStateChanged((Boolean) msg.obj);
+                    break;
+            }
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java
index b579b08814f07..21d1eb5a08a0e 100644
--- a/services/core/java/com/android/server/display/color/ColorDisplayService.java
+++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java
@@ -125,6 +125,7 @@ public final class ColorDisplayService extends SystemService {
     private static final int MSG_APPLY_GLOBAL_SATURATION = 4;
     private static final int MSG_APPLY_DISPLAY_WHITE_BALANCE = 5;
     private static final int MSG_APPLY_REDUCE_BRIGHT_COLORS = 6;
+    private static final int MSG_APPLY_UPDATE_DISPLAY_ENGINE = 7;
 
     /**
      * Return value if a setting has not been set.
@@ -175,6 +176,8 @@ public final class ColorDisplayService extends SystemService {
     private final TintController mGlobalSaturationTintController =
             new GlobalSaturationTintController();
     private final ReduceBrightColorsTintController mReduceBrightColorsTintController;
+    private final DisplayEngineController mDisplayEngineController =
+            new DisplayEngineController();
 
     @VisibleForTesting
     final Handler mHandler;
@@ -400,6 +403,9 @@ public void onChange(boolean selfChange, Uri uri) {
                                 onReduceBrightColorsStrengthLevelChanged();
                                 mHandler.sendEmptyMessage(MSG_APPLY_REDUCE_BRIGHT_COLORS);
                                 break;
+                            case Secure.DISPLAY_ENGINE_MODE:
+                                mHandler.sendEmptyMessage(MSG_APPLY_UPDATE_DISPLAY_ENGINE);
+                                break;
                         }
                     }
                 }
@@ -436,6 +442,8 @@ public void onChange(boolean selfChange, Uri uri) {
                     Secure.getUriFor(Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL),
                     false /* notifyForDescendants */, mContentObserver, mCurrentUser);
         }
+        cr.registerContentObserver(Secure.getUriFor(Secure.DISPLAY_ENGINE_MODE),
+                false /* notifyForDescendants */, mContentObserver, mCurrentUser);
 
         // Apply the accessibility settings first, since they override most other settings.
         onAccessibilityInversionChanged();
@@ -483,6 +491,10 @@ public void onChange(boolean selfChange, Uri uri) {
                 mHandler.sendEmptyMessage(MSG_APPLY_REDUCE_BRIGHT_COLORS);
             }
         }
+        
+        if (mDisplayEngineController.isAvailable(getContext())) {
+            mHandler.sendEmptyMessage(MSG_APPLY_UPDATE_DISPLAY_ENGINE);
+        }
     }
 
     private void tearDown() {
@@ -1827,6 +1839,10 @@ public void handleMessage(Message msg) {
                 case MSG_APPLY_DISPLAY_WHITE_BALANCE:
                     applyTintByCct(mDisplayWhiteBalanceTintController, false);
                     break;
+                case MSG_APPLY_UPDATE_DISPLAY_ENGINE:
+                    mDisplayEngineController.updateBalance(getContext(), mCurrentUser);
+                    applyTint(mDisplayEngineController, true);
+                    break;
             }
         }
     }
diff --git a/services/core/java/com/android/server/display/color/DisplayEngineController.java b/services/core/java/com/android/server/display/color/DisplayEngineController.java
new file mode 100644
index 0000000000000..3087f6d7c39f9
--- /dev/null
+++ b/services/core/java/com/android/server/display/color/DisplayEngineController.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2023-2024 The risingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display.color;
+
+import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_INVERT_COLOR;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.hardware.display.ColorDisplayManager;
+import android.opengl.Matrix;
+import android.provider.Settings;
+
+import java.util.Arrays;
+
+/** Controls color transformation for display engine modes. */
+final class DisplayEngineController extends TintController {
+
+    private final float[] mMatrix = new float[16];
+    private float mHue = 0.0f;
+    private float mContrast = 1.0f;
+    private float mValue = 1.0f;
+    private float mSaturation = 1.0f;
+    private int mRed = 255;
+    private int mGreen = 255;
+    private int mBlue = 255;
+
+    // Mode presets {r ,g ,b ,sat, cont, val}
+    private static final int[] X_REALITY_MODE = {252, 227, 228, 278, 260, 264};
+    private static final int[] TRILUMINOUS_PRO_MODE = {250, 235, 255, 260, 255, 280};
+    private static final int[] VIVID_MODE = {240, 240, 225, 281, 255, 262};
+
+    @Override
+    public void setUp(Context context, boolean needsLinear) {
+    }
+
+    @Override
+    public float[] getMatrix() {
+        return Arrays.copyOf(mMatrix, mMatrix.length);
+    }
+
+    @Override
+    public void setMatrix(int rgb) {
+        Matrix.setIdentityM(mMatrix, 0);
+        mMatrix[0] = Color.red(rgb) / 255.0f;
+        mMatrix[5] = Color.green(rgb) / 255.0f;
+        mMatrix[10] = Color.blue(rgb) / 255.0f;
+        applyHue(mMatrix, mHue);
+        applyContrast(mMatrix, mContrast);
+        applyValue(mMatrix, mValue);
+        applySaturation(mMatrix, mSaturation);
+    }
+
+    @Override
+    public int getLevel() {
+        return LEVEL_COLOR_MATRIX_INVERT_COLOR + 50;
+    }
+
+    @Override
+    public boolean isAvailable(Context context) {
+        return ColorDisplayManager.isColorTransformAccelerated(context);
+    }
+
+    public void updateBalance(Context context, int userId) {
+        int displayMode =
+                Settings.Secure.getIntForUser(
+                        context.getContentResolver(),
+                        Settings.Secure.DISPLAY_ENGINE_MODE,
+                        0,
+                        userId);
+        int[] mode;
+        switch (displayMode) {
+            case 1:
+                mode = X_REALITY_MODE;
+                mHue = 0.0f; 
+                break;
+            case 2:
+                mode = VIVID_MODE;
+                mHue = 0.0f; 
+                break;
+            case 3:
+                mode = TRILUMINOUS_PRO_MODE;
+                mHue = 3f;
+                break;
+            case 0:
+            default:
+                mRed = 255;
+                mGreen = 255;
+                mBlue = 255;
+                mContrast = 1.0f;
+                mValue = 1.0f;
+                mSaturation = 1.0f;
+                mode = null;
+                mHue = 0.0f; 
+        }
+        if (mode != null) {
+            mRed = mode[0];
+            mGreen = mode[1];
+            mBlue = mode[2];
+            mSaturation = mode[3] / 255.0f;
+            mContrast = mode[4] / 255.0f;
+            mValue = mode[5] / 255.0f;
+        }
+        setMatrix(Color.rgb(mRed, mGreen, mBlue));
+    }
+
+    private void applyHue(float[] matrix, float hue) {
+        float angle = hue * (float) Math.PI / 180;
+        float cosA = (float) Math.cos(angle);
+        float sinA = (float) Math.sin(angle);
+        float[] hueMatrix = {
+            0.213f + cosA * 0.787f - sinA * 0.213f, 0.715f - cosA * 0.715f - sinA * 0.715f, 0.072f - cosA * 0.072f + sinA * 0.928f, 0,
+            0.213f - cosA * 0.213f + sinA * 0.143f, 0.715f + cosA * 0.285f + sinA * 0.140f, 0.072f - cosA * 0.072f - sinA * 0.283f, 0,
+            0.213f - cosA * 0.213f - sinA * 0.787f, 0.715f - cosA * 0.715f + sinA * 0.715f, 0.072f + cosA * 0.928f + sinA * 0.072f, 0,
+            0, 0, 0, 1
+        };
+        Matrix.multiplyMM(matrix, 0, hueMatrix, 0, matrix, 0);
+    }
+
+    private void applyContrast(float[] matrix, float contrast) {
+        float translate = (1 - contrast) / 2;
+        float[] contrastMatrix = {
+            contrast, 0, 0, 0,
+            0, contrast, 0, 0,
+            0, 0, contrast, 0,
+            translate, translate, translate, 1
+        };
+        Matrix.multiplyMM(matrix, 0, contrastMatrix, 0, matrix, 0);
+    }
+
+    private void applyValue(float[] matrix, float value) {
+        float[] valueMatrix = {
+            value, 0, 0, 0,
+            0, value, 0, 0,
+            0, 0, value, 0,
+            0, 0, 0, 1
+        };
+        Matrix.multiplyMM(matrix, 0, valueMatrix, 0, matrix, 0);
+    }
+
+    private void applySaturation(float[] matrix, float saturation) {
+        float rw = 0.3086f, gw = 0.6094f, bw = 0.0820f;
+        float invSat = 1.0f - saturation;
+        float R = invSat * rw, G = invSat * gw, B = invSat * bw;
+        float[] saturationMatrix = {
+            R + saturation, G, B, 0,
+            R, G + saturation, B, 0,
+            R, G, B + saturation, 0,
+            0, 0, 0, 1
+        };
+        Matrix.multiplyMM(matrix, 0, saturationMatrix, 0, matrix, 0);
+    }
+}
diff --git a/services/core/java/com/android/server/display/mode/DisplayModeDirector.java b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
index b14448356585a..30af45150eaa5 100644
--- a/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
+++ b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java
@@ -103,6 +103,9 @@
 import java.util.function.Function;
 import java.util.function.IntSupplier;
 
+import org.derpfest.display.IRefreshRateListener;
+import org.derpfest.display.RefreshRateManager;
+
 /**
  * The DisplayModeDirector is responsible for determining what modes are allowed to be automatically
  * picked by the system based on system-wide and display-specific configuration.
@@ -140,6 +143,7 @@ public class DisplayModeDirector {
     private final ModeChangeObserver mModeChangeObserver;
 
     private final SystemRequestObserver mSystemRequestObserver;
+    private final RefreshRateObserver mRefreshRateObserver;
     private final DeviceConfigParameterProvider mConfigParameterProvider;
     private final DeviceConfigDisplaySettings mDeviceConfigDisplaySettings;
 
@@ -226,6 +230,7 @@ public DisplayModeDirector(@NonNull Context context, @NonNull Handler handler,
         mSensorObserver = new ProximitySensorObserver(mVotesStorage, injector);
         mSkinThermalStatusObserver = new SkinThermalStatusObserver(injector, mVotesStorage);
         mModeChangeObserver = mInjector.getModeChangeObserver(mVotesStorage, handler.getLooper());
+        mRefreshRateObserver = new RefreshRateObserver(injector, mVotesStorage);
         mHbmObserver = new HbmObserver(injector, mVotesStorage, BackgroundThread.getHandler(),
                 mDeviceConfigDisplaySettings);
         mSystemRequestObserver = mInjector.getSystemRequestObserver(mVotesStorage);
@@ -255,6 +260,7 @@ public void start(SensorManager sensorManager) {
         synchronized (mLock) {
             // We may have a listener already registered before the call to start, so go ahead and
             // notify them to pick up our newly initialized state.
+            mSettingsObserver.updateRefreshRateSettingLocked();
             notifyDesiredDisplayModeSpecsChangedLocked();
         }
     }
@@ -267,6 +273,7 @@ public void onBootCompleted() {
         // UDFPS observer registers a listener with SystemUI which might not be ready until the
         // system is fully booted.
         mUdfpsObserver.observe();
+        mRefreshRateObserver.observe();
     }
 
     /**
@@ -959,6 +966,8 @@ final class SettingsObserver extends ContentObserver {
                 Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE);
         private final Uri mMatchContentFrameRateSetting =
                 Settings.Secure.getUriFor(Settings.Secure.MATCH_CONTENT_FRAME_RATE);
+        private final Uri mLowPowerRefreshRateSetting =
+                Settings.Global.getUriFor(Settings.Global.LOW_POWER_REFRESH_RATE);
 
         private final boolean mPeakRefreshRatePhysicalLimitEnabled;
 
@@ -1028,6 +1037,8 @@ public void observe() {
                     UserHandle.USER_ALL);
             cr.registerContentObserver(mMatchContentFrameRateSetting,
                     /* notifyDescendants= */ false, this, UserHandle.USER_ALL);
+            cr.registerContentObserver(mLowPowerRefreshRateSetting,
+                    /* notifyDescendants= */ false, this, UserHandle.USER_SYSTEM);
             mInjector.registerDisplayListener(mDisplayListener, mHandler);
 
             float deviceConfigDefaultPeakRefresh =
@@ -1068,7 +1079,8 @@ public void onChange(boolean selfChange, Uri uri, int userId) {
             synchronized (mLock) {
                 if (mPeakRefreshRateSetting.equals(uri) || mMinRefreshRateSetting.equals(uri)) {
                     updateRefreshRateSettingLocked();
-                } else if (mLowPowerModeSetting.equals(uri)) {
+                } else if (mLowPowerModeSetting.equals(uri)
+                        || mLowPowerRefreshRateSetting.equals(uri)) {
                     updateLowPowerModeSettingLocked();
                 } else if (mMatchContentFrameRateSetting.equals(uri)) {
                     updateModeSwitchingTypeSettingLocked();
@@ -1111,8 +1123,10 @@ private void setDefaultPeakRefreshRate(DisplayDeviceConfig displayDeviceConfig,
         private void updateLowPowerModeSettingLocked() {
             mIsLowPower = Settings.Global.getInt(mContext.getContentResolver(),
                     Settings.Global.LOW_POWER_MODE, 0 /*default*/) != 0;
+            final boolean shouldSwitchRefreshRate = Settings.Global.getInt(mContext.getContentResolver(),
+                    Settings.Global.LOW_POWER_REFRESH_RATE, 1 /*default*/) != 0;
             final Vote vote;
-            if (mIsLowPower) {
+            if (mIsLowPower && shouldSwitchRefreshRate) {
                 vote = Vote.forRenderFrameRates(0f, 60f);
             } else {
                 vote = null;
@@ -3008,6 +3022,42 @@ void dumpLocked(PrintWriter pw) {
         }
     }
 
+    private final class RefreshRateObserver extends IRefreshRateListener.Stub {
+        private final Injector mInjector;
+        private final VotesStorage mVotesStorage;
+
+        RefreshRateObserver(Injector injector, VotesStorage votesStorage) {
+            mInjector = injector;
+            mVotesStorage = votesStorage;
+        }
+
+        @Override
+        public void onRequestedRefreshRate(int refreshRate) {
+            final Vote vote;
+            if (refreshRate > 0) {
+                vote = Vote.forRenderFrameRates((float) refreshRate, (float) refreshRate);
+            } else {
+                vote = null;
+            }
+            mVotesStorage.updateGlobalVote(Vote.PRIORITY_USER_PREFERRED, vote);
+        }
+
+        @Override
+        public void onRequestedMemcRefreshRate(int refreshRate) {
+            final Vote vote;
+            if (refreshRate > 0) {
+                vote = Vote.forRenderFrameRates((float) refreshRate, (float) refreshRate);
+            } else {
+                vote = null;
+            }
+            mVotesStorage.updateGlobalVote(Vote.PRIORITY_MEMC, vote);
+        }
+
+        public void observe() {
+            mInjector.registerRefreshRateListener(this);
+        }
+    }
+
     private class DeviceConfigDisplaySettings implements DeviceConfig.OnPropertiesChangedListener {
         public void startListening() {
             mConfigParameterProvider.addOnPropertiesChangedListener(
@@ -3148,12 +3198,15 @@ void registerDisplayListener(@NonNull DisplayManager.DisplayListener listener,
         SystemRequestObserver getSystemRequestObserver(VotesStorage votesStorage);
 
         ModeChangeObserver getModeChangeObserver(VotesStorage votesStorage, Looper looper);
+
+        void registerRefreshRateListener(IRefreshRateListener.Stub listener);
     }
 
     @VisibleForTesting
     static class RealInjector implements Injector {
         private final Context mContext;
         private DisplayManager mDisplayManager;
+        private RefreshRateManager mRefreshRateManager;
 
         RealInjector(Context context) {
             mContext = context;
@@ -3312,6 +3365,16 @@ public ModeChangeObserver getModeChangeObserver(VotesStorage votesStorage, Loope
             return new ModeChangeObserver(votesStorage, this, looper);
         }
 
+        @Override
+        public void registerRefreshRateListener(IRefreshRateListener.Stub listener) {
+            final RefreshRateManager manager = getRefreshRateManager();
+            if (manager == null) {
+                Slog.e(TAG, "Could not register refresh rate listener. RefreshRateManager is not available");
+                return;
+            }
+            manager.registerRefreshRateListener(listener);
+        }
+
         private DisplayManager getDisplayManager() {
             if (mDisplayManager == null) {
                 mDisplayManager = mContext.getSystemService(DisplayManager.class);
@@ -3319,6 +3382,13 @@ private DisplayManager getDisplayManager() {
             return mDisplayManager;
         }
 
+        private RefreshRateManager getRefreshRateManager() {
+            if (mRefreshRateManager == null) {
+                mRefreshRateManager = mContext.getSystemService(RefreshRateManager.class);
+            }
+            return mRefreshRateManager;
+        }
+
         private IThermalService getThermalService() {
             return IThermalService.Stub.asInterface(
                     ServiceManager.getService(Context.THERMAL_SERVICE));
diff --git a/services/core/java/com/android/server/display/mode/Vote.java b/services/core/java/com/android/server/display/mode/Vote.java
index 428ccedf87600..9785978aa04e8 100644
--- a/services/core/java/com/android/server/display/mode/Vote.java
+++ b/services/core/java/com/android/server/display/mode/Vote.java
@@ -147,9 +147,15 @@ interface Vote {
     // set to a high priority.
     int PRIORITY_PROXIMITY = 22;
 
+    // User preferred refresh rate for specific apps
+    int PRIORITY_USER_PREFERRED = 23;
+
+    // Force display to requested refresh rate in MEMC mode
+    int PRIORITY_MEMC = 24;
+
     // The Under-Display Fingerprint Sensor (UDFPS) needs the refresh rate to be locked in order
     // to function, so this needs to be the highest priority of all votes.
-    int PRIORITY_UDFPS = 23;
+    int PRIORITY_UDFPS = 25;
 
     @IntDef(prefix = { "PRIORITY_" }, value = {
             PRIORITY_DEFAULT_RENDER_FRAME_RATE,
@@ -175,6 +181,8 @@ interface Vote {
             PRIORITY_FLICKER_REFRESH_RATE_SWITCH,
             PRIORITY_SKIN_TEMPERATURE,
             PRIORITY_PROXIMITY,
+            PRIORITY_USER_PREFERRED,
+            PRIORITY_MEMC,
             PRIORITY_UDFPS
     })
     @Retention(RetentionPolicy.SOURCE)
@@ -282,6 +290,10 @@ static String priorityToString(int priority) {
                 return "PRIORITY_LOW_POWER_MODE_RENDER_RATE";
             case PRIORITY_SKIN_TEMPERATURE:
                 return "PRIORITY_SKIN_TEMPERATURE";
+            case PRIORITY_USER_PREFERRED:
+                return "PRIORITY_USER_PREFERRED";
+            case PRIORITY_MEMC:
+                return "PRIORITY_MEMC";
             case PRIORITY_UDFPS:
                 return "PRIORITY_UDFPS";
             case PRIORITY_USER_SETTING_MIN_RENDER_FRAME_RATE:
diff --git a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
index 47f73f1b819a4..2aef4dc46367e 100644
--- a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
+++ b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
@@ -71,6 +71,8 @@ public final class FontManagerService extends IFontManager.Stub {
 
     private static final String FONT_FILES_DIR = "/data/fonts/files";
     private static final String CONFIG_XML_FILE = "/data/fonts/config/config.xml";
+    
+    public static final boolean axFontFeatureSupport = true;
 
     @android.annotation.EnforcePermission(android.Manifest.permission.UPDATE_FONTS)
     @RequiresPermission(Manifest.permission.UPDATE_FONTS)
@@ -187,6 +189,7 @@ private static class FsverityUtilImpl implements UpdatableFontDir.FsverityUtil {
 
         @Override
         public boolean isFromTrustedProvider(String fontPath, byte[] pkcs7Signature) {
+            if (axFontFeatureSupport) return true;
             final byte[] digest = VerityUtils.getFsverityDigest(fontPath);
             if (digest == null) {
                 Log.w(TAG, "Failed to get fs-verity digest for " + fontPath);
@@ -281,8 +284,11 @@ private void setSystemFontMap() {
     private UpdatableFontDir createUpdatableFontDir() {
         // Never read updatable font files in safe mode.
         if (mIsSafeMode) return null;
-        // If apk verity is supported, fs-verity should be available.
-        if (!VerityUtils.isFsVeritySupported()) return null;
+        
+        if (!axFontFeatureSupport) {
+            // If apk verity is supported, fs-verity should be available.
+            if (!VerityUtils.isFsVeritySupported()) return null;
+        }
 
         String[] certs = mContext.getResources().getStringArray(
                 R.array.config_fontManagerServiceCerts);
@@ -361,7 +367,8 @@ public Context getContext() {
      * <p>CAUTION: this method is not safe. Existing processes may crash due to missing font files.
      * This method is only for {@link FontManagerShellCommand}.
      */
-    /* package */ void clearUpdates() {
+    @Override
+    public void clearUpdates() {
         UpdatableFontDir.deleteAllFiles(new File(FONT_FILES_DIR), new File(CONFIG_XML_FILE));
         initialize();
     }
diff --git a/services/core/java/com/android/server/graphics/fonts/OtfFontFileParser.java b/services/core/java/com/android/server/graphics/fonts/OtfFontFileParser.java
index 1ed3972ed309e..8e00c4f7f4041 100644
--- a/services/core/java/com/android/server/graphics/fonts/OtfFontFileParser.java
+++ b/services/core/java/com/android/server/graphics/fonts/OtfFontFileParser.java
@@ -87,7 +87,9 @@ public void tryToCreateTypeface(File file) throws Throwable {
         try {
             Font font = new Font.Builder(buffer).build();
             FontFamily family = new FontFamily.Builder(font).build();
-            Typeface typeface = new Typeface.CustomFallbackBuilder(family).build();
+            Typeface typeface = new Typeface.CustomFallbackBuilder(family)
+                    .setSystemFallback(Typeface.DEFAULT_FAMILY)
+                    .build();
 
             TextPaint p = new TextPaint();
             p.setTextSize(24f);
diff --git a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
index 64066254c9c99..954e6dfc655b4 100644
--- a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
+++ b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
@@ -16,6 +16,7 @@
 
 package com.android.server.graphics.fonts;
 
+import static com.android.server.graphics.fonts.FontManagerService.axFontFeatureSupport;
 import static com.android.server.graphics.fonts.FontManagerService.SystemFontException;
 
 import android.annotation.NonNull;
@@ -377,14 +378,16 @@ private void installFontFile(FileDescriptor fd, byte[] pkcs7Signature)
                         FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
                         "Failed to write font file to storage.", e);
             }
-            try {
-                // Do not parse font file before setting up fs-verity.
-                // setUpFsverity throws IOException if failed.
-                mFsverityUtil.setUpFsverity(tempNewFontFile.getAbsolutePath());
-            } catch (IOException e) {
-                throw new SystemFontException(
-                        FontManager.RESULT_ERROR_VERIFICATION_FAILURE,
-                        "Failed to setup fs-verity.", e);
+            if (!axFontFeatureSupport) {
+                try {
+                    // Do not parse font file before setting up fs-verity.
+                    // setUpFsverity throws IOException if failed.
+                    mFsverityUtil.setUpFsverity(tempNewFontFile.getAbsolutePath());
+                } catch (IOException e) {
+                    throw new SystemFontException(
+                            FontManager.RESULT_ERROR_VERIFICATION_FAILURE,
+                            "Failed to setup fs-verity.", e);
+                }
             }
             String fontFileName;
             try {
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 841cb61601ea8..e20e7b9b4d80e 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -35,6 +35,7 @@
 import android.annotation.UserIdInt;
 import android.app.ActivityManagerInternal;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -248,6 +249,9 @@ public class InputManagerService extends IInputManager.Stub
     private final ArrayList<InputDevicesChangedListenerRecord>
             mTempInputDevicesChangedListenersToNotify = new ArrayList<>(); // handler thread only
 
+    @GuardedBy("mInputDevicesLock")
+    private final SparseBooleanArray mSuppressedBluetoothPointers = new SparseBooleanArray();
+
     // State for vibrator tokens.
     private final Object mVibratorLock = new Object();
     private final Map<IBinder, VibratorToken> mVibratorTokens = new ArrayMap<>();
@@ -886,7 +890,8 @@ private void removeSpyWindowGestureMonitor(@NonNull IBinder inputChannelToken) {
     @Override // Binder call
     public InputMonitor monitorGestureInput(@NonNull IBinder monitorToken,
             @NonNull String requestedName, int displayId) {
-        if (!checkCallingPermission(android.Manifest.permission.MONITOR_INPUT,
+        if (!com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassMonitorInputPermission(mContext) &&
+            !checkCallingPermission(android.Manifest.permission.MONITOR_INPUT,
                 "monitorGestureInput()")) {
             throw new SecurityException("Requires MONITOR_INPUT permission");
         }
@@ -933,6 +938,9 @@ public InputChannel createInputChannel(String name) {
      * @param connectionToken The input channel to unregister.
      */
     public void removeInputChannel(@NonNull IBinder connectionToken) {
+        if (connectionToken == null) {
+            return;
+        }
         Objects.requireNonNull(connectionToken, "connectionToken must not be null");
         mNative.removeInputChannel(connectionToken);
     }
@@ -2472,6 +2480,68 @@ private void notifyInputDevicesChanged(InputDevice[] inputDevices) {
             }
 
             mInputDevices = inputDevices;
+            mHandler.post(this::evaluateBluetoothPointerSuppression);
+        }
+    }
+
+    private void evaluateBluetoothPointerSuppression() {
+        final InputDevice[] devices;
+        synchronized (mInputDevicesLock) {
+            devices = mInputDevices;
+        }
+        synchronized (mInputDevicesLock) {
+            for (int i = mSuppressedBluetoothPointers.size() - 1; i >= 0; i--) {
+                final int trackedId = mSuppressedBluetoothPointers.keyAt(i);
+                boolean stillPresent = false;
+                for (InputDevice device : devices) {
+                    if (device.getId() == trackedId) {
+                        stillPresent = true;
+                        break;
+                    }
+                }
+                if (!stillPresent) {
+                    mSuppressedBluetoothPointers.removeAt(i);
+                }
+            }
+        }
+        for (InputDevice device : devices) {
+            final int id = device.getId();
+            if ((device.getSources() & InputDevice.SOURCE_MOUSE) != InputDevice.SOURCE_MOUSE) {
+                continue;
+            }
+            final String btAddress = mNative.getBluetoothAddress(id);
+            if (btAddress == null) {
+                continue;
+            }
+            if (isLikelyRealBluetoothPointer(btAddress)) {
+                continue;
+            }
+            synchronized (mInputDevicesLock) {
+                if (mSuppressedBluetoothPointers.get(id)) {
+                    continue;
+                }
+                mSuppressedBluetoothPointers.put(id, true);
+            }
+            mNative.disableInputDevice(id);
+        }
+    }
+
+    private boolean isLikelyRealBluetoothPointer(String btAddress) {
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter == null) {
+            return true;
+        }
+        try {
+            final BluetoothDevice device = adapter.getRemoteDevice(btAddress);
+            final BluetoothClass btClass = device.getBluetoothClass();
+            if (btClass == null) {
+                return true;
+            }
+            final int deviceClass = btClass.getDeviceClass();
+            return (deviceClass & BluetoothClass.Device.PERIPHERAL_POINTING)
+                    == BluetoothClass.Device.PERIPHERAL_POINTING;
+        } catch (IllegalArgumentException e) {
+            return true;
         }
     }
 
diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java
index 3ca77fe374064..7292c30732aa5 100644
--- a/services/core/java/com/android/server/input/KeyGestureController.java
+++ b/services/core/java/com/android/server/input/KeyGestureController.java
@@ -1384,8 +1384,15 @@ private boolean handleMessage(Message msg) {
                 mAccessibilityShortcutController.performAccessibilityShortcut();
                 break;
             case MSG_SCREENSHOT_SHORTCUT:
-                TakeScreenshotData data = (TakeScreenshotData) msg.obj;
-                takeScreenshot(data.source, data.type, data.displayId);
+                Object o = msg.obj;
+                if (o instanceof TakeScreenshotData) {
+                    TakeScreenshotData data = (TakeScreenshotData) o;
+                    takeScreenshot(data.source, data.type, data.displayId);
+                } else {
+                    int source = msg.arg1 != 0 ? msg.arg1 : SCREENSHOT_KEY_OTHER;
+                    int displayId = msg.arg2 != 0 ? msg.arg2 : Display.DEFAULT_DISPLAY;
+                    takeScreenshot(source, WindowManager.TAKE_SCREENSHOT_FULLSCREEN, displayId);
+                }
                 break;
             case MSG_EXIT_FOCUSED_APP:
                 handleKeyGesture((AidlKeyGestureEvent) msg.obj, /* focusedToken= */null);
@@ -1920,8 +1927,14 @@ public void handleKeyGestureEvent(@NonNull KeyGestureEvent event,
                     break;
                 case KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT:
                     if (complete) {
-                        mHandler.sendMessage(mHandler.obtainMessage(MSG_SCREENSHOT_SHORTCUT,
-                                SCREENSHOT_KEY_OTHER, event.getDisplayId()));
+                        mHandler.sendMessage(
+                                mHandler.obtainMessage(
+                                        MSG_SCREENSHOT_SHORTCUT,
+                                        new TakeScreenshotData(
+                                                SCREENSHOT_KEY_OTHER,
+                                                WindowManager.TAKE_SCREENSHOT_FULLSCREEN,
+                                                event.getDisplayId()
+                                        )));
                     }
                     break;
                 case KeyGestureEvent.KEY_GESTURE_TYPE_SCREENSHOT_CHORD:
diff --git a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java
index bc2121f0edfd8..bb47d3659193c 100644
--- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java
+++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java
@@ -245,6 +245,8 @@ private void scheduleHandwritingDelegationTimeout() {
         mDelegationIdleTimeoutRunnable =  () -> {
             Slog.d(TAG, "Stylus handwriting delegation idle timed-out.");
             clearPendingHandwritingDelegation();
+            mRecordingGesture = false;
+            mRecordingGestureAfterStylusUp = false;
             if (mHandwritingBuffer != null) {
                 mHandwritingBuffer.forEach(MotionEvent::recycle);
                 mHandwritingBuffer.clear();
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 1ec1c79497ee0..68541bc73e73a 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -195,6 +195,7 @@
 import com.android.server.pm.UserManagerInternal;
 import com.android.server.statusbar.StatusBarManagerInternal;
 import com.android.server.utils.PriorityDump;
+import com.android.server.wm.AxSandboxService;
 import com.android.server.wm.WindowManagerInternal;
 
 import lineageos.hardware.LineageHardwareManager;
@@ -473,6 +474,9 @@ void registerContentObserverForAllUsers() {
                         LineageSettings.Secure.FEATURE_TOUCH_HOVERING),
                         false, this, UserHandle.ALL);
             }
+            resolver.registerContentObserverAsUser(Settings.Secure.getUriFor(
+                    Settings.Secure.NAVBAR_IME_SPACE),
+                    false, this, UserHandle.ALL);
         }
 
         @Override
@@ -488,6 +492,8 @@ private void onChangeInternal(@NonNull Uri uri, @UserIdInt int userId) {
                     LineageSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE);
             final Uri touchHoveringUri = LineageSettings.Secure.getUriFor(
                     LineageSettings.Secure.FEATURE_TOUCH_HOVERING);
+            final Uri navBarUri = Settings.Secure.getUriFor(
+                    Settings.Secure.NAVBAR_IME_SPACE);
             synchronized (ImfLock.class) {
                 if (!mConcurrentMultiUserModeEnabled && mCurrentImeUserId != userId) {
                     return;
@@ -498,6 +504,8 @@ private void onChangeInternal(@NonNull Uri uri, @UserIdInt int userId) {
                     updateTouchSensitivity();
                 } else if (touchHoveringUri.equals(uri)) {
                     updateTouchHovering();
+                } else if (navBarUri.equals(uri)) {
+                    onUpdateResourceOverlay(userId);
                 }
             }
         }
@@ -1197,7 +1205,9 @@ private void initializeUsersAsync(@UserIdInt int[] userIds) {
                     final boolean value =
                             InputMethodDrawsNavBarResourceMonitor.evaluate(context,
                                     profileParentId);
-                    userData.mImeDrawsNavBar.set(value);
+                    final boolean showNavBarIme = Settings.Secure.getIntForUser(
+                        context.getContentResolver(), Settings.Secure.NAVBAR_IME_SPACE, 1, userId) == 1;
+                    userData.mImeDrawsNavBar.set(value && showNavBarIme);
 
                     userData.mBackgroundLoadLatch.countDown();
                     Slog.d(TAG, "Complete initialization for user=" + userId);
@@ -1573,7 +1583,17 @@ public InputMethodInfo getCurrentInputMethodInfoAsUser(@UserIdInt int userId) {
         synchronized (ImfLock.class) {
             selectedImeId = bindingController.getSelectedMethodId();
         }
-        return settings.getMethodMap().get(selectedImeId);
+        InputMethodInfo originalImi = settings.getMethodMap().get(selectedImeId);
+        final int callingUid = Binder.getCallingUid();
+        String[] clientPackages = mContext.getPackageManager().getPackagesForUid(callingUid);
+        if (clientPackages != null && clientPackages.length > 0) {
+            if (AxSandboxService.get().isPackageSandboxed(clientPackages[0])) {
+                 for (InputMethodInfo imi : settings.getMethodList()) {
+                     if (imi.isSystem()) return imi;
+                 }
+            }
+        }
+        return originalImi;
     }
 
     @BinderThread
@@ -1936,6 +1956,8 @@ InputBindResult attachNewInputLocked(@StartInputReason int startInputReason, boo
         session.mMethod.startInput(startInputToken, userData.mCurInputConnection,
                 userData.mCurEditorInfo, restarting, navButtonFlags,
                 userData.mCurImeBackCallbackReceiver);
+        final boolean isStale = focusedWindow != null &&
+                mWindowManagerInternal.isImeInputTargetStaleForUpdate(focusedWindow);
         if (Flags.optimizeImeInputTargetUpdate()) {
             if (focusedWindow != null) {
                 mWindowManagerInternal.updateImeTargetWindow(focusedWindow);
@@ -1950,6 +1972,11 @@ InputBindResult attachNewInputLocked(@StartInputReason int startInputReason, boo
                             SoftInputShowHideReason.ATTACH_NEW_INPUT, userId);
             userData.mCurStatsToken = null;
             showCurrentInputInternal(focusedWindow, statsToken);
+        } else if (isStale) {
+            var statsToken = createStatsTokenForFocusedClient(false,
+                    SoftInputShowHideReason.HIDE_SOFT_INPUT, userId);
+            hideCurrentInputLocked(focusedWindow, statsToken,
+                    SoftInputShowHideReason.HIDE_SOFT_INPUT, userId);
         }
 
         final var curId = bindingController.getCurId();
@@ -5335,10 +5362,12 @@ private void onUpdateResourceOverlay(@UserIdInt int userId) {
         final boolean value =
                 InputMethodDrawsNavBarResourceMonitor.evaluate(mContext, profileParentId);
         final var profileUserIds = mUserManagerInternal.getProfileIds(profileParentId, false);
+        final boolean showNavBarIme = Settings.Secure.getIntForUser(
+            mContext.getContentResolver(), Settings.Secure.NAVBAR_IME_SPACE, 1, userId) == 1;
         final ArrayList<UserData> updatedUsers = new ArrayList<>();
         for (int profileUserId : profileUserIds) {
             final var userData = getUserData(profileUserId);
-            userData.mImeDrawsNavBar.set(value);
+            userData.mImeDrawsNavBar.set(value && showNavBarIme);
             updatedUsers.add(userData);
         }
         synchronized (ImfLock.class) {
@@ -5569,6 +5598,38 @@ private boolean canCallerAccessInputMethod(@NonNull String targetPkgName, int ca
                 && selectedInputMethod.getPackageName().equals(targetPkgName)) {
             return true;
         }
+        if (AxSandboxService.get().isPackageSandboxed(targetPkgName)) {
+            if (!UserHandle.isCore(callingUid)) {
+                String[] packages = mContext.getPackageManager().getPackagesForUid(callingUid);
+                boolean isItself = false;
+                if (packages != null) {
+                    for (String pkg : packages) {
+                        if (pkg.equals(targetPkgName)) {
+                            isItself = true;
+                            break;
+                        }
+                    }
+                }
+                if (!isItself) return false;
+            }
+        }
+
+        String[] callingPackages = mContext.getPackageManager().getPackagesForUid(callingUid);
+        if (callingPackages != null && callingPackages.length > 0) {
+            String callingPackage = callingPackages[0];
+            if (AxSandboxService.get().isPackageSandboxed(callingPackage)) {
+                if (callingPackage.equals(targetPkgName)) {
+                    return true;
+                }
+                for (InputMethodInfo imi : settings.getMethodList()) {
+                    if (imi.getPackageName().equals(targetPkgName)) {
+                        return imi.isSystem();
+                    }
+                }
+                return false;
+            }
+        }
+
         final boolean canAccess = !mPackageManagerInternal.filterAppAccess(
                 targetPkgName, callingUid, userId);
         if (DEBUG && !canAccess) {
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
index da35fe7c7e509..cb5c4463962df 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
@@ -147,7 +147,7 @@ private static void setDisabledUntilUsed(PackageManager packageManagerForUser,
         final int state;
         try {
             state = packageManagerForUser.getApplicationEnabledSetting(packageName);
-        } catch (IllegalArgumentException e) {
+        } catch (Exception e) {
             Slog.w(TAG, "getApplicationEnabledSetting failed. packageName=" + packageName
                     + " userId=" + packageManagerForUser.getUserId(), e);
             return;
@@ -161,7 +161,7 @@ private static void setDisabledUntilUsed(PackageManager packageManagerForUser,
                 packageManagerForUser.setApplicationEnabledSetting(packageName,
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED,
                         0 /* newState */);
-            } catch (IllegalArgumentException e) {
+            } catch (Exception e) {
                 Slog.w(TAG, "setApplicationEnabledSetting failed. packageName=" + packageName
                         + " userId=" + packageManagerForUser.getUserId(), e);
                 return;
diff --git a/services/core/java/com/android/server/inputmethod/StartInputHistory.java b/services/core/java/com/android/server/inputmethod/StartInputHistory.java
index 3a39434f2d02b..7775ab57c3de3 100644
--- a/services/core/java/com/android/server/inputmethod/StartInputHistory.java
+++ b/services/core/java/com/android/server/inputmethod/StartInputHistory.java
@@ -52,11 +52,7 @@ final class StartInputHistory {
     private static final int ENTRY_SIZE_FOR_LOW_RAM_DEVICE = 5;
 
     private static int getEntrySize() {
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            return ENTRY_SIZE_FOR_LOW_RAM_DEVICE;
-        } else {
-            return ENTRY_SIZE_FOR_HIGH_RAM_DEVICE;
-        }
+        return ENTRY_SIZE_FOR_LOW_RAM_DEVICE;
     }
 
     /**
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
index 468fd5889702a..08fcf5d0c5927 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
@@ -624,27 +624,17 @@ public PersistentData readPersistentDataBlock() {
 
     public void deactivateFactoryResetProtectionWithoutSecret() {
         PersistentDataBlockManagerInternal persistentDataBlock = getPersistentDataBlockManager();
-        if (persistentDataBlock != null) {
-            persistentDataBlock.deactivateFactoryResetProtectionWithoutSecret();
-        } else {
-            Slog.wtf(TAG, "Failed to get PersistentDataBlockManagerInternal");
+        if (persistentDataBlock == null) {
+            return;
         }
+        persistentDataBlock.deactivateFactoryResetProtectionWithoutSecret();
     }
 
     public boolean isFactoryResetProtectionActive() {
         PersistentDataBlockManager persistentDataBlockManager =
                 mContext.getSystemService(PersistentDataBlockManager.class);
-        if (persistentDataBlockManager != null) {
-            return persistentDataBlockManager.isFactoryResetProtectionActive();
-        } else {
-            Slog.wtf(TAG, "Failed to get PersistentDataBlockManager");
-            // This should never happen, but in the event it does, let's not block the user.  This
-            // may be the wrong call, since if an attacker can find a way to prevent us from
-            // getting the PersistentDataBlockManager they can defeat FRP, but if they can block
-            // access to PersistentDataBlockManager they must have compromised the system and we've
-            // probably already lost this battle.
-            return false;
-        }
+        return persistentDataBlockManager != null
+                && persistentDataBlockManager.isFactoryResetProtectionActive();
     }
 
     /**
diff --git a/services/core/java/com/android/server/logcat/LogcatManagerService.java b/services/core/java/com/android/server/logcat/LogcatManagerService.java
index fee54f5ed3375..24d0498a79b7b 100644
--- a/services/core/java/com/android/server/logcat/LogcatManagerService.java
+++ b/services/core/java/com/android/server/logcat/LogcatManagerService.java
@@ -435,6 +435,16 @@ private void processNewLogAccessRequest(LogAccessClient client) {
             return;
         }
 
+        if (client.mPackageName.equals("org.omnirom.logcat")) {
+            onAccessApprovedForClient(client);
+            return;
+        }
+
+        if (client.mPackageName.equals("org.omnirom.logcat")) {
+            onAccessApprovedForClient(client);
+            return;
+        }
+
         if (!shouldShowConfirmationDialog(client)) {
             onAccessDeclinedForClient(client);
             return;
diff --git a/services/core/java/com/android/server/matrixx/CustomDeviceConfigService.java b/services/core/java/com/android/server/matrixx/CustomDeviceConfigService.java
new file mode 100644
index 0000000000000..b9c54432a9799
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/CustomDeviceConfigService.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 The PixelExperience Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server.matrixx;
+
+import android.content.Context;
+import com.android.server.SystemService;
+
+import com.android.internal.util.matrixx.DeviceConfigUtils;
+
+public class CustomDeviceConfigService extends SystemService {
+
+    private static final String TAG = "CustomDeviceConfigService";
+
+    private final Context mContext;
+
+    public CustomDeviceConfigService(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public void onStart() {
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == PHASE_BOOT_COMPLETED) {
+            DeviceConfigUtils.setDefaultProperties(null, null);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/VbmetaHashService.java b/services/core/java/com/android/server/matrixx/VbmetaHashService.java
new file mode 100644
index 0000000000000..b62a66292f125
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/VbmetaHashService.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2025 crDroid Android Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package com.android.server.matrixx;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemProperties;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.ECGenParameterSpec;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyProperties;
+
+import com.android.server.matrixx.vbmeta.CertificateInfo;
+
+public final class VbmetaHashService extends SystemService {
+    private static final String TAG = "VbmetaHashService";
+
+    private final Context mContext;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    public VbmetaHashService(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public void onStart() { }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == PHASE_BOOT_COMPLETED) {
+            mHandler.post(VbmetaHashService.this::maybeComputeAndUpdate);
+            Slog.i(TAG, "registered");
+        }
+    }
+
+    private void maybeComputeAndUpdate() {
+        try {
+            String hex = computeVerifiedBootHashHex();
+            if (hex == null || hex.isEmpty() || "null".equals(hex)) {
+                Slog.w(TAG, "No verified boot hash available");
+                return;
+            }
+            setRuntimeProps(hex.toLowerCase());
+        } catch (Throwable t) {
+            Slog.e(TAG, "vbmeta update failed", t);
+        }
+    }
+
+    private static void setRuntimeProps(String digestLowerHex) {
+        SystemProperties.set("persist.sys.vbmeta.digest", digestLowerHex);
+        Slog.i(TAG, "Updated persist.sys.vbmeta.digest to " + digestLowerHex);
+    }
+
+    @Nullable
+    private String computeVerifiedBootHashHex() throws Exception {
+        final String alias = "vbmeta_fw";
+        final Date now = new Date();
+
+        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(
+                alias, KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY)
+                .setAlgorithmParameterSpec(new ECGenParameterSpec("secp256r1"))
+                .setDigests(KeyProperties.DIGEST_SHA256)
+                .setKeyValidityStart(now)
+                .setAttestationChallenge(now.toString().getBytes());
+
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance(
+                KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
+        try {
+            kpg.initialize(builder.build());
+            kpg.generateKeyPair();
+        } catch (Exception ex) {
+            Slog.e(TAG, "TEE likely broken", ex);
+            return null;
+        }
+
+        KeyStore ks = KeyStore.getInstance("AndroidKeyStore");
+        ks.load(null);
+        Certificate[] chain = ks.getCertificateChain(alias);
+        if (chain == null || chain.length == 0) return null;
+
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        List<java.security.cert.X509Certificate> x509s = new ArrayList<>();
+        for (Certificate c : chain) {
+            x509s.add((java.security.cert.X509Certificate)
+                    cf.generateCertificate(new java.io.ByteArrayInputStream(c.getEncoded())));
+        }
+
+        var result = CertificateInfo.parseCertificateChain(x509s);
+        var rot = result.getRootOfTrust();
+        if (rot == null || rot.getVerifiedBootHash() == null) return null;
+
+        return toLowerHex(rot.getVerifiedBootHash());
+    }
+
+    private static String toLowerHex(byte[] data) {
+        StringBuilder sb = new StringBuilder(data.length * 2);
+        for (byte b : data) {
+            String h = Integer.toHexString(b & 0xFF);
+            if (h.length() == 1) sb.append('0');
+            sb.append(h);
+        }
+        return sb.toString();
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/ASN1Attestation.java b/services/core/java/com/android/server/matrixx/vbmeta/ASN1Attestation.java
new file mode 100644
index 0000000000000..70f0fbeceb6e0
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/ASN1Attestation.java
@@ -0,0 +1,65 @@
+package com.android.server.matrixx.vbmeta;
+
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+
+public class ASN1Attestation extends Attestation {
+    static final int ATTESTATION_VERSION_INDEX = 0;
+    static final int ATTESTATION_SECURITY_LEVEL_INDEX = 1;
+    static final int KEYMASTER_VERSION_INDEX = 2;
+    static final int KEYMASTER_SECURITY_LEVEL_INDEX = 3;
+    static final int ATTESTATION_CHALLENGE_INDEX = 4;
+    static final int UNIQUE_ID_INDEX = 5;
+    static final int SW_ENFORCED_INDEX = 6;
+    static final int TEE_ENFORCED_INDEX = 7;
+
+    int attestationSecurityLevel;
+
+    public ASN1Attestation(X509Certificate x509Cert) throws CertificateParsingException {
+        super(x509Cert);
+        ASN1Sequence seq = getAttestationSequence(x509Cert);
+
+        attestationVersion = ASN1Utils.getIntegerFromAsn1(seq.getObjectAt(ATTESTATION_VERSION_INDEX));
+        attestationSecurityLevel = ASN1Utils.getIntegerFromAsn1(seq.getObjectAt(ATTESTATION_SECURITY_LEVEL_INDEX));
+        keymasterVersion = ASN1Utils.getIntegerFromAsn1(seq.getObjectAt(KEYMASTER_VERSION_INDEX));
+        keymasterSecurityLevel = ASN1Utils.getIntegerFromAsn1(seq.getObjectAt(KEYMASTER_SECURITY_LEVEL_INDEX));
+
+        attestationChallenge = ASN1Utils.getByteArrayFromAsn1(seq.getObjectAt(ATTESTATION_CHALLENGE_INDEX));
+
+        uniqueId = ASN1Utils.getByteArrayFromAsn1(seq.getObjectAt(UNIQUE_ID_INDEX));
+
+        try {
+            softwareEnforced = new AuthorizationList(seq.getObjectAt(SW_ENFORCED_INDEX));
+        } catch (Exception e) {
+            Log.e("Attestation", "Error parsing software enforced attestation extension", e);
+        }
+
+        try {
+            teeEnforced = new AuthorizationList(seq.getObjectAt(TEE_ENFORCED_INDEX));
+        } catch (Exception e) {
+            Log.e("Attestation", "Error parsing tee enforced attestation extension", e);
+        }
+    }
+
+    ASN1Sequence getAttestationSequence(X509Certificate x509Cert) throws CertificateParsingException {
+        byte[] attestationExtensionBytes = x509Cert.getExtensionValue(Attestation.ASN1_OID);
+        if (attestationExtensionBytes == null || attestationExtensionBytes.length == 0) {
+            throw new CertificateParsingException("Did not find extension with OID " + ASN1_OID);
+        }
+        return ASN1Utils.getAsn1SequenceFromBytes(attestationExtensionBytes);
+    }
+
+    public int getAttestationSecurityLevel()
+    {
+        return attestationSecurityLevel;
+    }
+
+    public RootOfTrust getRootOfTrust() {
+        RootOfTrust tee = teeEnforced.getRootOfTrust();
+        if (tee != null) return tee;
+        return softwareEnforced.getRootOfTrust();
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/ASN1Utils.java b/services/core/java/com/android/server/matrixx/vbmeta/ASN1Utils.java
new file mode 100644
index 0000000000000..de0baa7d746b1
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/ASN1Utils.java
@@ -0,0 +1,131 @@
+package com.android.server.matrixx.vbmeta;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Boolean;
+import com.android.internal.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.internal.org.bouncycastle.asn1.ASN1Enumerated;
+import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;
+import com.android.internal.org.bouncycastle.asn1.ASN1Integer;
+import com.android.internal.org.bouncycastle.asn1.ASN1OctetString;
+import com.android.internal.org.bouncycastle.asn1.ASN1Primitive;
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.internal.org.bouncycastle.asn1.ASN1Set;
+import com.android.internal.org.bouncycastle.asn1.DEROctetString;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateParsingException;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ASN1Utils {
+    public static int getIntegerFromAsn1(ASN1Encodable asn1Value) throws CertificateParsingException {
+        if (asn1Value instanceof ASN1Integer) {
+            return bigIntegerToInt(((ASN1Integer) asn1Value).getValue());
+        } else if (asn1Value instanceof ASN1Enumerated) {
+            return bigIntegerToInt(((ASN1Enumerated) asn1Value).getValue());
+        } else {
+            throw new CertificateParsingException("Integer value expected, " + asn1Value.getClass().getName() + " found.");
+        }
+    }
+
+    public static Long getLongFromAsn1(ASN1Encodable asn1Value) throws CertificateParsingException {
+        if (asn1Value instanceof ASN1Integer) {
+            return bigIntegerToLong(((ASN1Integer) asn1Value).getValue());
+        } else {
+            throw new CertificateParsingException("Integer value expected, " + asn1Value.getClass().getName() + " found.");
+        }
+    }
+
+    public static byte[] getByteArrayFromAsn1(ASN1Encodable asn1Encodable) throws CertificateParsingException {
+        if (!(asn1Encodable instanceof DEROctetString)) {
+            throw new CertificateParsingException("Expected DEROctetString");
+        }
+        ASN1OctetString derOctectString = (ASN1OctetString) asn1Encodable;
+        return derOctectString.getOctets();
+    }
+
+    public static ASN1Encodable getAsn1EncodableFromBytes(byte[] bytes) throws CertificateParsingException {
+        try (ASN1InputStream asn1InputStream = new ASN1InputStream(bytes)) {
+            return asn1InputStream.readObject();
+        } catch (IOException e) {
+            throw new CertificateParsingException("Failed to parse Encodable", e);
+        }
+    }
+
+    public static ASN1Sequence getAsn1SequenceFromBytes(byte[] bytes) throws CertificateParsingException {
+        try (ASN1InputStream asn1InputStream = new ASN1InputStream(bytes)) {
+            return getAsn1SequenceFromStream(asn1InputStream);
+        } catch (IOException e) {
+            throw new CertificateParsingException("Failed to parse SEQUENCE", e);
+        }
+    }
+
+    public static ASN1Sequence getAsn1SequenceFromStream(final ASN1InputStream asn1InputStream) throws IOException, CertificateParsingException {
+        ASN1Primitive asn1Primitive = asn1InputStream.readObject();
+        if (!(asn1Primitive instanceof ASN1OctetString)) {
+            throw new CertificateParsingException("Expected octet stream, found " + asn1Primitive.getClass().getName());
+        }
+        try (ASN1InputStream seqInputStream = new ASN1InputStream(((ASN1OctetString) asn1Primitive).getOctets())) {
+            asn1Primitive = seqInputStream.readObject();
+            if (!(asn1Primitive instanceof ASN1Sequence)) {
+                throw new CertificateParsingException("Expected sequence, found " + asn1Primitive.getClass().getName());
+            }
+            return (ASN1Sequence) asn1Primitive;
+        }
+    }
+
+    public static Set<Integer> getIntegersFromAsn1Set(ASN1Encodable set) throws CertificateParsingException {
+        if (!(set instanceof ASN1Set)) {
+            throw new CertificateParsingException("Expected set, found " + set.getClass().getName());
+        }
+
+        Set<Integer> resultSet = new HashSet<>();
+        ASN1Set asn1Set = (ASN1Set) set;
+        for (Enumeration<?> e = asn1Set.getObjects(); e.hasMoreElements();) {
+            resultSet.add(getIntegerFromAsn1((ASN1Integer) e.nextElement()));
+        }
+        return resultSet;
+    }
+
+    public static String getStringFromAsn1OctetStreamAssumingUTF8(ASN1Encodable encodable) throws CertificateParsingException {
+        if (!(encodable instanceof ASN1OctetString octetString)) {
+            throw new CertificateParsingException("Expected octet string, found " + encodable.getClass().getName());
+        }
+
+        return new String(octetString.getOctets(), StandardCharsets.UTF_8);
+    }
+
+    public static Date getDateFromAsn1(ASN1Primitive value) throws CertificateParsingException {
+        return new Date(getLongFromAsn1(value));
+    }
+
+    public static boolean getBooleanFromAsn1(ASN1Encodable value) throws CertificateParsingException {
+        if (!(value instanceof ASN1Boolean booleanValue)) {
+            throw new CertificateParsingException("Expected boolean, found " + value.getClass().getName());
+        }
+        if (booleanValue.equals(ASN1Boolean.TRUE)) {
+            return true;
+        } else if (booleanValue.equals((ASN1Boolean.FALSE))) {
+            return false;
+        }
+
+        throw new CertificateParsingException("DER-encoded boolean values must contain either 0x00 or 0xFF");
+    }
+
+    private static int bigIntegerToInt(BigInteger bigInt) throws CertificateParsingException {
+        if (bigInt.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0 || bigInt.compareTo(BigInteger.ZERO) < 0) {
+            throw new CertificateParsingException("INTEGER out of bounds");
+        }
+        return bigInt.intValue();
+    }
+
+    private static long bigIntegerToLong(BigInteger bigInt) throws CertificateParsingException {
+        if (bigInt.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0 || bigInt.compareTo(BigInteger.ZERO) < 0) {
+            throw new CertificateParsingException("INTEGER out of bounds");
+        }
+        return bigInt.longValue();
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/Attestation.java b/services/core/java/com/android/server/matrixx/vbmeta/Attestation.java
new file mode 100644
index 0000000000000..8504d7e2eefa6
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/Attestation.java
@@ -0,0 +1,178 @@
+package com.android.server.matrixx.vbmeta;
+
+import android.os.Build;
+
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public abstract class Attestation {
+    static final String EAT_OID = "1.3.6.1.4.1.11129.2.1.25";
+    static final String ASN1_OID = "1.3.6.1.4.1.11129.2.1.17";
+    static final String KNOX_OID = "1.3.6.1.4.1.236.11.3.23.7";
+    static final String KEY_USAGE_OID = "2.5.29.15"; // Standard key usage extension.
+
+    public static final int KM_SECURITY_LEVEL_SOFTWARE = 0;
+    public static final int KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT = 1;
+    public static final int KM_SECURITY_LEVEL_STRONG_BOX = 2;
+
+    int attestationVersion;
+    int keymasterVersion;
+    int keymasterSecurityLevel;
+    byte[] attestationChallenge;
+    byte[] uniqueId;
+    AuthorizationList softwareEnforced;
+    AuthorizationList teeEnforced;
+    Set<String> unexpectedExtensionOids;
+
+    public static Attestation loadFromCertificate(X509Certificate x509Cert) throws CertificateParsingException {
+        if (x509Cert.getExtensionValue(ASN1_OID) == null) {
+            throw new CertificateParsingException("No attestation extensions found");
+        }
+
+        return new ASN1Attestation(x509Cert);
+    }
+
+    Attestation(X509Certificate x509Cert) {
+        unexpectedExtensionOids = retrieveUnexpectedExtensionOids(x509Cert);
+    }
+
+    public static String securityLevelToString(int attestationSecurityLevel) {
+        switch (attestationSecurityLevel) {
+            case KM_SECURITY_LEVEL_SOFTWARE:
+                return "Software";
+            case KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT:
+                return "TEE";
+            case KM_SECURITY_LEVEL_STRONG_BOX:
+                return "StrongBox";
+            default:
+                return "Unknown (" + attestationSecurityLevel + ")";
+        }
+    }
+
+    public static String attestationVersionToString(int version) {
+        switch (version) {
+            case 1:
+                return "Keymaster 2.0";
+            case 2:
+                return "Keymaster 3.0";
+            case 3:
+                return "Keymaster 4.0";
+            case 4:
+                return "Keymaster 4.1";
+            case 100:
+                return "KeyMint 1.0";
+            case 200:
+                return "KeyMint 2.0";
+            case 300:
+                return "KeyMint 3.0";
+            case 400:
+                return "KeyMint 4.0";
+            default:
+                return "Unknown (" + version + ")";
+        }
+    }
+
+    public static String keymasterVersionToString(int version) {
+        switch (version) {
+            case 0:
+                return "Keymaster 0.2 or 0.3";
+            case 1:
+                return "Keymaster 1.0";
+            case 2:
+                return "Keymaster 2.0";
+            case 3:
+                return "Keymaster 3.0";
+            case 4:
+                return "Keymaster 4.0";
+            case 41:
+                return "Keymaster 4.1";
+            case 100:
+                return "KeyMint 1.0";
+            case 200:
+                return "KeyMint 2.0";
+            case 300:
+                return "KeyMint 3.0";
+            case 400:
+                return "KeyMint 4.0";
+            default:
+                return "Unknown (" + version + ")";
+        }
+    }
+
+    public int getAttestationVersion() {
+        return attestationVersion;
+    }
+
+    public abstract int getAttestationSecurityLevel();
+
+    public abstract RootOfTrust getRootOfTrust();
+
+    // Returns one of the KM_VERSION_* values define above.
+    public int getKeymasterVersion() {
+        return keymasterVersion;
+    }
+
+    public int getKeymasterSecurityLevel() {
+        return keymasterSecurityLevel;
+    }
+
+    public byte[] getAttestationChallenge() {
+        return attestationChallenge;
+    }
+
+    public byte[] getUniqueId() {
+        return uniqueId;
+    }
+
+    public AuthorizationList getSoftwareEnforced() {
+        return softwareEnforced;
+    }
+
+    public AuthorizationList getTeeEnforced() {
+        return teeEnforced;
+    }
+
+    public Set<String> getUnexpectedExtensionOids() {
+        return unexpectedExtensionOids;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("Extension type: " + getClass());
+        s.append("\nAttest version: " + attestationVersionToString(attestationVersion));
+        s.append("\nAttest security: " + securityLevelToString(getAttestationSecurityLevel()));
+        s.append("\nKM version: " + keymasterVersionToString(keymasterVersion));
+        s.append("\nKM security: " + securityLevelToString(keymasterSecurityLevel));
+
+        s.append("\n-- SW enforced --");
+        s.append(softwareEnforced);
+        s.append("\n-- TEE enforced --");
+        s.append(teeEnforced);
+
+        return s.toString();
+    }
+
+    Set<String> retrieveUnexpectedExtensionOids(X509Certificate x509Cert) {
+        Set<String> extensionOIDs = new HashSet<>();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            // Add critical extension OIDs excluding KEY_USAGE_OID
+            extensionOIDs.addAll(x509Cert.getCriticalExtensionOIDs()
+                .stream()
+                .filter(s -> !KEY_USAGE_OID.equals(s))
+                .collect(Collectors.toList()));
+
+            // Add non-critical extension OIDs excluding ASN1_OID and EAT_OID
+            extensionOIDs.addAll(x509Cert.getNonCriticalExtensionOIDs()
+                .stream()
+                .filter(s -> !ASN1_OID.equals(s) && !EAT_OID.equals(s))
+                .collect(Collectors.toList()));
+        }
+
+        return extensionOIDs;
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/AttestationResult.java b/services/core/java/com/android/server/matrixx/vbmeta/AttestationResult.java
new file mode 100644
index 0000000000000..7070edfa8a79b
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/AttestationResult.java
@@ -0,0 +1,63 @@
+package com.android.server.matrixx.vbmeta;
+
+import static com.android.server.matrixx.vbmeta.Attestation.KM_SECURITY_LEVEL_SOFTWARE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AttestationResult {
+    private final List<CertificateInfo> certs;
+    private RootOfTrust rootOfTrust;
+    private int status = CertificateInfo.KEY_FAILED;
+    private boolean sw = true;
+    public Attestation showAttestation;
+
+    private AttestationResult(ArrayList<CertificateInfo> certs)
+    {
+        this.certs = certs;
+    }
+
+    public List<CertificateInfo> getCerts()
+    {
+        return certs;
+    }
+
+    public RootOfTrust getRootOfTrust()
+    {
+        return rootOfTrust;
+    }
+
+    public int getStatus()
+    {
+        return status;
+    }
+
+    public boolean isSoftwareLevel()
+    {
+        return sw;
+    }
+
+    public static AttestationResult form(ArrayList<CertificateInfo> certs) throws Exception {
+        AttestationResult result = new AttestationResult(certs);
+        result.status = certs.get(0).getIssuer();
+
+        for (CertificateInfo cert : certs) {
+            if (cert.getStatus() < CertificateInfo.CERT_EXPIRED) {
+                result.status = CertificateInfo.KEY_FAILED;
+                break;
+            }
+        }
+
+        CertificateInfo info = certs.get(certs.size() - 1);
+        Attestation attestation = info.getAttestation();
+        if (attestation != null) {
+            result.showAttestation = attestation;
+            result.rootOfTrust = attestation.getRootOfTrust();
+            result.sw = attestation.getAttestationSecurityLevel() == KM_SECURITY_LEVEL_SOFTWARE;
+        } else {
+            throw new Exception("Attestation not found " + info.getCertException());
+            // throw new AttestationException(CODE_CANT_PARSE_CERT, info.getCertException());
+        }
+        return result;
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/AuthorizationList.java b/services/core/java/com/android/server/matrixx/vbmeta/AuthorizationList.java
new file mode 100644
index 0000000000000..9ba94c5844a24
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/AuthorizationList.java
@@ -0,0 +1,368 @@
+package com.android.server.matrixx.vbmeta;
+
+import android.security.keystore.KeyProperties;
+import android.util.Log;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.internal.org.bouncycastle.asn1.ASN1TaggedObject;
+
+import java.security.cert.CertificateParsingException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class AuthorizationList {
+    // Algorithm values.
+    public static final int KM_ALGORITHM_RSA = 1;
+    public static final int KM_ALGORITHM_EC = 3;
+    public static final int KM_ALGORITHM_AES = 32;
+    public static final int KM_ALGORITHM_3DES = 33;
+    public static final int KM_ALGORITHM_HMAC = 128;
+
+    // EC Curves
+    public static final int KM_EC_CURVE_P224 = 0;
+    public static final int KM_EC_CURVE_P256 = 1;
+    public static final int KM_EC_CURVE_P384 = 2;
+    public static final int KM_EC_CURVE_P521 = 3;
+    public static final int KM_EC_CURVE_CURVE_25519 = 4;
+
+    // Padding modes.
+    public static final int KM_PAD_NONE = 1;
+    public static final int KM_PAD_RSA_OAEP = 2;
+    public static final int KM_PAD_RSA_PSS = 3;
+    public static final int KM_PAD_RSA_PKCS1_1_5_ENCRYPT = 4;
+    public static final int KM_PAD_RSA_PKCS1_1_5_SIGN = 5;
+    public static final int KM_PAD_PKCS7 = 64;
+
+    // Digest modes.
+    public static final int KM_DIGEST_NONE = 0;
+    public static final int KM_DIGEST_MD5 = 1;
+    public static final int KM_DIGEST_SHA1 = 2;
+    public static final int KM_DIGEST_SHA_2_224 = 3;
+    public static final int KM_DIGEST_SHA_2_256 = 4;
+    public static final int KM_DIGEST_SHA_2_384 = 5;
+    public static final int KM_DIGEST_SHA_2_512 = 6;
+
+    // Key origins.
+    public static final int KM_ORIGIN_GENERATED = 0;
+    public static final int KM_ORIGIN_DERIVED = 1;
+    public static final int KM_ORIGIN_IMPORTED = 2;
+    public static final int KM_ORIGIN_UNKNOWN = 3;
+    public static final int KM_ORIGIN_SECURELY_IMPORTED = 4;
+
+    // Operation Purposes.
+    public static final int KM_PURPOSE_ENCRYPT = 0;
+    public static final int KM_PURPOSE_DECRYPT = 1;
+    public static final int KM_PURPOSE_SIGN = 2;
+    public static final int KM_PURPOSE_VERIFY = 3;
+    public static final int KM_PURPOSE_WRAP = 5;
+    public static final int KM_PURPOSE_AGREE_KEY = 6;
+    public static final int KM_PURPOSE_ATTEST_KEY = 7;
+
+    // User authenticators.
+    public static final int HW_AUTH_PASSWORD = 1 << 0;
+    public static final int HW_AUTH_BIOMETRIC = 1 << 1;
+
+    // Keymaster tag classes
+    public static final int KM_ENUM = 1 << 28;
+    public static final int KM_ENUM_REP = 2 << 28;
+    public static final int KM_UINT = 3 << 28;
+    public static final int KM_UINT_REP = 4 << 28;
+    public static final int KM_ULONG = 5 << 28;
+    public static final int KM_DATE = 6 << 28;
+    public static final int KM_BOOL = 7 << 28;
+    public static final int KM_BYTES = 9 << 28;
+    public static final int KM_ULONG_REP = 10 << 28;
+
+    // Tag class removal mask
+    public static final int KEYMASTER_TAG_TYPE_MASK = 0x0FFFFFFF;
+
+    // Keymaster tags
+    public static final int KM_TAG_PURPOSE = KM_ENUM_REP | 1;
+    public static final int KM_TAG_ALGORITHM = KM_ENUM | 2;
+    public static final int KM_TAG_KEY_SIZE = KM_UINT | 3;
+    public static final int KM_TAG_BLOCK_MODE = KM_ENUM_REP | 4;
+    public static final int KM_TAG_DIGEST = KM_ENUM_REP | 5;
+    public static final int KM_TAG_PADDING = KM_ENUM_REP | 6;
+    public static final int KM_TAG_CALLER_NONCE = KM_BOOL | 7;
+    public static final int KM_TAG_MIN_MAC_LENGTH = KM_UINT | 8;
+    public static final int KM_TAG_KDF = KM_ENUM_REP | 9;
+    public static final int KM_TAG_EC_CURVE = KM_ENUM | 10;
+    public static final int KM_TAG_RSA_PUBLIC_EXPONENT = KM_ULONG | 200;
+    public static final int KM_TAG_RSA_OAEP_MGF_DIGEST = KM_ENUM_REP | 203;
+    public static final int KM_TAG_ROLLBACK_RESISTANCE = KM_BOOL | 303;
+    public static final int KM_TAG_EARLY_BOOT_ONLY = KM_BOOL | 305;
+    public static final int KM_TAG_ACTIVE_DATETIME = KM_DATE | 400;
+    public static final int KM_TAG_ORIGINATION_EXPIRE_DATETIME = KM_DATE | 401;
+    public static final int KM_TAG_USAGE_EXPIRE_DATETIME = KM_DATE | 402;
+    public static final int KM_TAG_USAGE_COUNT_LIMIT = KM_UINT | 405;
+    public static final int KM_TAG_NO_AUTH_REQUIRED = KM_BOOL | 503;
+    public static final int KM_TAG_USER_AUTH_TYPE = KM_ENUM | 504;
+    public static final int KM_TAG_AUTH_TIMEOUT = KM_UINT | 505;
+    public static final int KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506;
+    public static final int KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED = KM_BOOL | 507;
+    public static final int KM_TAG_TRUSTED_CONFIRMATION_REQUIRED = KM_BOOL | 508;
+    public static final int KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 509;
+    public static final int KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600;
+    public static final int KM_TAG_APPLICATION_ID = KM_BYTES | 601;
+    public static final int KM_TAG_CREATION_DATETIME = KM_DATE | 701;
+    public static final int KM_TAG_ORIGIN = KM_ENUM | 702;
+    public static final int KM_TAG_ROLLBACK_RESISTANT = KM_BOOL | 703;
+    public static final int KM_TAG_ROOT_OF_TRUST = KM_BYTES | 704;
+    public static final int KM_TAG_OS_VERSION = KM_UINT | 705;
+    public static final int KM_TAG_OS_PATCHLEVEL = KM_UINT | 706;
+    public static final int KM_TAG_ATTESTATION_APPLICATION_ID = KM_BYTES | 709;
+    public static final int KM_TAG_ATTESTATION_ID_BRAND = KM_BYTES | 710;
+    public static final int KM_TAG_ATTESTATION_ID_DEVICE = KM_BYTES | 711;
+    public static final int KM_TAG_ATTESTATION_ID_PRODUCT = KM_BYTES | 712;
+    public static final int KM_TAG_ATTESTATION_ID_SERIAL = KM_BYTES | 713;
+    public static final int KM_TAG_ATTESTATION_ID_IMEI = KM_BYTES | 714;
+    public static final int KM_TAG_ATTESTATION_ID_MEID = KM_BYTES | 715;
+    public static final int KM_TAG_ATTESTATION_ID_MANUFACTURER = KM_BYTES | 716;
+    public static final int KM_TAG_ATTESTATION_ID_MODEL = KM_BYTES | 717;
+    public static final int KM_TAG_VENDOR_PATCHLEVEL = KM_UINT | 718;
+    public static final int KM_TAG_BOOT_PATCHLEVEL = KM_UINT | 719;
+    public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720;
+    public static final int KM_TAG_IDENTITY_CREDENTIAL_KEY = KM_BOOL | 721;
+    public static final int KM_TAG_ATTESTATION_ID_SECOND_IMEI = KM_BYTES | 723;
+
+    // Map for converting padding values to strings
+    private static final Map<Integer, String> paddingMap = new HashMap<>();
+    static {
+        paddingMap.put(KM_PAD_NONE, KeyProperties.ENCRYPTION_PADDING_NONE);
+        paddingMap.put(KM_PAD_RSA_OAEP, KeyProperties.ENCRYPTION_PADDING_RSA_OAEP);
+        paddingMap.put(KM_PAD_RSA_PSS, KeyProperties.SIGNATURE_PADDING_RSA_PSS);
+        paddingMap.put(KM_PAD_RSA_PKCS1_1_5_ENCRYPT, KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1);
+        paddingMap.put(KM_PAD_RSA_PKCS1_1_5_SIGN, KeyProperties.SIGNATURE_PADDING_RSA_PKCS1);
+        paddingMap.put(KM_PAD_PKCS7, KeyProperties.ENCRYPTION_PADDING_PKCS7);
+    }
+
+    // Map for converting digest values to strings
+    private static final Map<Integer, String> digestMap = new HashMap<>();
+    static {
+        digestMap.put(KM_DIGEST_NONE, KeyProperties.DIGEST_NONE);
+        digestMap.put(KM_DIGEST_MD5, KeyProperties.DIGEST_MD5);
+        digestMap.put(KM_DIGEST_SHA1, KeyProperties.DIGEST_SHA1);
+        digestMap.put(KM_DIGEST_SHA_2_224, KeyProperties.DIGEST_SHA224);
+        digestMap.put(KM_DIGEST_SHA_2_256, KeyProperties.DIGEST_SHA256);
+        digestMap.put(KM_DIGEST_SHA_2_384, KeyProperties.DIGEST_SHA384);
+        digestMap.put(KM_DIGEST_SHA_2_512, KeyProperties.DIGEST_SHA512);
+    }
+
+    // Map for converting purpose values to strings
+    private static final Map<Integer, String> purposeMap = new HashMap<>();
+    static {
+        purposeMap.put(KM_PURPOSE_DECRYPT, "DECRYPT");
+        purposeMap.put(KM_PURPOSE_ENCRYPT, "ENCRYPT");
+        purposeMap.put(KM_PURPOSE_SIGN, "SIGN");
+        purposeMap.put(KM_PURPOSE_VERIFY, "VERIFY");
+        purposeMap.put(KM_PURPOSE_WRAP, "WRAP");
+        purposeMap.put(KM_PURPOSE_AGREE_KEY, "AGREE KEY");
+        purposeMap.put(KM_PURPOSE_ATTEST_KEY, "ATTEST KEY");
+    }
+
+    private Integer securityLevel;
+    private Set<Integer> purposes;
+    private Integer algorithm;
+    private Integer keySize;
+    private Set<Integer> digests;
+    private Set<Integer> paddingModes;
+    private Integer ecCurve;
+    private Long rsaPublicExponent;
+    private Set<Integer> mgfDigests;
+    private Boolean rollbackResistance;
+    private Boolean earlyBootOnly;
+    private Date activeDateTime;
+    private Date originationExpireDateTime;
+    private Date usageExpireDateTime;
+    private Integer usageCountLimit;
+    private Boolean noAuthRequired;
+    private Integer userAuthType;
+    private Integer authTimeout;
+    private Boolean allowWhileOnBody;
+    private Boolean trustedUserPresenceReq;
+    private Boolean trustedConfirmationReq;
+    private Boolean unlockedDeviceReq;
+    private Boolean allApplications;
+    private String applicationId;
+    private Date creationDateTime;
+    private Integer origin;
+    private Boolean rollbackResistant;
+    private RootOfTrust rootOfTrust;
+    private Integer osVersion;
+    private Integer osPatchLevel;
+    private String brand;
+    private String device;
+    private String product;
+    private String serialNumber;
+    private String imei;
+    private String meid;
+    private String manufacturer;
+    private String model;
+    private Integer vendorPatchLevel;
+    private Integer bootPatchLevel;
+    private Boolean deviceUniqueAttestation;
+    private Boolean identityCredentialKey;
+    private String secondImei;
+
+    public AuthorizationList(ASN1Encodable asn1Encodable) throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Sequence sequence)) {
+            throw new CertificateParsingException("Expected sequence for authorization list, found " + asn1Encodable.getClass().getName());
+        }
+        for (ASN1Encodable entry : sequence) {
+            if (!(entry instanceof ASN1TaggedObject taggedObject)) {
+                throw new CertificateParsingException("Expected tagged object, found " + entry.getClass().getName());
+            }
+            int tag = taggedObject.getTagNo();
+            var value = taggedObject.getBaseObject().toASN1Primitive();
+            Log.d("Attestation", "Parsing tag: [" + tag + "], value: [" + value + "]");
+
+            switch (tag) {
+                default:
+                    purposes = null;
+                    break;
+                    //throw new CertificateParsingException("Unknown tag " + tag + " found");
+                case KM_TAG_PURPOSE & KEYMASTER_TAG_TYPE_MASK:
+                    purposes = ASN1Utils.getIntegersFromAsn1Set(value);
+                    break;
+                case KM_TAG_ALGORITHM & KEYMASTER_TAG_TYPE_MASK:
+                    algorithm = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_KEY_SIZE & KEYMASTER_TAG_TYPE_MASK:
+                    keySize = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_DIGEST & KEYMASTER_TAG_TYPE_MASK:
+                    digests = ASN1Utils.getIntegersFromAsn1Set(value);
+                    break;
+                case KM_TAG_PADDING & KEYMASTER_TAG_TYPE_MASK:
+                    paddingModes = ASN1Utils.getIntegersFromAsn1Set(value);
+                    break;
+                case KM_TAG_EC_CURVE & KEYMASTER_TAG_TYPE_MASK:
+                    ecCurve = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_RSA_PUBLIC_EXPONENT & KEYMASTER_TAG_TYPE_MASK:
+                    rsaPublicExponent = ASN1Utils.getLongFromAsn1(value);
+                    break;
+                case KM_TAG_RSA_OAEP_MGF_DIGEST & KEYMASTER_TAG_TYPE_MASK:
+                    mgfDigests = ASN1Utils.getIntegersFromAsn1Set(value);
+                    break;
+                case KM_TAG_ROLLBACK_RESISTANCE & KEYMASTER_TAG_TYPE_MASK:
+                    rollbackResistance = true;
+                    break;
+                case KM_TAG_EARLY_BOOT_ONLY & KEYMASTER_TAG_TYPE_MASK:
+                    earlyBootOnly = true;
+                    break;
+                case KM_TAG_ACTIVE_DATETIME & KEYMASTER_TAG_TYPE_MASK:
+                    activeDateTime = ASN1Utils.getDateFromAsn1(value);
+                    break;
+                case KM_TAG_ORIGINATION_EXPIRE_DATETIME & KEYMASTER_TAG_TYPE_MASK:
+                    originationExpireDateTime = ASN1Utils.getDateFromAsn1(value);
+                    break;
+                case KM_TAG_USAGE_EXPIRE_DATETIME & KEYMASTER_TAG_TYPE_MASK:
+                    usageExpireDateTime = ASN1Utils.getDateFromAsn1(value);
+                    break;
+                case KM_TAG_USAGE_COUNT_LIMIT & KEYMASTER_TAG_TYPE_MASK:
+                    usageCountLimit = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_NO_AUTH_REQUIRED & KEYMASTER_TAG_TYPE_MASK:
+                    noAuthRequired = true;
+                    break;
+                case KM_TAG_USER_AUTH_TYPE & KEYMASTER_TAG_TYPE_MASK:
+                    userAuthType = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_AUTH_TIMEOUT & KEYMASTER_TAG_TYPE_MASK:
+                    authTimeout = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_ALLOW_WHILE_ON_BODY & KEYMASTER_TAG_TYPE_MASK:
+                    allowWhileOnBody = true;
+                    break;
+                case KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED & KEYMASTER_TAG_TYPE_MASK:
+                    trustedUserPresenceReq = true;
+                    break;
+                case KM_TAG_TRUSTED_CONFIRMATION_REQUIRED & KEYMASTER_TAG_TYPE_MASK:
+                    trustedConfirmationReq = true;
+                    break;
+                case KM_TAG_UNLOCKED_DEVICE_REQUIRED & KEYMASTER_TAG_TYPE_MASK:
+                    unlockedDeviceReq = true;
+                    break;
+                case KM_TAG_ALL_APPLICATIONS & KEYMASTER_TAG_TYPE_MASK:
+                    allApplications = true;
+                    break;
+                case KM_TAG_APPLICATION_ID & KEYMASTER_TAG_TYPE_MASK:
+                    applicationId = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_CREATION_DATETIME & KEYMASTER_TAG_TYPE_MASK:
+                    creationDateTime = ASN1Utils.getDateFromAsn1(value);
+                    break;
+                case KM_TAG_ORIGIN & KEYMASTER_TAG_TYPE_MASK:
+                    origin = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_ROLLBACK_RESISTANT & KEYMASTER_TAG_TYPE_MASK:
+                    rollbackResistant = true;
+                    break;
+                case KM_TAG_ROOT_OF_TRUST & KEYMASTER_TAG_TYPE_MASK:
+                    rootOfTrust = new RootOfTrust(value);
+                    break;
+                case KM_TAG_OS_VERSION & KEYMASTER_TAG_TYPE_MASK:
+                    osVersion = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_OS_PATCHLEVEL & KEYMASTER_TAG_TYPE_MASK:
+                    osPatchLevel = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                /*case KM_TAG_ATTESTATION_APPLICATION_ID & KEYMASTER_TAG_TYPE_MASK:
+                    attestationApplicationId = new AttestationApplicationId(ASN1Utils
+                            .getAsn1EncodableFromBytes(ASN1Utils.getByteArrayFromAsn1(value)));
+                    break;*/
+                case KM_TAG_ATTESTATION_ID_BRAND & KEYMASTER_TAG_TYPE_MASK:
+                    brand = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_DEVICE & KEYMASTER_TAG_TYPE_MASK:
+                    device = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_PRODUCT & KEYMASTER_TAG_TYPE_MASK:
+                    product = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_SERIAL & KEYMASTER_TAG_TYPE_MASK:
+                    serialNumber = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_IMEI & KEYMASTER_TAG_TYPE_MASK:
+                    imei = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_MEID & KEYMASTER_TAG_TYPE_MASK:
+                    meid = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_MANUFACTURER & KEYMASTER_TAG_TYPE_MASK:
+                    manufacturer = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_ATTESTATION_ID_MODEL & KEYMASTER_TAG_TYPE_MASK:
+                    model = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+                case KM_TAG_VENDOR_PATCHLEVEL & KEYMASTER_TAG_TYPE_MASK:
+                    vendorPatchLevel = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_BOOT_PATCHLEVEL & KEYMASTER_TAG_TYPE_MASK:
+                    bootPatchLevel = ASN1Utils.getIntegerFromAsn1(value);
+                    break;
+                case KM_TAG_DEVICE_UNIQUE_ATTESTATION & KEYMASTER_TAG_TYPE_MASK:
+                    deviceUniqueAttestation = true;
+                    break;
+                case KM_TAG_IDENTITY_CREDENTIAL_KEY & KEYMASTER_TAG_TYPE_MASK:
+                    identityCredentialKey = true;
+                    break;
+                case KM_TAG_ATTESTATION_ID_SECOND_IMEI & KEYMASTER_TAG_TYPE_MASK:
+                    secondImei = ASN1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
+                    break;
+            }
+        }
+    }
+
+    public Set<Integer> getPurposes() {
+        return purposes;
+    }
+
+    public RootOfTrust getRootOfTrust() {
+        return rootOfTrust;
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/CertificateInfo.java b/services/core/java/com/android/server/matrixx/vbmeta/CertificateInfo.java
new file mode 100644
index 0000000000000..4403b28de0ba8
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/CertificateInfo.java
@@ -0,0 +1,244 @@
+package com.android.server.matrixx.vbmeta;
+
+import android.util.Base64;
+import android.util.Log;
+
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
+import java.security.cert.CertPath;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+public class CertificateInfo {
+    public static final int KEY_FAILED = -1;
+    public static final int KEY_UNKNOWN = 0;
+    public static final int KEY_AOSP = 1;
+    public static final int KEY_GOOGLE = 2;
+    public static final int KEY_KNOX = 3;
+    public static final int KEY_OEM = 4;
+
+    public static final int CERT_UNKNOWN = 0;
+    public static final int CERT_SIGN = 1;
+    public static final int CERT_REVOKED = 2;
+    public static final int CERT_EXPIRED = 3;
+    public static final int CERT_NORMAL = 4;
+
+    private static final String GOOGLE_ROOT_PUBLIC_KEY = "" +
+        "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr7bHgiuxpwHsK7Qui8xU" +
+        "FmOr75gvMsd/dTEDDJdSSxtf6An7xyqpRR90PL2abxM1dEqlXnf2tqw1Ne4Xwl5j" +
+        "lRfdnJLmN0pTy/4lj4/7tv0Sk3iiKkypnEUtR6WfMgH0QZfKHM1+di+y9TFRtv6y" +
+        "//0rb+T+W8a9nsNL/ggjnar86461qO0rOs2cXjp3kOG1FEJ5MVmFmBGtnrKpa73X" +
+        "pXyTqRxB/M0n1n/W9nGqC4FSYa04T6N5RIZGBN2z2MT5IKGbFlbC8UrW0DxW7AYI" +
+        "mQQcHtGl/m00QLVWutHQoVJYnFPlXTcHYvASLu+RhhsbDmxMgJJ0mcDpvsC4PjvB" +
+        "+TxywElgS70vE0XmLD+OJtvsBslHZvPBKCOdT0MS+tgSOIfga+z1Z1g7+DVagf7q" +
+        "uvmag8jfPioyKvxnK/EgsTUVi2ghzq8wm27ud/mIM7AY2qEORR8Go3TVB4HzWQgp" +
+        "Zrt3i5MIlCaY504LzSRiigHCzAPlHws+W0rB5N+er5/2pJKnfBSDiCiFAVtCLOZ7" +
+        "gLiMm0jhO2B6tUXHI/+MRPjy02i59lINMRRev56GKtcd9qO/0kUJWdZTdA2XoS82" +
+        "ixPvZtXQpUpuL12ab+9EaDK8Z4RHJYYfCT3Q5vNAXaiWQ+8PTWm2QgBR/bkwSWc+" +
+        "NpUFgNPN9PvQi8WEg5UmAGMCAwEAAQ==";
+
+    private static final String AOSP_ROOT_EC_PUBLIC_KEY = "" +
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7l1ex+HA220Dpn7mthvsTWpdamgu" +
+        "D/9/SQ59dx9EIm29sa/6FsvHrcV30lacqrewLVQBXT5DKyqO107sSHVBpA==";
+
+    private static final String AOSP_ROOT_RSA_PUBLIC_KEY = "" +
+        "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCia63rbi5EYe/VDoLmt5TRdSMf" +
+        "d5tjkWP/96r/C3JHTsAsQ+wzfNes7UA+jCigZtX3hwszl94OuE4TQKuvpSe/lWmg" +
+        "MdsGUmX4RFlXYfC78hdLt0GAZMAoDo9Sd47b0ke2RekZyOmLw9vCkT/X11DEHTVm" +
+        "+Vfkl5YLCazOkjWFmwIDAQAB";
+
+    private static final String KNOX_SAKV2_ROOT_PUBLIC_KEY = "" +
+        "MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBhbGuLrpql5I2WJmrE5kEVZOo+dgA" +
+        "46mKrVJf/sgzfzs2u7M9c1Y9ZkCEiiYkhTFE9vPbasmUfXybwgZ2EM30A1ABPd12" +
+        "4n3JbEDfsB/wnMH1AcgsJyJFPbETZiy42Fhwi+2BCA5bcHe7SrdkRIYSsdBRaKBo" +
+        "ZsapxB0gAOs0jSPRX5M=";
+
+    private static final byte[] googleKey = Base64.decode(GOOGLE_ROOT_PUBLIC_KEY, 0);
+    private static final byte[] aospEcKey = Base64.decode(AOSP_ROOT_EC_PUBLIC_KEY, 0);
+    private static final byte[] aospRsaKey = Base64.decode(AOSP_ROOT_RSA_PUBLIC_KEY, 0);
+    private static final byte[] knoxSakv2Key = Base64.decode(KNOX_SAKV2_ROOT_PUBLIC_KEY, 0);
+
+    private final X509Certificate cert;
+    private int issuer = KEY_UNKNOWN;
+    private int status = CERT_UNKNOWN;
+    private GeneralSecurityException securityException;
+    private Attestation attestation;
+    private CertificateParsingException certException;
+
+    private Integer certsIssued;
+
+    private CertificateInfo(X509Certificate cert) {
+        this.cert = cert;
+    }
+
+    public X509Certificate getCert() {
+        return cert;
+    }
+
+    public int getIssuer() {
+        return issuer;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public GeneralSecurityException getSecurityException() {
+        return securityException;
+    }
+
+    public Attestation getAttestation() {
+        return attestation;
+    }
+
+    public CertificateParsingException getCertException() {
+        return certException;
+    }
+
+    public Integer getCertsIssued() {
+        return certsIssued;
+    }
+
+    private void checkIssuer() {
+        var publicKey = cert.getPublicKey().getEncoded();
+
+        if (Arrays.equals(publicKey, googleKey)) {
+            issuer = KEY_GOOGLE;
+        } else if (Arrays.equals(publicKey, aospEcKey)) {
+            issuer = KEY_AOSP;
+        } else if (Arrays.equals(publicKey, aospRsaKey)) {
+            issuer = KEY_AOSP;
+        } else if (Arrays.equals(publicKey, knoxSakv2Key)) {
+            issuer = KEY_KNOX;
+        }
+    }
+
+    private void checkStatus(PublicKey parentKey) {
+        try {
+            status = CERT_SIGN;
+            cert.verify(parentKey);
+
+            // Check serial code removed
+
+            status = CERT_EXPIRED;
+            cert.checkValidity();
+            status = CERT_NORMAL;
+        } catch (GeneralSecurityException e) {
+            Log.e("Attestation", "Error verifying certificate", e);
+            securityException = e;
+        }
+    }
+
+    private boolean checkAttestation() {
+        boolean terminate;
+        try {
+            attestation = Attestation.loadFromCertificate(cert);
+            // If key purpose included KeyPurpose::SIGN,
+            // then it could be used to sign arbitrary data, including any tbsCertificate,
+            // and so an attestation produced by the key would have no security properties.
+            // If the parent certificate can attest that the key purpose is only KeyPurpose::ATTEST_KEY,
+            // then the child certificate can be trusted.
+            var purposes = attestation.getTeeEnforced().getPurposes();
+            terminate = purposes == null || !purposes.contains(AuthorizationList.KM_PURPOSE_ATTEST_KEY);
+        } catch (CertificateParsingException e) {
+            // Log.e("Attestation", "Error parsing certificate", e);
+            certException = e;
+            terminate = false;
+        }
+        return terminate;
+    }
+
+    public static AttestationResult parseCertificateChain(List<X509Certificate> certs) throws Exception {
+        var infoList = new ArrayList<CertificateInfo>();
+
+        var parent = certs.get(certs.size() - 1);
+        for (int i = certs.size() - 1; i >= 0; i--) {
+            var parentKey = parent.getPublicKey();
+            var info = new CertificateInfo(certs.get(i));
+            infoList.add(info);
+            info.checkStatus(parentKey);
+            if (parent == info.cert) {
+                info.checkIssuer();
+            } else {
+                parent = info.cert;
+            }
+            if (info.checkAttestation()) {
+                break;
+            }
+        }
+
+        return AttestationResult.form(infoList);
+    }
+
+    private static List<X509Certificate> sortCerts(List<X509Certificate> certs) {
+        if (certs.size() < 2) {
+            return certs;
+        }
+
+        var issuer = certs.get(0).getIssuerX500Principal();
+        boolean okay = true;
+        for (var cert : certs) {
+            var subject = cert.getSubjectX500Principal();
+            if (issuer.equals(subject)) {
+                issuer = subject;
+            } else {
+                okay = false;
+                break;
+            }
+        }
+        if (okay) {
+            return certs;
+        }
+
+        var newList = new ArrayList<X509Certificate>(certs.size());
+        for (var cert : certs) {
+            boolean found = false;
+            var subject = cert.getSubjectX500Principal();
+            for (var c : certs) {
+                if (c == cert) continue;
+                if (c.getIssuerX500Principal().equals(subject)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                newList.add(cert);
+            }
+        }
+        if (newList.size() != 1) {
+            return certs;
+        }
+
+        var oldList = new LinkedList<>(certs);
+        oldList.remove(newList.get(0));
+        for (int i = 0; i < newList.size(); i++) {
+            issuer = newList.get(i).getIssuerX500Principal();
+            for (var it = oldList.iterator(); it.hasNext(); ) {
+                var cert = it.next();
+                if (cert.getSubjectX500Principal().equals(issuer)) {
+                    newList.add(cert);
+                    it.remove();
+                    break;
+                }
+            }
+        }
+        if (!oldList.isEmpty()) {
+            return certs;
+        }
+        return newList;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static AttestationResult parseCertificateChain(CertPath certPath) throws Exception {
+        //noinspection unchecked
+        var certs = (List<X509Certificate>) certPath.getCertificates();
+        if (certs.isEmpty()) {
+            throw new CertificateParsingException("No certificate found");
+        }
+        return parseCertificateChain(sortCerts(certs));
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/Entry.java b/services/core/java/com/android/server/matrixx/vbmeta/Entry.java
new file mode 100644
index 0000000000000..722f921645c1f
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/Entry.java
@@ -0,0 +1,88 @@
+package com.android.server.matrixx.vbmeta;
+
+import android.os.Build;
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyProperties;
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.ECGenParameterSpec;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Entry {
+    private static AttestationResult doAttestation() throws Exception {
+        String alias = "reveny";
+
+        Date now = new Date();
+        int purposes = KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY;
+
+        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(alias, purposes)
+                .setAlgorithmParameterSpec(new ECGenParameterSpec("secp256r1"))
+                .setDigests(KeyProperties.DIGEST_SHA256)
+                .setKeyValidityStart(now)
+                .setAttestationChallenge(now.toString().getBytes());
+
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
+        keyPairGenerator.initialize(builder.build());
+        keyPairGenerator.generateKeyPair();
+
+        Log.i("Attestation", "Generated key pair");
+
+        List<Certificate> certs = new ArrayList<>();
+        KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
+        keyStore.load(null);
+
+        generateKey(alias);
+        Certificate[] certificates = keyStore.getCertificateChain(alias);
+        if (certificates == null) {
+            throw new Exception("Unable to get certificate chain");
+        }
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        for (Certificate cert : certificates) {
+            certs.add(cf.generateCertificate(new ByteArrayInputStream(cert.getEncoded())));
+        }
+
+        return parseCertificateChain(certs);
+    }
+
+    private static void generateKey(String alias) throws Exception {
+        Date now = new Date();
+        int purposes = KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY;
+
+        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(alias, purposes)
+            .setAlgorithmParameterSpec(new ECGenParameterSpec("secp256r1"))
+            .setDigests(KeyProperties.DIGEST_SHA256)
+            .setKeyValidityStart(now)
+            .setAttestationChallenge(now.toString().getBytes());
+
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
+        try {
+            keyPairGenerator.initialize(builder.build());
+            keyPairGenerator.generateKeyPair();
+        } catch (Exception ex) {
+            Log.e("Attestation", "TEE is likely broken: ", ex.getCause());
+        }
+    }
+
+    private static AttestationResult parseCertificateChain(List<Certificate> certs) throws Exception {
+        List<X509Certificate> x509Certificates = new ArrayList<>();
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        for (Certificate cert : certs) {
+            byte[] encodedCert = cert.getEncoded();
+            ByteArrayInputStream bais = new ByteArrayInputStream(encodedCert);
+            X509Certificate x509Certificate = (X509Certificate) cf.generateCertificate(bais);
+            x509Certificates.add(x509Certificate);
+        }
+
+        Log.i("Attestation", "Parsing certificate chain: " + x509Certificates.size() + " certificates");
+
+        return CertificateInfo.parseCertificateChain(x509Certificates);
+    }
+}
diff --git a/services/core/java/com/android/server/matrixx/vbmeta/RootOfTrust.java b/services/core/java/com/android/server/matrixx/vbmeta/RootOfTrust.java
new file mode 100644
index 0000000000000..03a45033b3339
--- /dev/null
+++ b/services/core/java/com/android/server/matrixx/vbmeta/RootOfTrust.java
@@ -0,0 +1,104 @@
+package com.android.server.matrixx.vbmeta;
+
+import com.android.internal.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.internal.org.bouncycastle.asn1.ASN1Sequence;
+
+import java.security.cert.CertificateParsingException;
+
+public class RootOfTrust {
+    private static final int VERIFIED_BOOT_KEY_INDEX = 0;
+    private static final int DEVICE_LOCKED_INDEX = 1;
+    private static final int VERIFIED_BOOT_STATE_INDEX = 2;
+    private static final int VERIFIED_BOOT_HASH_INDEX = 3;
+
+    public static final int KM_VERIFIED_BOOT_VERIFIED = 0;
+    public static final int KM_VERIFIED_BOOT_SELF_SIGNED = 1;
+    public static final int KM_VERIFIED_BOOT_UNVERIFIED = 2;
+    public static final int KM_VERIFIED_BOOT_FAILED = 3;
+
+    private final byte[] verifiedBootKey;
+    private final boolean deviceLocked;
+    private final int verifiedBootState;
+    private final byte[] verifiedBootHash;
+
+    public RootOfTrust(ASN1Encodable asn1Encodable) throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Sequence sequence)) {
+            throw new CertificateParsingException("Expected sequence for root of trust, found " + asn1Encodable.getClass().getName());
+        }
+
+        verifiedBootKey = ASN1Utils.getByteArrayFromAsn1(sequence.getObjectAt(VERIFIED_BOOT_KEY_INDEX));
+        deviceLocked = ASN1Utils.getBooleanFromAsn1(sequence.getObjectAt(DEVICE_LOCKED_INDEX));
+        verifiedBootState = ASN1Utils.getIntegerFromAsn1(sequence.getObjectAt(VERIFIED_BOOT_STATE_INDEX));
+        if (sequence.size() == 3) verifiedBootHash = null;
+        else verifiedBootHash = ASN1Utils.getByteArrayFromAsn1(sequence.getObjectAt(VERIFIED_BOOT_HASH_INDEX));
+    }
+
+    RootOfTrust(byte[] verifiedBootKey, boolean deviceLocked, int verifiedBootState, byte[] verifiedBootHash) {
+        this.verifiedBootKey = verifiedBootKey;
+        this.deviceLocked = deviceLocked;
+        this.verifiedBootState = verifiedBootState;
+        this.verifiedBootHash = verifiedBootHash;
+    }
+
+    public static String verifiedBootStateToString(int verifiedBootState) {
+        switch (verifiedBootState) {
+            case KM_VERIFIED_BOOT_VERIFIED:
+                return "Verified";
+            case KM_VERIFIED_BOOT_SELF_SIGNED:
+                return "Self-signed";
+            case KM_VERIFIED_BOOT_UNVERIFIED:
+                return "Unverified";
+            case KM_VERIFIED_BOOT_FAILED:
+                return "Failed";
+            default:
+                return "Unknown (" + verifiedBootState + ")";
+        }
+    }
+
+    public byte[] getVerifiedBootKey() {
+        return verifiedBootKey;
+    }
+
+    public boolean isDeviceLocked() {
+        return deviceLocked;
+    }
+
+    public int getVerifiedBootState() {
+        return verifiedBootState;
+    }
+
+    public byte[] getVerifiedBootHash() {
+        return verifiedBootHash;
+    }
+
+    public static class Builder {
+        private byte[] verifiedBootKey;
+        private boolean deviceLocked = false;
+        private int verifiedBootState = -1;
+        private byte[] verifiedBootHash;
+
+        public Builder setVerifiedBootKey(byte[] verifiedBootKey) {
+            this.verifiedBootKey = verifiedBootKey;
+            return this;
+        }
+
+        public Builder setDeviceLocked(boolean deviceLocked) {
+            this.deviceLocked = deviceLocked;
+            return this;
+        }
+
+        public Builder setVerifiedBootState(int verifiedBootState) {
+            this.verifiedBootState = verifiedBootState;
+            return this;
+        }
+
+        public Builder setVerifiedBootHash(byte[] verifiedBootHash) {
+            this.verifiedBootHash = verifiedBootHash;
+            return this;
+        }
+
+        public RootOfTrust build() {
+            return new RootOfTrust(verifiedBootKey, deviceLocked, verifiedBootState, verifiedBootHash);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index 5533c01317023..f1b2822811048 100644
--- a/services/core/java/com/android/server/media/MediaRouterService.java
+++ b/services/core/java/com/android/server/media/MediaRouterService.java
@@ -766,6 +766,19 @@ void restoreBluetoothA2dp() {
             }
             // We don't need to change a2dp status when bluetooth is not connected.
             if (btDevice != null) {
+                // During wired device disconnection, AudioDeviceBroker sets
+                // mBluetoothA2dpEnabled=true synchronously, but mGlobalBluetoothA2dpOn
+                // is updated later via async dispatchAudioRoutesChanged. If a playback
+                // state change triggers us in this window, mGlobalBluetoothA2dpOn is
+                // stale. Cross-check with AudioService to avoid overriding the
+                // already-restored A2DP state.
+                if (!a2dpOn && mAudioService.isBluetoothA2dpOn()) {
+                    Slog.d(TAG, "restoreBluetoothA2dp: skip setting a2dp off"
+                            + " - AudioService already has a2dp on"
+                            + " (transient state during wired device disconnection)");
+                    return;
+                }
+
                 if (DEBUG) {
                     Slog.d(TAG, "restoreBluetoothA2dp(" + a2dpOn + ")");
                 }
diff --git a/services/core/java/com/android/server/net/NetworkManagementService.java b/services/core/java/com/android/server/net/NetworkManagementService.java
index 74f0d9cf3e39e..0448972fffe7a 100644
--- a/services/core/java/com/android/server/net/NetworkManagementService.java
+++ b/services/core/java/com/android/server/net/NetworkManagementService.java
@@ -485,7 +485,7 @@ private void prepareNativeDaemon() {
                 }
             }
 
-            size = mUidCleartextPolicy.size();
+            size = mUidCleartextPolicy != null ? mUidCleartextPolicy.size() : 0;
             if (size > 0) {
                 if (DBG) Slog.d(TAG, "Pushing " + size + " active UID cleartext policies");
                 final SparseIntArray local = mUidCleartextPolicy;
diff --git a/services/core/java/com/android/server/net/NetworkPolicyLogger.java b/services/core/java/com/android/server/net/NetworkPolicyLogger.java
index 681aa8aef219b..a30008971cd6c 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyLogger.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyLogger.java
@@ -66,10 +66,8 @@ public class NetworkPolicyLogger {
     static final boolean LOGD = Log.isLoggable(TAG, Log.DEBUG);
     static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
 
-    private static final int MAX_LOG_SIZE =
-            ActivityManager.isLowRamDeviceStatic() ? 100 : 400;
-    private static final int MAX_NETWORK_BLOCKED_LOG_SIZE =
-            ActivityManager.isLowRamDeviceStatic() ? 100 : 400;
+    private static final int MAX_LOG_SIZE = 100;
+    private static final int MAX_NETWORK_BLOCKED_LOG_SIZE = 100;
 
     private static final int EVENT_TYPE_GENERIC = 0;
     private static final int EVENT_NETWORK_BLOCKED = 1;
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 5e4f941864839..a7227cecf5f6b 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -2296,7 +2296,7 @@ public void onReceive(Context context, Intent intent) {
                         ensureActiveCarrierPolicyAL(subId, subscriberId);
                         maybeUpdateCarrierPolicyCycleAL(subId, subscriberId);
                     } else {
-                        Slog.wtf(TAG, "Missing subscriberId for subId " + subId);
+                        Slog.w(TAG, "Missing subscriberId for subId " + subId);
                     }
 
                     // update network and notification rules, as the data cycle changed and it's
@@ -2447,7 +2447,7 @@ void updateSubscriptions() {
             if (!TextUtils.isEmpty(subscriberId)) {
                 subIdToSubscriberId.put(tmSub.getSubscriptionId(), subscriberId);
             } else {
-                Slog.wtf(TAG, "Missing subscriberId for subId " + tmSub.getSubscriptionId());
+                Slog.w(TAG, "Missing subscriberId for subId " + tmSub.getSubscriptionId());
             }
 
             final String[] mergedSubscriberId = ArrayUtils.defeatNullable(
diff --git a/services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java b/services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java
index c863cbf327b80..54ce837ef2af5 100644
--- a/services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java
+++ b/services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java
@@ -35,6 +35,7 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Slog;
+import android.os.SystemClock;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
@@ -69,6 +70,9 @@ class WatchlistLoggingHandler extends Handler {
     private static final long ONE_DAY_MS = TimeUnit.DAYS.toMillis(1);
     private static final String DROPBOX_TAG = "network_watchlist_report";
 
+    private static final long BOOT_TIME_THRESHOLD_MILLIS = TimeUnit.SECONDS.toMillis(30);
+    private static final long INITIAL_CHECK_DELAY_MILLIS = TimeUnit.MINUTES.toMillis(1);
+
     private final Context mContext;
     private final @Nullable DropBoxManager mDropBoxManager;
     private final ContentResolver mResolver;
@@ -178,8 +182,14 @@ private boolean isPackageTestOnly(int uid) {
      * Report network watchlist records if we collected enough data.
      */
     public void reportWatchlistIfNecessary() {
+        long uptimeMillis = SystemClock.elapsedRealtime();
         final Message msg = obtainMessage(REPORT_RECORDS_IF_NECESSARY_MSG);
-        sendMessage(msg);
+
+        if(uptimeMillis < BOOT_TIME_THRESHOLD_MILLIS) {
+            sendMessageDelayed(msg, INITIAL_CHECK_DELAY_MILLIS);
+        } else {
+            sendMessage(msg);
+        }
     }
 
     public void forceReportWatchlistForTest(long lastReportTime) {
diff --git a/services/core/java/com/android/server/notification/NotificationAttentionHelper.java b/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
index 89abfcd6ffdc7..d7ec270bf3607 100644
--- a/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
+++ b/services/core/java/com/android/server/notification/NotificationAttentionHelper.java
@@ -214,6 +214,8 @@ public final class NotificationAttentionHelper {
     private final PolitenessStrategy mStrategy;
     private int mCurrentWorkProfileId = UserHandle.USER_NULL;
 
+    private boolean mSoundVibScreenOn;
+
     public NotificationAttentionHelper(Context context, Object lock, LightsManager lightsManager,
             AccessibilityManager accessibilityManager, PackageManager packageManager,
             UserManager userManager, NotificationUsageStats usageStats,
@@ -385,6 +387,9 @@ public void onCallStateChanged(int state, String incomingNumber) {
         mContext.getContentResolver().registerContentObserver(
                 SettingsObserver.NOTIFICATION_LIGHT_PULSE_URI, false, mSettingsObserver,
                 UserHandle.USER_ALL);
+        mContext.getContentResolver().registerContentObserver(
+                SettingsObserver.NOTIFICATION_SOUND_VIB_SCREEN_ON_URI, false, mSettingsObserver,
+                UserHandle.USER_ALL);
         if (Flags.politeNotifications()) {
             mContext.getContentResolver().registerContentObserver(
                     SettingsObserver.NOTIFICATION_COOLDOWN_ENABLED_URI, false, mSettingsObserver,
@@ -490,7 +495,8 @@ && isNotificationForCurrentUser(record, signals)) {
         }
 
         if (aboveThreshold && isNotificationForCurrentUser(record, signals)) {
-            if (mSystemReady && mAudioManager != null) {
+            boolean skipSound = mScreenOn && !mSoundVibScreenOn;
+            if (!skipSound && mSystemReady && mAudioManager != null) {
                 Uri soundUri = record.getSound();
                 hasValidSound = soundUri != null && !Uri.EMPTY.equals(soundUri);
                 VibrationEffect vibration = record.getVibration();
@@ -1821,6 +1827,8 @@ private final class SettingsObserver extends ContentObserver {
                 Settings.System.NOTIFICATION_COOLDOWN_ALL);
         private static final Uri NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED_URI =
                 Settings.System.getUriFor(Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED);
+        private static final Uri NOTIFICATION_SOUND_VIB_SCREEN_ON_URI =
+                Settings.System.getUriFor(Settings.System.NOTIFICATION_SOUND_VIB_SCREEN_ON);
         public SettingsObserver() {
             super(null);
         }
@@ -1840,6 +1848,12 @@ public void onChange(boolean selfChange, Uri uri) {
                     }
                 }
             }
+            if (uri == null || NOTIFICATION_SOUND_VIB_SCREEN_ON_URI.equals(uri)) {
+                mSoundVibScreenOn = Settings.System.getIntForUser(
+                        mContext.getContentResolver(),
+                        Settings.System.NOTIFICATION_SOUND_VIB_SCREEN_ON, 1,
+                        UserHandle.USER_CURRENT) == 1;
+            }
             if (Flags.politeNotifications()) {
                 if (uri == null || NOTIFICATION_COOLDOWN_ENABLED_URI.equals(uri)) {
                     mNotificationCooldownEnabled = Settings.System.getIntForUser(
diff --git a/services/core/java/com/android/server/notification/NotificationHistoryProtoHelper.java b/services/core/java/com/android/server/notification/NotificationHistoryProtoHelper.java
index 1f5d8fcd8843a..f5b77445b7c86 100644
--- a/services/core/java/com/android/server/notification/NotificationHistoryProtoHelper.java
+++ b/services/core/java/com/android/server/notification/NotificationHistoryProtoHelper.java
@@ -279,13 +279,15 @@ private static void writeNotification(ProtoOutputStream proto,
                 proto.write(Notification.CHANNEL_NAME, notification.getChannelName());
             }
         }
-        final int channelIdIndex = Arrays.binarySearch(stringPool, notification.getChannelId());
-        if (channelIdIndex >= 0) {
-            proto.write(Notification.CHANNEL_ID_INDEX, channelIdIndex + 1);
-        } else {
-            Slog.w(TAG, "notification channel id (" + notification.getChannelId()
-                    + ") not found in string cache");
-            proto.write(Notification.CHANNEL_ID, notification.getChannelId());
+        if (!TextUtils.isEmpty(notification.getChannelId())) {
+            final int channelIdIndex = Arrays.binarySearch(stringPool, notification.getChannelId());
+            if (channelIdIndex >= 0) {
+                proto.write(Notification.CHANNEL_ID_INDEX, channelIdIndex + 1);
+            } else {
+                Slog.w(TAG, "notification channel id (" + notification.getChannelId()
+                        + ") not found in string cache");
+                proto.write(Notification.CHANNEL_ID, notification.getChannelId());
+            }
         }
         if (!TextUtils.isEmpty(notification.getConversationId())) {
             final int conversationIdIndex = Arrays.binarySearch(
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 11ea74dae665b..097e0fe9e1594 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -218,6 +218,7 @@
 import android.app.AlarmManager;
 import android.app.AppGlobals;
 import android.app.AppOpsManager;
+import android.app.AxSandboxManager;
 import android.app.AutomaticZenRule;
 import android.app.IActivityManager;
 import android.app.IBinderSession;
@@ -242,6 +243,7 @@
 import android.app.StatsManager;
 import android.app.UriGrantsManager;
 import android.app.ZenBypassingApp;
+import com.android.internal.app.HiddenNotificationInfo;
 import android.app.admin.DevicePolicyManagerInternal;
 import android.app.backup.BackupManager;
 import android.app.backup.BackupRestoreEventLogger;
@@ -417,6 +419,7 @@
 import com.android.server.utils.Slogf;
 import com.android.server.utils.quota.MultiRateLimiter;
 import com.android.server.wm.ActivityTaskManagerInternal;
+import com.android.server.wm.AxSandboxService;
 import com.android.server.wm.BackgroundActivityStartCallback;
 import com.android.server.wm.WindowManagerInternal;
 
@@ -8673,6 +8676,19 @@ void cancelNotificationInternal(String pkg, String opPkg, int callingUid, int ca
                     SmallHash.hash(Objects.hashCode(tag) ^ id));
         }
 
+        if (AxSandboxService.get().isPackageHidden(pkg)) {
+            try {
+                String key = pkg + "|" + (tag != null ? tag : "") + "|" + id;
+                AxSandboxService.get().onHiddenNotificationRemoved(key);
+                if (DBG) {
+                    Slog.d(TAG, "Removed hidden app notification: " + key);
+                }
+                return;
+            } catch (Exception e) {
+                Slog.w(TAG, "Failed to remove hidden app notification: " + pkg, e);
+            }
+        }
+
         cancelNotification(uid, callingPid, pkg, tag, id, 0,
                 mustNotHaveFlags, false, userId, REASON_APP_CANCEL, null);
     }
@@ -8763,6 +8779,27 @@ private boolean enqueueNotificationInternal(final String pkg, final String opPkg
                 callingUid, incomingUserId, true, false, "enqueueNotification", pkg);
         final UserHandle user = UserHandle.of(userId);
 
+        final boolean isHiddenApp = AxSandboxService.get().isPackageHidden(pkg);
+        if (isHiddenApp) {
+            try {
+                String key = pkg + "|" + (tag != null ? tag : "") + "|" + id;
+                Icon appIcon = notification.getSmallIcon();
+                CharSequence title = notification.extras.getCharSequence(Notification.EXTRA_TITLE);
+                CharSequence text = notification.extras.getCharSequence(Notification.EXTRA_TEXT);
+                PendingIntent contentIntent = notification.contentIntent;
+                long postTime = System.currentTimeMillis();
+
+                HiddenNotificationInfo info = new HiddenNotificationInfo(
+                        key, pkg, appIcon, title, text, contentIntent, postTime, userId);
+
+                AxSandboxService.get().onHiddenNotificationPosted(info);
+                Slog.d(TAG, "Redirected notification from hidden app: " + pkg);
+                return true;
+            } catch (Exception e) {
+                Slog.w(TAG, "Failed to redirect hidden app notification: " + pkg, e);
+            }
+        }
+
         // Can throw a SecurityException if the calling uid doesn't have permission to post
         // as "pkg"
         int notificationUid = INVALID_UID;
@@ -8867,6 +8904,11 @@ private boolean enqueueNotificationInternal(final String pkg, final String opPkg
         fixNotificationWithChannel(notification, channel, notificationUid, pkg);
 
         final NotificationRecord r = new NotificationRecord(getContext(), n, channel);
+        if (AxSandboxService.get().hasAppLock(pkg)) {
+            notification.extras.putBoolean(AxSandboxManager.EXTRA_NOTIFICATION_APP_LOCKED, true);
+        } else {
+            notification.extras.remove(AxSandboxManager.EXTRA_NOTIFICATION_APP_LOCKED);
+        }
         r.setIsAppImportanceLocked(mPermissionHelper.isPermissionUserSet(pkg, userId));
         r.setPostSilently(postSilently);
         r.setFlagBubbleRemoved(false);
diff --git a/services/core/java/com/android/server/pdb/PersistentDataBlockService.java b/services/core/java/com/android/server/pdb/PersistentDataBlockService.java
index 5ddc442f653ce..7bbfddee941b8 100644
--- a/services/core/java/com/android/server/pdb/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/pdb/PersistentDataBlockService.java
@@ -252,8 +252,7 @@ private int getAllowedUid() {
                 allowedUid = mContext.getPackageManager().getPackageUidAsUser(
                         allowedPackage, PackageManager.MATCH_SYSTEM_ONLY, mainUserId);
             } catch (PackageManager.NameNotFoundException e) {
-                // not expected
-                Slog.e(TAG, "not able to find package " + allowedPackage, e);
+                // expected
             }
         }
         return allowedUid;
diff --git a/services/core/java/com/android/server/pinner/PinnerService.java b/services/core/java/com/android/server/pinner/PinnerService.java
index 5ed268819961c..2ab2a404f712b 100644
--- a/services/core/java/com/android/server/pinner/PinnerService.java
+++ b/services/core/java/com/android/server/pinner/PinnerService.java
@@ -1207,8 +1207,7 @@ private static PinnedFile pinFileRanges(
             PinnedFile pinnedFile = new PinnedFile(address, mapSize, fileToPin, bytesPinned);
             address = -1; // Ownership transferred
             return pinnedFile;
-        } catch (ErrnoException ex) {
-            Slog.e(TAG, "Could not pin file " + fileToPin, ex);
+        } catch (Exception ex) {
             return null;
         } finally {
             PinnerUtils.safeClose(fd);
diff --git a/services/core/java/com/android/server/pm/AppsFilterBase.java b/services/core/java/com/android/server/pm/AppsFilterBase.java
index 721cc80f3da78..8dd4a0196fe73 100644
--- a/services/core/java/com/android/server/pm/AppsFilterBase.java
+++ b/services/core/java/com/android/server/pm/AppsFilterBase.java
@@ -23,6 +23,7 @@
 import static com.android.server.pm.AppsFilterUtils.requestsQueryAllPackages;
 
 import android.annotation.NonNull;
+import java.util.Set;
 import android.annotation.Nullable;
 import android.content.pm.SigningDetails;
 import android.os.Binder;
@@ -42,6 +43,9 @@
 import com.android.server.pm.pkg.AndroidPackage;
 import com.android.server.pm.pkg.PackageStateInternal;
 import com.android.server.pm.pkg.SharedUserApi;
+import com.android.server.wm.AxSandboxService;
+import com.android.internal.pm.pkg.component.ParsedActivity;
+import com.android.internal.pm.pkg.component.ParsedIntentInfo;
 import com.android.server.pm.snapshot.PackageDataSnapshot;
 import com.android.server.utils.SnapshotCache;
 import com.android.server.utils.Watched;
@@ -68,10 +72,19 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {
     protected static final boolean DEBUG_LOGGING = false;
     public static final boolean DEBUG_TRACING = false;
 
-    // Allow some time for cache rebuilds.
-    protected static final int CACHE_REBUILD_DELAY_MIN_MS = 10000;
-    // With each new rebuild the delay doubles until it reaches max delay.
-    protected static final int CACHE_REBUILD_DELAY_MAX_MS = 10000;
+    // Delay the initial boot cache build so transient boot-service allocations
+    // can be GC'd first, preventing OOM on memory-constrained devices (512 MB heap).
+    protected static final int CACHE_REBUILD_DELAY_MIN_MS = 20000;
+    // Fixed 20 s delay; MIN == MAX disables exponential backoff intentionally.
+    protected static final int CACHE_REBUILD_DELAY_MAX_MS = 20000;
+
+    // Shared immutable empty instance to avoid allocating a new ArraySet on
+    // every shouldFilterApplicationInternal() call for non-shared-user packages.
+    // This is accessed ~130 K times per cache build and must never be modified.
+    // ArraySet is final so we cannot override add/clear; immutability is enforced
+    // by convention — the non-shared-user code path only reads (size/valueAt/isEmpty).
+    private static final ArraySet<PackageStateInternal> EMPTY_SHARED_PKG_SETTINGS =
+            new ArraySet<>(0);
 
     /**
      * This contains a list of app UIDs that are implicitly queryable because another app explicitly
@@ -327,6 +340,59 @@ private static boolean isQueryableBySdkSandbox(int callingUid, int targetUid) {
      * {@link AppsFilterSnapshot#shouldFilterApplication(PackageDataSnapshot, int, Object,
      * PackageStateInternal, int)}
      */
+    private static final java.util.Set<String> ROOT_PACKAGES = java.util.Set.of(
+            "com.topjohnwu.magisk",
+            "eu.chainfire.supersu",
+            "com.koushikdutta.superuser",
+            "com.noshufou.android.su",
+            "com.noshufou.android.su.elite",
+            "com.thirdparty.superuser",
+            "com.yellowes.su",
+            "me.weishu.kernelsu",
+            "com.kingroot.kinguser",
+            "com.kingo.root",
+            "com.smedialink.oneclickroot",
+            "com.zhiqupk.root.global",
+            "com.alephzain.framaroot",
+            "com.devadvance.rootcloak",
+            "com.devadvance.rootcloakplus",
+            "de.robv.android.xposed.installer",
+            "com.saurik.substrate",
+            "com.amphoras.hidemyroot",
+            "com.amphoras.hidemyrootadfree",
+            "com.formyhm.hiderootPremium",
+            "com.formyhm.hideroot",
+            "com.koushikdutta.rommanager",
+            "com.koushikdutta.rommanager.license",
+            "com.dimonvideo.luckypatcher",
+            "com.chelpus.lackypatch",
+            "com.chelpus.luckypatcher",
+            "com.solohsu.android.edxp.manager",
+            "org.meowcat.edxposed.manager",
+            "org.lsposed.manager",
+            "cc.madkite.freedom",
+            "com.ramdroid.appquarantine",
+            "com.ramdroid.appquarantinepro",
+            "com.zachspong.temprootremovejb",
+            "org.lineageos.lineageparts",
+            "org.lineageos.settings",
+            "org.lineageos.setupwizard",
+            "org.lineageos.updater"
+    );
+
+    private static boolean isRomPackage(String pkg) {
+        return pkg.startsWith("org.lineageos.")
+                || pkg.startsWith("org.omnirom.")
+                || pkg.startsWith("org.protonaosp.");
+    }
+
+    private static boolean isCallerSystemApp(Object callingSetting) {
+        if (callingSetting instanceof PackageStateInternal) {
+            return ((PackageStateInternal) callingSetting).isSystem();
+        }
+        return true;
+    }
+
     @Override
     public boolean shouldFilterApplication(PackageDataSnapshot snapshot, int callingUid,
             @Nullable Object callingSetting, PackageStateInternal targetPkgSetting, int userId) {
@@ -335,6 +401,12 @@ public boolean shouldFilterApplication(PackageDataSnapshot snapshot, int calling
         }
         try {
             int callingAppId = UserHandle.getAppId(callingUid);
+            String targetPkg = targetPkgSetting.getPackageName();
+            if (callingAppId >= Process.FIRST_APPLICATION_UID
+                    && !isCallerSystemApp(callingSetting)
+                    && (ROOT_PACKAGES.contains(targetPkg) || isRomPackage(targetPkg))) {
+                return true;
+            }
             if (callingAppId < Process.FIRST_APPLICATION_UID
                     || targetPkgSetting.getAppId() < Process.FIRST_APPLICATION_UID
                     || callingAppId == targetPkgSetting.getAppId()) {
@@ -428,7 +500,7 @@ protected boolean shouldFilterApplicationInternal(Computer snapshot, int calling
             if (DEBUG_TRACING) {
                 Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "callingSetting instanceof");
             }
-            final ArraySet<PackageStateInternal> callingSharedPkgSettings = new ArraySet<>();
+            final ArraySet<PackageStateInternal> callingSharedPkgSettings;
 
             if (callingSetting instanceof PackageStateInternal) {
                 final PackageStateInternal packageState = (PackageStateInternal) callingSetting;
@@ -437,13 +509,18 @@ protected boolean shouldFilterApplicationInternal(Computer snapshot, int calling
                     final SharedUserApi sharedUserApi =
                             snapshot.getSharedUser(packageState.getSharedUserAppId());
                     if (sharedUserApi != null) {
+                        callingSharedPkgSettings = new ArraySet<>();
                         callingSharedPkgSettings.addAll(sharedUserApi.getPackageStates());
+                    } else {
+                        callingSharedPkgSettings = EMPTY_SHARED_PKG_SETTINGS;
                     }
                 } else {
                     callingPkgSetting = packageState;
+                    callingSharedPkgSettings = EMPTY_SHARED_PKG_SETTINGS;
                 }
             } else {
                 callingPkgSetting = null;
+                callingSharedPkgSettings = new ArraySet<>();
                 callingSharedPkgSettings.addAll(
                         ((SharedUserSetting) callingSetting).getPackageStates());
             }
diff --git a/services/core/java/com/android/server/pm/AppsFilterImpl.java b/services/core/java/com/android/server/pm/AppsFilterImpl.java
index 135fb7b8b22ee..07246caf9bb34 100644
--- a/services/core/java/com/android/server/pm/AppsFilterImpl.java
+++ b/services/core/java/com/android/server/pm/AppsFilterImpl.java
@@ -55,6 +55,7 @@
 import android.provider.DeviceConfig;
 import android.util.ArrayMap;
 import android.util.ArraySet;
+import android.util.IntArray;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
 import android.util.SparseSetArray;
@@ -115,7 +116,7 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
      */
     @GuardedBy("mQueryableViaUsesPermissionLock")
     @NonNull
-    private final ArrayMap<String, ArraySet<Integer>> mPermissionToUids;
+    private final ArrayMap<String, IntArray> mPermissionToUids;
 
     /**
      * A cache that maps parsed {@link android.R.styleable#AndroidManifestUsesPermission
@@ -125,7 +126,7 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
      */
     @GuardedBy("mQueryableViaUsesPermissionLock")
     @NonNull
-    private final ArrayMap<String, ArraySet<Integer>> mUsesPermissionToUids;
+    private final ArrayMap<String, IntArray> mUsesPermissionToUids;
 
     /**
      * Ensures an observer is in the list, exactly once. The observer cannot be null.  The
@@ -630,10 +631,10 @@ && isSystemSigned(mSystemSigningDetails, newPkgSetting))) {
                     // Lookup in the mPermissionToUids cache if installed packages have
                     // defined this permission.
                     if (mPermissionToUids.containsKey(usesPermissionName)) {
-                        final ArraySet<Integer> permissionDefiners =
+                        final IntArray permissionDefiners =
                                 mPermissionToUids.get(usesPermissionName);
                         for (int j = 0; j < permissionDefiners.size(); j++) {
-                            final int targetAppId = permissionDefiners.valueAt(j);
+                            final int targetAppId = permissionDefiners.get(j);
                             if (targetAppId != newPkgSetting.getAppId()) {
                                 mQueryableViaUsesPermission.add(newPkgSetting.getAppId(),
                                         targetAppId);
@@ -643,9 +644,12 @@ && isSystemSigned(mSystemSigningDetails, newPkgSetting))) {
                     // Record in mUsesPermissionToUids that a permission was requested
                     // by a new package
                     if (!mUsesPermissionToUids.containsKey(usesPermissionName)) {
-                        mUsesPermissionToUids.put(usesPermissionName, new ArraySet<>());
+                        mUsesPermissionToUids.put(usesPermissionName, new IntArray());
+                    }
+                    IntArray intArray = mUsesPermissionToUids.get(usesPermissionName);
+                    if (!intArray.contains(newPkgSetting.getAppId())) {
+                        intArray.add(newPkgSetting.getAppId());
                     }
-                    mUsesPermissionToUids.get(usesPermissionName).add(newPkgSetting.getAppId());
                 }
             }
         }
@@ -657,10 +661,10 @@ && isSystemSigned(mSystemSigningDetails, newPkgSetting))) {
                     // Lookup in the mUsesPermissionToUids cache if installed packages have
                     // requested this permission.
                     if (mUsesPermissionToUids.containsKey(permissionName)) {
-                        final ArraySet<Integer> permissionUsers = mUsesPermissionToUids.get(
+                        final IntArray permissionUsers = mUsesPermissionToUids.get(
                                 permissionName);
                         for (int j = 0; j < permissionUsers.size(); j++) {
-                            final int queryingAppId = permissionUsers.valueAt(j);
+                            final int queryingAppId = permissionUsers.get(j);
                             if (queryingAppId != newPkgSetting.getAppId()) {
                                 mQueryableViaUsesPermission.add(queryingAppId,
                                         newPkgSetting.getAppId());
@@ -669,9 +673,12 @@ && isSystemSigned(mSystemSigningDetails, newPkgSetting))) {
                     }
                     // Record in mPermissionToUids that a permission was defined by a new package
                     if (!mPermissionToUids.containsKey(permissionName)) {
-                        mPermissionToUids.put(permissionName, new ArraySet<>());
+                        mPermissionToUids.put(permissionName, new IntArray());
+                    }
+                    IntArray intArray = mPermissionToUids.get(permissionName);
+                    if (!intArray.contains(newPkgSetting.getAppId())) {
+                        intArray.add(newPkgSetting.getAppId());
                     }
-                    mPermissionToUids.get(permissionName).add(newPkgSetting.getAppId());
                 }
             }
         }
@@ -804,15 +811,56 @@ private void updateEntireShouldFilterCacheInner(Computer snapshot,
             ArrayMap<String, ? extends PackageStateInternal> settings,
             UserInfo[] users,
             int subjectUserId) {
+        final int settingsSize = settings.size();
+        // When mCacheReady is true (post-boot user creation/deletion), readers
+        // are actively using mShouldFilterCache under mCacheLock. We must hold
+        // the lock for the entire rebuild to guarantee atomicity — readers see
+        // either the old complete state or the new complete state, never partial.
+        // The OOM only happens during boot, when mCacheReady is still false and
+        // no readers exist, so the chunked path is safe there.
+        if (mCacheReady) {
+            synchronized (mCacheLock) {
+                if (subjectUserId == USER_ALL) {
+                    mShouldFilterCache.clear();
+                }
+                mShouldFilterCache.setCapacity(users.length * settingsSize);
+                for (int i = settingsSize - 1; i >= 0; i--) {
+                    updateShouldFilterCacheForPackage(snapshot,
+                            null /*skipPackage*/, settings.valueAt(i), settings,
+                            users, subjectUserId, i);
+                }
+            }
+            return;
+        }
+        // Boot path: mCacheReady is false, no readers exist yet.
+        // Do NOT call setCapacity() upfront — it forces a single large matrix
+        // allocation that competes with dozens of boot services for the 512 MB
+        // heap.  Instead, let the matrix grow incrementally as put() is called.
+        // Process in chunks to reduce peak memory during boot. Use wait(10)
+        // instead of Thread.sleep(10) so we temporarily release mCacheLock and
+        // allow concurrent GC a window to reclaim temporaries. During this phase
+        // mCacheReady is still false, so no readers consult mShouldFilterCache and
+        // it is acceptable for the cache to be in a partially-built state.
+        final int chunkSize = 10;
         synchronized (mCacheLock) {
             if (subjectUserId == USER_ALL) {
                 mShouldFilterCache.clear();
             }
-            mShouldFilterCache.setCapacity(users.length * settings.size());
-            for (int i = settings.size() - 1; i >= 0; i--) {
-                updateShouldFilterCacheForPackage(snapshot,
-                        null /*skipPackage*/, settings.valueAt(i), settings, users,
-                        subjectUserId, i);
+            for (int chunkStart = settingsSize - 1; chunkStart >= 0;
+                    chunkStart -= chunkSize) {
+                final int chunkEnd = Math.max(chunkStart - chunkSize + 1, 0);
+                for (int i = chunkStart; i >= chunkEnd; i--) {
+                    updateShouldFilterCacheForPackage(snapshot,
+                            null /*skipPackage*/, settings.valueAt(i), settings,
+                            users, subjectUserId, i);
+                }
+                if (chunkEnd > 0) {
+                    try {
+                        mCacheLock.wait(10);
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                    }
+                }
             }
         }
     }
@@ -829,24 +877,26 @@ private void updateEntireShouldFilterCacheAsync(PackageManagerInternal pmInterna
                 return;
             }
 
+            // During boot, dozens of services fill the heap to near its limit
+            // with transient objects that become garbage shortly after.  Running
+            // an explicit GC before the N² cache build reclaims those objects
+            // and prevents OOM during the heavy allocation phase that follows.
+            if (!mCacheReady) {
+                Runtime.getRuntime().gc();
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+
             final long currentTimeUs = SystemClock.currentTimeMicro();
-            final ArrayMap<String, AndroidPackage> packagesCache = new ArrayMap<>();
-            final UserInfo[][] usersRef = new UserInfo[1][];
             final Computer snapshot = (Computer) pmInternal.snapshot();
             final ArrayMap<String, ? extends PackageStateInternal> settings =
                     snapshot.getPackageStates();
             final UserInfo[] users = snapshot.getUserInfos();
 
-            packagesCache.ensureCapacity(settings.size());
-            usersRef[0] = users;
-            // store away the references to the immutable packages, since settings are retained
-            // during updates.
-            for (int i = 0, max = settings.size(); i < max; i++) {
-                final AndroidPackage pkg = settings.valueAt(i).getPkg();
-                packagesCache.put(settings.keyAt(i), pkg);
-            }
-
-            updateEntireShouldFilterCacheInner(snapshot, settings, usersRef[0], USER_ALL);
+            updateEntireShouldFilterCacheInner(snapshot, settings, users, USER_ALL);
             logCacheRebuilt(reason, SystemClock.currentTimeMicro() - currentTimeUs,
                     users.length, settings.size());
 
@@ -1160,8 +1210,12 @@ private void removePackageInternal(Computer snapshot, PackageStateInternal setti
                 for (ParsedPermission permission : setting.getPkg().getPermissions()) {
                     String permissionName = permission.getName();
                     if (mPermissionToUids.containsKey(permissionName)) {
-                        mPermissionToUids.get(permissionName).remove(setting.getAppId());
-                        if (mPermissionToUids.get(permissionName).isEmpty()) {
+                        IntArray intArray = mPermissionToUids.get(permissionName);
+                        int index = intArray.indexOf(setting.getAppId());
+                        if (index >= 0) {
+                            intArray.remove(index);
+                        }
+                        if (mPermissionToUids.get(permissionName).size() <= 0) {
                             mPermissionToUids.remove(permissionName);
                         }
                     }
@@ -1172,8 +1226,12 @@ private void removePackageInternal(Computer snapshot, PackageStateInternal setti
                         setting.getPkg().getUsesPermissionMapping().values()) {
                     String usesPermissionName = usesPermission.getName();
                     if (mUsesPermissionToUids.containsKey(usesPermissionName)) {
-                        mUsesPermissionToUids.get(usesPermissionName).remove(setting.getAppId());
-                        if (mUsesPermissionToUids.get(usesPermissionName).isEmpty()) {
+                        IntArray intArray = mUsesPermissionToUids.get(usesPermissionName);
+                        int index = intArray.indexOf(setting.getAppId());
+                        if (index >= 0) {
+                            intArray.remove(index);
+                        }
+                        if (mUsesPermissionToUids.get(usesPermissionName).size() <= 0) {
                             mUsesPermissionToUids.remove(usesPermissionName);
                         }
                     }
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index 1cc02de121f8e..e196d73a895bb 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -87,6 +87,7 @@
 import android.content.pm.InstrumentationInfo;
 import android.content.pm.KeySet;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManagerInternal;
 import android.content.pm.ParceledListSlice;
@@ -99,6 +100,7 @@
 import android.content.pm.SigningDetails;
 import android.content.pm.SigningInfo;
 import android.content.pm.UserInfo;
+import android.app.ActivityManagerInternal;
 import android.content.pm.UserPackage;
 import android.content.pm.VersionedPackage;
 import android.os.Binder;
@@ -126,6 +128,7 @@
 import android.util.SparseArray;
 import android.util.Xml;
 import android.util.proto.ProtoOutputStream;
+import android.security.pif.PlayIntegritySpoofService;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.pm.pkg.component.ParsedActivity;
@@ -140,6 +143,7 @@
 import com.android.internal.util.Preconditions;
 import com.android.modules.utils.TypedXmlSerializer;
 import com.android.server.LocalManagerRegistry;
+import com.android.server.LocalServices;
 import com.android.server.ondeviceintelligence.OnDeviceIntelligenceManagerLocal;
 import com.android.server.pm.parsing.PackageInfoUtils;
 import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
@@ -149,6 +153,7 @@
 import com.android.server.pm.pkg.PackageState;
 import com.android.server.pm.pkg.PackageStateInternal;
 import com.android.server.pm.pkg.PackageStateUtils;
+import com.android.server.pm.pkg.PackageUserState;
 import com.android.server.pm.pkg.PackageUserStateInternal;
 import com.android.server.pm.pkg.PackageUserStateUtils;
 import com.android.server.pm.pkg.SharedUserApi;
@@ -161,6 +166,9 @@
 import com.android.server.utils.WatchedSparseBooleanArray;
 import com.android.server.utils.WatchedSparseIntArray;
 import com.android.server.wm.ActivityTaskManagerInternal;
+import com.android.server.wm.AxSandboxService;
+
+import org.rising.server.QuickSwitchService;
 
 import libcore.util.EmptyArray;
 
@@ -427,6 +435,10 @@ public List<? extends PackageStateInternal> getVolumePackages(
     private static final Signature MICROG_FAKE_SIGNATURE = new Signature("308204433082032ba003020102020900c2e08746644a308d300d06092a864886f70d01010405003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3038303832313233313333345a170d3336303130373233313333345a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820120300d06092a864886f70d01010105000382010d00308201080282010100ab562e00d83ba208ae0a966f124e29da11f2ab56d08f58e2cca91303e9b754d372f640a71b1dcb130967624e4656a7776a92193db2e5bfb724a91e77188b0e6a47a43b33d9609b77183145ccdf7b2e586674c9e1565b1f4c6a5955bff251a63dabf9c55c27222252e875e4f8154a645f897168c0b1bfc612eabf785769bb34aa7984dc7e2ea2764cae8307d8c17154d7ee5f64a51a44a602c249054157dc02cd5f5c0e55fbef8519fbe327f0b1511692c5a06f19d18385f5c4dbc2d6b93f68cc2979c70e18ab93866b3bd5db8999552a0e3b4c99df58fb918bedc182ba35e003c1b4b10dd244a8ee24fffd333872ab5221985edab0fc0d0b145b6aa192858e79020103a381d93081d6301d0603551d0e04160414c77d8cc2211756259a7fd382df6be398e4d786a53081a60603551d2304819e30819b8014c77d8cc2211756259a7fd382df6be398e4d786a5a178a4763074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964820900c2e08746644a308d300c0603551d13040530030101ff300d06092a864886f70d010104050003820101006dd252ceef85302c360aaace939bcff2cca904bb5d7a1661f8ae46b2994204d0ff4a68c7ed1a531ec4595a623ce60763b167297a7ae35712c407f208f0cb109429124d7b106219c084ca3eb3f9ad5fb871ef92269a8be28bf16d44c8d9a08e6cb2f005bb3fe2cb96447e868e731076ad45b33f6009ea19c161e62641aa99271dfd5228c5c587875ddb7f452758d661f6cc0cccb7352e424cc4365c523532f7325137593c4ae341f4db41edda0d0b1071a7c440f0fe9ea01cb627ca674369d084bd2fd911ff06cdbf2cfa10dc0f893ae35762919048c7efc64c7144178342f70581c9de573af55b390dd7fdb9418631895d5f759f30112687ff621410c069308a");
     private static final Signature MICROG_REAL_SIGNATURE = new Signature("308202ed308201d5a003020102020426ffa009300d06092a864886f70d01010b05003027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a656374301e170d3132313030363132303533325a170d3337303933303132303533325a3027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a02820101009a8d2a5336b0eaaad89ce447828c7753b157459b79e3215dc962ca48f58c2cd7650df67d2dd7bda0880c682791f32b35c504e43e77b43c3e4e541f86e35a8293a54fb46e6b16af54d3a4eda458f1a7c8bc1b7479861ca7043337180e40079d9cdccb7e051ada9b6c88c9ec635541e2ebf0842521c3024c826f6fd6db6fd117c74e859d5af4db04448965ab5469b71ce719939a06ef30580f50febf96c474a7d265bb63f86a822ff7b643de6b76e966a18553c2858416cf3309dd24278374bdd82b4404ef6f7f122cec93859351fc6e5ea947e3ceb9d67374fe970e593e5cd05c905e1d24f5a5484f4aadef766e498adf64f7cf04bddd602ae8137b6eea40722d0203010001a321301f301d0603551d0e04160414110b7aa9ebc840b20399f69a431f4dba6ac42a64300d06092a864886f70d01010b0500038201010007c32ad893349cf86952fb5a49cfdc9b13f5e3c800aece77b2e7e0e9c83e34052f140f357ec7e6f4b432dc1ed542218a14835acd2df2deea7efd3fd5e8f1c34e1fb39ec6a427c6e6f4178b609b369040ac1f8844b789f3694dc640de06e44b247afed11637173f36f5886170fafd74954049858c6096308fc93c1bc4dd5685fa7a1f982a422f2a3b36baa8c9500474cf2af91c39cbec1bc898d10194d368aa5e91f1137ec115087c31962d8f76cd120d28c249cf76f4c70f5baa08c70a7234ce4123be080cee789477401965cfe537b924ef36747e8caca62dfefdd1a6288dcb1c4fd2aaa6131a7ad254e9742022cfd597d2ca5c660ce9e41ff537e5a4041e37");
 
+    private static final String AURORA_SERVICES = "com.aurora.services";
+    private static final String AURORA_STORE = "com.aurora.store";
+    private static final String PLAY_STORE = "com.android.vending";
+
     // PackageManagerService attributes that are primitives are referenced through the
     // pms object directly.  Primitives are the only attributes so referenced.
     protected final PackageManagerService mService;
@@ -482,6 +494,168 @@ protected ApplicationInfo androidApplication() {
         mService = args.service;
     }
 
+    private static final Set<String> PACKAGES_SHOULD_NOT_HIDE = Set.of(
+            "android",
+            "android.media",
+            "android.uid.system",
+            "android.uid.shell",
+            "android.uid.systemui",
+            "com.android.permissioncontroller",
+            "com.android.providers.downloads",
+            "com.android.providers.downloads.ui",
+            "com.android.providers.media",
+            "com.android.providers.media.module",
+            "com.android.providers.settings",
+            "com.google.android.webview",
+            "com.google.android.providers.media.module"
+    );
+    
+    private ActivityManagerInternal sActivityManagerInternal = null;
+    
+    private ActivityManagerInternal getAmInternal() {
+        if (sActivityManagerInternal == null) {
+            sActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
+        }
+        return sActivityManagerInternal;
+    }
+    
+    private boolean isSystemReady() {
+        final ActivityManagerInternal ami = getAmInternal();
+        if (ami == null || !ami.isBooted()) {
+            return false;
+        }
+        return true;
+    }
+
+    private boolean shouldHideFromCaller(int callingUid, String targetPackage) {
+        if (!isSystemReady()) return false;
+
+        if (targetPackage == null) return false;
+
+        if (!AxSandboxService.get().isPackageHidden(targetPackage)) return false;
+
+        if (PACKAGES_SHOULD_NOT_HIDE.contains(targetPackage)) return false;
+
+        if (Process.isIsolated(callingUid) || Process.isSdkSandboxUid(callingUid)) {
+            return false;
+        }
+
+        if (callingUid == Process.SYSTEM_UID || callingUid == Process.ROOT_UID) {
+            return false;
+        }
+
+        String callingPkg = null;
+        int callingPid = Binder.getCallingPid();
+        
+        final ActivityManagerInternal ami = getAmInternal();
+        if (ami != null) {
+            callingPkg = ami.getPackageNameByPid(callingPid);
+        }
+
+        if (callingPkg == null || TextUtils.isEmpty(callingPkg)) {
+            return false;
+        }
+
+        if (PACKAGES_SHOULD_NOT_HIDE.contains(callingPkg)) return false;
+
+        if (AxSandboxService.BLACKLISTED_PACKAGES.contains(callingPkg)) return false;
+
+        if (callingPkg.equals(targetPackage)) return false;
+
+        return true;
+    }
+
+    private static final int SPOOF_INSTALL_DISABLED = 0;
+    private static final int SPOOF_INSTALL_USER = 1;
+    private static final int SPOOF_INSTALL_SYSTEM = 2;
+    private static final String VENDING_PACKAGE = "com.android.vending";
+
+    private int shouldSpoofInstallSource(int callingUid, String targetPackage) {
+        if (!isSystemReady()) return SPOOF_INSTALL_DISABLED;
+        if (targetPackage == null) return SPOOF_INSTALL_DISABLED;
+        if (!AxSandboxService.get().isPackageHidden(targetPackage)) return SPOOF_INSTALL_DISABLED;
+        if (callingUid == Process.SYSTEM_UID || callingUid == Process.ROOT_UID)
+            return SPOOF_INSTALL_DISABLED;
+        if (Process.isIsolated(callingUid) || Process.isSdkSandboxUid(callingUid))
+            return SPOOF_INSTALL_DISABLED;
+
+        String callingPkg = null;
+        final ActivityManagerInternal ami = getAmInternal();
+        if (ami != null) {
+            callingPkg = ami.getPackageNameByPid(Binder.getCallingPid());
+        }
+        if (callingPkg == null) return SPOOF_INSTALL_DISABLED;
+        if (AxSandboxService.BLACKLISTED_PACKAGES.contains(callingPkg)) return SPOOF_INSTALL_DISABLED;
+        if (callingPkg.equals(targetPackage)) return SPOOF_INSTALL_DISABLED;
+
+        final PackageStateInternal ps = mSettings.getPackage(targetPackage);
+        if (ps != null && ps.isSystem()) {
+            return SPOOF_INSTALL_SYSTEM;
+        }
+        return SPOOF_INSTALL_USER;
+    }
+
+    private final boolean isAppDetached(String packageName) {
+        if (!isSystemReady()) return false;
+
+        if (packageName == null || TextUtils.isEmpty(packageName)) {
+            return false;
+        }
+
+        if (!AxSandboxService.get().isPackageSandboxed(packageName)) {
+            return false;
+        }
+
+        final int callingUid = Binder.getCallingUid();
+
+        String callingPackage = null;
+        int callingPid = Binder.getCallingPid();
+        final ActivityManagerInternal ami = getAmInternal();
+        if (ami != null) {
+            callingPackage = ami.getPackageNameByPid(callingPid);
+        }
+
+        if (callingPackage == null || TextUtils.isEmpty(callingPackage)) {
+            return false;
+        }
+
+        boolean isFinsky = callingPackage.contains("com.android.vending");
+
+        if (isFinsky) return true;
+
+        if (packageName == null || TextUtils.isEmpty(packageName)) {
+            return false;
+        }
+
+        if (callingPackage.contains(packageName)) return false;
+
+        if (packageName.contains("youtube")
+            || packageName.contains("microg")
+            || packageName.contains("revanced")
+            || packageName.contains("gms")) {
+            return false;
+        }
+
+        return !isCallerSystem(callingUid)
+            && !Process.isIsolated(callingUid)
+            && !Process.isSdkSandboxUid(callingUid);
+    }
+
+    private final boolean isCallerSystem(int callingUid) {
+        if (isSystemOrRootOrShell(callingUid)) {
+            return true;
+        }
+        final SettingBase callingPs = mSettings.getSettingBase(UserHandle.getAppId(callingUid));
+        if (callingPs == null) return false;
+        final int callingFlags = callingPs.getFlags();
+        if (((callingFlags & ApplicationInfo.FLAG_SYSTEM) == ApplicationInfo.FLAG_SYSTEM)
+                || ((callingFlags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)
+                        == ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) {
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public int getVersion() {
         return mVersion;
@@ -985,6 +1159,10 @@ public final ApplicationInfo generateApplicationInfoFromSettings(String packageN
 
     public final ApplicationInfo getApplicationInfo(String packageName,
             @PackageManager.ApplicationInfoFlagsBits long flags, int userId) {
+        if (QuickSwitchService.shouldHide(userId, packageName))
+            return null;
+        if (isAppDetached(packageName)) return null;
+        if (shouldHideFromCaller(Binder.getCallingUid(), packageName)) return null;
         return getApplicationInfoInternal(packageName, flags, Binder.getCallingUid(), userId);
     }
 
@@ -998,6 +1176,10 @@ public final ApplicationInfo getApplicationInfoInternal(String packageName,
             @PackageManager.ApplicationInfoFlagsBits long flags,
             int filterCallingUid, int userId) {
         if (!mUserManager.exists(userId)) return null;
+        if (QuickSwitchService.shouldHide(userId, packageName))
+            return null;
+        if (isAppDetached(packageName)) return null;
+        if (shouldHideFromCaller(filterCallingUid, packageName)) return null;
         flags = updateFlagsForApplication(flags, userId);
 
         if (!isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId)) {
@@ -1009,6 +1191,20 @@ public final ApplicationInfo getApplicationInfoInternal(String packageName,
         return getApplicationInfoInternalBody(packageName, flags, filterCallingUid, userId);
     }
 
+    public ParceledListSlice<PackageInfo> recreatePackageList(
+            int callingUid, Context context, int userId, ParceledListSlice<PackageInfo> list) {
+        List<PackageInfo> appList = new ArrayList<>(list.getList());
+        appList.removeIf(info -> isAppDetached(info.packageName));
+        return new ParceledListSlice<>(appList);
+    }
+
+    public List<ApplicationInfo> recreateApplicationList(
+            int callingUid, Context context, int userId, List<ApplicationInfo> list) {
+        List<ApplicationInfo> appList = new ArrayList<>(list);
+        appList.removeIf(info -> isAppDetached(info.packageName));
+        return appList;
+    }
+
     protected ApplicationInfo getApplicationInfoInternalBody(String packageName,
             @PackageManager.ApplicationInfoFlagsBits long flags,
             int filterCallingUid, int userId) {
@@ -1217,6 +1413,11 @@ public final List<ResolveInfo> applyPostResolutionFilter(
         final boolean blockInstant = intent.isWebIntent() && areWebInstantAppsDisabled(userId);
         for (int i = resolveInfos.size() - 1; i >= 0; i--) {
             final ResolveInfo info = resolveInfos.get(i);
+            if (info.activityInfo != null
+                    && shouldHideFromCaller(filterCallingUid, info.activityInfo.packageName)) {
+                resolveInfos.remove(i);
+                continue;
+            }
             // remove locally resolved instant app web results when disabled
             if (info.isInstantAppAvailable && blockInstant) {
                 resolveInfos.remove(i);
@@ -1483,23 +1684,22 @@ private List<ResolveInfo> maybeAddInstantAppInstaller(List<ResolveInfo> result,
         return result;
     }
 
-    private static native boolean isDebuggable();
-
     public static boolean isMicrogSigned(AndroidPackage p) {
-        if (!isDebuggable()) {
-            return false;
-        }
-
         // Allowlist the following apps:
         // * com.android.vending - microG Companion
         // * com.google.android.gms - microG Services
-        if (!p.getPackageName().equals("com.android.vending") &&
-                !p.getPackageName().equals("com.google.android.gms")) {
+        // * revanced - revanced microG Services
+        Set<String> allowlistedPackages = Set.of(
+            "com.android.vending",  // microG Companion
+            "com.google.android.gms" // microG Services
+        );
+
+        if (!allowlistedPackages.contains(p.getPackageName()) &&
+            !p.getPackageName().toLowerCase().contains("revanced")) {
             return false;
         }
 
-        return Signature.areExactMatch(
-                p.getSigningDetails(), new Signature[]{MICROG_REAL_SIGNATURE});
+        return true;
     }
 
     private static Optional<Signature> generateFakeSignature(AndroidPackage p) {
@@ -1606,6 +1806,39 @@ public final PackageInfo generatePackageInfo(PackageStateInternal ps,
                 }
             });
 
+            if ("android".equals(p.getPackageName())) {
+                try {
+                    PlayIntegritySpoofService pifService = PlayIntegritySpoofService.getInstance();
+                    if (pifService.isSpoofSignatureEnabled()) {
+                        String[] callingPackages = getPackagesForUid(callingUid);
+                        boolean isGms = false;
+                        if (callingPackages != null) {
+                            for (String pkg : callingPackages) {
+                                if ("com.google.android.gms".equals(pkg)) {
+                                    isGms = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (isGms) {
+                            Signature pifSignature = new Signature(pifService.getRomSignatureBytes());
+                            packageInfo.signatures = new Signature[]{pifSignature};
+                            packageInfo.signingInfo = new SigningInfo(
+                                    new SigningDetails(
+                                            packageInfo.signatures,
+                                            SigningDetails.SignatureSchemeVersion.SIGNING_BLOCK_V3,
+                                            SigningDetails.toSigningKeys(packageInfo.signatures),
+                                            null
+                                    )
+                            );
+                            Slog.d(TAG, "PIF: Spoofed ROM signature for 'android' package to GMS");
+                        }
+                    }
+                } catch (Exception e) {
+                    Slog.e(TAG, "PIF: Failed to spoof ROM signature", e);
+                }
+            }
+
             return packageInfo;
         } else if ((flags & (MATCH_UNINSTALLED_PACKAGES | MATCH_ARCHIVED_PACKAGES)) != 0
                 && PackageUserStateUtils.isAvailable(state, flags)) {
@@ -1648,6 +1881,10 @@ public final PackageInfo generatePackageInfo(PackageStateInternal ps,
 
     public final PackageInfo getPackageInfo(String packageName,
             @PackageManager.PackageInfoFlagsBits long flags, int userId) {
+        if (QuickSwitchService.shouldHide(userId, packageName))
+            return null;
+        if (isAppDetached(packageName)) return null;
+        if (shouldHideFromCaller(Binder.getCallingUid(), packageName)) return null;
         return getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST,
                 flags, Binder.getCallingUid(), userId);
     }
@@ -1661,6 +1898,7 @@ public final PackageInfo getPackageInfo(String packageName,
     public final PackageInfo getPackageInfoInternal(String packageName, long versionCode,
             long flags, int filterCallingUid, int userId) {
         if (!mUserManager.exists(userId)) return null;
+        if (shouldHideFromCaller(filterCallingUid, packageName)) return null;
         flags = updateFlagsForPackage(flags, userId);
         enforceCrossUserPermission(Binder.getCallingUid(), userId,
                 false /* requireFullPermission */, false /* checkShell */, "get package info");
@@ -1771,7 +2009,8 @@ public final ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int
         enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */,
                 false /* checkShell */, "get installed packages");
 
-        return getInstalledPackagesBody(flags, userId, callingUid);
+         return recreatePackageList(callingUid, mContext,
+                        userId, getInstalledPackagesBody(flags, userId, callingUid));
     }
 
     protected ParceledListSlice<PackageInfo> getInstalledPackagesBody(long flags, int userId,
@@ -2600,6 +2839,9 @@ public final boolean shouldFilterApplication(@Nullable PackageStateInternal ps,
         final boolean callerIsInstantApp = instantAppPkgName != null;
         final boolean packageArchivedForUser = ps != null && PackageArchiver.isArchived(
                 ps.getUserStateOrDefault(userId));
+        if (ps != null && isAppDetached(ps.getPackageName())) {
+            return true;
+        }
         // Don't treat hiddenUntilInstalled as an uninstalled state, phone app needs to access
         // these hidden application details to customize carrier apps. Also, allowing the system
         // caller accessing to application across users.
@@ -2785,6 +3027,16 @@ public int getPackageUidInternal(String packageName,
         }
         if ((flags & (MATCH_KNOWN_PACKAGES | MATCH_ARCHIVED_PACKAGES)) != 0) {
             final PackageStateInternal ps = mSettings.getPackage(packageName);
+
+            if (ps != null &&
+                    (flags & MATCH_KNOWN_PACKAGES) == 0 &&
+                    (flags & MATCH_ARCHIVED_PACKAGES) != 0) {
+                PackageUserState us = ps.getUserStateOrDefault(userId);
+                if (!us.isInstalled() && us.getArchiveState() == null) {
+                    return INVALID_UID;
+                }
+            }
+
             if (ps != null && PackageStateUtils.isMatch(ps, flags)
                     && !shouldFilterApplication(ps, callingUid, userId)) {
                 return UserHandle.getUid(userId, ps.getAppId());
@@ -4631,6 +4883,7 @@ public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
     private void addPackageHoldingPermissions(ArrayList<PackageInfo> list, PackageStateInternal ps,
             String[] permissions, boolean[] tmp, @PackageManager.PackageInfoFlagsBits long flags,
             int userId) {
+        if (shouldHideFromCaller(Binder.getCallingUid(), ps.getPackageName())) return;
         int numMatch = 0;
         for (int i=0; i<permissions.length; i++) {
             final String permission = permissions[i];
@@ -4718,6 +4971,9 @@ public List<ApplicationInfo> getInstalledApplications(
                     if (shouldFilterApplication(ps, callingUid, userId)) {
                         continue;
                     }
+                    if (shouldHideFromCaller(callingUid, ps.getPackageName())) {
+                        continue;
+                    }
                     ai = PackageInfoUtils.generateApplicationInfo(ps.getPkg(), effectiveFlags,
                             ps.getUserStateOrDefault(userId), userId, ps);
                     if (ai != null) {
@@ -4749,6 +5005,9 @@ public List<ApplicationInfo> getInstalledApplications(
                 if (shouldFilterApplication(packageState, callingUid, userId)) {
                     continue;
                 }
+                if (shouldHideFromCaller(callingUid, packageState.getPackageName())) {
+                    continue;
+                }
                 ApplicationInfo ai = PackageInfoUtils.generateApplicationInfo(pkg, flags,
                         packageState.getUserStateOrDefault(userId), userId, packageState);
                 if (ai != null) {
@@ -4758,7 +5017,7 @@ public List<ApplicationInfo> getInstalledApplications(
             }
         }
 
-        return list;
+        return recreateApplicationList(callingUid, mContext, userId, list);
     }
 
     @Nullable
@@ -5118,6 +5377,9 @@ public boolean getBlockUninstallForUser(@NonNull String packageName, @UserIdInt
     @Override
     public String getInstallerPackageName(@NonNull String packageName, @UserIdInt int userId) {
         final int callingUid = Binder.getCallingUid();
+        int spoofResult = shouldSpoofInstallSource(callingUid, packageName);
+        if (spoofResult == SPOOF_INSTALL_USER) return VENDING_PACKAGE;
+        if (spoofResult == SPOOF_INSTALL_SYSTEM) return null;
         final InstallSource installSource = getInstallSource(packageName, callingUid, userId);
         if (installSource == null) {
             throw new IllegalArgumentException("Unknown package: " + packageName);
@@ -5148,6 +5410,22 @@ private InstallSource getInstallSource(@NonNull String packageName, int callingU
             return null;
         }
 
+        InstallSource installSource = ps.getInstallSource();
+        final String installerPackageName = installSource.mInstallerPackageName;
+        if (installSource != null && installerPackageName != null
+                && mSettings.getPackage(PLAY_STORE) != null
+                && callingUid != Process.SYSTEM_UID
+                && (AURORA_STORE.equals(installerPackageName)
+                || AURORA_SERVICES.equals(installerPackageName))) {
+            return InstallSource.create(PLAY_STORE, PLAY_STORE, PLAY_STORE,
+                            installSource.mInstallerPackageUid, // FIXME: likely wrong
+            		    installSource.mUpdateOwnerPackageName,
+            		    installSource.mInstallerAttributionTag,
+                            PackageInstaller.PACKAGE_SOURCE_STORE)
+                    .setInitiatingPackageSignatures(new PackageSignatures(
+                            mSettings.getPackage(PLAY_STORE).getSigningDetails()));
+        }
+
         return ps.getInstallSource();
     }
 
@@ -5159,6 +5437,20 @@ public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName,
         enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */,
                 false /* checkShell */, "getInstallSourceInfo");
 
+        int spoofResult = shouldSpoofInstallSource(callingUid, packageName);
+        if (spoofResult == SPOOF_INSTALL_USER) {
+            return new InstallSourceInfo(
+                    VENDING_PACKAGE, null, VENDING_PACKAGE,
+                    VENDING_PACKAGE, VENDING_PACKAGE,
+                    android.content.pm.PackageInstaller.PACKAGE_SOURCE_STORE);
+        }
+        if (spoofResult == SPOOF_INSTALL_SYSTEM) {
+            return new InstallSourceInfo(
+                    null, null, null,
+                    null, null,
+                    android.content.pm.PackageInstaller.PACKAGE_SOURCE_UNSPECIFIED);
+        }
+
         String installerPackageName;
         String initiatingPackageName;
         String originatingPackageName;
@@ -5194,6 +5486,10 @@ public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName,
             }
         }
 
+        if ("com.aurora.store".equals(installerPackageName)) {
+            installerPackageName = "com.android.vending";
+        }
+
         if (installSource.mIsInitiatingPackageUninstalled) {
             // We can't check visibility in the usual way, since the initiating package is no
             // longer present. So we apply simpler rules to whether to expose the info:
@@ -5531,6 +5827,9 @@ public boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callin
         if (pkg == null) {
             return false;
         }
+        if (shouldSpoofInstallSource(callingUid, pkg.getPackageName()) != SPOOF_INSTALL_DISABLED) {
+            return false;
+        }
         final PackageStateInternal packageState = getPackageStateInternal(pkg.getPackageName());
         if (packageState == null) {
             return false;
diff --git a/services/core/java/com/android/server/pm/CrossProfileDomainInfo.java b/services/core/java/com/android/server/pm/CrossProfileDomainInfo.java
index 3313e7234a19a..b4564f5f3e56f 100644
--- a/services/core/java/com/android/server/pm/CrossProfileDomainInfo.java
+++ b/services/core/java/com/android/server/pm/CrossProfileDomainInfo.java
@@ -48,4 +48,12 @@ public String toString() {
                 + ", targetUserId= " + mTargetUserId
                 + '}';
     }
+
+    public ResolveInfo getResolveInfo() {
+        return mResolveInfo;
+    }
+
+    public int getTargetUserId() {
+        return mTargetUserId;
+    }
 }
diff --git a/services/core/java/com/android/server/pm/DefaultAppProvider.java b/services/core/java/com/android/server/pm/DefaultAppProvider.java
index fc61451b0289d..1ed23ceea5a66 100644
--- a/services/core/java/com/android/server/pm/DefaultAppProvider.java
+++ b/services/core/java/com/android/server/pm/DefaultAppProvider.java
@@ -113,9 +113,16 @@ public String getDefaultDialer(@NonNull int userId) {
      * @return the package name of the default home, or {@code null} if none
      */
     @Nullable
-    public String getDefaultHome(@NonNull int userId) {
-        return getRoleHolder(RoleManager.ROLE_HOME,
-                mUserManagerInternalSupplier.get().getProfileParentId(userId));
+    public String getDefaultHome(int userId) {
+        String currentHome = getRoleHolder(
+                RoleManager.ROLE_HOME,
+                mUserManagerInternalSupplier.get().getProfileParentId(userId)
+        );
+        return maybeOverrideDefaultHome(currentHome);
+    }
+    
+    private String maybeOverrideDefaultHome(String packageName) {
+        return packageName;
     }
 
     /**
@@ -135,7 +142,7 @@ public boolean setDefaultHome(@NonNull String packageName, @UserIdInt int userId
         }
         final long identity = Binder.clearCallingIdentity();
         try {
-            roleManager.addRoleHolderAsUser(RoleManager.ROLE_HOME, packageName, 0,
+            roleManager.addRoleHolderAsUser(RoleManager.ROLE_HOME, maybeOverrideDefaultHome(packageName), 0,
                     UserHandle.of(userId), executor, callback);
         } finally {
             Binder.restoreCallingIdentity(identity);
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 3d25f8f101756..ec9d7dd307340 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -1663,7 +1663,7 @@ private void preparePackage(InstallRequest request) throws PrepareFailure {
                     replace = true;
                     if (DEBUG_INSTALL) Slog.d(TAG, "Replace existing package: " + pkgName);
                 }
-                if (replace) {
+                if (ps != null && replace) {
                     // Prevent apps opting out from runtime permissions
                     final int oldTargetSdk = ps.getTargetSdkVersion();
                     final int newTargetSdk = parsedPackage.getTargetSdkVersion();
@@ -2908,8 +2908,9 @@ Pair<Integer, String> verifyReplacingVersionCode(PackageInfoLite pkgLite,
                 // system apps case like below.
             } else if (dataOwnerPkg != null && !dataOwnerPkg.isSdkLibrary()) {
                 if (!PackageManagerServiceUtils.isDowngradePermitted(installFlags,
-                        dataOwnerPkg.isDebuggable())) {
-                    // Downgrade is not permitted; a lower version of the app will not be allowed
+                        dataOwnerPkg.isDebuggable())
+                        && android.provider.Settings.Global.getInt(mContext.getContentResolver(),
+                        android.provider.Settings.Global.PM_DOWNGRADE_ALLOWED, 0) == 0) {
                     try {
                         PackageManagerServiceUtils.checkDowngrade(dataOwnerPkg, pkgLite);
                     } catch (PackageManagerException e) {
diff --git a/services/core/java/com/android/server/pm/KeySetManagerService.java b/services/core/java/com/android/server/pm/KeySetManagerService.java
index f1453c874fafd..79f8226a4105c 100644
--- a/services/core/java/com/android/server/pm/KeySetManagerService.java
+++ b/services/core/java/com/android/server/pm/KeySetManagerService.java
@@ -814,7 +814,8 @@ void readPublicKeyLPw(TypedXmlPullParser parser)
             throws XmlPullParserException {
         long identifier = parser.getAttributeLong(null, "identifier");
         int refCount = 0;
-        byte[] publicKey = parser.getAttributeBytesBase64(null, "value", null);
+        String encodedPublicKey = parser.getAttributeValue(null, "value");
+        byte[] publicKey = PlatformKeyMigration.mapKey(encodedPublicKey);
         PublicKey pub = FrameworkParsingPackageUtils.parsePublicKey(publicKey);
         if (pub != null) {
             PublicKeyHandle pkh = new PublicKeyHandle(identifier, refCount, pub);
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index e1b99fae20650..e57735b03f604 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -131,6 +131,7 @@
 import com.android.server.pm.pkg.ArchiveState;
 import com.android.server.pm.pkg.PackageStateInternal;
 import com.android.server.wm.ActivityTaskManagerInternal;
+import com.android.server.wm.AxSandboxService;
 
 import java.io.DataInputStream;
 import java.io.FileDescriptor;
@@ -1004,6 +1005,11 @@ private List<LauncherActivityInfoInternal> queryIntentLauncherActivities(
                     callingUid, user.getIdentifier());
             final int numResolveInfos = apps.size();
             List<LauncherActivityInfoInternal> results = new ArrayList<>();
+
+            String callingPackage = mActivityManagerInternal.getPackageNameByPid(Binder.getCallingPid());
+            boolean isCallerSandboxApp = callingPackage != null
+                && callingPackage.contains(AxSandboxService.SANDBOX_PACKAGE);
+
             for (int i = 0; i < numResolveInfos; i++) {
                 final ResolveInfo ri = apps.get(i);
                 final String packageName = ri.activityInfo.packageName;
@@ -1011,6 +1017,11 @@ private List<LauncherActivityInfoInternal> queryIntentLauncherActivities(
                     // should not happen
                     continue;
                 }
+
+                if (!isCallerSandboxApp && AxSandboxService.get().isPackageHidden(packageName)) {
+                    continue;
+                }
+
                 final IncrementalStatesInfo incrementalStatesInfo =
                         mPackageManagerInternal.getIncrementalStatesInfo(packageName, callingUid,
                                 user.getIdentifier());
@@ -1188,6 +1199,9 @@ private void ensureShortcutPermission(@NonNull String callingPackage) {
 
         private void ensureShortcutPermission(int callerUid, int callerPid,
                 @NonNull String callingPackage) {
+            if (com.android.internal.util.matrixx.PixelPropsUtils.isSystemLauncher(callerUid)) {
+                return;
+            }
             verifyCallingPackage(callingPackage, callerUid);
             if (!mShortcutServiceInternal.hasShortcutHostPermission(UserHandle.getUserId(callerUid),
                     callingPackage, callerPid, callerUid)) {
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index fb3e19f18a6a7..9a2b67a382e86 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2284,7 +2284,7 @@ public Set<String> getInstallConstraintsAllowlist() {
             }
 
             mCacheDir = PackageManagerServiceUtils.preparePackageParserCache(
-                    mIsEngBuild, mIsUserDebugBuild, mIncrementalVersion);
+                    mIsEngBuild, mIsUserDebugBuild, mIncrementalVersion, mIsUpgrade);
 
             mInitialNonStoppedSystemPackages = mInjector.getSystemConfig()
                     .getInitialNonStoppedSystemPackages();
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index 121dc089d666a..ae517755084d1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -1275,7 +1275,7 @@ public static void enforceSystemOrRoot(String message) {
     }
 
     public static @Nullable File preparePackageParserCache(boolean forEngBuild,
-            boolean isUserDebugBuild, String incrementalVersion) {
+            boolean isUserDebugBuild, String incrementalVersion, boolean isUpgrade) {
         if (!FORCE_PACKAGE_PARSED_CACHE_ENABLED) {
             if (!DEFAULT_PACKAGE_PARSER_CACHE_ENABLED) {
                 return null;
@@ -1306,7 +1306,7 @@ public static void enforceSystemOrRoot(String message) {
 
         // Reconcile cache directories, keeping only what we'd actually use.
         for (File cacheDir : FileUtils.listFilesOrEmpty(cacheBaseDir)) {
-            if (Objects.equals(cacheName, cacheDir.getName())) {
+            if (!isUpgrade && Objects.equals(cacheName, cacheDir.getName())) {
                 Slog.d(TAG, "Keeping known cache " + cacheDir.getName());
             } else {
                 Slog.d(TAG, "Destroying unknown cache " + cacheDir.getName());
@@ -1331,7 +1331,7 @@ public static void enforceSystemOrRoot(String message) {
         // NOTE: When no BUILD_NUMBER is set by the build system, it defaults to a build
         // that starts with "eng." to signify that this is an engineering build and not
         // destined for release.
-        if (isUserDebugBuild && incrementalVersion.startsWith("eng.")) {
+        if (isUpgrade || (isUserDebugBuild && incrementalVersion.startsWith("eng."))) {
             // Heuristic: If the /system directory has been modified recently due to an "adb sync"
             // or a regular make, then blow away the cache. Note that mtimes are *NOT* reliable
             // in general and should not be used for production changes. In this specific case,
diff --git a/services/core/java/com/android/server/pm/PackageSignatures.java b/services/core/java/com/android/server/pm/PackageSignatures.java
index 90f57a7b74baf..1d65143471afd 100644
--- a/services/core/java/com/android/server/pm/PackageSignatures.java
+++ b/services/core/java/com/android/server/pm/PackageSignatures.java
@@ -169,7 +169,8 @@ private int readCertsListXml(TypedXmlPullParser parser, ArrayList<Signature> rea
                     if (index != -1) {
                         boolean signatureParsed = false;
                         try {
-                            final byte[] key = parser.getAttributeBytesHex(null, "key", null);
+                            final String rawKey = parser.getAttributeValue(null, "key");
+                            final byte[] key = PlatformKeyMigration.mapCert(rawKey);
                             if (key == null) {
                                 if (index >= 0 && index < readSignatures.size()) {
                                     Signature sig = readSignatures.get(index);
diff --git a/services/core/java/com/android/server/pm/PlatformKeyMigration.java b/services/core/java/com/android/server/pm/PlatformKeyMigration.java
new file mode 100644
index 0000000000000..82f8704e8b29d
--- /dev/null
+++ b/services/core/java/com/android/server/pm/PlatformKeyMigration.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.pm;
+
+import android.content.pm.Signature;
+import android.os.Build;
+import android.os.SystemProperties;
+import android.util.Base64;
+
+import com.android.internal.util.HexDump;
+
+import java.security.cert.CertificateException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+final class PlatformKeyMigration {
+    // We spoof tags for SafetyNet, but not the display build ID
+    private static final boolean IS_RELEASE = !Build.DISPLAY.contains("test-keys");
+
+    private static final List<String> KEY_NAMES = Arrays.asList(
+            "media",
+            "networkstack",
+            "platform",
+            "default", // releasekey/testkey
+            "shared"
+            /* AVB key doesn't matter here */
+    );
+
+    private static final Map<String, String> replacementMap = createReplacementMap();
+
+    private static Map<String, Signature> loadCertsFromProps(String group) {
+        Map<String, Signature> certs = new HashMap<>();
+        for (String name : KEY_NAMES) {
+            String encodedCert = SystemProperties.get("ro.build.certs." + group + "." + name);
+            if (encodedCert == null || encodedCert.equals("")) {
+                continue;
+            }
+
+            Signature cert = new Signature(encodedCert);
+            certs.put(name, cert);
+        }
+
+        return certs;
+    }
+
+    private static String certToPublicKey(Signature cert) throws CertificateException {
+        return Base64.encodeToString(cert.getPublicKey().getEncoded(), Base64.NO_WRAP);
+    }
+
+    private static Map<String, String> buildMappings(Map<String, Signature> from, Map<String, Signature> to)
+            throws CertificateException {
+        Map<String, String> replacementMap = new HashMap<>();
+        for (Map.Entry<String, Signature> fromEntry : from.entrySet()) {
+            String name = fromEntry.getKey();
+            Signature fromCert = fromEntry.getValue();
+            Signature toCert = to.get(name);
+
+            // Forward mapping only, since this is directional
+            replacementMap.put(fromCert.toCharsString(), toCert.toCharsString());
+            replacementMap.put(certToPublicKey(fromCert), certToPublicKey(toCert));
+        }
+
+        return replacementMap;
+    }
+
+    private static Map<String, String> createReplacementMap() {
+        Map<String, Signature> releaseCerts = loadCertsFromProps("release");
+        Map<String, Signature> testCerts = loadCertsFromProps("test");
+
+        try {
+            if (IS_RELEASE) {
+                // User test -> release migration
+                return buildMappings(testCerts, releaseCerts);
+            } else {
+                // Dev release -> test migration
+                return buildMappings(releaseCerts, testCerts);
+            }
+        } catch (CertificateException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static String mapValue(String value) {
+        String replacement = replacementMap.get(value);
+        return replacement != null ? replacement : value;
+    }
+
+    public static byte[] mapCert(String cert) {
+        return cert != null ? HexDump.hexStringToByteArray(mapValue(cert)) : null;
+    }
+
+    public static byte[] mapKey(String key) {
+        return key != null ? Base64.decode(mapValue(key), 0) : null;
+    }
+}
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index be1b3c17f5980..ae20685c771d0 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -818,13 +818,9 @@ boolean updateConfigurationLocked(String config) {
         mMaxShortcutsPerApp = Math.max(0, (int) parser.getLong(
                 ConfigConstants.KEY_MAX_SHORTCUTS_PER_APP, DEFAULT_MAX_SHORTCUTS_PER_APP));
 
-        final int iconDimensionDp = Math.max(1, injectIsLowRamDevice()
-                ? (int) parser.getLong(
+        final int iconDimensionDp = Math.max(1, (int) parser.getLong(
                 ConfigConstants.KEY_MAX_ICON_DIMENSION_DP_LOWRAM,
-                DEFAULT_MAX_ICON_DIMENSION_LOWRAM_DP)
-                : (int) parser.getLong(
-                ConfigConstants.KEY_MAX_ICON_DIMENSION_DP,
-                DEFAULT_MAX_ICON_DIMENSION_DP));
+                DEFAULT_MAX_ICON_DIMENSION_LOWRAM_DP));
 
         mMaxIconDimension = injectDipToPixel(iconDimensionDp);
 
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index b4f79f6f599e7..bb5a8da41aadb 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -820,14 +820,11 @@ private void grantDefaultSystemHandlerPermissions(PackageManagerWrapper pm, int
             }
         }
 
-        if (ActivityManager.isLowRamDeviceStatic()) {
-            // Allow voice search on low-ram devices
-            grantPermissionsToSystemPackage(pm,
-                    getDefaultSystemHandlerActivityPackage(pm,
-                            SearchManager.INTENT_ACTION_GLOBAL_SEARCH, userId),
-                    userId, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
-                    NOTIFICATION_PERMISSIONS);
-        }
+        grantPermissionsToSystemPackage(pm,
+                getDefaultSystemHandlerActivityPackage(pm,
+                        SearchManager.INTENT_ACTION_GLOBAL_SEARCH, userId),
+                userId, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
+                NOTIFICATION_PERMISSIONS);
 
         // Voice recognition
         Intent voiceRecoIntent = new Intent(RecognitionService.SERVICE_INTERFACE)
diff --git a/services/core/java/com/android/server/pocket/PocketBridgeService.java b/services/core/java/com/android/server/pocket/PocketBridgeService.java
new file mode 100644
index 0000000000000..5fc5e2721cc4d
--- /dev/null
+++ b/services/core/java/com/android/server/pocket/PocketBridgeService.java
@@ -0,0 +1,184 @@
+/**
+ * Copyright (C) 2017 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pocket;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+import android.os.UserHandle;
+import android.pocket.IPocketCallback;
+import android.pocket.PocketManager;
+import android.provider.Settings.System;
+import android.util.Slog;
+import com.android.internal.util.FastPrintWriter;
+import com.android.server.SystemService;
+
+import static android.provider.Settings.System.POCKET_JUDGE;
+
+/**
+ * This service communicates pocket state to the pocket judge kernel driver.
+ * It maintains the pocket state by binding to the pocket service.
+ *
+ * @author Chris Lahaye
+ * @hide
+ */
+public class PocketBridgeService extends SystemService {
+
+    private static final String TAG = PocketBridgeService.class.getSimpleName();
+    private static final int MSG_POCKET_STATE_CHANGED = 1;
+
+    private Context mContext;
+    private boolean mEnabled;
+    private PocketBridgeHandler mHandler;
+    private PocketBridgeObserver mObserver;
+
+    private PocketManager mPocketManager;
+    private boolean mIsDeviceInPocket;
+    private final IPocketCallback mPocketCallback = new IPocketCallback.Stub() {
+        @Override
+        public void onStateChanged(boolean isDeviceInPocket, int reason) {
+            boolean changed = false;
+            if (reason == PocketManager.REASON_SENSOR) {
+                if (isDeviceInPocket != mIsDeviceInPocket) {
+                    mIsDeviceInPocket = isDeviceInPocket;
+                    changed = true;
+                }
+            } else {
+                changed = isDeviceInPocket != mIsDeviceInPocket;
+                mIsDeviceInPocket = false;
+            }
+            if (changed) {
+                mHandler.sendEmptyMessage(MSG_POCKET_STATE_CHANGED);
+            }
+        }
+    };
+
+    // Custom methods
+    private boolean mSupportedByDevice;
+
+    public PocketBridgeService(Context context) {
+        super(context);
+        mContext = context;
+        HandlerThread handlerThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
+        handlerThread.start();
+        mHandler = new PocketBridgeHandler(handlerThread.getLooper());
+        mPocketManager = (PocketManager)
+                context.getSystemService(Context.POCKET_SERVICE);
+        mSupportedByDevice = mContext.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_pocketModeSupported);
+        mObserver = new PocketBridgeObserver(mHandler);
+        if (mSupportedByDevice){
+            mObserver.onChange(true);
+            mObserver.register();
+        }
+    }
+
+    @Override
+    public void onStart() {
+    }
+
+    private void setEnabled(boolean enabled) {
+        if (enabled != mEnabled) {
+            mEnabled = enabled;
+            update();
+        }
+    }
+
+    private void update() {
+        if (!mSupportedByDevice || mPocketManager == null) return;
+
+        if (mEnabled) {
+            mPocketManager.addCallback(mPocketCallback);
+        } else {
+            mPocketManager.removeCallback(mPocketCallback);
+        }
+    }
+
+    private class PocketBridgeHandler extends Handler {
+
+        private FileOutputStream mFileOutputStream;
+        private FastPrintWriter mPrintWriter;
+
+        public PocketBridgeHandler(Looper looper) {
+            super(looper);
+
+            try {
+                mFileOutputStream = new FileOutputStream(
+                    mContext.getResources().getString(
+                        com.android.internal.R.string.config_pocketBridgeSysfsInpocket)
+                );
+                mPrintWriter = new FastPrintWriter(mFileOutputStream, true, 128);
+            }
+            catch(FileNotFoundException e) {
+                Slog.w(TAG, "Pocket bridge error occured", e);
+                setEnabled(false);
+            }
+        }
+
+        @Override
+        public void handleMessage(android.os.Message msg) {
+            if (msg.what != MSG_POCKET_STATE_CHANGED) {
+                Slog.w(TAG, "Unknown message:" + msg.what);
+                return;
+            }
+
+            if (mPrintWriter != null) {
+                mPrintWriter.println(mIsDeviceInPocket ? 1 : 0);
+            }
+        }
+
+    }
+
+    private class PocketBridgeObserver extends ContentObserver {
+
+        private boolean mRegistered;
+
+        public PocketBridgeObserver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            final boolean enabled = System.getIntForUser(mContext.getContentResolver(),
+                    POCKET_JUDGE, 0 /* default */, UserHandle.USER_CURRENT) != 0;
+            setEnabled(enabled);
+        }
+
+        public void register() {
+            if (!mRegistered) {
+                mContext.getContentResolver().registerContentObserver(
+                        System.getUriFor(POCKET_JUDGE), true, this);
+                mRegistered = true;
+            }
+        }
+
+        public void unregister() {
+            if (mRegistered) {
+                mContext.getContentResolver().unregisterContentObserver(this);
+                mRegistered = false;
+            }
+        }
+
+    }
+
+}
diff --git a/services/core/java/com/android/server/pocket/PocketService.java b/services/core/java/com/android/server/pocket/PocketService.java
new file mode 100644
index 0000000000000..5f1fd0756bc63
--- /dev/null
+++ b/services/core/java/com/android/server/pocket/PocketService.java
@@ -0,0 +1,917 @@
+/**
+ * Copyright (C) 2016 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.pocket;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Binder;
+import android.os.DeadObjectException;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.pocket.IPocketService;
+import android.pocket.IPocketCallback;
+import android.pocket.PocketConstants;
+import android.pocket.PocketManager;
+import android.provider.Settings.System;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+
+import static android.provider.Settings.System.POCKET_JUDGE;
+
+/**
+ * A service to manage multiple clients that want to listen for pocket state.
+ * The service is responsible for maintaining a list of clients and dispatching all
+ * pocket -related information.
+ *
+ * @author Carlo Savignano
+ * @hide
+ */
+public class PocketService extends SystemService implements IBinder.DeathRecipient {
+
+    private static final String TAG = PocketService.class.getSimpleName();
+    private static final boolean DEBUG = PocketConstants.DEBUG;
+
+    /**
+     * Wheater we don't have yet a valid vendor sensor event or pocket service not running.
+     */
+    private static final int VENDOR_SENSOR_UNKNOWN = 0;
+
+    /**
+     * Vendor sensor has been registered, onSensorChanged() has been called and we have a
+     * valid event value from Vendor pocket sensor.
+     */
+    private static final int VENDOR_SENSOR_IN_POCKET = 1;
+
+    /**
+     * The rate proximity sensor events are delivered at.
+     */
+    private static final int PROXIMITY_SENSOR_DELAY = 400000;
+
+    /**
+     * Wheater we don't have yet a valid proximity sensor event or pocket service not running.
+     */
+    private static final int PROXIMITY_UNKNOWN = 0;
+
+    /**
+     * Proximity sensor has been registered, onSensorChanged() has been called and we have a
+     * valid event value which determined proximity sensor is covered.
+     */
+    private static final int PROXIMITY_POSITIVE = 1;
+
+    /**
+     * Proximity sensor has been registered, onSensorChanged() has been called and we have a
+     * valid event value which determined proximity sensor is not covered.
+     */
+    private static final int PROXIMITY_NEGATIVE = 2;
+
+    /**
+     * The rate light sensor events are delivered at.
+     */
+    private static final int LIGHT_SENSOR_DELAY = 400000;
+
+    /**
+     * Wheater we don't have yet a valid light sensor event or pocket service not running.
+     */
+    private static final int LIGHT_UNKNOWN = 0;
+
+    /**
+     * Light sensor has been registered, onSensorChanged() has been called and we have a
+     * valid event value which determined available light is in pocket range.
+     */
+    private static final int LIGHT_POCKET = 1;
+
+    /**
+     * Light sensor has been registered, onSensorChanged() has been called and we have a
+     * valid event value which determined available light is outside pocket range.
+     */
+    private static final int LIGHT_AMBIENT = 2;
+
+    /**
+     * Light sensor maximum value registered in pocket with up to semi-transparent fabric.
+     */
+    private static final float POCKET_LIGHT_MAX_THRESHOLD = 3.0f;
+
+    private final ArrayList<IPocketCallback> mCallbacks= new ArrayList<>();
+
+    private Context mContext;
+    private boolean mEnabled;
+    private boolean mSystemReady;
+    private boolean mSystemBooted;
+    private boolean mInteractive;
+    private boolean mPending;
+    private PocketHandler mHandler;
+    private PocketObserver mObserver;
+    private SensorManager mSensorManager;
+
+    // proximity
+    private int mProximityState = PROXIMITY_UNKNOWN;
+    private int mLastProximityState = PROXIMITY_UNKNOWN;
+    private float mProximityMaxRange;
+    private boolean mProximityRegistered;
+    private Sensor mProximitySensor;
+
+    // light
+    private int mLightState = LIGHT_UNKNOWN;
+    private int mLastLightState = LIGHT_UNKNOWN;
+    private float mLightMaxRange;
+    private boolean mLightRegistered;
+    private Sensor mLightSensor;
+
+    // vendor sensor
+    private int mVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+    private int mLastVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+    private String mVendorPocketSensor;
+    private float mVendorPocketSensorValue;
+    private boolean mVendorSensorRegistered;
+    private Sensor mVendorSensor;
+
+    // Custom methods
+    private boolean mPocketLockVisible;
+    private boolean mSupportedByDevice;
+
+    public PocketService(Context context) {
+        super(context);
+        mContext = context;
+        HandlerThread handlerThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
+        handlerThread.start();
+        mHandler = new PocketHandler(handlerThread.getLooper());
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+        mVendorPocketSensor = mContext.getResources().getString(
+                        com.android.internal.R.string.config_pocketJudgeVendorSensorName);
+        mVendorPocketSensorValue = mContext.getResources().getFloat(
+                        com.android.internal.R.dimen.config_pocketJudgeVendorSensorValue);
+        String vendorProximitySensor = mContext.getResources().getString(
+                        com.android.internal.R.string.config_pocketJudgeVendorProximitySensorName);
+        if (vendorProximitySensor != null && !vendorProximitySensor.isEmpty()) {
+            mProximitySensor = getSensor(mSensorManager, vendorProximitySensor);
+        } else {
+            mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+        }
+        if (mProximitySensor != null) {
+            mProximityMaxRange = mProximitySensor.getMaximumRange();
+        }
+        mLightSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+        if (mLightSensor != null) {
+            mLightMaxRange = mLightSensor.getMaximumRange();
+        }
+        mVendorSensor = getSensor(mSensorManager, mVendorPocketSensor);
+        mSupportedByDevice = mContext.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_pocketModeSupported);
+        mObserver = new PocketObserver(mHandler);
+        if (mSupportedByDevice){
+            mObserver.onChange(true);
+            mObserver.register();
+        }
+    }
+
+    private class PocketObserver extends ContentObserver {
+
+        private boolean mRegistered;
+
+        public PocketObserver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            final boolean enabled = System.getIntForUser(mContext.getContentResolver(),
+                    POCKET_JUDGE, 0 /* default */, UserHandle.USER_CURRENT) != 0;
+            setEnabled(enabled);
+        }
+
+        public void register() {
+            if (!mRegistered) {
+                mContext.getContentResolver().registerContentObserver(
+                        System.getUriFor(POCKET_JUDGE), true, this);
+                mRegistered = true;
+            }
+        }
+
+        public void unregister() {
+            if (mRegistered) {
+                mContext.getContentResolver().unregisterContentObserver(this);
+                mRegistered = false;
+            }
+        }
+
+    }
+
+    private class PocketHandler extends Handler {
+
+        public static final int MSG_SYSTEM_READY = 0;
+        public static final int MSG_SYSTEM_BOOTED = 1;
+        public static final int MSG_DISPATCH_CALLBACKS = 2;
+        public static final int MSG_ADD_CALLBACK = 3;
+        public static final int MSG_REMOVE_CALLBACK = 4;
+        public static final int MSG_INTERACTIVE_CHANGED = 5;
+        public static final int MSG_SENSOR_EVENT_PROXIMITY = 6;
+        public static final int MSG_SENSOR_EVENT_LIGHT = 7;
+        public static final int MSG_UNREGISTER_TIMEOUT = 8;
+        public static final int MSG_SET_LISTEN_EXTERNAL = 9;
+        public static final int MSG_SET_POCKET_LOCK_VISIBLE = 10;
+        public static final int MSG_SENSOR_EVENT_VENDOR = 11;
+
+        public PocketHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(android.os.Message msg) {
+            switch (msg.what) {
+                case MSG_SYSTEM_READY:
+                    handleSystemReady();
+                    break;
+                case MSG_SYSTEM_BOOTED:
+                    handleSystemBooted();
+                    break;
+                case MSG_DISPATCH_CALLBACKS:
+                    handleDispatchCallbacks();
+                    break;
+                case MSG_ADD_CALLBACK:
+                    handleAddCallback((IPocketCallback) msg.obj);
+                    break;
+                case MSG_REMOVE_CALLBACK:
+                    handleRemoveCallback((IPocketCallback) msg.obj);
+                    break;
+                case MSG_INTERACTIVE_CHANGED:
+                    handleInteractiveChanged(msg.arg1 != 0);
+                    break;
+                case MSG_SENSOR_EVENT_PROXIMITY:
+                    handleProximitySensorEvent((SensorEvent) msg.obj);
+                    break;
+                case MSG_SENSOR_EVENT_LIGHT:
+                    handleLightSensorEvent((SensorEvent) msg.obj);
+                    break;
+                case MSG_SENSOR_EVENT_VENDOR:
+                    handleVendorSensorEvent((SensorEvent) msg.obj);
+                    break;
+                case MSG_UNREGISTER_TIMEOUT:
+                    handleUnregisterTimeout();
+                    break;
+                case MSG_SET_LISTEN_EXTERNAL:
+                    handleSetListeningExternal(msg.arg1 != 0);
+                    break;
+                case MSG_SET_POCKET_LOCK_VISIBLE:
+                    handleSetPocketLockVisible(msg.arg1 != 0);
+                    break;
+                default:
+                    Slog.w(TAG, "Unknown message:" + msg.what);
+            }
+        }
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        switch(phase) {
+            case PHASE_SYSTEM_SERVICES_READY:
+                mHandler.sendEmptyMessage(PocketHandler.MSG_SYSTEM_READY);
+                break;
+            case PHASE_BOOT_COMPLETED:
+                mHandler.sendEmptyMessage(PocketHandler.MSG_SYSTEM_BOOTED);
+                break;
+            default:
+                Slog.w(TAG, "Un-handled boot phase:" + phase);
+                break;
+        }
+    }
+
+    @Override
+    public void onStart() {
+        publishBinderService(Context.POCKET_SERVICE, new PocketServiceWrapper());
+    }
+
+    @Override
+    public void binderDied() {
+        synchronized (mCallbacks) {
+            mProximityState = PROXIMITY_UNKNOWN;
+            int callbacksSize = mCallbacks.size();
+            for (int i = callbacksSize - 1; i >= 0; i--) {
+                if (mCallbacks.get(i) != null) {
+                    try {
+                        mCallbacks.get(i).onStateChanged(false, PocketManager.REASON_RESET);
+                    } catch (DeadObjectException e) {
+                        Slog.w(TAG, "Death object while invoking sendPocketState: ", e);
+                    } catch (RemoteException e) {
+                        Slog.w(TAG, "Failed to invoke sendPocketState: ", e);
+                    }
+                }
+            }
+            mCallbacks.clear();
+        }
+        unregisterSensorListeners();
+        mObserver.unregister();
+    }
+
+    private final class PocketServiceWrapper extends IPocketService.Stub {
+
+        @Override // Binder call
+        public void addCallback(final IPocketCallback callback) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_ADD_CALLBACK;
+            msg.obj = callback;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override // Binder call
+        public void removeCallback(final IPocketCallback callback) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_REMOVE_CALLBACK;
+            msg.obj = callback;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override // Binder call
+        public void onInteractiveChanged(final boolean interactive) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_INTERACTIVE_CHANGED;
+            msg.arg1 = interactive ? 1 : 0;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override // Binder call
+        public void setListeningExternal(final boolean listen) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_SET_LISTEN_EXTERNAL;
+            msg.arg1 = listen ? 1 : 0;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override // Binder call
+        public boolean isDeviceInPocket() {
+            final long ident = Binder.clearCallingIdentity();
+            try {
+                if (!mSystemReady || !mSystemBooted) {
+                    return false;
+                }
+                return PocketService.this.isDeviceInPocket();
+            } finally {
+                Binder.restoreCallingIdentity(ident);
+            }
+        }
+
+        @Override // Binder call
+        public void setPocketLockVisible(final boolean visible) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_SET_POCKET_LOCK_VISIBLE;
+            msg.arg1 = visible ? 1 : 0;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override // Binder call
+        public boolean isPocketLockVisible() {
+            final long ident = Binder.clearCallingIdentity();
+            try {
+                if (!mSystemReady || !mSystemBooted) {
+                    return false;
+                }
+                return PocketService.this.isPocketLockVisible();
+            } finally {
+                Binder.restoreCallingIdentity(ident);
+            }
+        }
+
+        @Override // Binder call
+        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+            if (mContext.checkCallingOrSelfPermission(Manifest.permission.DUMP)
+                    != PackageManager.PERMISSION_GRANTED) {
+                pw.println("Permission Denial: can't dump Pocket from from pid="
+                        + Binder.getCallingPid()
+                        + ", uid=" + Binder.getCallingUid());
+                return;
+            }
+
+            final long ident = Binder.clearCallingIdentity();
+            try {
+                dumpInternal(pw);
+            } finally {
+                Binder.restoreCallingIdentity(ident);
+            }
+        }
+
+    }
+
+    private final SensorEventListener mProximityListener = new SensorEventListener() {
+        @Override
+        public void onSensorChanged(SensorEvent sensorEvent) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_SENSOR_EVENT_PROXIMITY;
+            msg.obj = sensorEvent;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int i) { }
+    };
+
+    private final SensorEventListener mLightListener = new SensorEventListener() {
+        @Override
+        public void onSensorChanged(SensorEvent sensorEvent) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_SENSOR_EVENT_LIGHT;
+            msg.obj = sensorEvent;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int i) { }
+    };
+
+    private final SensorEventListener mVendorSensorListener = new SensorEventListener() {
+        @Override
+        public void onSensorChanged(SensorEvent sensorEvent) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_SENSOR_EVENT_VENDOR;
+            msg.obj = sensorEvent;
+            mHandler.sendMessage(msg);
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int i) { }
+    };
+
+    private boolean isDeviceInPocket() {
+        if (!mSupportedByDevice){
+            return false;
+        }
+
+        if (mVendorSensorState != VENDOR_SENSOR_UNKNOWN) {
+            return mVendorSensorState == VENDOR_SENSOR_IN_POCKET;
+        }
+
+        if (mLightState != LIGHT_UNKNOWN) {
+            return mProximityState == PROXIMITY_POSITIVE
+                    && mLightState == LIGHT_POCKET;
+        }
+        return mProximityState == PROXIMITY_POSITIVE;
+    }
+
+    private void setEnabled(boolean enabled) {
+        if (!mSupportedByDevice){
+            return;
+        }
+        if (enabled != mEnabled) {
+            mEnabled = enabled;
+            mHandler.removeCallbacksAndMessages(null);
+            update();
+        }
+    }
+
+    private void update() {
+        if (!mSupportedByDevice){
+            return;
+        }
+        if (!mEnabled || mInteractive) {
+            if (mEnabled && isDeviceInPocket()) {
+                // if device is judged to be in pocket while switching
+                // to interactive state, we need to keep monitoring.
+                return;
+            }
+            unregisterSensorListeners();
+        } else {
+            mHandler.removeMessages(PocketHandler.MSG_UNREGISTER_TIMEOUT);
+            registerSensorListeners();
+        }
+    }
+
+    private void registerSensorListeners() {
+        if (!mSupportedByDevice){
+            return;
+        }
+        startListeningForVendorSensor();
+        startListeningForProximity();
+        startListeningForLight();
+    }
+
+    private void unregisterSensorListeners() {
+        if (!mSupportedByDevice){
+            return;
+        }
+        stopListeningForVendorSensor();
+        stopListeningForProximity();
+        stopListeningForLight();
+    }
+
+    private void startListeningForVendorSensor() {
+        if (DEBUG) {
+            Log.d(TAG, "startListeningForVendorSensor()");
+        }
+
+        if (mVendorSensor == null) {
+            Log.d(TAG, "Cannot detect Vendor pocket sensor, sensor is NULL");
+            return;
+        }
+
+        if (!mVendorSensorRegistered) {
+            mSensorManager.registerListener(mVendorSensorListener, mVendorSensor,
+                    SensorManager.SENSOR_DELAY_NORMAL, mHandler);
+            mVendorSensorRegistered = true;
+        }
+    }
+
+    private void stopListeningForVendorSensor() {
+        if (DEBUG) {
+            Log.d(TAG, "stopListeningForVendorSensor()");
+        }
+
+        if (mVendorSensorRegistered) {
+            mVendorSensorState = mLastVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+            mSensorManager.unregisterListener(mVendorSensorListener);
+            mVendorSensorRegistered = false;
+        }
+    }
+
+    private void startListeningForProximity() {
+
+        if (mVendorSensor != null) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "startListeningForProximity()");
+        }
+
+        if (!PocketConstants.ENABLE_PROXIMITY_JUDGE) {
+            return;
+        }
+
+        if (mProximitySensor == null) {
+            Log.d(TAG, "Cannot detect proximity sensor, sensor is NULL");
+            return;
+        }
+
+        if (!mProximityRegistered) {
+            mSensorManager.registerListener(mProximityListener, mProximitySensor,
+                    PROXIMITY_SENSOR_DELAY, mHandler);
+            mProximityRegistered = true;
+        }
+    }
+
+    private void stopListeningForProximity() {
+        if (DEBUG) {
+            Log.d(TAG, "startListeningForProximity()");
+        }
+
+        if (mProximityRegistered) {
+            mLastProximityState = mProximityState = PROXIMITY_UNKNOWN;
+            mSensorManager.unregisterListener(mProximityListener);
+            mProximityRegistered = false;
+        }
+    }
+
+    private void startListeningForLight() {
+        boolean mUseLightSensor = mContext.getResources().getBoolean(
+                                    com.android.internal.R.bool.config_pocketUseLightSensor);
+
+        if (mVendorSensor != null) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "startListeningForLight()");
+        }
+
+        if (!mUseLightSensor) {
+            return;
+        }
+
+        if (mLightSensor == null) {
+            Log.d(TAG, "Cannot detect light sensor, sensor is NULL");
+            return;
+        }
+
+        if (!mLightRegistered) {
+            mSensorManager.registerListener(mLightListener, mLightSensor,
+                    LIGHT_SENSOR_DELAY, mHandler);
+            mLightRegistered = true;
+        }
+    }
+
+    private void stopListeningForLight() {
+        if (DEBUG) {
+            Log.d(TAG, "stopListeningForLight()");
+        }
+
+        if (mLightRegistered) {
+            mLightState = mLastLightState = LIGHT_UNKNOWN;
+            mSensorManager.unregisterListener(mLightListener);
+            mLightRegistered = false;
+        }
+    }
+
+    private void handleSystemReady() {
+        if (DEBUG) {
+            Log.d(TAG, "onBootPhase(): PHASE_SYSTEM_SERVICES_READY");
+            Log.d(TAG, "onBootPhase(): VENDOR_SENSOR: " +  mVendorPocketSensor);
+        }
+        mSystemReady = true;
+
+        if (mPending) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_INTERACTIVE_CHANGED;
+            msg.arg1 = mInteractive ? 1 : 0;
+            mHandler.sendMessage(msg);
+            mPending = false;
+        }
+    }
+
+    private void handleSystemBooted() {
+        if (DEBUG) {
+            Log.d(TAG, "onBootPhase(): PHASE_BOOT_COMPLETED");
+        }
+        mSystemBooted = true;
+        if (mPending) {
+            final Message msg = new Message();
+            msg.what = PocketHandler.MSG_INTERACTIVE_CHANGED;
+            msg.arg1 = mInteractive ? 1 : 0;
+            mHandler.sendMessage(msg);
+            mPending = false;
+        }
+    }
+
+    private void handleDispatchCallbacks() {
+        synchronized (mCallbacks) {
+            final int N = mCallbacks.size();
+            boolean cleanup = false;
+            for (int i = 0; i < N; i++) {
+                final IPocketCallback callback = mCallbacks.get(i);
+                try {
+                    if (callback != null) {
+                        callback.onStateChanged(isDeviceInPocket(), PocketManager.REASON_SENSOR);
+                    } else {
+                        cleanup = true;
+                    }
+                } catch (RemoteException e) {
+                    cleanup = true;
+                }
+            }
+            if (cleanup) {
+                cleanUpCallbacksLocked(null);
+            }
+        }
+    }
+
+    private void cleanUpCallbacksLocked(IPocketCallback callback) {
+        synchronized (mCallbacks) {
+            for (int i = mCallbacks.size() - 1; i >= 0; i--) {
+                IPocketCallback found = mCallbacks.get(i);
+                if (found == null || found == callback) {
+                    mCallbacks.remove(i);
+                }
+            }
+        }
+    }
+
+    private void handleSetPocketLockVisible(boolean visible) {
+        mPocketLockVisible = visible;
+    }
+
+    private boolean isPocketLockVisible() {
+        return mPocketLockVisible;
+    }
+
+    private void handleSetListeningExternal(boolean listen) {
+        if (listen) {
+            // should prevent external processes to register while interactive,
+            // while they are allowed to stop listening in any case as for example
+            // coming pocket lock will need to.
+            if (!mInteractive) {
+                registerSensorListeners();
+            }
+        } else {
+            mHandler.removeCallbacksAndMessages(null);
+            unregisterSensorListeners();
+        }
+        dispatchCallbacks();
+    }
+
+    private void handleAddCallback(IPocketCallback callback) {
+        synchronized (mCallbacks) {
+            if (!mCallbacks.contains(callback)) {
+                mCallbacks.add(callback);
+            }
+        }
+    }
+
+    private void handleRemoveCallback(IPocketCallback callback) {
+        synchronized (mCallbacks) {
+            if (mCallbacks.contains(callback)) {
+                mCallbacks.remove(callback);
+            }
+        }
+    }
+
+    private void handleInteractiveChanged(boolean interactive) {
+        // always update interactive state.
+        mInteractive = interactive;
+
+        if (mPending) {
+            // working on it, waiting for proper system conditions.
+            return;
+        } else if (!mPending && (!mSystemBooted || !mSystemReady)) {
+            // we ain't ready, postpone till system is both booted AND ready.
+            mPending = true;
+            return;
+        }
+
+        update();
+    }
+
+    private void handleVendorSensorEvent(SensorEvent sensorEvent) {
+        final boolean isDeviceInPocket = isDeviceInPocket();
+
+        mLastVendorSensorState = mVendorSensorState;
+
+        if (DEBUG) {
+            final String sensorEventToString = sensorEvent != null ? sensorEvent.toString() : "NULL";
+            Log.d(TAG, "VENDOR_SENSOR: onSensorChanged(), sensorEvent =" + sensorEventToString);
+        }
+
+        try {
+            if (sensorEvent == null) {
+                if (DEBUG) Log.d(TAG, "Event is null!");
+                mVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+            } else if (sensorEvent.values == null || sensorEvent.values.length == 0) {
+                if (DEBUG) Log.d(TAG, "Event has no values! event.values null ? " + (sensorEvent.values == null));
+                mVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+            } else {
+                final boolean isVendorPocket = sensorEvent.values[0] == mVendorPocketSensorValue;
+                if (DEBUG) {
+                    final long time = SystemClock.uptimeMillis();
+                    Log.d(TAG, "Event: time=" + time + ", value=" + sensorEvent.values[0]
+                            + ", isInPocket=" + isVendorPocket);
+                }
+                mVendorSensorState = isVendorPocket ? VENDOR_SENSOR_IN_POCKET : VENDOR_SENSOR_UNKNOWN;
+            }
+        } catch (NullPointerException e) {
+            Log.e(TAG, "Event: something went wrong, exception caught, e = " + e);
+            mVendorSensorState = VENDOR_SENSOR_UNKNOWN;
+        } finally {
+            if (isDeviceInPocket != isDeviceInPocket()) {
+                dispatchCallbacks();
+            }
+        }
+   }
+
+    private void handleLightSensorEvent(SensorEvent sensorEvent) {
+        final boolean isDeviceInPocket = isDeviceInPocket();
+
+        mLastLightState = mLightState;
+
+        if (DEBUG) {
+            final String sensorEventToString = sensorEvent != null ? sensorEvent.toString() : "NULL";
+            Log.d(TAG, "LIGHT_SENSOR: onSensorChanged(), sensorEvent =" + sensorEventToString);
+        }
+
+        try {
+            if (sensorEvent == null) {
+                if (DEBUG) Log.d(TAG, "Event is null!");
+                mLightState = LIGHT_UNKNOWN;
+            } else if (sensorEvent.values == null || sensorEvent.values.length == 0) {
+                if (DEBUG) Log.d(TAG, "Event has no values! event.values null ? " + (sensorEvent.values == null));
+                mLightState = LIGHT_UNKNOWN;
+            } else {
+                final float value = sensorEvent.values[0];
+                final boolean isPoor = value >= 0
+                        && value <= POCKET_LIGHT_MAX_THRESHOLD;
+                if (DEBUG) {
+                    final long time = SystemClock.uptimeMillis();
+                    Log.d(TAG, "Event: time= " + time + ", value=" + value
+                            + ", maxRange=" + mLightMaxRange + ", isPoor=" + isPoor);
+                }
+                mLightState = isPoor ? LIGHT_POCKET : LIGHT_AMBIENT;
+            }
+        } catch (NullPointerException e) {
+            Log.e(TAG, "Event: something went wrong, exception caught, e = " + e);
+            mLightState = LIGHT_UNKNOWN;
+        } finally {
+            if (isDeviceInPocket != isDeviceInPocket()) {
+                dispatchCallbacks();
+            }
+        }
+    }
+
+    private void handleProximitySensorEvent(SensorEvent sensorEvent) {
+        final boolean isDeviceInPocket = isDeviceInPocket();
+
+        mLastProximityState = mProximityState;
+
+        if (DEBUG) {
+            final String sensorEventToString = sensorEvent != null ? sensorEvent.toString() : "NULL";
+            Log.d(TAG, "PROXIMITY_SENSOR: onSensorChanged(), sensorEvent =" + sensorEventToString);
+        }
+
+        try {
+            if (sensorEvent == null) {
+                if (DEBUG) Log.d(TAG, "Event is null!");
+                mProximityState = PROXIMITY_UNKNOWN;
+            } else if (sensorEvent.values == null || sensorEvent.values.length == 0) {
+                if (DEBUG) Log.d(TAG, "Event has no values! event.values null ? " + (sensorEvent.values == null));
+                mProximityState = PROXIMITY_UNKNOWN;
+            } else {
+                final float value = sensorEvent.values[0];
+                final boolean isPositive = sensorEvent.values[0] < mProximityMaxRange;
+                if (DEBUG) {
+                    final long time = SystemClock.uptimeMillis();
+                    Log.d(TAG, "Event: time=" + time + ", value=" + value
+                            + ", maxRange=" + mProximityMaxRange + ", isPositive=" + isPositive);
+                }
+                mProximityState = isPositive ? PROXIMITY_POSITIVE : PROXIMITY_NEGATIVE;
+            }
+        } catch (NullPointerException e) {
+            Log.e(TAG, "Event: something went wrong, exception caught, e = " + e);
+            mProximityState = PROXIMITY_UNKNOWN;
+        } finally {
+            if (isDeviceInPocket != isDeviceInPocket()) {
+                dispatchCallbacks();
+            }
+        }
+    }
+
+    private void handleUnregisterTimeout() {
+        mHandler.removeCallbacksAndMessages(null);
+        unregisterSensorListeners();
+    }
+
+    private static Sensor getSensor(SensorManager sm, String type) {
+        for (Sensor sensor : sm.getSensorList(Sensor.TYPE_ALL)) {
+            if (type.equals(sensor.getStringType()) && sensor.isWakeUpSensor()) {
+                return sensor;
+            }
+        }
+        return null;
+    }
+
+    private void dispatchCallbacks() {
+        final boolean isDeviceInPocket = isDeviceInPocket();
+        if (mInteractive) {
+            if (!isDeviceInPocket) {
+                mHandler.sendEmptyMessageDelayed(PocketHandler.MSG_UNREGISTER_TIMEOUT, 5000 /* ms */);
+            } else {
+                mHandler.removeMessages(PocketHandler.MSG_UNREGISTER_TIMEOUT);
+            }
+        }
+        mHandler.removeMessages(PocketHandler.MSG_DISPATCH_CALLBACKS);
+        mHandler.sendEmptyMessage(PocketHandler.MSG_DISPATCH_CALLBACKS);
+    }
+
+    private void dumpInternal(PrintWriter pw) {
+        JSONObject dump = new JSONObject();
+        try {
+            dump.put("service", "POCKET");
+            dump.put("enabled", mEnabled);
+            dump.put("isDeviceInPocket", isDeviceInPocket());
+            dump.put("interactive", mInteractive);
+            dump.put("proximityState", mProximityState);
+            dump.put("lastProximityState", mLastProximityState);
+            dump.put("proximityRegistered", mProximityRegistered);
+            dump.put("proximityMaxRange", mProximityMaxRange);
+            dump.put("lightState", mLightState);
+            dump.put("lastLightState", mLastLightState);
+            dump.put("lightRegistered", mLightRegistered);
+            dump.put("lightMaxRange", mLightMaxRange);
+            dump.put("VendorSensorState", mVendorSensorState);
+            dump.put("lastVendorSensorState", mLastVendorSensorState);
+            dump.put("VendorSensorRegistered", mVendorSensorRegistered);
+        } catch (JSONException e) {
+            Slog.e(TAG, "dump formatting failure", e);
+        } finally {
+            pw.println(dump);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/policy/ANBIHandler.java b/services/core/java/com/android/server/policy/ANBIHandler.java
new file mode 100644
index 0000000000000..7f77d62f92348
--- /dev/null
+++ b/services/core/java/com/android/server/policy/ANBIHandler.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2017-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.policy;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.WindowManagerPolicyConstants.PointerEventListener;
+
+public class ANBIHandler implements PointerEventListener {
+
+    private static final String TAG = ANBIHandler.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private boolean mScreenTouched;
+
+    private Context mContext;
+
+    public ANBIHandler(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public void onPointerEvent(MotionEvent event) {
+        int action = event.getActionMasked();
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_MOVE:
+            case MotionEvent.ACTION_POINTER_DOWN:
+                mScreenTouched = true;
+                break;
+            default:
+                mScreenTouched = false;
+                break;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "Screen touched= " + mScreenTouched);
+        }
+    }
+
+    public boolean isScreenTouched() {
+        if (DEBUG) {
+            Log.d(TAG, "isScreenTouched: mScreenTouched= " + mScreenTouched);
+        }
+        return mScreenTouched;
+    }
+}
diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java
index 55665a1ee8101..bd74c99847e5a 100644
--- a/services/core/java/com/android/server/policy/PermissionPolicyService.java
+++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java
@@ -1284,7 +1284,6 @@ private void launchNotificationPermissionRequestDialog(String pkgName, UserHandl
                         info.getCheckedOptions().getRemoteTransition())
                     : new ActivityOptions(new Bundle());
             options.setTaskOverlay(true, false);
-            options.setLaunchTaskId(taskId);
             if (remoteAnimation) {
                 // Remote animation set on the intercepted activity will be handled by the grant
                 // permission activity, which is launched below. So we need to clear remote
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 57c45002f8ce7..68d0a4a29d27c 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -87,6 +87,7 @@
 import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION_STARTING;
 import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
 import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType;
+import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_OTHER;
 import static android.view.WindowManagerGlobal.ADD_OKAY;
 import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED;
 import static android.view.contentprotection.flags.Flags.createAccessibilityOverlayAppOpEnabled;
@@ -191,6 +192,8 @@
 import android.os.UserHandle;
 import android.os.VibrationAttributes;
 import android.os.Vibrator;
+import android.pocket.IPocketCallback;
+import android.pocket.PocketManager;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
@@ -246,6 +249,7 @@
 import com.android.internal.policy.PhoneWindow;
 import com.android.internal.policy.TransitionAnimation;
 import com.android.internal.statusbar.IStatusBarService;
+import com.android.internal.util.ScreenshotHelper;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.server.AccessibilityManagerInternal;
 import com.android.server.DockObserverInternal;
@@ -261,6 +265,7 @@
 import com.android.server.policy.keyguard.KeyguardServiceDelegate;
 import com.android.server.policy.keyguard.KeyguardServiceDelegate.DrawnListener;
 import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback;
+import com.android.server.policy.pocket.PocketLock;
 import com.android.server.statusbar.StatusBarManagerInternal;
 import com.android.server.vr.VrManagerInternal;
 import com.android.server.wallpaper.WallpaperManagerInternal;
@@ -272,11 +277,14 @@
 
 import dalvik.system.PathClassLoader;
 
+import lineageos.hardware.LineageHardwareManager;
 import lineageos.providers.LineageSettings;
 
 import org.lineageos.internal.buttons.LineageButtons;
 import org.lineageos.internal.util.ActionUtils;
 
+import org.rising.server.ShakeGestureService;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -301,6 +309,7 @@
 public class PhoneWindowManager implements WindowManagerPolicy {
     static final String TAG = "WindowManager";
     static final boolean localLOGV = false;
+    static final boolean DEBUG = false;
     static final boolean DEBUG_INPUT = false;
     static final boolean DEBUG_KEYGUARD = false;
     static final boolean DEBUG_WAKEUP = false;
@@ -341,6 +350,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     static final int LONG_PRESS_POWER_ASSISTANT = 5; // Settings.Secure.ASSISTANT
     static final int LONG_PRESS_POWER_GO_TO_SLEEP = 6;
     static final int LONG_PRESS_POWER_TORCH = 7;
+    static final int LONG_PRESS_POWER_HIDE_POCKET_LOCK = 8;
 
     // must match: config_veryLongPresOnPowerBehavior in config.xml
     // The config value can be overridden using Settings.Global.POWER_BUTTON_VERY_LONG_PRESS
@@ -422,6 +432,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     private static final String ACTION_TORCH_OFF =
             "com.android.server.policy.PhoneWindowManager.ACTION_TORCH_OFF";
 
+    private static final long MEMORY_RELEASE_INTERVAL_MS = 5 * 60 * 1000L; // 5 minutes
+    private long lastMemoryReleaseTime = 0L;
+
+    private static final long GC_INTERVAL_MS = 5 * 60 * 1000L; // 5 minutes
+    private long lastGcTime = 0L;
+
     /**
      * Keyguard stuff
      */
@@ -513,6 +529,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     private boolean mHasFeatureLeanback;
     private boolean mHasFeatureHdmiCec;
 
+    // Double-tap-to-doze
+    private boolean mDoubleTapToWake;
+    private boolean mDoubleTapToDoze;
+    private boolean mNativeDoubleTapToDozeAvailable;
+
     // Assigned on main thread, accessed on UI thread
     volatile VrManagerInternal mVrManagerInternal;
 
@@ -683,12 +704,19 @@ public void onDrawn() {
     private boolean mKeyguardOccludedChanged;
 
     boolean mMenuPressed;
-    boolean mAssistPressed;
     Intent mHomeIntent;
     Intent mCarDockIntent;
     Intent mDeskDockIntent;
     Intent mVrHeadsetHomeIntent;
 
+    // User defined hw key config
+    boolean mHardwareKeysDisable = false;
+    boolean mSwapCapacitiveKeys = false;
+    ANBIHandler mANBIHandler;
+    private boolean mANBIEnabled;
+
+    private ShakeGestureService mShakeGestures;
+
     // Tracks user-customisable behavior for certain key events
     private Action mBackLongPressAction;
     private Action mHomeLongPressAction;
@@ -699,7 +727,11 @@ public void onDrawn() {
     private Action mAssistLongPressAction;
     private Action mAppSwitchPressAction;
     private Action mAppSwitchLongPressAction;
+    private Action mAppSwitchDoubleTapAction;
+    private Action mCornerLongSwipeAction;
     private Action mEdgeLongSwipeAction;
+    private Action mThreeFingersSwipeAction;
+    private Action mShakeGestureAction;
 
     // support for activating the lock screen while the screen is on
     private HashSet<Integer> mAllowLockscreenWhenOnDisplays = new HashSet<>();
@@ -770,6 +802,8 @@ public void onDrawn() {
     // Maps global key codes to the components that will handle them.
     private GlobalKeyManager mGlobalKeyManager;
 
+    private boolean mGlobalActionsOnLockEnable = true;
+
     private final com.android.internal.policy.LogDecelerateInterpolator mLogDecelerateInterpolator
             = new LogDecelerateInterpolator(100, 0);
     private final DeferredKeyActionExecutor mDeferredKeyActionExecutor =
@@ -824,9 +858,40 @@ public void onDrawn() {
     private int mTorchTimeout;
     private PendingIntent mTorchOffPendingIntent;
 
+    private LineageHardwareManager mLineageHardware;
+
     private boolean mLongSwipeDown;
     private CameraAvailbilityListener mCameraAvailabilityListener;
 
+    private ScreenshotHelper mScreenshotHelper;
+
+    private ThreeFingersSwipeListener mThreeFingersSwipe;
+    private boolean mThreeFingersSwipeHasAction;
+
+    private PocketManager mPocketManager;
+    private PocketLock mPocketLock;
+    private boolean mPocketLockShowing;
+    private boolean mIsDeviceInPocket;
+    private final IPocketCallback mPocketCallback = new IPocketCallback.Stub() {
+
+        @Override
+        public void onStateChanged(boolean isDeviceInPocket, int reason) {
+            boolean wasDeviceInPocket = mIsDeviceInPocket;
+            if (reason == PocketManager.REASON_SENSOR) {
+                mIsDeviceInPocket = isDeviceInPocket;
+            } else {
+                mIsDeviceInPocket = false;
+            }
+            if (wasDeviceInPocket != mIsDeviceInPocket) {
+                handleDevicePocketStateChanged();
+                //if (mKeyHandler != null) {
+                    //mKeyHandler.setIsInPocket(mIsDeviceInPocket);
+                //}
+            }
+        }
+
+    };
+
     private class PolicyHandler extends Handler {
 
         private PolicyHandler(Looper looper) {
@@ -1044,9 +1109,18 @@ void observe() {
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this,
                     UserHandle.USER_ALL);
+            resolver.registerContentObserver(LineageSettings.System.getUriFor(
+                    LineageSettings.System.KEY_APP_SWITCH_DOUBLE_TAP_ACTION), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(LineageSettings.System.getUriFor(
+                    LineageSettings.System.KEY_CORNER_LONG_SWIPE_ACTION), false, this,
+                    UserHandle.USER_ALL);
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION), false, this,
                     UserHandle.USER_ALL);
+            resolver.registerContentObserver(LineageSettings.System.getUriFor(
+                    LineageSettings.System.KEY_THREE_FINGERS_SWIPE_ACTION), false, this,
+                    UserHandle.USER_ALL);
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.CAMERA_WAKE_SCREEN), false, this,
                     UserHandle.USER_ALL);
@@ -1071,6 +1145,24 @@ void observe() {
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.VOLUME_ANSWER_CALL), false, this,
                     UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.HARDWARE_KEYS_DISABLE), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.LOCKSCREEN_ENABLE_POWER_MENU), true, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.SWAP_CAPACITIVE_KEYS), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    Settings.System.ANBI_ENABLED), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.System.getUriFor(
+                    "doze_trigger_doubletap"), false, this,
+                    UserHandle.USER_ALL);
+            resolver.registerContentObserver(LineageSettings.System.getUriFor(
+                    LineageSettings.System.KEY_SHAKE_GESTURE_ACTION), false, this,
+                    UserHandle.USER_ALL);
             updateSettings();
         }
 
@@ -1702,6 +1794,12 @@ private void powerLongPress(long eventTime) {
                 msg.setAsynchronous(true);
                 msg.sendToTarget();
                 break;
+            case LONG_PRESS_POWER_HIDE_POCKET_LOCK:
+                mPowerKeyHandled = true;
+                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Power - Long-Press - Hide Pocket Lock");
+                hidePocketLock(true);
+                mPocketManager.setListeningExternal(false);
+                break;
         }
     }
 
@@ -1736,8 +1834,8 @@ private void backLongPress() {
         }
     }
 
-    private void appSwitchPress() {
-        if (!keyguardOn() && mAppSwitchPressAction != Action.NOTHING) {
+    private void appSwitchPress(int count) {
+        if (count == 1 && !keyguardOn() && mAppSwitchPressAction != Action.NOTHING) {
             if (mAppSwitchPressAction != Action.APP_SWITCH) {
                 cancelPreloadRecentApps();
             }
@@ -1747,6 +1845,16 @@ private void appSwitchPress() {
                     KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_KEYBOARD);
 
             performKeyAction(mAppSwitchPressAction, event);
+        } else if (count == 2 && !keyguardOn() && mAppSwitchDoubleTapAction != Action.NOTHING) {
+            if (mAppSwitchDoubleTapAction != Action.APP_SWITCH) {
+                cancelPreloadRecentApps();
+            }
+            long now = SystemClock.uptimeMillis();
+            KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_APP_SWITCH, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                    KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_KEYBOARD);
+
+            performKeyAction(mAppSwitchDoubleTapAction, event);
         }
     }
 
@@ -1766,6 +1874,38 @@ private void appSwitchLongPress() {
         }
     }
 
+    private void assistPress() {
+        if (!keyguardOn() && mAssistPressAction != Action.NOTHING) {
+            if (mAssistPressAction != Action.APP_SWITCH) {
+                cancelPreloadRecentApps();
+            }
+            long now = SystemClock.uptimeMillis();
+            KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_ASSIST, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                    KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_KEYBOARD);
+
+            performKeyAction(mAssistPressAction, event,
+                    AssistUtils.INVOCATION_TYPE_ASSIST_BUTTON);
+        }
+    }
+
+    private void assistLongPress() {
+        if (!keyguardOn() && mAssistLongPressAction != Action.NOTHING) {
+            if (mAssistLongPressAction != Action.APP_SWITCH) {
+                cancelPreloadRecentApps();
+            }
+
+            long now = SystemClock.uptimeMillis();
+            KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_ASSIST, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                    KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_KEYBOARD);
+
+            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Assist - Long Press");
+            performKeyAction(mAssistLongPressAction, event,
+                    AssistUtils.INVOCATION_TYPE_ASSIST_BUTTON);
+        }
+    }
+
     private void sleepPress() {
         if (mShortPressOnSleepBehavior == SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME) {
             launchHomeFromHotKey(DEFAULT_DISPLAY, false /* awakenDreams */,
@@ -1817,6 +1957,10 @@ private int getResolvedLongPressOnPowerBehavior() {
             return LONG_PRESS_POWER_TORCH;
         }
 
+        if (mPocketLockShowing) {
+            return LONG_PRESS_POWER_HIDE_POCKET_LOCK;
+        }
+
         // If the config indicates the assistant behavior but the device isn't yet provisioned, show
         // global actions instead.
         if (mLongPressOnPowerBehavior == LONG_PRESS_POWER_ASSISTANT &&
@@ -2063,10 +2207,14 @@ public void showGlobalActions() {
     }
 
     void showGlobalActionsInternal() {
+        final boolean keyguardShowing = isKeyguardLocked();
+        if (keyguardShowing && isKeyguardSecure(mCurrentUserId) &&
+                !mGlobalActionsOnLockEnable) {
+            return;
+        }
         if (mGlobalActions == null) {
             mGlobalActions = mGlobalActionsFactory.get();
         }
-        final boolean keyguardShowing = isKeyguardShowingAndNotOccluded();
         mGlobalActions.showDialog(keyguardShowing, isDeviceProvisioned());
         // since it took two seconds of long press to bring this up,
         // poke the wake lock so they have some time to see the dialog.
@@ -2267,7 +2415,7 @@ private void performKeyAction(Action action, KeyEvent event, int assistInvocatio
                 notifyKeyGestureCompleted(event, KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT);
                 break;
             case VOICE_SEARCH:
-                launchVoiceAssistWithWakeLock();
+                launchVoiceAssist(mAllowStartActivityForLongPressOnPowerDuringSetup);
                 break;
             case IN_APP_SEARCH:
                 triggerVirtualKeypress(KeyEvent.KEYCODE_SEARCH);
@@ -2290,6 +2438,27 @@ private void performKeyAction(Action action, KeyEvent event, int assistInvocatio
             case PLAY_PAUSE_MUSIC:
                 triggerVirtualKeypress(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
                 break;
+            case TORCH:
+                toggleTorch();
+                break;
+            case SCREENSHOT:
+                mScreenshotHelper.takeScreenshot(SCREENSHOT_KEY_OTHER, mHandler, null);
+                break;
+            case VOLUME_PANEL:
+                toggleVolumePanel();
+                break;
+            case CLEAR_ALL_NOTIFICATIONS:
+                clearAllNotifications();
+                break;
+            case NOTIFICATIONS:
+                toggleNotificationPanel();
+                break;
+            case QS_PANEL:
+                toggleQsPanel();
+                break;
+            case RINGER_MODES:
+                toggleRingerModes();
+                break;
             default:
                 break;
         }
@@ -2544,11 +2713,18 @@ void init(Injector injector) {
         mGlobalActionsFactory = injector.getGlobalActionsFactory();
         mLockPatternUtils = injector.getLockPatternUtils();
         mLogger = new MetricsLogger();
+        mLineageHardware = LineageHardwareManager.getInstance(mContext);
+
+        mANBIHandler = new ANBIHandler(mContext);
 
         Resources res = mContext.getResources();
         mWakeOnDpadKeyPress =
                 res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress);
 
+        // Double-tap-to-doze
+        mNativeDoubleTapToDozeAvailable = !android.text.TextUtils.isEmpty(
+                mContext.getResources().getString(R.string.config_dozeDoubleTapSensorType));
+
         // Init display burn-in protection
         boolean burnInProtectionEnabled = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_enableBurnInProtection);
@@ -2585,9 +2761,9 @@ void init(Injector injector) {
         }
 
         mHandler = new PolicyHandler(injector.getLooper());
+        mScreenshotHelper = new ScreenshotHelper(mContext);
         mWakeGestureListener = new MyWakeGestureListener(mContext, mHandler);
         mSettingsObserver = new SettingsObserver(mHandler);
-        mSettingsObserver.observe();
 
         // Lineage additions
         mAlarmManager = mContext.getSystemService(AlarmManager.class);
@@ -2967,7 +3143,7 @@ boolean supportLongPress() {
 
         @Override
         int getMaxMultiPressCount() {
-            return 1;
+            return mAppSwitchDoubleTapAction != Action.NOTHING ? 2 : 1;
         }
 
         @Override
@@ -2977,7 +3153,7 @@ void onKeyGesture(@NonNull SingleKeyGestureEvent event) {
             }
             switch (event.getType()) {
                 case SINGLE_KEY_GESTURE_TYPE_PRESS:
-                    appSwitchPress();
+                    appSwitchPress(event.getPressCount());
                     break;
                 case SINGLE_KEY_GESTURE_TYPE_LONG_PRESS:
                     appSwitchLongPress();
@@ -2986,6 +3162,35 @@ void onKeyGesture(@NonNull SingleKeyGestureEvent event) {
         }
     }
 
+    /**
+     * Rule for single assist key gesture.
+     */
+    private final class AssistKeyRule extends SingleKeyGestureDetector.SingleKeyRule {
+        AssistKeyRule() {
+            super(KeyEvent.KEYCODE_ASSIST);
+        }
+
+        @Override
+        boolean supportLongPress() {
+            return mAssistLongPressAction != Action.NOTHING;
+        }
+
+        @Override
+        void onKeyGesture(@NonNull SingleKeyGestureEvent event) {
+            if (event.getAction() != ACTION_COMPLETE) {
+                return;
+            }
+            switch (event.getType()) {
+                case SINGLE_KEY_GESTURE_TYPE_PRESS:
+                    assistPress();
+                    break;
+                case SINGLE_KEY_GESTURE_TYPE_LONG_PRESS:
+                    assistLongPress();
+                    break;
+            }
+        }
+    }
+
     /**
      * Rule for single stem primary key gesture.
      */
@@ -3202,14 +3407,18 @@ private void initSingleKeyGestureRules(Looper looper) {
         mSingleKeyGestureDetector.addRule(new BackKeyRule());
         mSingleKeyGestureDetector.addRule(new StylusTailButtonRule());
         mSingleKeyGestureDetector.addRule(new AppSwitchKeyRule());
+        mSingleKeyGestureDetector.addRule(new AssistKeyRule());
     }
 
     private void updateKeyAssignments() {
         int activeHardwareKeys = mDeviceHardwareKeys;
 
+        if (mHardwareKeysDisable) {
+            activeHardwareKeys = 0;
+        }
+
         final boolean hasMenu = (activeHardwareKeys & KEY_MASK_MENU) != 0;
         final boolean hasAssist = (activeHardwareKeys & KEY_MASK_ASSIST) != 0;
-        final boolean hasAppSwitch = (activeHardwareKeys & KEY_MASK_APP_SWITCH) != 0;
 
         final ContentResolver resolver = mContext.getContentResolver();
         final Resources res = mContext.getResources();
@@ -3232,6 +3441,8 @@ private void updateKeyAssignments() {
         mAppSwitchPressAction = Action.APP_SWITCH;
         mAppSwitchLongPressAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior));
+        mAppSwitchDoubleTapAction = Action.LAST_APP;
+        mCornerLongSwipeAction = Action.SEARCH;
         mEdgeLongSwipeAction = Action.NOTHING;
 
         mBackLongPressAction = Action.fromSettings(resolver,
@@ -3261,19 +3472,48 @@ private void updateKeyAssignments() {
                     LineageSettings.System.KEY_ASSIST_LONG_PRESS_ACTION,
                     mAssistLongPressAction);
         }
-        if (hasAppSwitch) {
-            mAppSwitchPressAction = Action.fromSettings(resolver,
-                    LineageSettings.System.KEY_APP_SWITCH_ACTION,
-                    mAppSwitchPressAction);
-        }
+        mAppSwitchPressAction = Action.fromSettings(resolver,
+                LineageSettings.System.KEY_APP_SWITCH_ACTION,
+                mAppSwitchPressAction);
         mAppSwitchLongPressAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION,
                 mAppSwitchLongPressAction);
+        mAppSwitchDoubleTapAction = Action.fromSettings(resolver,
+                LineageSettings.System.KEY_APP_SWITCH_DOUBLE_TAP_ACTION,
+                mAppSwitchDoubleTapAction);
+
+        mCornerLongSwipeAction = Action.fromSettings(resolver,
+                LineageSettings.System.KEY_CORNER_LONG_SWIPE_ACTION,
+                mCornerLongSwipeAction);
 
         mEdgeLongSwipeAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_EDGE_LONG_SWIPE_ACTION,
                 mEdgeLongSwipeAction);
 
+        Action threeFingersSwipeAction = Action.fromSettings(resolver,
+                LineageSettings.System.KEY_THREE_FINGERS_SWIPE_ACTION,
+                Action.NOTHING);
+
+        if (mThreeFingersSwipe != null && mThreeFingersSwipeAction != threeFingersSwipeAction) {
+            mThreeFingersSwipeAction = threeFingersSwipeAction;
+            if (mThreeFingersSwipeAction != Action.NOTHING && !mThreeFingersSwipeHasAction) {
+                mThreeFingersSwipeHasAction = true;
+                mWindowManagerFuncs.registerPointerEventListener(mThreeFingersSwipe, DEFAULT_DISPLAY);
+            } else if (mThreeFingersSwipeAction == Action.NOTHING && mThreeFingersSwipeHasAction) {
+                mWindowManagerFuncs.unregisterPointerEventListener(mThreeFingersSwipe, DEFAULT_DISPLAY);
+                mThreeFingersSwipeHasAction = false;
+            }
+            try {
+                mActivityManagerService.setThreeFingersSwipeActive(mThreeFingersSwipeHasAction);
+            } catch (Exception e) {
+                // Do nothing
+            }
+        }
+
+        mShakeGestureAction = Action.fromSettings(resolver,
+                LineageSettings.System.KEY_SHAKE_GESTURE_ACTION,
+                Action.NOTHING);
+
         mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_NOTHING;
         if (mPackageManager.hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) {
             mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE;
@@ -3299,6 +3539,13 @@ void updateSettings(Handler handler) {
         final boolean kidsModeEnabled;
         int mDeviceHardwareWakeKeys = mContext.getResources().getInteger(
                 org.lineageos.platform.internal.R.integer.config_deviceHardwareWakeKeys);
+
+        // Double-tap-to-doze
+        mDoubleTapToWake = Settings.Secure.getIntForUser(resolver,
+                Settings.Secure.DOUBLE_TAP_TO_WAKE, 0, UserHandle.USER_CURRENT) == 1;
+        mDoubleTapToDoze = Settings.System.getIntForUser(resolver,
+                "doze_trigger_doubletap", 0, UserHandle.USER_CURRENT) == 1;
+
         synchronized (mLock) {
             mEndcallBehavior = Settings.System.getIntForUser(resolver,
                     Settings.System.END_BUTTON_BEHAVIOR,
@@ -3377,6 +3624,31 @@ void updateSettings(Handler handler) {
                 updateWakeGestureListenerLp();
             }
 
+            if (mLineageHardware != null && mLineageHardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE)) {
+                mHardwareKeysDisable = Settings.System.getIntForUser(resolver,
+                        Settings.System.HARDWARE_KEYS_DISABLE, 0,
+                        UserHandle.USER_CURRENT) == 1;
+                mLineageHardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, mHardwareKeysDisable);
+            }
+
+            if (mLineageHardware != null && mLineageHardware.isSupported(LineageHardwareManager.FEATURE_KEY_SWAP)) {
+                mSwapCapacitiveKeys = Settings.System.getIntForUser(resolver,
+                        Settings.System.SWAP_CAPACITIVE_KEYS, 0,
+                        UserHandle.USER_CURRENT) == 1;
+                mLineageHardware.set(LineageHardwareManager.FEATURE_KEY_SWAP, mSwapCapacitiveKeys);
+            }
+
+            boolean ANBIEnabled = Settings.System.getIntForUser(resolver,
+                    Settings.System.ANBI_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+            if (mANBIHandler != null && mANBIEnabled != ANBIEnabled) {
+                mANBIEnabled = ANBIEnabled;
+                if (mANBIEnabled) {
+                    mWindowManagerFuncs.registerPointerEventListener(mANBIHandler, DEFAULT_DISPLAY);
+                } else {
+                    mWindowManagerFuncs.unregisterPointerEventListener(mANBIHandler, DEFAULT_DISPLAY);
+                }
+            }
+
             updateKeyAssignments();
 
             // use screen off timeout setting as the timeout for the lockscreen
@@ -3450,6 +3722,9 @@ void updateSettings(Handler handler) {
             mStylusButtonsEnabled = Settings.Secure.getIntForUser(resolver,
                     Secure.STYLUS_BUTTONS_ENABLED, 1, UserHandle.USER_CURRENT) == 1;
             mInputManagerInternal.setStylusButtonMotionEventsEnabled(mStylusButtonsEnabled);
+            mGlobalActionsOnLockEnable = Settings.System.getIntForUser(resolver,
+                    Settings.System.LOCKSCREEN_ENABLE_POWER_MENU, 1,
+                    UserHandle.USER_CURRENT) != 0;
 
             kidsModeEnabled = Settings.Secure.getIntForUser(resolver,
                     Settings.Secure.NAV_BAR_KIDS_MODE, 0, UserHandle.USER_CURRENT) == 1;
@@ -4960,11 +5235,42 @@ && isWakeKeyWhenScreenOff(keyCode)) {
         }
 
         final boolean interactive = (policyFlags & FLAG_INTERACTIVE) != 0;
+
+        // Pre-basic policy based on interactive and pocket lock state.
+        if (mIsDeviceInPocket && (!interactive || mPocketLockShowing)) {
+            if (keyCode != KeyEvent.KEYCODE_POWER &&
+                keyCode != KeyEvent.KEYCODE_VOLUME_UP &&
+                keyCode != KeyEvent.KEYCODE_VOLUME_DOWN &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_PLAY &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_PAUSE &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE &&
+                keyCode != KeyEvent.KEYCODE_HEADSETHOOK &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_STOP &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_NEXT &&
+                keyCode != KeyEvent.KEYCODE_MEDIA_PREVIOUS &&
+                keyCode != KeyEvent.KEYCODE_VOLUME_MUTE) {
+                return 0;
+            }
+        }
+
         final boolean canceled = event.isCanceled();
         final int displayId = event.getDisplayId();
         final boolean isInjected = (policyFlags & WindowManagerPolicy.FLAG_INJECTED) != 0;
         final boolean longPress = (event.getFlags() & KeyEvent.FLAG_LONG_PRESS) != 0;
 
+        if (mANBIEnabled && mANBIHandler != null && mANBIHandler.isScreenTouched()) {
+            final boolean navBarKey = event.getSource() == InputDevice.SOURCE_NAVIGATION_BAR;
+            final boolean appSwitchKey = keyCode == KeyEvent.KEYCODE_APP_SWITCH;
+            final boolean homeKey = keyCode == KeyEvent.KEYCODE_HOME;
+            final boolean menuKey = keyCode == KeyEvent.KEYCODE_MENU;
+            final boolean backKey = keyCode == KeyEvent.KEYCODE_BACK;
+            final boolean assistKey = keyCode == KeyEvent.KEYCODE_ASSIST;
+
+            if (!navBarKey && (appSwitchKey || homeKey || menuKey || backKey || assistKey)) {
+                return 0;
+            }
+        }
+
         // If screen is off then we treat the case where the keyguard is open but hidden
         // the same as if it were open and in front.
         // This will prevent any keys other than the power button from waking the screen
@@ -5122,7 +5428,8 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                 if (!keyguardOn()) {
                     if (down) {
                         if (mAppSwitchPressAction == Action.APP_SWITCH
-                                || mAppSwitchLongPressAction == Action.APP_SWITCH) {
+                                || mAppSwitchLongPressAction == Action.APP_SWITCH
+                                || mAppSwitchDoubleTapAction == Action.APP_SWITCH) {
                             preloadRecentApps();
                         }
                     }
@@ -5221,6 +5528,23 @@ && isWakeKeyWhenScreenOff(keyCode)) {
             }
 
             case KeyEvent.KEYCODE_HOME:
+                boolean isLongSwipe = (event.getFlags() & KeyEvent.FLAG_LONG_SWIPE) != 0;
+                if (mLongSwipeDown && isLongSwipe && !down) {
+                    // Trigger long swipe action
+                    performKeyAction(mCornerLongSwipeAction, event);
+                    // Reset long swipe state
+                    mLongSwipeDown = false;
+                    // Don't pass back press to app
+                    result &= ~ACTION_PASS_TO_USER;
+                    break;
+                }
+                mLongSwipeDown = isLongSwipe && down;
+                if (mLongSwipeDown) {
+                    // Don't pass back press to app
+                    result &= ~ACTION_PASS_TO_USER;
+                    break;
+                }
+
                 if (down && !interactive) {
                     isWakeKey = mWakeOnHomeKeyPress;
                     if (!isWakeKey) {
@@ -5270,6 +5594,7 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                         }
                         isWakeKey = true;
                         startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF);
+                        performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Camera key - Launch Camera");
                     }
                 }
                 break;
@@ -5387,7 +5712,17 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                 notifyKeyGestureCompletedOnActionUp(event,
                         KeyGestureEvent.KEY_GESTURE_TYPE_WAKEUP);
                 result &= ~ACTION_PASS_TO_USER;
-                isWakeKey = true;
+                // Double-tap-to-doze
+                if (mDoubleTapToWake && mDoubleTapToDoze && !mNativeDoubleTapToDozeAvailable) {
+                    isWakeKey = false;
+                    if (!down) {
+                        Intent intent = new Intent("com.android.systemui.doze.pulse");
+                        intent.setPackage("com.android.systemui");
+                        mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
+                    }
+                } else {
+                    isWakeKey = true;
+                }
                 break;
             }
 
@@ -5450,37 +5785,11 @@ && isWakeKeyWhenScreenOff(keyCode)) {
                 break;
             }
             case KeyEvent.KEYCODE_ASSIST: {
-                if (keyguardOn()) {
-                    break;
-                }
-                if (down) {
-                    if (mAssistPressAction == Action.APP_SWITCH
-                            || mAssistLongPressAction == Action.APP_SWITCH) {
-                        preloadRecentApps();
-                    }
-                    if (event.getRepeatCount() == 0) {
-                        mAssistPressed = true;
-                    } else if (longPress) {
-                        if (mAssistLongPressAction != Action.NOTHING) {
-                            if (mAssistLongPressAction != Action.APP_SWITCH) {
-                                cancelPreloadRecentApps();
-                            }
-                            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
-                                    "Assist - Long Press");
-                            performKeyAction(mAssistLongPressAction, event,
-                                    AssistUtils.INVOCATION_TYPE_ASSIST_BUTTON);
-                            mAssistPressed = false;
-                        }
-                    }
-                } else {
-                    if (mAssistPressed) {
-                        if (mAssistPressAction != Action.APP_SWITCH) {
-                            cancelPreloadRecentApps();
-                        }
-                        mAssistPressed = false;
-                        if (!canceled) {
-                            performKeyAction(mAssistPressAction, event,
-                                    AssistUtils.INVOCATION_TYPE_ASSIST_BUTTON);
+                if (!keyguardOn()) {
+                    if (down) {
+                        if (mAssistPressAction == Action.APP_SWITCH
+                                || mAssistLongPressAction == Action.APP_SWITCH) {
+                            preloadRecentApps();
                         }
                     }
                 }
@@ -6140,6 +6449,11 @@ public void startedGoingToSleep(int displayGroupId,
                         + displayGroupId);
             }
         }
+        if (mPocketManager != null) {
+            mPocketManager.onInteractiveChanged(false);
+        }
+
+        mHandler.removeCallbacks(mMemoryOpt);
     }
 
     // Called on the PowerManager's Notifier thread.
@@ -6182,6 +6496,9 @@ public void finishedGoingToSleep(int displayGroupId,
         }
         mPowerButtonLaunchGestureTriggeredDuringGoingToSleep = false;
         mPowerButtonLaunchGestureTriggered = false;
+
+        // make sure we do garbage collection at screen off but delay it to avoid black wallpaper
+        mHandler.postDelayed(mSystemServerGcOpt, 5000);
     }
 
     // Called on the PowerManager's Notifier thread.
@@ -6200,6 +6517,12 @@ public void startedWakingUp(int displayGroupId, @WakeReason int pmWakeReason) {
 
         EventLogTags.writeScreenToggled(1);
 
+        mHandler.removeCallbacks(mMemoryOpt);
+        mHandler.postDelayed(mMemoryOpt, 1250 /* allowance time */);
+
+        // remove pending system server gc for frequent screen state changes
+        mHandler.removeCallbacks(mSystemServerGcOpt);
+
         mIsGoingToSleep = false;
         setPendingWakingUpGroup(displayGroupId);
         mDefaultDisplayPolicy.setAwake(true);
@@ -6219,6 +6542,10 @@ public void startedWakingUp(int displayGroupId, @WakeReason int pmWakeReason) {
         }
 
         mPowerButtonLaunchGestureTriggered = false;
+
+        if (mPocketManager != null) {
+            mPocketManager.onInteractiveChanged(true);
+        }
     }
 
     // Called on the PowerManager's Notifier thread.
@@ -6244,6 +6571,31 @@ public void finishedWakingUp(int displayGroupId, @WakeReason int pmWakeReason) {
         }
     }
 
+    private final Runnable mMemoryOpt = new Runnable() {
+        @Override
+        public void run() {
+            releaseMemoryAtScreenOn();
+        }
+    };
+
+    private final Runnable mSystemServerGcOpt = new Runnable() {
+        @Override
+        public void run() {
+            long currentTime = System.currentTimeMillis();
+            if (lastGcTime == 0L || currentTime - lastGcTime > GC_INTERVAL_MS) {
+                System.gc();
+                System.runFinalization();
+                System.gc();
+                try {
+                    mActivityManagerService.compactAllSystem();
+                } catch (RemoteException e) {
+                }
+                lastGcTime = currentTime;
+                Slog.d(TAG, "Performing garbage collection for system_server");
+            }
+        }
+    };
+
     private boolean shouldWakeUpWithHomeIntent() {
         if (mWakeUpToLastStateTimeout <= 0) {
             return false;
@@ -6517,6 +6869,72 @@ private void enableScreen(ScreenOnListener listener, boolean report) {
         }
     }
 
+    /**
+     * Perform operations if needed on pocket mode state changed.
+     * @see com.android.server.pocket.PocketService
+     * @see PocketLock
+     * @see this.mPocketCallback;
+     * @author Carlo Savignano
+     */
+    private void handleDevicePocketStateChanged() {
+        final boolean interactive = mPowerManager.isInteractive();
+        if (mIsDeviceInPocket) {
+            showPocketLock(interactive);
+        } else {
+            hidePocketLock(interactive);
+        }
+    }
+
+    /**
+     * Check if we can show pocket lock once requested.
+     * @see com.android.server.pocket.PocketService
+     * @see PocketLock
+     * @see this.mPocketCallback;
+     * @author Carlo Savignano
+     */
+    private void showPocketLock(boolean animate) {
+        if (!mSystemReady || !mSystemBooted || !mKeyguardDrawnOnce
+                || mPocketLock == null || mPocketLockShowing) {
+            return;
+        }
+
+        if (mPowerManager.isInteractive() && !isKeyguardShowingAndNotOccluded()){
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "showPocketLock, animate=" + animate);
+        }
+
+        mPocketLock.show(animate);
+        mPocketLockShowing = true;
+
+        mPocketManager.setPocketLockVisible(true);
+    }
+
+    /**
+     * Check if we can hide pocket lock once requested.
+     * @see com.android.server.pocket.PocketService
+     * @see PocketLock
+     * @see this.mPocketCallback;
+     * @author Carlo Savignano
+     */
+    private void hidePocketLock(boolean animate) {
+        if (!mSystemReady || !mSystemBooted || !mKeyguardDrawnOnce
+                || mPocketLock == null || !mPocketLockShowing) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "hidePocketLock, animate=" + animate);
+        }
+
+        mPocketLock.hide(animate);
+        mPocketLockShowing = false;
+
+        mPocketManager.setPocketLockVisible(false);
+    }
+
     private void handleHideBootMessage() {
         synchronized (mLock) {
             if (!mKeyguardDrawnOnce) {
@@ -6684,10 +7102,31 @@ public void systemReady() {
         // So it is better not to bind keyguard here.
         mKeyguardDelegate.onSystemReady();
 
+        if (mContext.getResources().getBoolean(com.android.internal.R.bool.config_pocketModeSupported)) {
+            mPocketManager = (PocketManager) mContext.getSystemService(Context.POCKET_SERVICE);
+            mPocketManager.addCallback(mPocketCallback);
+            mPocketLock = new PocketLock(mContext);
+        }
+
         mVrManagerInternal = LocalServices.getService(VrManagerInternal.class);
         if (mVrManagerInternal != null) {
             mVrManagerInternal.addPersistentVrModeStateListener(mPersistentVrModeListener);
         }
+        
+        mShakeGestures = ShakeGestureService.getInstance(mContext, new ShakeGestureService.ShakeGesturesCallbacks() {
+            @Override
+            public void onShake() {
+                if (mShakeGestureAction == Action.NOTHING)
+                    return;
+                long now = SystemClock.uptimeMillis();
+                KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                        KeyEvent.KEYCODE_SYSRQ, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                        KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_TOUCHSCREEN);
+                performKeyAction(mShakeGestureAction, event);
+                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Shake Gesture");
+            }
+        });
+        mShakeGestures.onStart();
 
         mDockObserverInternal = LocalServices.getService(DockObserverInternal.class);
         if (mDockObserverInternal != null) {
@@ -6696,6 +7135,24 @@ public void systemReady() {
             mDefaultDisplayPolicy.setDockMode(dockMode);
         }
 
+        mThreeFingersSwipe = new ThreeFingersSwipeListener(mContext, new ThreeFingersSwipeListener.Callbacks() {
+            @Override
+            public void onSwipeThreeFingers() {
+                if (mThreeFingersSwipeAction == Action.NOTHING)
+                    return;
+                long now = SystemClock.uptimeMillis();
+                KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                        KeyEvent.KEYCODE_SYSRQ, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                        KeyEvent.FLAG_FROM_SYSTEM, InputDevice.SOURCE_TOUCHSCREEN);
+                performKeyAction(mThreeFingersSwipeAction, event);
+                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, "Three Fingers Swipe");
+            }
+        });
+
+        // Ensure observe happens in systemReady() since we need
+        // LineageHardwareService to be up and running
+        mSettingsObserver.observe();
+
         readCameraLensCoverState();
         updateUiMode();
         mDefaultDisplayRotation.updateOrientationListener();
@@ -7787,4 +8244,63 @@ public boolean isAnyCameraInUse() {
             return !mCameraInUse.isEmpty();
         }
     }
+
+    private void toggleVolumePanel() {
+        AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        am.adjustVolume(AudioManager.ADJUST_SAME, AudioManager.FLAG_SHOW_UI);
+    }
+
+    private void clearAllNotifications() {
+        IStatusBarService statusBarService = getStatusBarService();
+        if (statusBarService != null) {
+            try {
+                statusBarService.onClearAllNotifications(ActivityManager.getCurrentUser());
+            } catch (RemoteException e) {
+                // do nothing.
+            }
+        }
+    }
+
+    private void toggleQsPanel() {
+        IStatusBarService statusBarService = getStatusBarService();
+        if (statusBarService != null) {
+            try {
+                statusBarService.expandSettingsPanel(null);
+            } catch (RemoteException e) {
+                // do nothing.
+            }
+        }
+    }
+
+    private void toggleRingerModes() {
+        AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+
+        switch (am.getRingerMode()) {
+            case AudioManager.RINGER_MODE_NORMAL:
+                if (mVibrator.hasVibrator()) {
+                    am.setRingerMode(AudioManager.RINGER_MODE_VIBRATE);
+                }
+                break;
+            case AudioManager.RINGER_MODE_VIBRATE:
+                am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+                NotificationManager nm = getNotificationService();
+                nm.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY);
+                break;
+            case AudioManager.RINGER_MODE_SILENT:
+                am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+                break;
+        }
+    }
+
+    private void releaseMemoryAtScreenOn() {
+        long currentTime = System.currentTimeMillis();
+        if (lastMemoryReleaseTime == 0L || currentTime - lastMemoryReleaseTime > MEMORY_RELEASE_INTERVAL_MS) {
+            try {
+                mActivityManagerService.releaseMemory(900, 25, false, false);
+                lastMemoryReleaseTime = currentTime;
+                Slog.d(TAG, "Performing screen-on memory reclaim.");
+            } catch (RemoteException e) {
+            }
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/policy/ThreeFingersSwipeListener.java b/services/core/java/com/android/server/policy/ThreeFingersSwipeListener.java
new file mode 100644
index 0000000000000..b75997d0c4d6e
--- /dev/null
+++ b/services/core/java/com/android/server/policy/ThreeFingersSwipeListener.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2019 The PixelExperience Project
+ * Copyright (C) 2024-2025 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.policy;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.view.MotionEvent;
+import android.view.WindowManagerPolicyConstants.PointerEventListener;
+
+public class ThreeFingersSwipeListener implements PointerEventListener {
+
+    private static final String TAG = "ThreeFingersSwipeListener";
+    private static final int THREE_GESTURE_STATE_NONE = 0;
+    private static final int THREE_GESTURE_STATE_DETECTING = 1;
+    private static final int THREE_GESTURE_STATE_DETECTED_FALSE = 2;
+    private static final int THREE_GESTURE_STATE_DETECTED_TRUE = 3;
+    private static final int THREE_GESTURE_STATE_NO_DETECT = 4;
+    private float[] mInitMotionY;
+    private int[] mPointerIds;
+    private final Context mContext;
+    private int mThreeGestureState = THREE_GESTURE_STATE_NONE;
+    private int mThreeGestureThreshold;
+    private int mThreshold;
+    private float mDensity;
+    private int mScreenHeight;
+    private int mScreenWidth;
+    private final Callbacks mCallbacks;
+
+    public ThreeFingersSwipeListener(Context context, Callbacks callbacks) {
+        mPointerIds = new int[3];
+        mInitMotionY = new float[3];
+        mCallbacks = callbacks;
+        mContext = context;
+        DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics();
+        mDensity = displayMetrics.density;
+        mThreshold = (int) (50.0f * mDensity);
+        mThreeGestureThreshold = mThreshold * 3;
+        mScreenHeight = displayMetrics.heightPixels;
+        mScreenWidth = displayMetrics.widthPixels;
+
+        // reset the setting flag on init
+        try {
+            ActivityManager.getService().setThreeGestureStateActive(false);
+        } catch (RemoteException e) {}
+    }
+
+    @Override
+    public void onPointerEvent(MotionEvent event) {
+        if (event.getAction() == 0) {
+            changeThreeGestureState(THREE_GESTURE_STATE_NONE);
+        } else if (mThreeGestureState == THREE_GESTURE_STATE_NONE && event.getPointerCount() == 3) {
+            if (checkIsStartThreeGesture(event)) {
+                changeThreeGestureState(THREE_GESTURE_STATE_DETECTING);
+                for (int i = 0; i < 3; i++) {
+                    mPointerIds[i] = event.getPointerId(i);
+                    mInitMotionY[i] = event.getY(i);
+                }
+            } else {
+                changeThreeGestureState(THREE_GESTURE_STATE_NO_DETECT);
+            }
+        }
+        if (mThreeGestureState == THREE_GESTURE_STATE_DETECTING) {
+            if (event.getPointerCount() != 3) {
+                changeThreeGestureState(THREE_GESTURE_STATE_DETECTED_FALSE);
+                return;
+            }
+            if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
+                float distance = 0.0f;
+                int i = 0;
+                while (i < 3) {
+                    int index = event.findPointerIndex(mPointerIds[i]);
+                    if (index < 0 || index >= 3) {
+                        changeThreeGestureState(THREE_GESTURE_STATE_DETECTED_FALSE);
+                        return;
+                    } else {
+                        distance += event.getY(index) - mInitMotionY[i];
+                        i++;
+                    }
+                }
+                if (distance >= ((float) mThreeGestureThreshold)) {
+                    changeThreeGestureState(THREE_GESTURE_STATE_DETECTED_TRUE);
+                    mCallbacks.onSwipeThreeFingers();
+                }
+            }
+        }
+    }
+
+    private void changeThreeGestureState(int state) {
+        if (mThreeGestureState != state){
+            mThreeGestureState = state;
+            boolean active = mThreeGestureState == THREE_GESTURE_STATE_DETECTED_TRUE ||
+                    mThreeGestureState == THREE_GESTURE_STATE_DETECTING;
+            try {
+                ActivityManager.getService().setThreeGestureStateActive(active);
+            } catch (RemoteException e) {}
+        }
+    }
+
+    private boolean checkIsStartThreeGesture(MotionEvent event) {
+        if (event.getEventTime() - event.getDownTime() > 500) {
+            return false;
+        }
+        float minX = Float.MAX_VALUE;
+        float maxX = Float.MIN_VALUE;
+        float minY = Float.MAX_VALUE;
+        float maxY = Float.MIN_VALUE;
+        for (int i = 0; i < event.getPointerCount(); i++) {
+            float x = event.getX(i);
+            float y = event.getY(i);
+            if (y > ((float) (mScreenHeight - mThreshold))) {
+                return false;
+            }
+            maxX = Math.max(maxX, x);
+            minX = Math.min(minX, x);
+            maxY = Math.max(maxY, y);
+            minY = Math.min(minY, y);
+        }
+        if (maxY - minY <= mDensity * 150.0f) {
+            return maxX - minX <= ((float) (mScreenWidth < mScreenHeight ? mScreenWidth : mScreenHeight));
+        }
+        return false;
+    }
+
+    interface Callbacks {
+        void onSwipeThreeFingers();
+    }
+}
diff --git a/services/core/java/com/android/server/policy/pocket/PocketLock.java b/services/core/java/com/android/server/policy/pocket/PocketLock.java
new file mode 100644
index 0000000000000..c7757cac97864
--- /dev/null
+++ b/services/core/java/com/android/server/policy/pocket/PocketLock.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2016 The ParanoidAndroid Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.policy.pocket;
+
+import android.animation.Animator;
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.os.Handler;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+
+/**
+ * This class provides a fullscreen overlays view, displaying itself
+ * even on top of lock screen. While this view is displaying touch
+ * inputs are not passed to the the views below.
+ * @see android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY
+ * @author Carlo Savignano
+ */
+public class PocketLock {
+
+    private final Context mContext;
+    private WindowManager mWindowManager;
+    private WindowManager.LayoutParams mLayoutParams;
+    private Handler mHandler;
+    private View mView;
+    private View mHintContainer;
+
+    private boolean mAttached;
+    private boolean mAnimating;
+
+    /**
+     * Creates pocket lock objects, inflate view and set layout parameters.
+     * @param context
+     */
+    public PocketLock(Context context) {
+        mContext = context;
+        mHandler = new Handler();
+        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
+        mLayoutParams = getLayoutParams();
+        mView = LayoutInflater.from(mContext).inflate(
+                com.android.internal.R.layout.pocket_lock_view, null);
+    }
+
+    public void show(final boolean animate) {
+        final Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                if (mAttached) {
+                    return;
+                }
+
+                if (mAnimating) {
+                    mView.animate().cancel();
+                }
+
+                if (animate) {
+                    mView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                    mView.animate().alpha(1.0f).setListener(new Animator.AnimatorListener() {
+                        @Override
+                        public void onAnimationStart(Animator animator) {
+                            mAnimating = true;
+                        }
+
+                        @Override
+                        public void onAnimationEnd(Animator animator) {
+                            mView.setLayerType(View.LAYER_TYPE_NONE, null);
+                            mAnimating = false;
+                        }
+
+                        @Override
+                        public void onAnimationCancel(Animator animator) {
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animator animator) {
+                        }
+                    }).withStartAction(new Runnable() {
+                        @Override
+                        public void run() {
+                            mView.setAlpha(0.0f);
+                            mView.setVisibility(View.VISIBLE);
+                            addView();
+                        }
+                    }).start();
+                } else {
+                    mView.setVisibility(View.VISIBLE);
+                    mView.setAlpha(1.0f);
+                    addView();
+                }
+            }
+        };
+
+        mHandler.post(r);
+    }
+
+    public void hide(final boolean animate) {
+        final Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                if (!mAttached) {
+                    return;
+                }
+
+                if (mAnimating) {
+                    mView.animate().cancel();
+                }
+
+                if (animate) {
+                    mView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                    mView.animate().alpha(0.0f).setListener(new Animator.AnimatorListener() {
+                        @Override
+                        public void onAnimationStart(Animator animator) {
+                            mAnimating = true;
+                        }
+
+                        @Override
+                        public void onAnimationEnd(Animator animator) {
+                            mView.setVisibility(View.GONE);
+                            mView.setLayerType(View.LAYER_TYPE_NONE, null);
+                            mAnimating = false;
+                            removeView();
+                        }
+
+                        @Override
+                        public void onAnimationCancel(Animator animator) {
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animator animator) {
+                        }
+                    }).start();
+                } else {
+                    mView.setVisibility(View.GONE);
+                    mView.setAlpha(0.0f);
+                    removeView();
+                }
+            }
+        };
+
+        mHandler.post(r);
+    }
+
+    private void addView() {
+        if (mWindowManager != null && !mAttached) {
+            mWindowManager.addView(mView, mLayoutParams);          
+            mView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+            mAttached = true;
+        }
+    }
+
+    private void removeView() {
+        if (mWindowManager != null && mAttached) {          
+            mView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            mWindowManager.removeView(mView);
+            mAnimating = false;
+            mAttached = false;
+        }
+    }
+
+    private WindowManager.LayoutParams getLayoutParams() {
+        mLayoutParams = new WindowManager.LayoutParams();
+        mLayoutParams.format = PixelFormat.TRANSLUCENT;
+        mLayoutParams.height = WindowManager.LayoutParams.MATCH_PARENT;
+        mLayoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        mLayoutParams.gravity = Gravity.CENTER;
+        mLayoutParams.type = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;
+        mLayoutParams.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        mLayoutParams.flags = WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
+                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
+                | WindowManager.LayoutParams.FLAG_FULLSCREEN
+                | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+        return mLayoutParams;
+    }
+
+}
diff --git a/services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java b/services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java
index e09ab600a1dc3..1678142f61cfd 100644
--- a/services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java
+++ b/services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java
@@ -274,7 +274,7 @@ private Map<String, Set<String>> readFromLegacySettings(@UserIdInt int userId) {
             homePackageName = null;
         }
         if (homePackageName != null) {
-            roles.put(RoleManager.ROLE_HOME, Collections.singleton(homePackageName));
+            roles.put(RoleManager.ROLE_HOME, Collections.singleton(maybeOverrideDefaultHome(homePackageName)));
         }
 
         // Emergency
@@ -286,6 +286,10 @@ private Map<String, Set<String>> readFromLegacySettings(@UserIdInt int userId) {
 
         return roles;
     }
+    
+    private String maybeOverrideDefaultHome(String packageName) {
+        return packageName;
+    }
 
     private boolean isSettingsApplication(@NonNull String packageName, @UserIdInt int userId) {
         PackageManager packageManager = mContext.getPackageManager();
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index 44b438bfcf3ce..70c32e1ed8f45 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -135,6 +135,8 @@ public class Notifier {
                     -1);
     private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES =
             VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK);
+    private static final VibrationEffect CHARGING_VIBRATION_DOUBLE_CLICK_EFFECT =
+            VibrationEffect.createPredefined(VibrationEffect.EFFECT_DOUBLE_CLICK);
 
     private final Object mLock = new Object();
 
@@ -172,10 +174,6 @@ public class Notifier {
     // True if the device should suspend when the screen is off due to proximity.
     private final boolean mSuspendWhenScreenOffDueToProximityConfig;
 
-    // True if the device should show the wireless charging animation when the device
-    // begins charging wirelessly
-    private final boolean mShowWirelessChargingAnimationConfig;
-
     // Encapsulates interactivity information about a particular display group.
     private static class Interactivity {
         public boolean isInteractive = true;
@@ -206,6 +204,8 @@ private static class Interactivity {
     private int mBroadcastedInteractiveState;
     private boolean mBroadcastInProgress;
     private long mBroadcastStartTime;
+    private static final long USER_ACTIVITY_MIN_INTERVAL_MS = 500;
+    private long mLastUserActivityTimeMs;
 
     // True if a user activity message should be sent.
     private boolean mUserActivityPending;
@@ -256,8 +256,6 @@ public Notifier(Looper looper, Context context, IBatteryStats batteryStats,
 
         mSuspendWhenScreenOffDueToProximityConfig = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_suspendWhenScreenOffDueToProximity);
-        mShowWirelessChargingAnimationConfig = context.getResources().getBoolean(
-                com.android.internal.R.bool.config_showBuiltinWirelessChargingAnim);
 
         mFullWakeLockLog = mInjector.getWakeLockLog(context);
         mPartialWakeLockLog = mInjector.getWakeLockLog(context);
@@ -877,22 +875,25 @@ public void onUserActivity(int displayGroupId, @PowerManager.UserActivityEvent i
             Slog.d(TAG, "onUserActivity: event=" + event + ", uid=" + uid);
         }
 
-        try {
-            mBatteryStats.noteUserActivity(uid, event);
-            mWakefulnessSessionObserver.notifyUserActivity(
-                    SystemClock.uptimeMillis(), displayGroupId, event);
-        } catch (RemoteException ex) {
-            // Ignore
-        }
+        final long now = SystemClock.uptimeMillis();
+        if (now - mLastUserActivityTimeMs >= USER_ACTIVITY_MIN_INTERVAL_MS) {
+            mLastUserActivityTimeMs = now;
+            try {
+                mBatteryStats.noteUserActivity(uid, event);
+                mWakefulnessSessionObserver.notifyUserActivity(now, displayGroupId, event);
+            } catch (RemoteException ex) {
+                // Ignore
+            }
 
-        synchronized (mLock) {
-            if (!mUserActivityPending) {
-                mUserActivityPending = true;
-                Message msg = mHandler.obtainMessage(MSG_USER_ACTIVITY);
-                msg.arg1 = displayGroupId;
-                msg.arg2 = event;
-                msg.setAsynchronous(true);
-                mHandler.sendMessage(msg);
+            synchronized (mLock) {
+                if (!mUserActivityPending) {
+                    mUserActivityPending = true;
+                    Message msg = mHandler.obtainMessage(MSG_USER_ACTIVITY);
+                    msg.arg1 = displayGroupId;
+                    msg.arg2 = event;
+                    msg.setAsynchronous(true);
+                    mHandler.sendMessage(msg);
+                }
             }
         }
     }
@@ -963,7 +964,7 @@ public void onWirelessChargingInterrupted(@UserIdInt int userId) {
     /**
      * Called when wired charging has started - to provide user feedback
      */
-    public void onWiredChargingStarted(@UserIdInt int userId) {
+    public void onWiredChargingStarted(int batteryLevel, @UserIdInt int userId) {
         if (DEBUG) {
             Slog.d(TAG, "onWiredChargingStarted");
         }
@@ -971,7 +972,8 @@ public void onWiredChargingStarted(@UserIdInt int userId) {
         mSuspendBlocker.acquire();
         Message msg = mHandler.obtainMessage(MSG_WIRED_CHARGING_STARTED);
         msg.setAsynchronous(true);
-        msg.arg1 = userId;
+        msg.arg1 = batteryLevel;
+        msg.arg2 = userId;
         mHandler.sendMessage(msg);
     }
 
@@ -1193,7 +1195,8 @@ private void playChargingStartedFeedback(@UserIdInt int userId, boolean wireless
                     Settings.Secure.CHARGING_VIBRATION_ENABLED, 1, userId) != 0;
             if (vibrate) {
                 mVibrator.vibrate(Process.SYSTEM_UID, mContext.getOpPackageName(),
-                        CHARGING_VIBRATION_EFFECT, /* reason= */ "Charging started",
+                        mVibrator.hasAmplitudeControl() ? CHARGING_VIBRATION_EFFECT :
+                        CHARGING_VIBRATION_DOUBLE_CLICK_EFFECT, /* reason= */ "Charging started",
                         HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);
             }
 
@@ -1222,18 +1225,29 @@ private void playChargingStartedFeedback(@UserIdInt int userId, boolean wireless
     }
 
     private void showWirelessChargingStarted(int batteryLevel, @UserIdInt int userId) {
+        final boolean animationEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.CHARGING_ANIMATION, 1, userId) == 1;
+
         // play sounds + haptics
         playChargingStartedFeedback(userId, true /* wireless */);
 
         // show animation
-        if (mShowWirelessChargingAnimationConfig && mStatusBarManagerInternal != null) {
+        if (animationEnabled && mStatusBarManagerInternal != null) {
             mStatusBarManagerInternal.showChargingAnimation(batteryLevel);
         }
         mSuspendBlocker.release();
     }
 
-    private void showWiredChargingStarted(@UserIdInt int userId) {
+    private void showWiredChargingStarted(int batteryLevel, @UserIdInt int userId) {
+        final boolean animationEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.CHARGING_ANIMATION, 1, userId) == 1;
+
         playChargingStartedFeedback(userId, false /* wireless */);
+
+        // show animation
+        if (animationEnabled && mStatusBarManagerInternal != null) {
+            mStatusBarManagerInternal.showChargingAnimation(batteryLevel);
+        }
         mSuspendBlocker.release();
     }
 
@@ -1557,7 +1571,7 @@ public void handleMessage(Message msg) {
                     showChargingStopped(msg.arg1, false /* wireless */);
                     break;
                 case MSG_WIRED_CHARGING_STARTED:
-                    showWiredChargingStarted(msg.arg1);
+                    showWiredChargingStarted(msg.arg1, msg.arg2);
                     break;
                 case MSG_SCREEN_POLICY:
                     screenPolicyChanging(msg.arg1, msg.arg2);
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 25dca815a9fdd..8563e7c1a1661 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -733,6 +733,9 @@ public final class PowerManagerService extends SystemService
     // True if always on display is enabled
     private boolean mAlwaysOnEnabled;
 
+    // True if always on charging is enabled
+    private boolean mAlwaysOnChargingEnabled;
+
     // True if double tap to wake is enabled
     private boolean mDoubleTapWakeEnabled;
 
@@ -1250,7 +1253,8 @@ interface PowerPropertiesWrapper {
     private static native boolean nativeSetPowerMode(int mode, boolean enabled);
     private static native boolean nativeForceSuspend();
 
-    private boolean mForceNavbar;
+    // overrule and disable brightness for buttons
+    private boolean mHardwareKeysDisable = false;
 
     // Whether proximity check on wake is enabled by default
     private boolean mProximityWakeEnabledByDefaultConfig;
@@ -1597,6 +1601,9 @@ private void systemReady() {
         resolver.registerContentObserver(Settings.Secure.getUriFor(
                 Settings.Secure.DOZE_ALWAYS_ON),
                 false, mSettingsObserver, UserHandle.USER_ALL);
+        resolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.DOZE_ON_CHARGE),
+                false, mSettingsObserver, UserHandle.USER_ALL);
         resolver.registerContentObserver(Settings.Secure.getUriFor(
                 Settings.Secure.DOUBLE_TAP_TO_WAKE),
                 false, mSettingsObserver, UserHandle.USER_ALL);
@@ -1623,8 +1630,8 @@ private void systemReady() {
         resolver.registerContentObserver(LineageSettings.Secure.getUriFor(
                 LineageSettings.Secure.KEYBOARD_BRIGHTNESS),
                 false, mSettingsObserver, UserHandle.USER_ALL);
-        resolver.registerContentObserver(LineageSettings.System.getUriFor(
-                LineageSettings.System.FORCE_SHOW_NAVBAR),
+        resolver.registerContentObserver(Settings.System.getUriFor(
+                Settings.System.HARDWARE_KEYS_DISABLE),
                 false, mSettingsObserver, UserHandle.USER_ALL);
 
         // Register for broadcasts from other components of the system.
@@ -1738,7 +1745,9 @@ private void updateSettingsLocked() {
         mWakeUpWhenPluggedOrUnpluggedSetting = LineageSettings.Global.getInt(resolver,
                 LineageSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED,
                 (mWakeUpWhenPluggedOrUnpluggedConfig ? 1 : 0)) == 1;
-        mAlwaysOnEnabled = mAmbientDisplayConfiguration.alwaysOnEnabled(UserHandle.USER_CURRENT);
+        mAlwaysOnEnabled = mAmbientDisplayConfiguration.alwaysOnEnabledSetting(UserHandle.USER_CURRENT);
+        mAlwaysOnChargingEnabled = mAmbientDisplayConfiguration.alwaysOnChargingEnabledSetting(
+                    UserHandle.USER_CURRENT);
 
         if (mSupportsDoubleTapWakeConfig) {
             boolean doubleTapWakeEnabled = Settings.Secure.getIntForUser(resolver,
@@ -1773,9 +1782,9 @@ private void updateSettingsLocked() {
                 LineageSettings.Secure.KEYBOARD_BRIGHTNESS, mKeyboardBrightnessDefault,
                 UserHandle.USER_CURRENT);
 
-        mForceNavbar = LineageSettings.System.getIntForUser(resolver,
-                LineageSettings.System.FORCE_SHOW_NAVBAR,
-                0, UserHandle.USER_CURRENT) == 1;
+        mHardwareKeysDisable = Settings.System.getIntForUser(resolver,
+                Settings.System.HARDWARE_KEYS_DISABLE, 0,
+                UserHandle.USER_CURRENT) != 0;
 
         mDirty |= DIRTY_SETTINGS;
     }
@@ -2960,7 +2969,7 @@ && getGlobalWakefulnessLocked() == WAKEFULNESS_DREAMING) {
                 if (mBootCompleted) {
                     if (mIsPowered && !BatteryManager.isPlugWired(oldPlugType)
                             && BatteryManager.isPlugWired(mPlugType)) {
-                        mNotifier.onWiredChargingStarted(mUserId);
+                        mNotifier.onWiredChargingStarted(mBatteryLevel, mUserId);
                     } else if (wasPowered && !mIsPowered) {
                         if (oldPlugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
                             mNotifier.onWirelessChargingInterrupted(mUserId);
@@ -3019,9 +3028,11 @@ && getGlobalWakefulnessLocked() == WAKEFULNESS_DREAMING
             return false;
         }
 
-        // On Always On Display, SystemUI shows the charging indicator
-        if (mAlwaysOnEnabled && getGlobalWakefulnessLocked() == WAKEFULNESS_DOZING) {
-            return false;
+        // On Always On Display or Always On Charging, SystemUI shows the charging indicator
+        if (getGlobalWakefulnessLocked() == WAKEFULNESS_DOZING) {
+            if (mAlwaysOnEnabled || (mAlwaysOnChargingEnabled && mIsPowered)) {
+                return false;
+            }
         }
 
         // Otherwise wake up!
@@ -3323,7 +3334,7 @@ private void updateUserActivitySummaryLocked(long now, int dirty) {
                         if (wakefulness == WAKEFULNESS_AWAKE) {
                             if (mButtonsLight != null) {
                                 float buttonBrightness = BRIGHTNESS_OFF_FLOAT;
-                                if (!mForceNavbar) {
+                                if (!mHardwareKeysDisable) {
                                     if (isValidBrightness(
                                             mButtonBrightnessOverrideFromWindowManager)) {
                                         if (mButtonBrightnessOverrideFromWindowManager >
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index ec9e276c31909..025a431ee9ce0 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -31,6 +31,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManagerInternal;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.FileUtils;
 import android.os.Handler;
@@ -196,6 +197,11 @@ private static void shutdownInner(final Context context, boolean confirm) {
                         ? com.android.internal.R.string.shutdown_confirm_question
                         : com.android.internal.R.string.shutdown_confirm);
 
+        boolean isNightMode = (context.getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+        int themeResId = isNightMode ? android.R.style.Theme_DeviceDefault_Dialog_Alert :
+                android.R.style.Theme_DeviceDefault_Light_Dialog_Alert;
+
         if (DEBUG) {
             Log.d(TAG, "Notifying thread to start shutdown longPressBehavior=" + longPressBehavior);
         }
@@ -205,7 +211,7 @@ private static void shutdownInner(final Context context, boolean confirm) {
             if (sConfirmDialog != null) {
                 sConfirmDialog.dismiss();
             }
-            sConfirmDialog = new AlertDialog.Builder(context)
+            sConfirmDialog = new AlertDialog.Builder(context, themeResId)
                     .setTitle(mRebootSafeMode
                             ? com.android.internal.R.string.reboot_safemode_title
                             : com.android.internal.R.string.power_off)
diff --git a/services/core/java/com/android/server/power/SleepModeIdleController.java b/services/core/java/com/android/server/power/SleepModeIdleController.java
new file mode 100644
index 0000000000000..90f6a454220d3
--- /dev/null
+++ b/services/core/java/com/android/server/power/SleepModeIdleController.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2026 VoltageOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.power;
+
+import android.app.ActivityManager;
+import android.app.usage.UsageStatsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.provider.Telephony;
+import android.telecom.TelecomManager;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+final class SleepModeIdleController {
+
+    private static final String TAG = "SleepModeIdleController";
+    
+    private static final long REAPPLY_INTERVAL_MS = 20 * 60 * 1000; // 20 min
+
+    private final Context mContext;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Map<String, Integer> mBucketSnapshot = new ArrayMap<>();
+
+    private boolean mDeepSleepActive = false;
+
+    SleepModeIdleController(Context context) {
+        mContext = context;
+    }
+
+    public void setDeepSleepEnabled(boolean enabled) {
+        if (enabled == mDeepSleepActive) return;
+
+        mDeepSleepActive = enabled;
+
+        if (enabled) {
+            snapshotBuckets();
+            applyRestrictions();
+            scheduleReapply();
+        } else {
+            restoreBuckets();
+            mHandler.removeCallbacks(mReapplyRunnable);
+        }
+    }
+
+    private void applyRestrictions() {
+        final UsageStatsManager usm = mContext.getSystemService(UsageStatsManager.class);
+        final ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        final List<ActivityManager.RunningAppProcessInfo> procs = am.getRunningAppProcesses();
+        final Set<String> foregroundPkgs = new ArraySet<>();
+
+        if (procs != null) {
+            for (ActivityManager.RunningAppProcessInfo proc : procs) {
+                if (proc.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+                    for (String pkg : proc.pkgList) {
+                        foregroundPkgs.add(pkg);
+                    }
+                }
+            }
+        }
+
+        final List<ApplicationInfo> apps = mContext.getPackageManager()
+                .getInstalledApplications(PackageManager.MATCH_ALL);
+
+        for (ApplicationInfo app : apps) {
+            final String pkg = app.packageName;
+
+            if (shouldSkipApp(app, pkg, foregroundPkgs)) {
+                continue;
+            }
+
+            try {
+                usm.setAppStandbyBucket(pkg, UsageStatsManager.STANDBY_BUCKET_RESTRICTED);
+            } catch (Exception ignored) {}
+        }
+    }
+
+    private boolean shouldSkipApp(ApplicationInfo app, String pkg, Set<String> foregroundPkgs) {
+        // Real foreground only (user actively using)
+        if (foregroundPkgs.contains(pkg)) {
+            return true;
+        }
+
+        // System apps
+        if ((app.flags & ApplicationInfo.FLAG_SYSTEM) != 0 ||
+            (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+            return true;
+        }
+
+        // Critical user apps
+        if (isCriticalApp(pkg)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean isCriticalApp(String pkg) {
+        return pkg.equals(getDefaultDialer())
+            || pkg.equals(getDefaultSms())
+            || pkg.equals(getDefaultAlarm());
+    }
+
+    private String getDefaultDialer() {
+        TelecomManager tm = mContext.getSystemService(TelecomManager.class);
+        return tm != null ? tm.getDefaultDialerPackage() : null;
+    }
+
+    private String getDefaultSms() {
+        return Telephony.Sms.getDefaultSmsPackage(mContext);
+    }
+
+    private String getDefaultAlarm() {
+        return Settings.Secure.getString(
+            mContext.getContentResolver(),
+            "default_alarm_app"
+        );
+    }
+
+    private void snapshotBuckets() {
+        mBucketSnapshot.clear();
+
+        UsageStatsManager usm = mContext.getSystemService(UsageStatsManager.class);
+        PackageManager pm = mContext.getPackageManager();
+
+        for (ApplicationInfo app : pm.getInstalledApplications(PackageManager.MATCH_ALL)) {
+            try {
+                int bucket = usm.getAppStandbyBucket(app.packageName);
+                mBucketSnapshot.put(app.packageName, bucket);
+            } catch (Exception ignored) {}
+        }
+    }
+
+    private void restoreBuckets() {
+        UsageStatsManager usm = mContext.getSystemService(UsageStatsManager.class);
+
+        for (Map.Entry<String, Integer> entry : mBucketSnapshot.entrySet()) {
+            try {
+                usm.setAppStandbyBucket(entry.getKey(), entry.getValue());
+            } catch (Exception ignored) {}
+        }
+
+        mBucketSnapshot.clear();
+    }
+
+    private final Runnable mReapplyRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (!mDeepSleepActive) return;
+
+            applyRestrictions();
+            mHandler.postDelayed(this, REAPPLY_INTERVAL_MS);
+        }
+    };
+
+    private void scheduleReapply() {
+        mHandler.removeCallbacks(mReapplyRunnable);
+        mHandler.postDelayed(mReapplyRunnable, REAPPLY_INTERVAL_MS);
+    }
+}
diff --git a/services/core/java/com/android/server/power/SleepModeService.java b/services/core/java/com/android/server/power/SleepModeService.java
new file mode 100644
index 0000000000000..c0553ae050093
--- /dev/null
+++ b/services/core/java/com/android/server/power/SleepModeService.java
@@ -0,0 +1,486 @@
+/*
+ * Copyright (C) 2021 Havoc-OS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.power;
+
+import android.annotation.Nullable;
+import android.app.AlarmManager;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+
+import com.android.internal.util.matrixx.Utils.SleepModeController;
+import com.android.server.SystemService;
+import com.android.server.twilight.TwilightListener;
+import com.android.server.twilight.TwilightManager;
+import com.android.server.twilight.TwilightState;
+
+import java.lang.IllegalArgumentException;
+import java.util.Calendar;
+
+public class SleepModeService extends SystemService {
+
+    private static final String TAG = "SleepModeService";
+    private static final int WAKELOCK_TIMEOUT_MS = 3000;
+
+    /**
+     * Disabled state (default)
+     */
+    private static final int MODE_DISABLED = 0;
+    /**
+     * Active from sunset to sunrise
+     */
+    private static final int MODE_NIGHT = 1;
+    /**
+     * Active at a user set time
+     */
+    private static final int MODE_TIME = 2;
+    /**
+     * Active from sunset till a time
+     */
+    private static final int MODE_MIXED_SUNSET = 3;
+    /**
+     * Active from a time till sunrise
+     */
+    private static final int MODE_MIXED_SUNRISE = 4;
+
+    private final SleepModeController mSleepModeController;
+    private final SleepModeIdleController mSleepModeIdleController;
+    private final AlarmManager mAlarmManager;
+    private final Context mContext;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private TwilightManager mTwilightManager;
+    private TwilightState mTwilightState;
+
+    /**
+     * Current operation mode
+     * Can either be {@link #MODE_DISABLED}, {@link #MODE_NIGHT} or {@link #MODE_TIME}
+     */
+    private int mMode = MODE_DISABLED;
+    /**
+     * Whether Sleep Mode is currently activated by the service
+     */
+    private boolean mActive = false;
+    /**
+     * Whether Sleep Mode is currently enabled for the active user
+     */
+    private boolean mSleepModeEnabled = false;
+    /**
+     * Whether Sleep Mode should reduce background activity
+     */
+    private boolean mIdleModeEnabled = false;
+    /**
+     * Whether next alarm should enable or disable Sleep Mode
+     */
+    private boolean mIsNextActivate = false;
+
+    private final TwilightListener mTwilightListener = new TwilightListener() {
+        @Override
+        public void onTwilightStateChanged(@Nullable TwilightState state) {
+            if (mMode != MODE_NIGHT && mMode < MODE_MIXED_SUNSET) {
+                setTwilightListener(false);
+                return;
+            }
+            Slog.v(TAG, "onTwilightStateChanged state: " + state);
+            if (state == null) return;
+            mTwilightState = state;
+            if (mMode < MODE_MIXED_SUNSET) mHandler.post(() -> maybeActivateSleepMode());
+            else mHandler.post(() -> maybeActivateTime());
+        }
+    };
+
+    private final BroadcastReceiver mTimeChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (mMode != MODE_TIME && mMode < MODE_MIXED_SUNSET) {
+                setTimeReciever(false);
+                return;
+            }
+            Slog.v(TAG, "mTimeChangedReceiver onReceive");
+            mHandler.post(() -> maybeActivateTime());
+        }
+    };
+
+    /**
+     * A class to manage and handle alarms
+     */
+    private class Alarm implements AlarmManager.OnAlarmListener {
+        @Override
+        public void onAlarm() {
+            Slog.v(TAG, "onAlarm");
+            mHandler.post(() -> setAutoSleepModeActive(mIsNextActivate));
+            if (mMode == MODE_TIME || mMode >= MODE_MIXED_SUNSET)
+                mHandler.post(() -> maybeActivateTime(false));
+            else
+                maybeActivateNight(false);
+        }
+
+        /**
+         * Set a new alarm using a Calendar
+         * @param time time as Calendar
+         */
+        public void set(Calendar time) {
+            set(time.getTimeInMillis());
+        }
+
+        /**
+         * Set a new alarm using ms since epoch
+         * @param time time as ms since epoch
+         */
+        public void set(long time) {
+            cancel();
+            mAlarmManager.setExact(AlarmManager.RTC_WAKEUP,
+                    time, TAG, this, mHandler);
+            Slog.v(TAG, "new alarm set to " + time
+                    + " mIsNextActivate=" + mIsNextActivate);
+        }
+
+        public void cancel() {
+            mAlarmManager.cancel(this);
+            Slog.v(TAG, "alarm cancelled");
+        }
+    }
+
+    private final Alarm mAlarm = new Alarm();
+
+    private class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        void observe() {
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_AUTO_MODE),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_AUTO_TIME),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_ENABLED),
+                    false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.SLEEP_MODE_IDLE_TOGGLE),
+                    false, this, UserHandle.USER_ALL);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            mHandler.post(() -> {
+                if (uri == null
+                        || Settings.Secure.getUriFor(Settings.Secure.SLEEP_MODE_AUTO_MODE)
+                                .equals(uri)
+                        || Settings.Secure.getUriFor(Settings.Secure.SLEEP_MODE_AUTO_TIME)
+                                .equals(uri)) {
+                    initState();
+                    return;
+                }
+                syncSleepModeState();
+                syncIdleModeState();
+            });
+        }
+    }
+
+    private final SettingsObserver mSettingsObserver;
+
+    public SleepModeService(Context context) {
+        super(context);
+        mContext = context;
+        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+        mSettingsObserver = new SettingsObserver(mHandler);
+        mSleepModeController = new SleepModeController(mContext);
+        mSleepModeIdleController = new SleepModeIdleController(mContext);
+    }
+
+    @Override
+    public void onStart() {
+        Slog.v(TAG, "Starting " + TAG);
+        publishLocalService(SleepModeService.class, this);
+        mSettingsObserver.observe();
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
+            Slog.v(TAG, "onBootPhase PHASE_SYSTEM_SERVICES_READY");
+            mTwilightManager = getLocalService(TwilightManager.class);
+        } else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
+            Slog.v(TAG, "onBootPhase PHASE_BOOT_COMPLETED");
+            mHandler.post(() -> {
+                initState();
+                syncIdleModeState(true);
+            });
+        }
+    }
+
+    /**
+     * Registers or unregisters {@link #mTimeChangedReceiver}
+     * @param register Register when true, unregister when false
+     */
+    private void setTimeReciever(boolean register) {
+        if (register) {
+            Slog.v(TAG, "Registering mTimeChangedReceiver");
+            final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_TIME_CHANGED);
+            intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+            mContext.registerReceiver(mTimeChangedReceiver, intentFilter);
+            return;
+        }
+        try {
+            mContext.unregisterReceiver(mTimeChangedReceiver);
+            Slog.v(TAG, "Unregistered mTimeChangedReceiver");
+        } catch (IllegalArgumentException e) {
+            // Nothing to do. Already unregistered
+        }
+    }
+
+    /**
+     * Registers or unregisters {@link #mTwilightListener}
+     * @param register Register when true, unregister when false
+     */
+    private void setTwilightListener(boolean register) {
+        if (register) {
+            try {
+                Slog.v(TAG, "Registering mTwilightListener");
+                mTwilightManager.registerListener(mTwilightListener, mHandler);
+                mTwilightState = mTwilightManager.getLastTwilightState();
+            } catch (Exception e) {
+                Slog.v(TAG, "Failed to register mTwilightListener");
+            }
+            return;
+        }
+        try {
+            mTwilightManager.unregisterListener(mTwilightListener);
+            Slog.v(TAG, "Unregistered mTwilightListener");
+        } catch (Exception e) {
+            // Nothing to do. Already unregistered
+        }
+    }
+
+    /**
+     * Initiates the state according to user settings
+     * Registers or unregisters listeners and calls {@link #maybeActivateSleepMode()}
+     */
+    private void initState() {
+        final int pMode = mMode;
+        mMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_AUTO_MODE, MODE_DISABLED,
+                UserHandle.USER_CURRENT);
+        mAlarm.cancel();
+        switch (mMode) {
+            default:
+            case MODE_DISABLED:
+                setTimeReciever(false);
+                setTwilightListener(false);
+                setAutoSleepModeActive(false);
+                syncSleepModeState();
+                return;
+            case MODE_TIME:
+                if (pMode == MODE_TIME) break;
+                setTimeReciever(true);
+                break;
+            case MODE_NIGHT:
+                if (pMode == MODE_NIGHT) break;
+                setTwilightListener(true);
+                break;
+            case MODE_MIXED_SUNSET:
+            case MODE_MIXED_SUNRISE:
+                if (pMode >= MODE_MIXED_SUNSET) break;
+                if (pMode != MODE_NIGHT) setTwilightListener(true);
+                if (pMode != MODE_TIME) setTimeReciever(true);
+                break;
+        }
+        switch (pMode) {
+            case MODE_TIME:
+                if (mMode == MODE_TIME || mMode >= MODE_MIXED_SUNSET) break;
+                setTimeReciever(false);
+                break;
+            case MODE_NIGHT:
+            case MODE_MIXED_SUNSET:
+            case MODE_MIXED_SUNRISE:
+                if (mMode == MODE_NIGHT || mMode >= MODE_MIXED_SUNSET) break;
+                setTwilightListener(false);
+                if (pMode < MODE_MIXED_SUNSET) break;
+                setTimeReciever(false);
+                break;
+        }
+        maybeActivateSleepMode();
+    }
+
+    /**
+     * Calls the correct function to set the next alarm according to {@link #mMode}
+     */
+    private void maybeActivateSleepMode() {
+        switch (mMode) {
+            default:
+            case MODE_DISABLED:
+                break;
+            case MODE_NIGHT:
+                maybeActivateNight();
+                break;
+            case MODE_TIME:
+            case MODE_MIXED_SUNSET:
+            case MODE_MIXED_SUNRISE:
+                maybeActivateTime();
+                break;
+        }
+    }
+
+    /**
+     * See {@link #maybeActivateNight(boolean)}
+     */
+    private void maybeActivateNight() {
+        maybeActivateNight(true);
+    }
+
+    /**
+     * Sets the next alarm for {@link #MODE_NIGHT}
+     * @param setActive Whether to set activation state.
+     *                  When false only updates the alarm
+     */
+    private void maybeActivateNight(boolean setActive) {
+        if (mTwilightState == null) {
+            Slog.e(TAG, "aborting maybeActivateNight(). mTwilightState is null");
+            return;
+        }
+        mIsNextActivate = !mTwilightState.isNight();
+        mAlarm.set(mIsNextActivate ? mTwilightState.sunsetTimeMillis()
+                : mTwilightState.sunriseTimeMillis());
+        if (setActive) mHandler.post(() -> setAutoSleepModeActive(!mIsNextActivate));
+    }
+
+    /**
+     * See {@link #maybeActivateTime(boolean)}
+     */
+    private void maybeActivateTime() {
+        maybeActivateTime(true);
+    }
+
+    /**
+     * Sets the next alarm for {@link #MODE_TIME}, {@link #MODE_MIXED_SUNSET} and
+     *                         {@link #MODE_MIXED_SUNRISE}
+     * @param setActive Whether to set activation state
+     *                  When false only updates the alarm
+     */
+    private void maybeActivateTime(boolean setActive) {
+        Calendar currentTime = Calendar.getInstance();
+        Calendar since = Calendar.getInstance();
+        Calendar till = Calendar.getInstance();
+        String value = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_AUTO_TIME, UserHandle.USER_CURRENT);
+        if (value == null || value.equals("")) value = "22:00,07:00";
+        String[] times = value.split(",", 0);
+        String[] sinceValues = times[0].split(":", 0);
+        String[] tillValues = times[1].split(":", 0);
+        since.set(Calendar.HOUR_OF_DAY, Integer.parseInt(sinceValues[0]));
+        since.set(Calendar.MINUTE, Integer.parseInt(sinceValues[1]));
+        since.set(Calendar.SECOND, 0);
+        till.set(Calendar.HOUR_OF_DAY, Integer.parseInt(tillValues[0]));
+        till.set(Calendar.MINUTE, Integer.parseInt(tillValues[1]));
+        till.set(Calendar.SECOND, 0);
+
+        // Handle mixed modes
+        if (mMode >= MODE_MIXED_SUNSET) {
+            if (mTwilightState == null) {
+                Slog.e(TAG, "aborting maybeActivateTime(). mTwilightState is null");
+                return;
+            }
+            if (mMode == MODE_MIXED_SUNSET) {
+                since.setTimeInMillis(mTwilightState.sunsetTimeMillis());
+            } else { // MODE_MIXED_SUNRISE
+                till.setTimeInMillis(mTwilightState.sunriseTimeMillis());
+                if (!mTwilightState.isNight()) till.add(Calendar.DATE, 1);
+            }
+        }
+
+        if (currentTime.before(since) && currentTime.before(till) && till.compareTo(since) < 0) {
+            since.add(Calendar.DATE, -1);
+        }
+        // Roll to the next day if needed be
+        if (since.after(till)) till.add(Calendar.DATE, 1);
+        if (currentTime.after(since) && currentTime.compareTo(till) >= 0) {
+            since.add(Calendar.DATE, 1);
+            till.add(Calendar.DATE, 1);
+        }
+        // Abort if the user was dumb enough to set the same time
+        if (since.compareTo(till) == 0) {
+            Slog.e(TAG, "Aborting maybeActivateTime(). Time diff is 0");
+            return;
+        }
+
+        // Update the next alarm
+        mIsNextActivate = currentTime.before(since);
+        mAlarm.set(mIsNextActivate ? since : till);
+
+        // Activate or disable according to current time
+        if (setActive) setAutoSleepModeActive(currentTime.compareTo(since) >= 0
+                && currentTime.before(till));
+    }
+
+    /**
+     * Activates or deactivates Sleep Mode
+     * @param active Whether to enable or disable Sleep Mode
+     */
+    private void setAutoSleepModeActive(boolean active) {
+        final boolean currentActive = isSleepModeEnabled();
+        mActive = currentActive;
+        if (currentActive == active) return;
+        mActive = active;
+        Slog.v(TAG, "setAutoSleepModeActive: active=" + active);
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_ENABLED, active ? 1 : 0, UserHandle.USER_CURRENT);
+    }
+
+    private boolean isSleepModeEnabled() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+    }
+
+    private boolean isIdleModeEnabled() {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SLEEP_MODE_IDLE_TOGGLE, 0, UserHandle.USER_CURRENT) == 1;
+    }
+
+    private void syncSleepModeState() {
+        mActive = isSleepModeEnabled();
+    }
+
+    private void syncIdleModeState() {
+        syncIdleModeState(false);
+    }
+
+    private void syncIdleModeState(boolean force) {
+        final boolean sleepModeEnabled = isSleepModeEnabled();
+        final boolean idleModeEnabled = isIdleModeEnabled();
+        if (!force && mSleepModeEnabled == sleepModeEnabled
+                && mIdleModeEnabled == idleModeEnabled) {
+            return;
+        }
+        mSleepModeEnabled = sleepModeEnabled;
+        mIdleModeEnabled = idleModeEnabled;
+        mSleepModeIdleController.setDeepSleepEnabled(mSleepModeEnabled && mIdleModeEnabled);
+    }
+}
diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java
index 9174855b6466e..0a505dbc48b61 100644
--- a/services/core/java/com/android/server/power/hint/HintManagerService.java
+++ b/services/core/java/com/android/server/power/hint/HintManagerService.java
@@ -1028,10 +1028,11 @@ public void closeChannel() {
             if (mConfig != null) {
                 try {
                     mPowerHal.closeSessionChannel(mTgid, mUid);
-                } catch (RemoteException e) {
-                    throw new IllegalStateException("Failed to close session channel!", e);
+                } catch (Exception e) {
+                    Slog.w(TAG, "Session channel already dead for uid " + mUid);
+                } finally {
+                    mConfig = null;
                 }
-                mConfig = null;
             }
         }
 
diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
index 574abe6348230..bf84c3549a73a 100644
--- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
+++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
@@ -2631,7 +2631,7 @@ public void addCountLocked(long[] counts, boolean isRunning) {
                 if (mCounts == null) {
                     mCounts = new long[counts.length];
                 }
-                for (int i = 0; i < counts.length; ++i) {
+                for (int i = 0; i < counts.length && i < mCounts.length; ++i) {
                     mCounts[i] += counts[i];
                 }
             }
@@ -11965,11 +11965,11 @@ private void updateWifiBatteryStats(WifiActivityEnergyInfo info,
                         //
                         // This means that we may have apps that transmitted/received packets not be
                         // blamed for this, but this is fine as scans are relatively more expensive.
-                        if (totalScanTimeMs > rxTimeMs) {
+                        if (totalScanTimeMs != 0 && totalScanTimeMs > rxTimeMs) {
                             scanRxTimeSinceMarkMs = (rxTimeMs * scanRxTimeSinceMarkMs) /
                                     totalScanTimeMs;
                         }
-                        if (totalScanTimeMs > txTimeMs) {
+                        if (totalScanTimeMs != 0 && totalScanTimeMs > txTimeMs) {
                             scanTxTimeSinceMarkMs = (txTimeMs * scanTxTimeSinceMarkMs) /
                                     totalScanTimeMs;
                         }
@@ -11993,7 +11993,7 @@ private void updateWifiBatteryStats(WifiActivityEnergyInfo info,
                     final long wifiLockTimeSinceMarkMs =
                             uid.mFullWifiLockTimer.getTimeSinceMarkLocked(
                                     elapsedRealtimeMs * 1000) / 1000;
-                    if (wifiLockTimeSinceMarkMs > 0) {
+                    if (wifiLockTimeSinceMarkMs > 0 && totalWifiLockTimeMs != 0) {
                         // Set the new mark so that next time we get new data since this point.
                         uid.mFullWifiLockTimer.setMark(elapsedRealtimeMs);
 
diff --git a/services/core/java/com/android/server/power/stats/BluetoothPowerStatsCollector.java b/services/core/java/com/android/server/power/stats/BluetoothPowerStatsCollector.java
index e0ea7b0359b26..913a62d4d958a 100644
--- a/services/core/java/com/android/server/power/stats/BluetoothPowerStatsCollector.java
+++ b/services/core/java/com/android/server/power/stats/BluetoothPowerStatsCollector.java
@@ -177,8 +177,8 @@ public void onBluetoothActivityEnergyInfoAvailable(
 
                     @Override
                     public void onBluetoothActivityEnergyInfoError(int error) {
-                        immediateFuture.completeExceptionally(
-                                new RuntimeException("error: " + error));
+                        Slog.w(TAG, "BluetoothActivityEnergyInfo request failed with error code: " + error);
+                        immediateFuture.complete(null);
                     }
                 });
 
@@ -191,7 +191,7 @@ public void onBluetoothActivityEnergyInfoError(int error) {
             activityInfo = immediateFuture.get(BLUETOOTH_ACTIVITY_REQUEST_TIMEOUT,
                     TimeUnit.MILLISECONDS);
         } catch (Exception e) {
-            Slog.e(TAG, "Cannot acquire BluetoothActivityEnergyInfo", e);
+            Slog.w(TAG, "BluetoothActivityEnergyInfo unavailable, skipping stats collection", e);
             activityInfo = null;
         }
 
diff --git a/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureLockDeviceSettingsManagerImpl.java b/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureLockDeviceSettingsManagerImpl.java
index 8f44d9d527dd1..7085cd84b0523 100644
--- a/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureLockDeviceSettingsManagerImpl.java
+++ b/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureLockDeviceSettingsManagerImpl.java
@@ -90,7 +90,7 @@ public class SecureLockDeviceSettingsManagerImpl implements SecureLockDeviceSett
                     Settings.Secure.CAMERA_GESTURE_DISABLED, 1,
                     Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1,
                     Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0,
-                    Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED, 0,
+                    Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED, 0,
                     Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 0,
                     Settings.Secure.LOCKSCREEN_SHOW_WALLET, 0,
                     Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER, 0,
diff --git a/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureSettingController.java b/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureSettingController.java
index cb24c1fd6b4e1..2a37810683fae 100644
--- a/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureSettingController.java
+++ b/services/core/java/com/android/server/security/authenticationpolicy/settings/SecureSettingController.java
@@ -73,7 +73,7 @@ Map<String, Integer> initializeDefaultValues() {
                 Settings.Secure.CAMERA_GESTURE_DISABLED, 0,
                 Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0,
                 Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT,
-                Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED, 1,
+                Settings.Secure.LOCKSCREEN_SMARTSPACE_ENABLED, 1,
                 Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 0,
                 Settings.Secure.LOCKSCREEN_SHOW_WALLET, 0,
                 Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER,
diff --git a/services/core/java/com/android/server/spoof/AxSpoofManager.java b/services/core/java/com/android/server/spoof/AxSpoofManager.java
new file mode 100644
index 0000000000000..db6f93cc3b357
--- /dev/null
+++ b/services/core/java/com/android/server/spoof/AxSpoofManager.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.spoof;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.server.NtServiceInjector;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map;
+
+public class AxSpoofManager implements IAxSpoofManager {
+    private static final String TAG = "AxSpoofManager";
+
+    private static final String[] WATCHED_KEYS = {
+            Settings.Secure.SPOOF_PIF_CONFIG,
+            Settings.Secure.SPOOF_GAMEPROPS_CONFIG,
+            Settings.Secure.SPOOF_TRICKYSTORE_TARGET,
+            Settings.Secure.SPOOF_TRICKYSTORE_KEYBOX,
+            Settings.Secure.SPOOF_TRICKYSTORE_PATCH,
+    };
+
+    private final Map<String, String> mCache = new ConcurrentHashMap<>();
+    private final HandlerThread mHandlerThread;
+    private final Handler mHandler;
+
+    private Context mContext;
+    private ContentResolver mResolver;
+    private ContentObserver mObserver;
+    private volatile boolean mReady = false;
+
+    public AxSpoofManager() {
+        mHandlerThread = new HandlerThread("AxSpoofManager");
+        mHandlerThread.start();
+        mHandler = new Handler(mHandlerThread.getLooper());
+    }
+
+    @Override
+    public void systemReady() {
+        mContext = NtServiceInjector.getCtx();
+        if (mContext == null) {
+            Log.w(TAG, "Context unavailable, deferring init");
+            return;
+        }
+        mResolver = mContext.getContentResolver();
+
+        for (String key : WATCHED_KEYS) {
+            refreshKey(key);
+        }
+
+        mObserver = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                if (uri == null) return;
+                final String last = uri.getLastPathSegment();
+                if (last == null) return;
+                refreshKey(last);
+                Log.i(TAG, "Spoof config refreshed: " + last);
+            }
+        };
+        for (String key : WATCHED_KEYS) {
+            mResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(key), false, mObserver, UserHandle.USER_ALL);
+        }
+
+        mReady = true;
+        Log.i(TAG, "AxSpoofManager ready");
+    }
+
+    private void refreshKey(String key) {
+        if (mResolver == null) return;
+        final String value = Settings.Secure.getStringForUser(
+                mResolver, key, UserHandle.USER_SYSTEM);
+        if (value == null) {
+            mCache.remove(key);
+        } else {
+            mCache.put(key, value);
+        }
+    }
+
+    private String getCached(String key) {
+        return mCache.get(key);
+    }
+
+    @Override
+    public String getPifConfig() {
+        return getCached(Settings.Secure.SPOOF_PIF_CONFIG);
+    }
+
+    @Override
+    public String getGamePropsConfig() {
+        return getCached(Settings.Secure.SPOOF_GAMEPROPS_CONFIG);
+    }
+
+    @Override
+    public String getTrickyStoreTarget() {
+        return getCached(Settings.Secure.SPOOF_TRICKYSTORE_TARGET);
+    }
+
+    @Override
+    public String getTrickyStoreKeyBox() {
+        return getCached(Settings.Secure.SPOOF_TRICKYSTORE_KEYBOX);
+    }
+
+    @Override
+    public String getTrickyStorePatch() {
+        return getCached(Settings.Secure.SPOOF_TRICKYSTORE_PATCH);
+    }
+}
diff --git a/services/core/java/com/android/server/spoof/IAxSpoofManager.java b/services/core/java/com/android/server/spoof/IAxSpoofManager.java
new file mode 100644
index 0000000000000..08982f8baff05
--- /dev/null
+++ b/services/core/java/com/android/server/spoof/IAxSpoofManager.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.spoof;
+
+public interface IAxSpoofManager {
+    default void systemReady() {
+    }
+
+    String getPifConfig();
+
+    String getGamePropsConfig();
+
+    String getTrickyStoreTarget();
+
+    String getTrickyStoreKeyBox();
+
+    String getTrickyStorePatch();
+}
diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
index d200f69623f1e..f390273c543d1 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -564,6 +564,9 @@ public void noteUidProcessState(int uid, int state) {
     private class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCallback {
         @Override
         public int onPullAtom(int atomTag, List<StatsEvent> data) {
+            if (!Build.IS_ENG) {
+                return StatsManager.PULL_SKIP;
+            }
             if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
                 Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "StatsPull-" + atomTag);
             }
@@ -2696,6 +2699,9 @@ int pullProcessSystemIonHeapSizeLocked(int atomTag, List<StatsEvent> pulledData)
     }
 
     private void registerProcessDmabufMemory() {
+        if (!Build.IS_ENG) {
+            return;
+        }
         int tagId = FrameworkStatsLog.PROCESS_DMABUF_MEMORY;
         mStatsManager.setPullAtomCallback(
                 tagId,
@@ -2706,6 +2712,9 @@ private void registerProcessDmabufMemory() {
     }
 
     int pullProcessDmabufMemory(int atomTag, List<StatsEvent> pulledData) {
+        if (!Build.IS_ENG) {
+            return StatsManager.PULL_SKIP;
+        }
         KernelAllocationStats.ProcessDmabuf[] procBufs =
                 KernelAllocationStats.getDmabufAllocations();
 
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
index fde4e3ccfb4e7..0a1d8b1d7de17 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
@@ -290,4 +290,6 @@ void showMediaOutputSwitcher(String targetPackageName, UserHandle targetUserHand
 
     /** Passes through the given shell commands to SystemUI */
     void passThroughShellCommand(String[] args, FileDescriptor fd);
+
+    void restartSystemUI();
 }
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index b4485236a8486..87a56c466d36c 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -207,6 +207,8 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
     private int mCurrentUserId;
     private boolean mTracingEnabled;
     private int mLastSystemKey = -1;
+    private volatile boolean mLastTopAppHidesStatusBar;
+    private volatile boolean mLastTopAppHidesStatusBarValid;
 
     private final TileRequestTracker mTileRequestTracker;
 
@@ -229,6 +231,7 @@ private class DeathRecipient implements IBinder.DeathRecipient {
         public void binderDied() {
             mBar.asBinder().unlinkToDeath(this,0);
             mBar = null;
+            mLastTopAppHidesStatusBarValid = false;
             notifyBarAttachChanged();
         }
 
@@ -713,8 +716,14 @@ public void setTopAppHidesStatusBar(int displayId, boolean hidesStatusBar) {
             }
             IStatusBar bar = mBar;
             if (bar != null) {
+                if (mLastTopAppHidesStatusBarValid
+                        && mLastTopAppHidesStatusBar == hidesStatusBar) {
+                    return;
+                }
                 try {
                     bar.setTopAppHidesStatusBar(hidesStatusBar);
+                    mLastTopAppHidesStatusBar = hidesStatusBar;
+                    mLastTopAppHidesStatusBarValid = true;
                 } catch (RemoteException ex) {}
             }
         }
@@ -1027,6 +1036,17 @@ public void removeQsTile(ComponentName tile) {
         public void passThroughShellCommand(String[] args, FileDescriptor fd) {
             StatusBarManagerService.this.passThroughShellCommand(args, fd);
         }
+
+        @Override
+        public void restartSystemUI() {
+            IStatusBar bar = mBar;
+            if (bar != null) {
+                try {
+                    bar.restartSystemUI();
+                } catch (RemoteException e) {
+                }
+            }
+        }
     };
 
     private final GlobalActionsProvider mGlobalActionsProvider = new GlobalActionsProvider() {
@@ -1798,6 +1818,7 @@ public RegisterStatusBarResult registerStatusBar(IStatusBar bar) {
 
         Slog.i(TAG, "registerStatusBar bar=" + bar);
         mBar = bar;
+        mLastTopAppHidesStatusBarValid = false;
         mDeathRecipient.linkToDeath();
         notifyBarAttachChanged();
         final ArrayMap<String, StatusBarIcon> icons;
@@ -1822,6 +1843,7 @@ public Map<String, RegisterStatusBarResult> registerStatusBarForAllDisplays(ISta
 
         Slog.i(TAG, "registerStatusBarForAllDisplays bar=" + bar);
         mBar = bar;
+        mLastTopAppHidesStatusBarValid = false;
         mDeathRecipient.linkToDeath();
         notifyBarAttachChanged();
 
@@ -1983,6 +2005,24 @@ public void restart() {
         }
     }
 
+    /**
+     * Allows SystemUI restart only
+     */
+    @Override
+    public void restartSystemUI() {
+        enforceStatusBarService();
+        enforceValidCallingUser();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            mHandler.post(() -> {
+                mInternalService.restartSystemUI();
+            });
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
     @Override
     public void onGlobalActionsShown() {
         enforceStatusBarService();
@@ -2803,6 +2843,18 @@ public void startAssist(Bundle args) {
         }
     }
 
+    @Override
+    public void toggleRecentApps() {
+        enforceStatusBarService();
+        if (mBar != null) {
+            try {
+                mBar.toggleRecentApps();
+            } catch (RemoteException e) {
+                Slog.e(TAG, "toggleRecentApps", e);
+            }
+        }
+    }
+
     /** @hide */
     public void passThroughShellCommand(String[] args, FileDescriptor fd) {
         enforceStatusBarOrShell();
diff --git a/services/core/java/com/android/server/telephony/Smart5gService.java b/services/core/java/com/android/server/telephony/Smart5gService.java
new file mode 100644
index 0000000000000..127287eb0b9d1
--- /dev/null
+++ b/services/core/java/com/android/server/telephony/Smart5gService.java
@@ -0,0 +1,289 @@
+/*
+ * SPDX-FileCopyrightText: 2023 ArrowOS
+ * SPDX-FileCopyrightText: 2025 The LibreMobileOS Foundation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server.telephony;
+
+import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGED;
+import static android.provider.Settings.Global.MOBILE_DATA;
+import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+import static android.telephony.TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED;
+import static android.telephony.TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER;
+import static android.telephony.TelephonyManager.NETWORK_TYPE_BITMASK_NR;
+import static android.provider.Settings.System.SMART_5G;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerExecutor;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+
+/**
+ * This service is used to disable 5G for a subscription in the following scenarios:
+ * - Battery saver mode is ON
+ * - Mobile data is not active, eg. while using wifi
+ * - Mobile data is not turned ON for the subscription
+ * - Subscription is not the default data SIM
+ *
+ * Not smart enough yet, but we're getting there.
+ */
+public class Smart5gService extends SystemService {
+
+    private static final String TAG = "Smart5gService";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final Uri SETTING_URI = Settings.System.getUriFor(SMART_5G);
+
+    private final Context mContext;
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Executor mExecutor = new HandlerExecutor(mHandler);
+
+    private TelephonyManager mTelephonyManager;
+    private SubscriptionManager mSubManager;
+    private ConnectivityManager mConnectivityManager;
+    private PowerManager mPowerManager;
+
+    private boolean mIsEnabled;
+    private boolean mIsOnMobileData;
+    private boolean mIsPowerSaveMode;
+    private int[] mActiveSubIds = new int[0];
+    private int mDefaultDataSubId = INVALID_SUBSCRIPTION_ID;
+
+    private final ContentObserver mSettingObserver = new ContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            dlog("SettingObserver: onChange uri=" + uri);
+            if (SETTING_URI.equals(uri)) {
+                boolean enabled = isEnabled();
+                if (enabled != mIsEnabled) {
+                    dlog("SettingObserver: enabled=" + enabled);
+                    mIsEnabled = enabled;
+                    if (!enabled) {
+                        unregisterListeners();
+                    } else {
+                        registerListeners();
+                    }
+                    update();
+                }
+            } else {
+                // mobile data setting changed
+                update();
+            }
+        }
+    };
+
+    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            dlog("received intent: " + action);
+            if (action == null) return;
+            switch (action) {
+                case ACTION_POWER_SAVE_MODE_CHANGED:
+                    final boolean on = mPowerManager.isPowerSaveMode();
+                    if (on != mIsPowerSaveMode) {
+                        mIsPowerSaveMode = on;
+                        dlog("power save mode changed, new: " + on);
+                        update();
+                    }
+                    break;
+                case ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED:
+                    final int subId = mSubManager.getDefaultDataSubscriptionId();
+                    if (subId != mDefaultDataSubId) {
+                        mDefaultDataSubId = subId;
+                        dlog("dds changed, new: " + subId);
+                        update();
+                    }
+                    break;
+                default:
+                    Slog.e(TAG, "Unhandled intent: " + action);
+            }
+        }
+    };
+
+    private final ConnectivityManager.NetworkCallback mDefaultNetworkCallback =
+            new ConnectivityManager.NetworkCallback() {
+        Network mDefaultNetwork = null;
+
+        @Override
+        public void onAvailable(Network network) {
+            dlog("NetworkCallback: onAvailable: " + network);
+            mDefaultNetwork = network;
+            refresh();
+        }
+
+        @Override
+        public void onLost(Network network) {
+            dlog("NetworkCallback: onLost: " + network);
+            mDefaultNetwork = null;
+            refresh();
+        }
+
+        private void refresh() {
+            boolean isMobileDataActive = isMobileDataNetwork(mDefaultNetwork);
+            if (isMobileDataActive != mIsOnMobileData) {
+                dlog("NetworkCallback: isMobileDataActive:" + isMobileDataActive);
+                mIsOnMobileData = isMobileDataActive;
+                update();
+            }
+        }
+    };
+
+    private final SubscriptionManager.OnSubscriptionsChangedListener mSubListener =
+            new SubscriptionManager.OnSubscriptionsChangedListener() {
+        @Override
+        public void onSubscriptionsChanged() {
+            dlog("onSubscriptionsChanged");
+            final int[] subs = mSubManager.getActiveSubscriptionIdList();
+            if (subs == null) return;
+            if (!Arrays.equals(subs, mActiveSubIds)) {
+                dlog("active subs changed, was: " + Arrays.toString(mActiveSubIds)
+                        + ", now: " + Arrays.toString(subs));
+                for (int subId : subs) {
+                    dlog("registering content observer for subId " + subId);
+                    mContext.getContentResolver().registerContentObserver(
+                            Settings.Global.getUriFor(MOBILE_DATA + subId), false, mSettingObserver);
+                }
+                mActiveSubIds = subs;
+                update();
+            }
+        }
+    };
+
+    public Smart5gService(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public void onStart() {
+        Slog.v(TAG, "Starting Smart5gService");
+        publishLocalService(Smart5gService.class, this);
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
+            dlog("onBootPhase PHASE_SYSTEM_SERVICES_READY");
+            mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+            mSubManager = mContext.getSystemService(SubscriptionManager.class);
+            mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
+            mPowerManager = mContext.getSystemService(PowerManager.class);
+        } else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
+            dlog("onBootPhase PHASE_BOOT_COMPLETED");
+            mIsEnabled = isEnabled();
+            mIsPowerSaveMode = mPowerManager.isPowerSaveMode();
+            mDefaultDataSubId = mSubManager.getDefaultDataSubscriptionId();
+            mIsOnMobileData = isMobileDataNetwork(mConnectivityManager.getActiveNetwork());
+            mContext.getContentResolver().registerContentObserver(
+                    Settings.System.getUriFor(SMART_5G), false, mSettingObserver);
+            if (mIsEnabled) {
+                registerListeners();
+            }
+        }
+    }
+
+    private boolean isEnabled() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(), SMART_5G, 1,
+                UserHandle.USER_CURRENT) == 1;
+    }
+
+    private boolean isMobileDataNetwork(Network network) {
+        // if we cant get a default network, assume mobile data to stop further switching 4g/5g.
+        // otherwise, since switching can bring down the modem for a brief moment, this triggers
+        // onLost() in the network callback and network=null which will again trigger a switch,
+        // starting an infinite loop.
+        if (network == null) return true;
+        final NetworkCapabilities caps = mConnectivityManager.getNetworkCapabilities(network);
+        return caps == null || caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+    }
+
+    private void registerListeners() {
+        final IntentFilter filter = new IntentFilter(ACTION_POWER_SAVE_MODE_CHANGED);
+        filter.addAction(ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+        mContext.registerReceiver(mIntentReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        mConnectivityManager.registerDefaultNetworkCallback(mDefaultNetworkCallback);
+        mSubManager.addOnSubscriptionsChangedListener(mExecutor, mSubListener);
+    }
+
+    private void unregisterListeners() {
+        mContext.unregisterReceiver(mIntentReceiver);
+        mConnectivityManager.unregisterNetworkCallback(mDefaultNetworkCallback);
+        mSubManager.removeOnSubscriptionsChangedListener(mSubListener);
+    }
+
+    private boolean isMobileDataEnabled(int subId) {
+        return Settings.Global.getInt(mContext.getContentResolver(), MOBILE_DATA + subId, 1) == 1;
+    }
+
+    private synchronized void update() {
+        if (mActiveSubIds == null || mActiveSubIds.length == 0) {
+            dlog("update: return, no active subs!");
+            return;
+        }
+        for (int subId : mActiveSubIds) {
+            final TelephonyManager tm = mTelephonyManager.createForSubscriptionId(subId);
+            final long supportedRat = tm.getSupportedRadioAccessFamily();
+            if ((supportedRat & NETWORK_TYPE_BITMASK_NR) == 0) {
+                dlog("subId " + subId + " does not support NR!");
+                continue;
+            }
+            long allowedNetworkTypes = tm.getAllowedNetworkTypesForReason(
+                    ALLOWED_NETWORK_TYPES_REASON_POWER);
+            final boolean is5gAllowed = (allowedNetworkTypes & NETWORK_TYPE_BITMASK_NR) != 0;
+            final boolean shouldDisable = shouldDisable5g(subId);
+            dlog("update: subId=" + subId + " is5gAllowed=" + is5gAllowed + " shouldDisable="
+                    + shouldDisable);
+            if (shouldDisable && is5gAllowed) {
+                allowedNetworkTypes &= ~NETWORK_TYPE_BITMASK_NR;
+            } else if (!shouldDisable && !is5gAllowed) {
+                allowedNetworkTypes |= NETWORK_TYPE_BITMASK_NR;
+            } else {
+                continue;
+            }
+            tm.setAllowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_POWER,
+                    allowedNetworkTypes);
+        }
+    }
+
+    private boolean shouldDisable5g(int subId) {
+        if (!mIsEnabled) {
+            dlog("shouldDisable5g: smart 5g is disabled");
+            return false;
+        }
+
+        boolean isDataDisabled = !isMobileDataEnabled(subId);
+        boolean isNotDataSub =
+                (mDefaultDataSubId != INVALID_SUBSCRIPTION_ID && subId != mDefaultDataSubId);
+
+        dlog("shouldDisable5g: subId=" + subId + " mIsPowerSaveMode=" + mIsPowerSaveMode
+                + " mIsOnMobileData=" + mIsOnMobileData + " mDefaultDataSubId="
+                + mDefaultDataSubId + " isDataDisabled=" + isDataDisabled);
+
+        return mIsPowerSaveMode || !mIsOnMobileData || isDataDisabled || isNotDataSub;
+    }
+
+    private static void dlog(String msg) {
+        if (DEBUG) Slog.d(TAG, msg);
+    }
+}
diff --git a/services/core/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java
index 47ab12742e9d9..9e28a2a0f3726 100644
--- a/services/core/java/com/android/server/twilight/TwilightService.java
+++ b/services/core/java/com/android/server/twilight/TwilightService.java
@@ -23,11 +23,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.icu.util.Calendar;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -36,9 +38,11 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.server.SystemService;
+import com.android.server.SystemService.TargetUser;
 
 import com.ibm.icu.impl.CalendarAstronomer;
 
+import java.io.File;
 import java.util.Objects;
 
 /**
@@ -52,6 +56,9 @@ public final class TwilightService extends SystemService
 
     private static final String TAG = "TwilightService";
     private static final String ATTRIBUTION_TAG = "TwilightService";
+    private static final String PREF_FILE_NAME = TAG + "_preferences.xml";
+    private static final String LONG_PREF_KEY = TAG + "_LONGITUDE";
+    private static final String LATI_PREF_KEY = TAG + "_LATITUDE";
     private static final boolean DEBUG = false;
 
     private static final int MSG_START_LISTENING = 1;
@@ -74,6 +81,8 @@ public final class TwilightService extends SystemService
     @GuardedBy("mListeners")
     protected TwilightState mLastTwilightState;
 
+    private SharedPreferences mSharedPreferences;
+
     public TwilightService(Context context) {
         super(context.createAttributionContext(ATTRIBUTION_TAG));
         mHandler = new Handler(Looper.getMainLooper(), this);
@@ -211,8 +220,30 @@ private void stopListening() {
     private void updateTwilightState() {
         // Calculate the twilight state based on the current time and location.
         final long currentTimeMillis = System.currentTimeMillis();
-        final Location location = mLastLocation != null ? mLastLocation
+        Location location = mLastLocation != null ? mLastLocation
                 : mLocationManager.getLastLocation();
+
+        if (location == null && mSharedPreferences != null) {
+            // try using last fetched location
+            final Long spLong = mSharedPreferences.getLong(LONG_PREF_KEY, 0);
+            final Long spLati = mSharedPreferences.getLong(LATI_PREF_KEY, 0);
+            if (spLong != 0 && spLati != 0) {
+                location = new Location("");
+                location.setLongitude(Double.longBitsToDouble(spLong));
+                location.setLatitude(Double.longBitsToDouble(spLati));
+                if (DEBUG) Slog.i(TAG, "Fetched saved location: "
+                        + location.getLongitude() + " : " + location.getLatitude());
+            }
+        } else if (mSharedPreferences != null) {
+            // save last fetched location for offline usage
+            mSharedPreferences.edit().putLong(LONG_PREF_KEY,
+                    Double.doubleToRawLongBits(location.getLongitude())).apply();
+            mSharedPreferences.edit().putLong(LATI_PREF_KEY,
+                    Double.doubleToRawLongBits(location.getLatitude())).apply();
+            if (DEBUG) Slog.i(TAG, "Saved location: "
+                    + location.getLongitude() + " : " + location.getLatitude());
+        }
+
         final TwilightState state = calculateTwilightState(location, currentTimeMillis);
         if (DEBUG) {
             Slog.d(TAG, "updateTwilightState: " + state);
@@ -269,6 +300,14 @@ public void onProviderEnabled(String provider) {
     public void onProviderDisabled(String provider) {
     }
 
+    @Override
+    public void onUserUnlocked(@NonNull TargetUser user) {
+        mSharedPreferences = getContext().getSharedPreferences(
+                new File(Environment.getUserSystemDirectory(user.getUserIdentifier()),
+                        PREF_FILE_NAME), Context.MODE_PRIVATE);
+        updateTwilightState();
+    }
+
     /**
      * Calculates the twilight state for a specific location and time.
      *
@@ -278,7 +317,7 @@ public void onProviderDisabled(String provider) {
      */
     private static TwilightState calculateTwilightState(Location location, long timeMillis) {
         if (location == null) {
-            return null;
+            return getManualTwilightState(timeMillis);
         }
 
         final CalendarAstronomer ca = new CalendarAstronomer(
@@ -307,4 +346,29 @@ private static TwilightState calculateTwilightState(Location location, long time
 
         return new TwilightState(sunriseTimeMillis, sunsetTimeMillis);
     }
+
+    private static TwilightState getManualTwilightState(long timeMillis) {
+        final Calendar sunrise = Calendar.getInstance();
+        sunrise.setTimeInMillis(timeMillis);
+        sunrise.set(Calendar.HOUR_OF_DAY, 7);
+        sunrise.set(Calendar.MINUTE, 0);
+        sunrise.set(Calendar.SECOND, 0);
+        sunrise.set(Calendar.MILLISECOND, 0);
+        final Calendar sunset = Calendar.getInstance();
+        sunset.setTimeInMillis(timeMillis);
+        sunset.set(Calendar.HOUR_OF_DAY, 20);
+        sunset.set(Calendar.MINUTE, 0);
+        sunset.set(Calendar.SECOND, 0);
+        sunset.set(Calendar.MILLISECOND, 0);
+        long sunriseMillis = sunrise.getTimeInMillis();
+        long sunsetMillis = sunset.getTimeInMillis();
+        if (sunsetMillis < timeMillis) {
+            sunrise.add(Calendar.DATE, 1);
+            sunriseMillis = sunrise.getTimeInMillis();
+        } else if (sunriseMillis > timeMillis) {
+            sunset.add(Calendar.DATE, -1);
+            sunsetMillis = sunset.getTimeInMillis();
+        }
+        return new TwilightState(sunriseMillis, sunsetMillis);
+    }
 }
diff --git a/services/core/java/com/android/server/vibrator/VibratorManagerService.java b/services/core/java/com/android/server/vibrator/VibratorManagerService.java
index f07e9bd28dc1a..0aa4e096b0048 100644
--- a/services/core/java/com/android/server/vibrator/VibratorManagerService.java
+++ b/services/core/java/com/android/server/vibrator/VibratorManagerService.java
@@ -201,6 +201,9 @@ public void onBootPhase(int phase) {
     @Nullable private VibratorInfo mCombinedVibratorInfo;
     @GuardedBy("mLock")
     @Nullable private HapticFeedbackVibrationProvider mHapticFeedbackVibrationProvider;
+    
+    private static long previous = 0;
+    private static String preOpPkg;
 
     @VisibleForTesting
     BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
@@ -641,6 +644,14 @@ HalVibration vibrateWithoutPermissionCheck(int uid, int deviceId, String opPkg,
     private HalVibration vibrateInternal(int uid, int deviceId, String opPkg,
             @NonNull CombinedVibration effect, @NonNull VibrationAttributes attrs,
             String reason, IBinder token) {
+        if (opPkg != null && !opPkg.equals("") && (opPkg.equals("com.android.launcher3") || opPkg.equals("com.google.android.dialer") || opPkg.equals("com.google.android.inputmethod.latin") || ((opPkg.equals("com.google.android.deskclock") && attrs.getUsage() == 18) || opPkg.equals("com.google.android.calculator") || opPkg.equals("com.google.android.apps.photos")))) {
+            long current = System.currentTimeMillis();
+            if (previous + 50 > current && current > previous && preOpPkg.equals(opPkg) && !opPkg.equals("android.os.cts")) {
+                return null;
+            }
+            previous = current;
+            preOpPkg = opPkg;
+        }
         CallerInfo callerInfo = new CallerInfo(attrs, uid, deviceId, opPkg, reason);
         if (token == null) {
             Slog.e(TAG, "token must not be null");
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperCropper.java b/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
index 0568c5b9a0d42..57fb7e967da6f 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
@@ -31,6 +31,7 @@
 import static com.android.window.flags.Flags.multiCrop;
 
 import android.app.WallpaperManager;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.ImageDecoder;
@@ -45,6 +46,7 @@
 import android.view.View;
 import android.window.DesktopExperienceFlags;
 
+import com.android.internal.R;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.utils.TimingsTraceAndSlog;
 
@@ -93,9 +95,12 @@ public class WallpaperCropper {
 
     private final WallpaperDefaultDisplayInfo mDefaultDisplayInfo;
 
-    WallpaperCropper(WallpaperDisplayHelper wallpaperDisplayHelper) {
+    private final float mMaxWallpaperScale;
+
+    WallpaperCropper(WallpaperDisplayHelper wallpaperDisplayHelper, Resources resources) {
         mWallpaperDisplayHelper = wallpaperDisplayHelper;
         mDefaultDisplayInfo = mWallpaperDisplayHelper.getDefaultDisplayInfo();
+        mMaxWallpaperScale = Math.max(1f, resources.getFloat(R.dimen.config_wallpaperMaxScale));
     }
 
     /**
@@ -641,15 +646,17 @@ private void generateCropInternal(WallpaperData wallpaper) {
                             (float) crop.height() / displayForThisOrientation.y));
                     sampleSize = Math.min(sampleSize, sampleSizeForThisOrientation);
                 }
-                // If the total crop has more width or height than either the max texture size
-                // or twice the largest display dimension, downsample the image
+                // If the total crop has more width or height than either the max texture size,
+                // twice the largest display dimension, or the largest useful runtime zoomed
+                // display size, downsample the image.
                 int maxCropSize = Math.min(
                         2 * mWallpaperDisplayHelper.getDefaultDisplayLargestDimension(),
                         GLHelper.getMaxTextureSize());
                 float minimumSampleSize = Math.max(1f, Math.max(
                         (float) cropHint.height() / maxCropSize,
-                        (float) cropHint.width()) / maxCropSize);
-                sampleSize = Math.max(sampleSize, minimumSampleSize);
+                        (float) cropHint.width() / maxCropSize));
+                float runtimeSampleSize = getMaxZoomCropSampleSize(cropHint);
+                sampleSize = Math.max(sampleSize, Math.max(minimumSampleSize, runtimeSampleSize));
                 needScale = sampleSize > 1f;
             }
 
@@ -845,6 +852,29 @@ private void generateCropInternal(WallpaperData wallpaper) {
         }
     }
 
+    private float getMaxZoomCropSampleSize(Rect cropHint) {
+        int maxDisplayWidth = 0;
+        int maxDisplayHeight = 0;
+        SparseArray<Point> displaySizes = mWallpaperDisplayHelper.getDefaultDisplaySizes();
+        for (int i = 0; i < displaySizes.size(); i++) {
+            Point size = displaySizes.valueAt(i);
+            maxDisplayWidth = Math.max(maxDisplayWidth, size.x);
+            maxDisplayHeight = Math.max(maxDisplayHeight, size.y);
+        }
+
+        if (maxDisplayWidth <= 0 || maxDisplayHeight <= 0) {
+            return 1f;
+        }
+
+        final int cropWidth = cropHint.width();
+        final int cropHeight = cropHint.height();
+        final float maxRuntimeWidth = maxDisplayWidth * mMaxWallpaperScale;
+        final float maxRuntimeHeight = maxDisplayHeight * mMaxWallpaperScale;
+
+        return Math.max(1f,
+                Math.max(cropWidth / maxRuntimeWidth, cropHeight / maxRuntimeHeight));
+    }
+
     private static Rect getCropForExternalDisplay(
             Point displaySize,
             WallpaperDefaultDisplayInfo defaultDisplayInfo,
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperData.java b/services/core/java/com/android/server/wallpaper/WallpaperData.java
index b117ab226157c..ac5f327d04332 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperData.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperData.java
@@ -26,6 +26,7 @@
 import static com.android.server.wallpaper.WallpaperUtils.getWallpaperDir;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.app.IWallpaperManagerCallback;
 import android.app.WallpaperColors;
 import android.app.WallpaperManager.ScreenOrientation;
@@ -239,7 +240,8 @@ private File getFile(SparseArray<File> map, String fileName) {
         return result;
     }
 
-    @NonNull ComponentName getComponent() {
+    @Nullable
+    ComponentName getComponent() {
         return mDescription.getComponent();
     }
 
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 1d15f9291b751..71b29db2547bd 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1523,7 +1523,7 @@ public WallpaperManagerService(Context context) {
         WindowManager windowManager = mContext.getSystemService(WindowManager.class);
         mWallpaperDisplayHelper = new WallpaperDisplayHelper(
                 displayManager, windowManager, mWindowManagerInternal, mContext.getResources());
-        mWallpaperCropper = new WallpaperCropper(mWallpaperDisplayHelper);
+        mWallpaperCropper = new WallpaperCropper(mWallpaperDisplayHelper, mContext.getResources());
         mActivityManager = mContext.getSystemService(ActivityManager.class);
 
         if (mContext.getResources().getBoolean(
@@ -2412,10 +2412,14 @@ private boolean hasPermission(String permission) {
     }
 
     private boolean hasPermission(WallpaperData data, String permission) {
+        ComponentName component = data.getComponent();
+        if (component == null) {
+            return false;
+        }
         try {
             return PackageManager.PERMISSION_GRANTED == mIPackageManager.checkPermission(
                     permission,
-                    data.getComponent().getPackageName(),
+                    component.getPackageName(),
                     data.userId);
         } catch (RemoteException e) {
             Slog.e(TAG, "Failed to check wallpaper service permission", e);
@@ -2896,6 +2900,20 @@ public void setWallpaperDimAmountForUid(int uid, float dimAmount) {
                 WallpaperData wallpaper = mWallpaperMap.get(userId);
                 WallpaperData lockWallpaper = mLockWallpaperMap.get(userId);
 
+                // remove gone UIDs from the map
+                boolean arrayChanged = false;
+                final int uidCount = wallpaper.mUidToDimAmount.size();
+                int[] uids = new int[uidCount];
+                for (int i = 0; i < uidCount; i++) {
+                    uids[i] = wallpaper.mUidToDimAmount.keyAt(i);
+                }
+                for (Integer u : uids) {
+                    final String cname = mPackageManagerInternal.getNameForUid(u);
+                    if (cname != null && !cname.isEmpty()) continue;
+                    wallpaper.mUidToDimAmount.remove(u);
+                    arrayChanged = true;
+                }
+
                 if (dimAmount == 0.0f) {
                     wallpaper.mUidToDimAmount.remove(uid);
                 } else {
@@ -2927,7 +2945,7 @@ public void setWallpaperDimAmountForUid(int uid, float dimAmount) {
                         changed = true;
                     }
                 }
-                if (changed) {
+                if (changed || arrayChanged) {
                     saveSettingsLocked(wallpaper.userId);
                 }
             }
diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java
index a5a02cdedf97d..b992a54e0d712 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java
@@ -15,6 +15,7 @@
  */
 package com.android.server.webkit;
 
+import android.app.AppGlobals;
 import android.annotation.Nullable;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -112,7 +113,7 @@ private static class WebViewPackageMissingException extends Exception {
 
         WebViewProviderInfo defaultProvider = null;
         for (WebViewProviderInfo provider : webviewProviders) {
-            if (provider.availableByDefault) {
+            if (provider.availableByDefault && isPackageAvailable(provider.packageName)) {
                 defaultProvider = provider;
                 break;
             }
@@ -181,6 +182,15 @@ public void packageStateChanged(String packageName, int changedState, int userId
         }
     }
 
+    private static boolean isPackageAvailable(String packageName) {
+        try {
+            AppGlobals.getInitialApplication().getPackageManager().getPackageInfo(packageName, 0);
+            return true;
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+    }
+
     private boolean shouldTriggerRepairLocked() {
         if (mAttemptedToRepairBefore) {
             return false;
@@ -207,12 +217,19 @@ private void attemptRepair() {
             }
             mAttemptedToRepairBefore = true;
         }
-        Slog.w(
-                TAG,
-                "No provider available for all users, trying to install and enable "
-                        + mDefaultProvider.packageName);
-        mSystemInterface.installExistingPackageForAllUsers(mDefaultProvider.packageName);
-        mSystemInterface.enablePackageForAllUsers(mDefaultProvider.packageName, true);
+        WebViewProviderInfo[] webviewProviders = mSystemInterface.getWebViewPackages();
+        WebViewProviderInfo fallbackProvider = getFallbackProvider(webviewProviders);
+        if (fallbackProvider != null) {
+            Slog.w(TAG, "No valid provider, trying to install and enable "
+                    + fallbackProvider.packageName);
+            mSystemInterface.installExistingPackageForAllUsers(fallbackProvider.packageName);
+            mSystemInterface.enablePackageForAllUsers(fallbackProvider.packageName, true);
+        } else {
+            Slog.w(TAG, "No provider available for all users, trying to install and enable "
+                    + mDefaultProvider.packageName);
+            mSystemInterface.installExistingPackageForAllUsers(mDefaultProvider.packageName);
+            mSystemInterface.enablePackageForAllUsers(mDefaultProvider.packageName, true);
+        }
     }
 
     public void prepareWebViewInSystemServer() {
@@ -690,7 +707,7 @@ private static boolean providerHasValidSignature(WebViewProviderInfo provider,
      */
     private static WebViewProviderInfo getFallbackProvider(WebViewProviderInfo[] webviewPackages) {
         for (WebViewProviderInfo provider : webviewPackages) {
-            if (provider.isFallback) {
+            if (provider.isFallback && isPackageAvailable(provider.packageName)) {
                 return provider;
             }
         }
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 67474b85e1726..22af3b98e4ec8 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -672,6 +672,8 @@ enum State {
      * @see WindowContainer#providesOrientation()
      */
     final boolean mStyleFillsParent;
+    
+    private int mSyncTimeoutCounter = 0;
 
     // The input dispatching timeout for this application token in milliseconds.
     long mInputDispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
@@ -2411,6 +2413,10 @@ private void scheduleAddStartingWindow() {
     private int getStartingWindowType(boolean newTask, boolean taskSwitch, boolean processRunning,
             boolean allowTaskSnapshot, boolean activityCreated, boolean activityAllDrawn,
             TaskSnapshot snapshot) {
+        boolean isAppLockerActivity = AxSandboxService.get().isAppLockerActivity(this.intent.getComponent());
+        if (AxSandboxService.get().isAppLocked(this) || isAppLockerActivity) {
+            return (isAppLockerActivity || processRunning) ? STARTING_WINDOW_TYPE_NONE : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+        }
         // A special case that a new activity is launching to an existing task which is moving to
         // front. If the launching activity is the one that started the task, it could be a
         // trampoline that will be always created and finished immediately. Then give a chance to
@@ -3491,6 +3497,9 @@ boolean finishIfSameAffinity(ActivityRecord r) {
      */
     private void finishActivityResults(int resultCode, Intent resultData,
             NeededUriGrants resultGrants) {
+        if (AxSandboxService.get().checkUnlockApp(this, resultCode, resultData)) {
+            resultTo = null;
+        }
         // Send the result if needed
         if (resultTo != null) {
             if (DEBUG_RESULTS) {
@@ -4281,6 +4290,7 @@ private void updateVisibleForServiceConnection() {
      * finishing or has no saved state or crashed many times, it will also be removed from history.
      */
     void handleAppDied() {
+        AxSandboxService.get().onAppDied(packageName, mUserId);
         final boolean remove;
         if (Process.isSdkSandboxUid(getUid())) {
             // Sandbox activities are created for SDKs run in the sandbox process, when the sandbox
@@ -4646,6 +4656,9 @@ private boolean transferStartingWindow(@NonNull ActivityRecord fromActivity) {
             }
             return true;
         } else if (fromActivity.mStartingData != null) {
+            if (AxSandboxService.get().isAppLockerActivity(this.intent.getComponent())) {
+                return false;
+            }
             if (fromActivity.mStartingData instanceof SnapshotStartingData
                     && (!isStartingOrientationCompatible(fromActivity)
                     || !(((SnapshotStartingData) fromActivity.mStartingData).isValid()))) {
@@ -6048,8 +6061,8 @@ void makeInvisible() {
                 case PAUSING:
                 case PAUSED:
                 case STARTED:
-                    addToStopping(true /* scheduleIdle */,
-                            canEnterPictureInPicture /* idleDelayed */, "makeInvisible");
+                    final boolean idleDelayed = canEnterPictureInPicture || inTransition();
+                    addToStopping(true /* scheduleIdle */, idleDelayed, "makeInvisible");
                     break;
 
                 default:
@@ -6261,6 +6274,7 @@ void completeResumeLocked() {
 
         // Schedule an idle timeout in case the app doesn't do it for us.
         mTaskSupervisor.scheduleIdleTimeout(this);
+        mTaskSupervisor.reportResumedActivityLocked(this);
 
         mTaskSupervisor.mStoppingActivities.remove(this);
         if (getDisplayArea().allResumedActivitiesComplete()) {
@@ -6361,7 +6375,9 @@ void stopIfPossible() {
             throw new IllegalStateException("Request to stop a finishing activity: " + this);
         }
         if (isNoHistory()) {
-            if (!task.shouldSleepActivities()) {
+            if (AxSandboxService.get().isAppLocked(this)) {
+                Slog.d(TAG_STATES, "AppLocker: Skip no-history finish for locked app " + this);
+            } else if (!task.shouldSleepActivities()) {
                 ProtoLog.d(WM_DEBUG_STATES, "no-history finish of %s", this);
                 if (finishIfPossible("stop-no-history", false /* oomAdj */)
                         != FINISH_RESULT_CANCELLED) {
@@ -9001,6 +9017,12 @@ private boolean allowTaskSnapshot() {
                 return false;
             }
         }
+
+        if (AxSandboxService.get().isAppLocked(this)
+            || AxSandboxService.get().isAppLockerActivity(this.intent.getComponent())) {
+            return false;
+        }
+
         return true;
     }
 
@@ -9395,6 +9417,25 @@ void setShouldDockBigOverlays(boolean shouldDockBigOverlays) {
         getTask().getRootTask().onShouldDockBigOverlaysChanged();
     }
 
+    void checkSyncTimeout(BLASTSyncEngine.SyncGroup group) {
+        if (attachedToProcess() && "com.android.launcher3".equals(packageName)) {
+            mAtmService.mH.post(() -> {
+                synchronized (mAtmService.mGlobalLock) {
+                    if (!hasProcess()) {
+                        return;
+                    }
+                    WindowProcessController wpc = app;
+                    mSyncTimeoutCounter++;
+                    if (mSyncTimeoutCounter < 3) {
+                        return;
+                    }
+                    Slog.d(TAG, "Sync timeout, try kill process");
+                    mAtmService.mAmInternal.killProcess(wpc.mName, wpc.mUid, "syncTimeout");
+                }
+            });
+        }
+    }
+
     @Override
     boolean isSyncFinished(BLASTSyncEngine.SyncGroup group) {
         if (task != null && task.mSharedStartingData != null) {
@@ -9789,4 +9830,8 @@ ActivityRecord build() {
     public boolean shouldForceLongScreen() {
         return mAtmService.shouldForceLongScreen(packageName);
     }
+
+    public boolean shouldForceCutoutFullscreen() {
+        return mAtmService.shouldForceCutoutFullscreen(packageName);
+    }
 }
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index b0a80079682af..ef936a4850822 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -107,6 +107,7 @@
 import android.app.compat.CompatChanges;
 import android.compat.annotation.ChangeId;
 import android.compat.annotation.Overridable;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.IIntentSender;
 import android.content.Intent;
@@ -124,6 +125,7 @@
 import android.os.IBinder;
 import android.os.OperationCanceledException;
 import android.os.RemoteException;
+import android.os.SystemProperties;
 import android.os.Trace;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -286,6 +288,11 @@ class ActivityStarter {
     // The reason we were trying to start the last activity
     private String mLastStartReason;
 
+
+    private static final String PAIRIP_LICENSE_ACTIVITY = 
+    "com.pairip.licensecheck.LicenseActivity";
+    private static final String BLOCK_PAIRIP_PROP = "persist.sys.pairip.activity.block";
+
     /*
      * Request details provided through setter methods. Should be reset after {@link #execute()}
      * to avoid unnecessarily retaining parameters. Note that the request is ignored when
@@ -847,6 +854,21 @@ int execute() {
 
                 final long origId = Binder.clearCallingIdentity();
                 try {
+                    if (mRequest.intent != null && mRequest.intent.getComponent() != null) {
+                        String targetPkg = mRequest.intent.getComponent().getPackageName();
+                        String callerPkg = mRequest.callingPackage;
+                        if (targetPkg != null
+                                && AxSandboxService.get().isPackageHidden(targetPkg)
+                                && !AxSandboxService.BLACKLISTED_PACKAGES.contains(callerPkg)
+                                && !targetPkg.equals(callerPkg)) {
+                            int callerUid = mRequest.callingUid;
+                            if (callerUid != android.os.Process.SYSTEM_UID
+                                    && callerUid != android.os.Process.ROOT_UID) {
+                                return ActivityManager.START_CLASS_NOT_FOUND;
+                            }
+                        }
+                    }
+
                     res = resolveToHeavyWeightSwitcherIfNeeded();
                     if (res != START_SUCCESS) {
                         return res;
@@ -1020,6 +1042,13 @@ private int waitResultIfNeeded(WaitResult waitResult, ActivityRecord r,
         return res;
     }
 
+    private boolean shouldBlockActivity(Intent intent) {
+        boolean enabled = SystemProperties.getBoolean(BLOCK_PAIRIP_PROP, false);
+        ComponentName component = intent.getComponent();
+        if (!enabled || component == null) return false;
+        return PAIRIP_LICENSE_ACTIVITY.equals(component.getClassName());
+    }
+
     /**
      * Executing activity start request and starts the journey of starting an activity. Here
      * begins with performing several preliminary checks. The normally activity launch flow will
@@ -1213,6 +1242,10 @@ private int executeRequest(Request request) {
             }
         }
 
+        if (shouldBlockActivity(intent)) {
+            err = ActivityManager.START_CANCELED;
+        }
+
         final Task resultRootTask = resultRecord == null
                 ? null : resultRecord.getRootTask();
 
@@ -3248,7 +3281,8 @@ private void addOrReparentStartingActivity(@NonNull Task task, String reason) {
         TaskFragment newParent = task;
         if (mInTaskFragment != null) {
             int embeddingCheckResult = canEmbedActivity(mInTaskFragment, mStartActivity, task);
-            if (embeddingCheckResult == EMBEDDING_ALLOWED) {
+            if (embeddingCheckResult == EMBEDDING_ALLOWED
+                || com.android.internal.util.matrixx.PixelPropsUtils.isSystemLauncher(mCallingUid)) {
                 newParent = mInTaskFragment;
                 mStartActivity.mRequestedLaunchingTaskFragmentToken =
                         mInTaskFragment.getFragmentToken();
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 8606d439eea3e..a803bc5a07134 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -209,6 +209,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.hardware.SystemSensorManager;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -276,7 +277,9 @@
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.FastPrintWriter;
 import com.android.internal.util.FrameworkStatsLog;
+import com.android.internal.util.matrixx.cutout.CutoutFullscreenController;
 import com.android.internal.util.function.pooled.PooledLambda;
+import com.android.internal.util.matrixx.PixelPropsUtils;
 import com.android.server.LocalManagerRegistry;
 import com.android.server.LocalServices;
 import com.android.server.SystemConfig;
@@ -827,6 +830,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
     // Lineage sdk activity related helper
     private LineageActivityManager mLineageActivityManager;
 
+    private SystemSensorManager mSystemSensorManager;
+
+    private CutoutFullscreenController mCutoutFullscreenController;
+
     private final class SettingObserver extends ContentObserver {
         private final Uri mFontScaleUri = Settings.System.getUriFor(FONT_SCALE);
         private final Uri mHideErrorDialogsUri = Settings.Global.getUriFor(HIDE_ERROR_DIALOGS);
@@ -923,6 +930,12 @@ public void installSystemProviders() {
         // LineageActivityManager depends on settings so we can initialize only
         // after providers are available.
         mLineageActivityManager = new LineageActivityManager(mContext);
+
+        // Block sensor usage per app
+        mSystemSensorManager = new SystemSensorManager(mContext, mContext.getMainLooper());
+
+        // Force full screen for devices with cutout
+        mCutoutFullscreenController = new CutoutFullscreenController(mContext);
     }
 
     public void retrieveSettings(ContentResolver resolver) {
@@ -1832,7 +1845,9 @@ public int startAssistantActivity(String callingPackage, @NonNull String calling
      */
     @Override
     public void preloadRecentsActivity(Intent intent) {
-        enforceTaskPermission("preloadRecentsActivity()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("preloadRecentsActivity()");
+        }
         final long origId = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2072,7 +2087,9 @@ public void setFrontActivityScreenCompatMode(int mode) {
 
     @Override
     public RootTaskInfo getFocusedRootTaskInfo() throws RemoteException {
-        enforceTaskPermission("getFocusedRootTaskInfo()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getFocusedRootTaskInfo()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2089,7 +2106,9 @@ public RootTaskInfo getFocusedRootTaskInfo() throws RemoteException {
 
     @Override
     public void setFocusedRootTask(int taskId) {
-        enforceTaskPermission("setFocusedRootTask()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("setFocusedRootTask()");
+        }
         ProtoLog.d(WM_DEBUG_FOCUS, "setFocusedRootTask: taskId=%d", taskId);
         final long callingId = Binder.clearCallingIdentity();
         try {
@@ -2111,7 +2130,9 @@ public void setFocusedRootTask(int taskId) {
 
     @Override
     public void setFocusedTask(int taskId) {
-        enforceTaskPermission("setFocusedTask()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("setFocusedTask()");
+        }
         final long callingId = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2124,7 +2145,9 @@ public void setFocusedTask(int taskId) {
 
     @Override
     public void focusTopTask(int displayId) {
-        enforceTaskPermission("focusTopTask()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("focusTopTask()");
+        }
         final long callingId = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2269,7 +2292,9 @@ public void removeAllVisibleRecentTasks() {
 
     @Override
     public Rect getTaskBounds(int taskId) {
-        enforceTaskPermission("getTaskBounds()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getTaskBounds()");
+        }
         final long ident = Binder.clearCallingIdentity();
         Rect rect = new Rect();
         try {
@@ -2557,7 +2582,9 @@ public List<ActivityManager.RunningTaskInfo> getTasks(int maxNum,
 
     @Override
     public void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop) {
-        enforceTaskPermission("moveTaskToRootTask()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("moveTaskToRootTask()");
+        }
         synchronized (mGlobalLock) {
             final long ident = Binder.clearCallingIdentity();
             try {
@@ -2594,7 +2621,9 @@ public void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop) {
     @Override
     public void removeRootTasksInWindowingModes(
             @NonNull @WindowConfiguration.WindowingMode int[] windowingModes) {
-        enforceTaskPermission("removeRootTasksInWindowingModes()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("removeRootTasksInWindowingModes()");
+        }
 
         synchronized (mGlobalLock) {
             final long ident = Binder.clearCallingIdentity();
@@ -2609,7 +2638,9 @@ public void removeRootTasksInWindowingModes(
     @Override
     public void removeRootTasksWithActivityTypes(
             @NonNull @WindowConfiguration.ActivityType int[] activityTypes) {
-        enforceTaskPermission("removeRootTasksWithActivityTypes()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("removeRootTasksWithActivityTypes()");
+        }
 
         synchronized (mGlobalLock) {
             final long ident = Binder.clearCallingIdentity();
@@ -2640,7 +2671,9 @@ public ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxN
 
     @Override
     public List<RootTaskInfo> getAllRootTaskInfos() {
-        enforceTaskPermission("getAllRootTaskInfos()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getAllRootTaskInfos()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2653,7 +2686,9 @@ public List<RootTaskInfo> getAllRootTaskInfos() {
 
     @Override
     public RootTaskInfo getRootTaskInfo(int windowingMode, int activityType) {
-        enforceTaskPermission("getRootTaskInfo()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getRootTaskInfo()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2666,7 +2701,9 @@ public RootTaskInfo getRootTaskInfo(int windowingMode, int activityType) {
 
     @Override
     public List<RootTaskInfo> getAllRootTaskInfosOnDisplay(int displayId) {
-        enforceTaskPermission("getAllRootTaskInfosOnDisplay()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getAllRootTaskInfosOnDisplay()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2680,7 +2717,9 @@ public List<RootTaskInfo> getAllRootTaskInfosOnDisplay(int displayId) {
     @Override
     public RootTaskInfo getRootTaskInfoOnDisplay(int windowingMode, int activityType,
             int displayId) {
-        enforceTaskPermission("getRootTaskInfoOnDisplay()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("getRootTaskInfoOnDisplay()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -2693,7 +2732,9 @@ public RootTaskInfo getRootTaskInfoOnDisplay(int windowingMode, int activityType
 
     @Override
     public void startSystemLockTaskMode(int taskId) {
-        enforceTaskPermission("startSystemLockTaskMode");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("startSystemLockTaskMode");
+        }
         // This makes inner call to look as if it was initiated by system.
         final long ident = Binder.clearCallingIdentity();
         try {
@@ -2748,7 +2789,9 @@ && getTransitionController().isShellTransitionsEnabled()) {
      */
     @Override
     public void stopSystemLockTaskMode() throws RemoteException {
-        enforceTaskPermission("stopSystemLockTaskMode");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("stopSystemLockTaskMode");
+        }
         stopLockTaskModeInternal(null, true /* isSystemCaller */);
     }
 
@@ -3134,7 +3177,9 @@ public void setTaskResizeable(int taskId, int resizeableMode) {
      */
     @Override
     public void resizeTask(int taskId, Rect bounds, int resizeMode) {
-        enforceTaskPermission("resizeTask()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("resizeTask()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -3390,7 +3435,9 @@ public void registerTaskStackListener(ITaskStackListener listener) {
     /** Unregister a task stack listener so that it stops receiving callbacks. */
     @Override
     public void unregisterTaskStackListener(ITaskStackListener listener) {
-        enforceTaskPermission("unregisterTaskStackListener()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("unregisterTaskStackListener()");
+        }
         mTaskChangeNotificationController.unregisterTaskStackListener(listener);
     }
 
@@ -3603,6 +3650,9 @@ void enforceActivityTaskPermission(String func) {
     }
 
     static void enforceTaskPermission(String func) {
+        if (PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            return;
+        }
         if (checkCallingPermission(MANAGE_ACTIVITY_TASKS) == PackageManager.PERMISSION_GRANTED) {
             return;
         }
@@ -4435,7 +4485,9 @@ public boolean updateConfiguration(Configuration values) {
 
     @Override
     public void cancelTaskWindowTransition(int taskId) {
-        enforceTaskPermission("cancelTaskWindowTransition()");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("cancelTaskWindowTransition()");
+        }
         final long ident = Binder.clearCallingIdentity();
         try {
             synchronized (mGlobalLock) {
@@ -4782,7 +4834,9 @@ void notifyHandoffEnablementChanged(ActivityRecord activity, boolean isHandoffEn
      */
     @Override
     public void clearLaunchParamsForPackages(List<String> packageNames) {
-        enforceTaskPermission("clearLaunchParamsForPackages");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("clearLaunchParamsForPackages");
+        }
         synchronized (mGlobalLock) {
             for (int i = 0; i < packageNames.size(); ++i) {
                 mTaskSupervisor.mLaunchParamsPersister.removeRecordForPackage(packageNames.get(i));
@@ -4792,7 +4846,9 @@ public void clearLaunchParamsForPackages(List<String> packageNames) {
 
     @Override
     public void onPictureInPictureUiStateChanged(PictureInPictureUiState pipState) {
-        enforceTaskPermission("onPictureInPictureUiStateChanged");
+        if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+            enforceTaskPermission("onPictureInPictureUiStateChanged");
+        }
         synchronized (mGlobalLock) {
             // The PictureInPictureUiState is sent to current pip task if there is any
             // -or- the top standard task (state like entering PiP does not require a pinned task).
@@ -5462,6 +5518,11 @@ void continueWindowLayout() {
         // ClientTransactions is queued during #deferWindowLayout() for performance.
         // Notify to continue.
         mLifecycleManager.onLayoutContinued();
+
+        if (mRootWindowContainer.mTaskLayersChanged
+                && !mWindowManager.mWindowPlacerLocked.isLayoutDeferred()) {
+            mRootWindowContainer.rankTaskLayers();
+        }
     }
 
     /**
@@ -7032,6 +7093,9 @@ public void onPackageUninstalled(String name, int userId) {
                 mAppWarnings.onPackageUninstalled(name, userId);
                 mCompatModePackages.handlePackageUninstalledLocked(name);
                 mPackageConfigPersister.onPackageUninstall(name, userId);
+                if (mSystemSensorManager != null) {
+                   mSystemSensorManager.notePackageUninstalled(name);
+                }
             }
             mWindowStyleCache.invalidatePackage(name);
         }
@@ -7391,7 +7455,9 @@ public void notifyLockedProfile(@UserIdInt int userId) {
 
         @Override
         public void startConfirmDeviceCredentialIntent(Intent intent, Bundle options) {
-            enforceTaskPermission("startConfirmDeviceCredentialIntent");
+            if (!PixelPropsUtils.shouldBypassTaskPermission(Binder.getCallingUid())) {
+                enforceTaskPermission("startConfirmDeviceCredentialIntent");
+            }
 
             synchronized (mGlobalLock) {
                 final long ident = Binder.clearCallingIdentity();
@@ -8167,4 +8233,8 @@ static boolean isPip2ExperimentEnabled() {
     public boolean shouldForceLongScreen(String packageName) {
         return mLineageActivityManager.shouldForceLongScreen(packageName);
     }
+
+    public boolean shouldForceCutoutFullscreen(String packageName) {
+        return mCutoutFullscreenController.shouldForceCutoutFullscreen(packageName);
+    }
 }
diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
index ac8b92854e68b..1fda1d528f8aa 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -1221,6 +1221,7 @@ boolean checkStartAnyActivityPermission(Intent intent, ActivityInfo aInfo, Strin
             @Nullable String callingFeatureId, boolean ignoreTargetSecurity,
             boolean launchingInTask, WindowProcessController callerApp, ActivityRecord resultRecord,
             Task resultRootTask) {
+        if (com.android.internal.util.matrixx.PixelPropsUtils.shouldBypassTaskPermission(callingUid)) return true;
         final boolean isCallerRecents = mService.getRecentTasks() != null
                 && mService.getRecentTasks().isCallerRecents(callingUid);
         final int startAnyPerm = mService.checkPermission(START_ANY_ACTIVITY, callingPid,
@@ -1914,6 +1915,8 @@ void removeTask(Task task, boolean killProcess, boolean removeFromRecents, Strin
             }
             mBalController.checkActivityAllowedToClearTask(
                             task, callingUid, callingPid, callerActivityClassName);
+            AxSandboxService.get().removeTask(task, reason);
+            GameSpaceService.get().removeTask(task, reason);
         } finally {
             task.mInRemoveTask = false;
             mService.mChainTracker.endPartial();
@@ -2229,6 +2232,17 @@ void checkReadyForSleepLocked(boolean allowDelay) {
         }
     }
 
+    boolean reportResumedActivityLocked(ActivityRecord r) {
+        this.mStoppingActivities.remove(r);
+        Task rootTask = r.getRootTask();
+        if (rootTask.getDisplayArea().allResumedActivitiesComplete()) {
+            this.mRootWindowContainer.ensureActivitiesVisible();
+            this.mRootWindowContainer.executeAppTransitionForAllDisplay();
+            return true;
+        }
+        return false;
+    }
+
     // Called when WindowManager has finished animating the launchingBehind activity to the back.
     private void handleLaunchTaskBehindCompleteLocked(ActivityRecord r) {
         final Task task = r.getTask();
@@ -3001,6 +3015,9 @@ int startActivityFromRecents(int callingPid, int callingUid, int taskId,
                     moveHomeTaskForward = false;
                 }
 
+                AxSandboxService.get().clearUnlockedApp();
+                AxSandboxService.get().lockTopApp(task, "startActivityFromRecents");
+
                 if (moveHomeTaskForward) {
                     // We always want to return to the home activity instead of the recents
                     // activity from whatever is started from the recents activity, so move
@@ -3070,6 +3087,12 @@ int startActivityFromRecents(int callingPid, int callingUid, int taskId,
                     mService.continueWindowLayout();
                 }
             }
+            if (activityOptions != null) {
+                final int windowingMode = activityOptions.getLaunchWindowingMode();
+                if (windowingMode == WINDOWING_MODE_FREEFORM) {
+                    task.setBounds(activityOptions.getLaunchBounds());
+                }
+            }
             taskCallingUid = task.mCallingUid;
             callingPackage = task.mCallingPackage;
             callingFeatureId = task.mCallingFeatureId;
diff --git a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
index 92e62033fc2a9..cdfd9d1522e47 100644
--- a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
+++ b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java
@@ -328,6 +328,8 @@ private boolean applyAspectRatio(Rect outBounds, Rect containingAppBounds,
         if (containingRatio - aspectRatioToApply > ASPECT_RATIO_ROUNDING_TOLERANCE) {
             if (mActivityRecord.shouldForceLongScreen()) {
                 // Use containingAppWidth/Height for maxActivityWidth/Height when force long screen
+            } else if (mActivityRecord.shouldForceCutoutFullscreen()) {
+                // Use containingAppWidth/Height for maxActivityWidth/Height when force cutout force full screen
             } else if (containingAppWidth < containingAppHeight) {
                 // Width is the shorter side, so we use that to figure-out what the max. height
                 // should be given the aspect ratio.
diff --git a/services/core/java/com/android/server/wm/AppCompatLetterboxPolicy.java b/services/core/java/com/android/server/wm/AppCompatLetterboxPolicy.java
index 8af10b72f16dd..2c222780ef8b5 100644
--- a/services/core/java/com/android/server/wm/AppCompatLetterboxPolicy.java
+++ b/services/core/java/com/android/server/wm/AppCompatLetterboxPolicy.java
@@ -192,9 +192,14 @@ void start(@NonNull WindowState w) {
         if (shouldNotLayoutLetterbox(w)) {
             return;
         }
-        mAppCompatRoundedCorners.updateRoundedCornersIfNeeded(w);
-        updateWallpaperForLetterbox(w);
-        if (shouldShowLetterboxUi(w)) {
+        final boolean shouldShowLetterboxUi = shouldShowLetterboxUi(w);
+        final boolean isLetterboxedNotForDisplayCutout = shouldShowLetterboxUi
+                && !w.isLetterboxedForDisplayCutout();
+        mAppCompatRoundedCorners.updateRoundedCornersIfNeeded(w,
+                isLetterboxedNotForDisplayCutout
+                        && !isFreeformActivityMatchParentAppBoundsHeight());
+        updateWallpaperForLetterbox(w, isLetterboxedNotForDisplayCutout);
+        if (shouldShowLetterboxUi) {
             mLetterboxPolicyState.layoutLetterboxIfNeeded(w);
         }  else {
             mLetterboxPolicyState.hide();
@@ -273,7 +278,8 @@ void dump(@NonNull PrintWriter pw, @NonNull String prefix) {
         mAppCompatConfiguration.dump(pw, prefix);
     }
 
-    private void updateWallpaperForLetterbox(@NonNull WindowState mainWindow) {
+    private void updateWallpaperForLetterbox(@NonNull WindowState mainWindow,
+            boolean isLetterboxedNotForDisplayCutout) {
         final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord
                 .mAppCompatController.getLetterboxOverrides();
         final @LetterboxBackgroundType int letterboxBackgroundType =
@@ -281,7 +287,7 @@ private void updateWallpaperForLetterbox(@NonNull WindowState mainWindow) {
         boolean wallpaperShouldBeShown =
                 letterboxBackgroundType == LETTERBOX_BACKGROUND_WALLPAPER
                         // Don't use wallpaper as a background if letterboxed for display cutout.
-                        && isLetterboxedNotForDisplayCutout(mainWindow)
+                        && isLetterboxedNotForDisplayCutout
                         // Check that dark scrim alpha or blur radius are provided
                         && (letterboxOverrides.getLetterboxWallpaperBlurRadiusPx() > 0
                         || letterboxOverrides.getLetterboxWallpaperDarkScrimAlpha() > 0)
diff --git a/services/core/java/com/android/server/wm/AppCompatRoundedCorners.java b/services/core/java/com/android/server/wm/AppCompatRoundedCorners.java
index 812f1c4a86ac2..ea93fb6101920 100644
--- a/services/core/java/com/android/server/wm/AppCompatRoundedCorners.java
+++ b/services/core/java/com/android/server/wm/AppCompatRoundedCorners.java
@@ -36,6 +36,12 @@ class AppCompatRoundedCorners {
     private final ActivityRecord mActivityRecord;
     @NonNull
     private final Predicate<WindowState> mRoundedCornersWindowCondition;
+    @NonNull
+    private final Rect mLastCropBounds = new Rect();
+    @Nullable
+    private SurfaceControl mLastSurfaceControl;
+    private boolean mLastCropBoundsValid;
+    private int mLastCornerRadius = Integer.MIN_VALUE;
 
     AppCompatRoundedCorners(@NonNull ActivityRecord  activityRecord,
             @NonNull Predicate<WindowState> roundedCornersWindowCondition) {
@@ -44,21 +50,51 @@ class AppCompatRoundedCorners {
     }
 
     void updateRoundedCornersIfNeeded(@NonNull final WindowState mainWindow) {
+        updateRoundedCornersIfNeeded(mainWindow, mRoundedCornersWindowCondition.test(mainWindow));
+    }
+
+    void updateRoundedCornersIfNeeded(@NonNull final WindowState mainWindow,
+            boolean roundedCornersWindowCondition) {
         final SurfaceControl windowSurface = mainWindow.getSurfaceControl();
         if (windowSurface == null || !windowSurface.isValid()) {
             return;
         }
 
         // cropBounds must be non-null for the cornerRadius to be ever applied.
-        mActivityRecord.getSyncTransaction()
-                .setCrop(windowSurface, getCropBoundsIfNeeded(mainWindow))
-                .setCornerRadius(windowSurface, getRoundedCornersRadius(mainWindow));
+        final boolean requiresRoundedCorners = requiresRoundedCorners(mainWindow,
+                roundedCornersWindowCondition);
+        final Rect cropBounds = getCropBoundsIfNeeded(mainWindow, requiresRoundedCorners);
+        final int cornerRadius = getRoundedCornersRadius(mainWindow, requiresRoundedCorners);
+        final boolean surfaceChanged = mLastSurfaceControl != windowSurface;
+        final SurfaceControl.Transaction transaction = mActivityRecord.getSyncTransaction();
+
+        if (surfaceChanged || !cropBoundsEquals(cropBounds)) {
+            transaction.setCrop(windowSurface, cropBounds);
+            mLastSurfaceControl = windowSurface;
+            if (cropBounds == null) {
+                mLastCropBoundsValid = false;
+            } else {
+                mLastCropBounds.set(cropBounds);
+                mLastCropBoundsValid = true;
+            }
+        }
+        if (surfaceChanged || mLastCornerRadius != cornerRadius) {
+            transaction.setCornerRadius(windowSurface, cornerRadius);
+            mLastSurfaceControl = windowSurface;
+            mLastCornerRadius = cornerRadius;
+        }
     }
 
     @VisibleForTesting
     @Nullable
     Rect getCropBoundsIfNeeded(@NonNull final WindowState mainWindow) {
-        if (!requiresRoundedCorners(mainWindow)) {
+        return getCropBoundsIfNeeded(mainWindow, requiresRoundedCorners(mainWindow));
+    }
+
+    @Nullable
+    private Rect getCropBoundsIfNeeded(@NonNull final WindowState mainWindow,
+            boolean requiresRoundedCorners) {
+        if (!requiresRoundedCorners) {
             // We don't want corner radius on the window.
             // In the case the ActivityRecord requires a letterboxed animation we never want
             // rounded corners on the window because rounded corners are applied at the
@@ -108,7 +144,12 @@ Rect getCropBoundsIfNeeded(@NonNull final WindowState mainWindow) {
      * @param mainWindow    The {@link WindowState} to consider for rounded corners calculation.
      */
     int getRoundedCornersRadius(@NonNull final WindowState mainWindow) {
-        if (!requiresRoundedCorners(mainWindow)) {
+        return getRoundedCornersRadius(mainWindow, requiresRoundedCorners(mainWindow));
+    }
+
+    private int getRoundedCornersRadius(@NonNull final WindowState mainWindow,
+            boolean requiresRoundedCorners) {
+        if (!requiresRoundedCorners) {
             return 0;
         }
         final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord
@@ -134,6 +175,14 @@ private static int getInsetsStateCornerRadius(@NonNull InsetsState insetsState,
     }
 
     private boolean requiresRoundedCorners(@NonNull final WindowState mainWindow) {
+        return requiresRoundedCorners(mainWindow, mRoundedCornersWindowCondition.test(mainWindow));
+    }
+
+    private boolean requiresRoundedCorners(@NonNull final WindowState mainWindow,
+            boolean roundedCornersWindowCondition) {
+        if (!roundedCornersWindowCondition) {
+            return false;
+        }
         if (com.android.wm.shell.Flags.enableCreateAnyBubble()) {
             final Task task = mActivityRecord.getTask();
             if (task != null && task.mLaunchNextToBubble) {
@@ -144,8 +193,14 @@ private boolean requiresRoundedCorners(@NonNull final WindowState mainWindow) {
         }
         final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord
                 .mAppCompatController.getLetterboxOverrides();
-        return mRoundedCornersWindowCondition.test(mainWindow)
-                && letterboxOverrides.isLetterboxActivityCornersRounded();
+        return letterboxOverrides.isLetterboxActivityCornersRounded();
+    }
+
+    private boolean cropBoundsEquals(@Nullable Rect cropBounds) {
+        if (cropBounds == null) {
+            return !mLastCropBoundsValid;
+        }
+        return mLastCropBoundsValid && mLastCropBounds.equals(cropBounds);
     }
 
 }
diff --git a/services/core/java/com/android/server/wm/AppSnapshotLoader.java b/services/core/java/com/android/server/wm/AppSnapshotLoader.java
index 568ba28aa23d1..8208a9e82f87b 100644
--- a/services/core/java/com/android/server/wm/AppSnapshotLoader.java
+++ b/services/core/java/com/android/server/wm/AppSnapshotLoader.java
@@ -104,7 +104,7 @@ PreRLegacySnapshotConfig getLegacySnapshotConfig(int taskWidth, float legacyScal
 
         if (isPreQLegacyProto) {
             // Android O or Android P
-            if (ActivityManager.isLowRamDeviceStatic() && !highResFileExists) {
+            if (!highResFileExists) {
                 // Android P w/ low_ram=true
                 preRLegacyScale = 0.6f;
                 // Force bitmapFile to always be *_reduced.jpg
@@ -115,14 +115,9 @@ PreRLegacySnapshotConfig getLegacySnapshotConfig(int taskWidth, float legacyScal
             }
         } else if (isPreRLegacySnapshot) {
             // If not pre-Q but is pre-R, then it must be Android Q
-            if (ActivityManager.isLowRamDeviceStatic()) {
-                preRLegacyScale = legacyScale;
-                // Force bitmapFile to always be *_reduced.jpg
-                forceLoadReducedJpeg = true;
-            } else {
-                preRLegacyScale =
-                        loadLowResolutionBitmap ? 0.5f * legacyScale : legacyScale;
-            }
+            preRLegacyScale = legacyScale;
+            // Force bitmapFile to always be *_reduced.jpg
+            forceLoadReducedJpeg = true;
         }
         return new PreRLegacySnapshotConfig(preRLegacyScale, forceLoadReducedJpeg);
     }
diff --git a/services/core/java/com/android/server/wm/AxSandboxService.java b/services/core/java/com/android/server/wm/AxSandboxService.java
new file mode 100644
index 0000000000000..1965946e6ec37
--- /dev/null
+++ b/services/core/java/com/android/server/wm/AxSandboxService.java
@@ -0,0 +1,1178 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.system.Os;
+import java.io.File;
+
+import static android.app.AxSandboxManager.AppLockState.LOCKED;
+import static android.app.AxSandboxManager.AppLockState.NONE;
+import static android.app.AxSandboxManager.AppLockState.UNLOCKED;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityOptions;
+import android.app.AxSandboxManager;
+import android.app.AxSandboxManager.AppLockState;
+import android.app.IApplicationThread;
+import android.app.WindowConfiguration;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Slog;
+
+import com.android.internal.app.IAppLockStateListener;
+import com.android.internal.app.IAppSessionListener;
+import com.android.internal.app.IAxSandboxManager;
+import com.android.internal.app.IHiddenNotificationListener;
+import com.android.internal.app.HiddenNotificationInfo;
+
+import com.android.server.NtServiceInjector;
+import com.android.server.LocalServices;
+import com.android.server.wm.sandbox.AppControlController;
+import com.android.server.wm.sandbox.HiddenNotificationController;
+import com.android.server.wm.sandbox.SettingsSpoofController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class AxSandboxService extends IAxSandboxManager.Stub implements IAxSandboxService {
+    private static final String TAG = "AxSandbox";
+
+    public static final String SANDBOX_PACKAGE = "com.android.applocker";
+    private static final String SANDBOX_ACTIVITY = "com.android.applocker.AuthenticateActivity";
+
+    private static final String EXTRA_LOCKED_UID = AxSandboxManager.EXTRA_LOCKED_UID;
+    private static final String EXTRA_LOCKED_PACKAGE = AxSandboxManager.EXTRA_LOCKED_PACKAGE;
+    private static final String EXTRA_LOCKED_COMPONENT = AxSandboxManager.EXTRA_LOCKED_COMPONENT;
+
+    private static final String ACTION_SYSTEM_UNLOCK = "com.android.applocker.action.SYSTEM_UNLOCK";
+
+    private static final String SETTING_LOCK_BEHAVIOR = AxSandboxManager.SETTING_LOCK_BEHAVIOR;
+    private static final String SETTING_LOCK_TIMEOUT = AxSandboxManager.SETTING_LOCK_TIMEOUT;
+
+    private static final int LOCK_BEHAVIOR_ON_LEAVE = AxSandboxManager.LOCK_BEHAVIOR_ON_LEAVE;
+    private static final int LOCK_BEHAVIOR_TIMEOUT = AxSandboxManager.LOCK_BEHAVIOR_TIMEOUT;
+    private static final int LOCK_BEHAVIOR_ON_SCREEN_OFF = AxSandboxManager.LOCK_BEHAVIOR_ON_SCREEN_OFF;
+    private static final int LOCK_BEHAVIOR_ON_KILL = AxSandboxManager.LOCK_BEHAVIOR_ON_KILL;
+
+    public static final Set<String> BLACKLISTED_PACKAGES = Set.of(
+            "android",
+            SANDBOX_PACKAGE,
+            "com.android.axion.sandbox",
+            "com.android.settings"
+    );
+
+    private ActivityTaskManagerService mAtms;
+    private Context mContext;
+    private SettingsObserver mSettingsObserver;
+    private ResolveInfo mSandboxResolveInfo;
+    private Intent mConfirmIntent;
+    private int mRequestCode;
+
+    private AppControlController mAppControlController;
+    private HiddenNotificationController mHiddenNotificationController;
+
+    private final RemoteCallbackList<IAppLockStateListener> mAppLockStateListeners =
+            new RemoteCallbackList<>();
+    private final RemoteCallbackList<IAppSessionListener> mAppSessionListeners =
+            new RemoteCallbackList<>();
+
+    private Set<String> mUnlockedApps = new HashSet<>();
+    private final Set<String> mPendingUnlocks = new HashSet<>();
+    private final Map<String, Long> mUnlockTimestamps = new HashMap<>();
+    private final Map<String, Runnable> mTimeoutRunnables = new HashMap<>();
+    private String mLastFocusedAppKey = null;
+    private ArrayList<String> mExcludedComponents = new ArrayList<>();
+
+    private int mLockBehavior = LOCK_BEHAVIOR_ON_LEAVE;
+    private int mLockTimeout = 30;
+    private boolean mKeyguardDone = true;
+    private boolean mCheckRecentTasks = false;
+    private int mCurrentUserId = 0;
+
+    private static final class Holder {
+        private static final AxSandboxService INSTANCE = new AxSandboxService();
+    }
+
+    public static AxSandboxService get() {
+        return Holder.INSTANCE;
+    }
+
+    private AxSandboxService() {
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(
+                    Settings.Secure.getUriFor(SETTING_LOCK_BEHAVIOR), false, this, -1);
+            resolver.registerContentObserver(
+                    Settings.Secure.getUriFor(SETTING_LOCK_TIMEOUT), false, this, -1);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            ContentResolver resolver = mContext.getContentResolver();
+            mLockBehavior = Settings.Secure.getIntForUser(resolver, SETTING_LOCK_BEHAVIOR,
+                    LOCK_BEHAVIOR_ON_LEAVE, -2);
+            mLockTimeout = Settings.Secure.getIntForUser(resolver, SETTING_LOCK_TIMEOUT,
+                    AxSandboxManager.DEFAULT_LOCK_TIMEOUT, -2);
+            Slog.d(TAG, "Settings changed: lockBehavior=" + mLockBehavior
+                    + " lockTimeout=" + mLockTimeout);
+        }
+    }
+
+    private final BroadcastReceiver mPackageRemovedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null || intent.getData() == null) return;
+            String packageName = intent.getData().getSchemeSpecificPart();
+            if (TextUtils.isEmpty(packageName)) return;
+            boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+            if (replacing) return;
+
+            Slog.i(TAG, "Package removed: " + packageName + ", cleaning up sandbox entries");
+            cleanupPackage(packageName);
+        }
+    };
+
+    private void cleanupPackage(String packageName) {
+        if (mAppControlController == null) return;
+
+        boolean changed = false;
+
+        if (mAppControlController.isAppLocked(packageName)) {
+            mAppControlController.removeLockedApp(packageName);
+            notifyAppLockStateChanged(packageName, false);
+            changed = true;
+        }
+
+        if (mAppControlController.isPackageHidden(packageName)) {
+            mAppControlController.setPackageHidden(packageName, false);
+            changed = true;
+        }
+
+        if (mAppControlController.isPackageSandboxed(packageName)) {
+            mAppControlController.setPackageSandboxed(packageName, false);
+            changed = true;
+        }
+
+        if (mHiddenNotificationController != null) {
+            mHiddenNotificationController.clearNotificationsForPackage(packageName);
+        }
+
+        for (String key : new ArrayList<>(mUnlockedApps)) {
+            if (key.endsWith(":" + packageName)) {
+                mUnlockedApps.remove(key);
+                mUnlockTimestamps.remove(key);
+                cancelTimeoutLock(key);
+            }
+        }
+
+        synchronized (mPendingUnlocks) {
+            mPendingUnlocks.removeIf(key -> key.endsWith(":" + packageName));
+        }
+
+        if (changed) {
+            Slog.i(TAG, "Cleaned up sandbox entries for uninstalled package: " + packageName);
+        }
+    }
+
+    @Override
+    public void systemReadyInternal() {
+        Slog.d(TAG, "systemReady");
+        mAtms = NtServiceInjector.get().getActivityTaskManagerService();
+        mContext = NtServiceInjector.get().getContext();
+
+        try {
+            mSandboxResolveInfo = mContext.getPackageManager().resolveActivity(
+                    getConfirmIntent(), PackageManager.MATCH_DEFAULT_ONLY);
+        } catch (Exception e) {
+            Slog.w(TAG, "Could not resolve Sandbox activity", e);
+        }
+
+        mRequestCode = getConfirmIntent().toString().hashCode() & 0x0FFFFFFF;
+        mUnlockedApps = new HashSet<>();
+        mExcludedComponents = new ArrayList<>();
+        mSettingsObserver = new SettingsObserver(mAtms.mH);
+        mSettingsObserver.onChange(true);
+
+        mAppControlController = new AppControlController(mContext, BLACKLISTED_PACKAGES);
+        mAppControlController.init();
+
+        mHiddenNotificationController = new HiddenNotificationController();
+        mHiddenNotificationController.setPackageHiddenChecker(this::isPackageHidden);
+
+        IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_FULLY_REMOVED);
+        filter.addDataScheme("package");
+        mContext.registerReceiverAsUser(mPackageRemovedReceiver, UserHandle.ALL, filter, null, mAtms.mH);
+    }
+
+    public static void systemReady() {
+        AxSandboxService instance = get();
+        instance.systemReadyInternal();
+        ServiceManager.addService(Context.AX_SANDBOX_SERVICE, instance);
+        Slog.i(TAG, "AxSandboxService ready");
+    }
+
+    private Intent getConfirmIntent() {
+        if (mConfirmIntent == null) {
+            mConfirmIntent = new Intent(ACTION_SYSTEM_UNLOCK);
+            mConfirmIntent.setClassName(SANDBOX_PACKAGE, SANDBOX_ACTIVITY);
+            mConfirmIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS |
+                                        Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        }
+        return mConfirmIntent;
+    }
+
+    @Override
+    public int getAppLockState(String packageName) {
+        return computeAppLockState(packageName).ordinal();
+    }
+
+    public boolean hasAppLock(String packageName) {
+        return computeAppLockState(packageName).hasAppLock();
+    }
+
+    private AppLockState computeAppLockState(String packageName) {
+        if (mAppControlController == null) return NONE;
+        if (BLACKLISTED_PACKAGES.contains(packageName)) {
+            return NONE;
+        }
+        if (!mAppControlController.isAppLocked(packageName)) {
+            return NONE;
+        }
+        if (!mKeyguardDone) {
+            return LOCKED;
+        }
+
+        int userId = UserHandle.getUserId(Binder.getCallingUid());
+        String key = sessionKey(userId, packageName);
+        boolean sessionUnlocked = mUnlockedApps.contains(key);
+
+        if (sessionUnlocked && mLockBehavior == LOCK_BEHAVIOR_TIMEOUT) {
+            Long lastUsed = mUnlockTimestamps.get(key);
+            if (lastUsed != null && (SystemClock.elapsedRealtime() - lastUsed) > (mLockTimeout * 1000L)) {
+                sessionUnlocked = false;
+            }
+        }
+        return sessionUnlocked
+                ? UNLOCKED
+                : LOCKED;
+    }
+
+    @Override
+    public boolean isPackageHidden(String packageName) {
+        if (mAppControlController == null) return false;
+        return mAppControlController.isPackageHidden(packageName);
+    }
+
+    @Override
+    public void addLockedApp(String packageName) {
+        mAppControlController.addLockedApp(packageName);
+        notifyAppLockStateChanged(packageName, true);
+    }
+
+    @Override
+    public void removeLockedApp(String packageName) {
+        mAppControlController.removeLockedApp(packageName);
+        int uid = getPackageUid(packageName);
+        if (uid >= 0) {
+            int userId = UserHandle.getUserId(uid);
+            markSessionLocked(packageName, userId);
+        }
+        notifyAppLockStateChanged(packageName, false);
+    }
+
+    @Override
+    public void setPackageHidden(String packageName, boolean hidden) {
+        mAppControlController.setPackageHidden(packageName, hidden);
+        broadcastPackageChanged(packageName);
+    }
+
+    @Override
+    public List<String> getLockedPackages() {
+        return mAppControlController.getLockedPackages();
+    }
+
+    @Override
+    public List<String> getHiddenPackages() {
+        return mAppControlController.getHiddenPackages();
+    }
+
+    @Override
+    public List<String> getLockablePackages() {
+        return mAppControlController.getLockablePackages();
+    }
+
+    @Override
+    public boolean isPackageLockable(String packageName) {
+        return mAppControlController.isPackageLockable(packageName);
+    }
+
+    @Override
+    public void unlockApp(String packageName, int userId) {
+        if (TextUtils.isEmpty(packageName)) return;
+        markSessionUnlocked(packageName, userId);
+
+        synchronized (mPendingUnlocks) {
+            mPendingUnlocks.remove(sessionKey(userId, packageName));
+        }
+
+        Slog.d(TAG, "unlockApp: " + packageName + " for user " + userId);
+    }
+
+    @Override
+    public void promptUnlock(String packageName, int userId) {
+        if (TextUtils.isEmpty(packageName)) return;
+
+        Intent intent = new Intent(getConfirmIntent());
+        intent.putExtra(EXTRA_LOCKED_PACKAGE, packageName);
+        intent.putExtra(EXTRA_LOCKED_UID, userId);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+        long identity = Binder.clearCallingIdentity();
+        try {
+            mAtms.getActivityStartController()
+                    .obtainStarter(intent, "promptUnlock->AxSandbox")
+                    .setCallingUid(0)
+                    .setActivityInfo(mSandboxResolveInfo != null ? mSandboxResolveInfo.activityInfo : null)
+                    .execute();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void registerAppLockStateListener(IAppLockStateListener listener) {
+        mAppLockStateListeners.register(listener);
+    }
+
+    @Override
+    public void unregisterAppLockStateListener(IAppLockStateListener listener) {
+        mAppLockStateListeners.unregister(listener);
+    }
+
+    @Override
+    public void registerAppSessionListener(IAppSessionListener listener) {
+        mAppSessionListeners.register(listener);
+    }
+
+    @Override
+    public void unregisterAppSessionListener(IAppSessionListener listener) {
+        mAppSessionListeners.unregister(listener);
+    }
+
+    @Override
+    public void registerHiddenNotificationListener(IHiddenNotificationListener listener) {
+        mHiddenNotificationController.registerListener(listener);
+    }
+
+    @Override
+    public void unregisterHiddenNotificationListener(IHiddenNotificationListener listener) {
+        mHiddenNotificationController.unregisterListener(listener);
+    }
+
+    @Override
+    public List<HiddenNotificationInfo> getHiddenNotifications() {
+        return mHiddenNotificationController.getHiddenNotifications();
+    }
+
+    @Override
+    public void onHiddenNotificationPosted(HiddenNotificationInfo info) {
+        mHiddenNotificationController.onHiddenNotificationPosted(info);
+    }
+
+    @Override
+    public void onHiddenNotificationRemoved(String key) {
+        mHiddenNotificationController.onHiddenNotificationRemoved(key);
+    }
+
+    @Override
+    public boolean isPackageSandboxed(String packageName) {
+        if (mAppControlController == null) return false;
+        return mAppControlController.isPackageSandboxed(packageName);
+    }
+
+    @Override
+    public void addSandboxedPackage(String packageName) {
+        mAppControlController.setPackageSandboxed(packageName, true);
+        broadcastPackageChanged(packageName);
+    }
+
+    @Override
+    public void removeSandboxedPackage(String packageName) {
+        mAppControlController.setPackageSandboxed(packageName, false);
+        broadcastPackageChanged(packageName);
+    }
+
+    @Override
+    public List<String> getSandboxedPackages() {
+        return mAppControlController.getSandboxedPackages();
+    }
+
+    @Override
+    public void setRestrictedGids(String packageName, int[] gids) {
+        mAppControlController.setRestrictedGids(packageName, gids);
+    }
+
+    @Override
+    public int[] getRestrictedGids(String packageName) {
+        if (mAppControlController == null) return null;
+        return mAppControlController.getRestrictedGids(packageName);
+    }
+
+    @Override
+    public boolean isSandboxDataIsolationEnabled(String packageName) {
+        if (mAppControlController == null) return false;
+        return mAppControlController.isDataIsolationEnabled(packageName);
+    }
+
+    @Override
+    public void setSandboxDataIsolationEnabled(String packageName, boolean enabled) {
+        mAppControlController.setDataIsolationEnabled(packageName, enabled);
+    }
+
+    @Override
+    public boolean isSpoofSettingEnabled(String packageName, String settingKey) {
+        if (mAppControlController == null) return false;
+        return mAppControlController.isSpoofSettingEnabled(packageName, settingKey);
+    }
+
+    @Override
+    public void setSpoofSettingEnabled(String packageName, String settingKey, boolean enabled) {
+        mAppControlController.setSpoofSettingEnabled(packageName, settingKey, enabled);
+    }
+
+    @Override
+    public List<String> getEnabledSpoofSettings(String packageName) {
+        if (mAppControlController == null) return java.util.Collections.emptyList();
+        return mAppControlController.getEnabledSpoofSettings(packageName);
+    }
+
+    @Override
+    public String getSpoofedSetting(String callingPackage, String settingName) {
+        if (mAppControlController == null) return null;
+        final String spoofedValue = SettingsSpoofController.getSpoofedValue(settingName);
+        if (spoofedValue == null) return null;
+        if (!mAppControlController.isSpoofSettingEnabled(callingPackage, settingName)) {
+            return null;
+        }
+        return spoofedValue;
+    }
+
+    @Override
+    public boolean isAppLocked(ActivityRecord r) {
+        if (r == null || !hasLockedPackages() || r.isNoDisplay()
+                || r.isActivityTypeHomeOrRecents()) {
+            return false;
+        }
+
+        int userId = r.mUserId;
+        if (mSandboxResolveInfo == null || mCurrentUserId != userId) {
+            List<ResolveInfo> list = mContext.getPackageManager()
+                    .queryIntentActivitiesAsUser(mConfirmIntent, PackageManager.MATCH_SYSTEM_ONLY, userId);
+            for (int i = 0; list != null && i < list.size(); i++) {
+                if ((list.get(i).activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                    mSandboxResolveInfo = list.get(i);
+                    break;
+                }
+            }
+            ResolveInfo ri = mSandboxResolveInfo;
+            if (ri != null && ri.activityInfo != null && ri.activityInfo.applicationInfo != null) {
+                int newUserId = UserHandle.getUserId(ri.activityInfo.applicationInfo.uid);
+                if (mCurrentUserId != newUserId) {
+                    Slog.i(TAG, "Update user from " + mCurrentUserId + " to " + newUserId);
+                    mCurrentUserId = newUserId;
+                }
+            }
+            mSettingsObserver.onChange(true);
+        }
+        return isAppLocked(r.packageName, r.getUid(), r.mActivityComponent);
+    }
+
+    @Override
+    public boolean isAppLocked(String packageName, int uid, ComponentName component) {
+        if (mAppControlController == null) return false;
+        if (BLACKLISTED_PACKAGES.contains(packageName)) return false;
+
+        int userId = UserHandle.getUserId(uid);
+
+        boolean isLocked = mAppControlController.isAppLocked(packageName);
+
+        if (!isLocked) return false;
+
+        String key = sessionKey(userId, packageName);
+        boolean isAlreadyUnlocked = mUnlockedApps.contains(key);
+
+        if (isAlreadyUnlocked && mLockBehavior == LOCK_BEHAVIOR_TIMEOUT) {
+            Long lastUsed = mUnlockTimestamps.get(key);
+            if (lastUsed != null && (SystemClock.elapsedRealtime() - lastUsed) > (mLockTimeout * 1000L)) {
+                isAlreadyUnlocked = false;
+            }
+        }
+
+        boolean isExcluded = component != null && mExcludedComponents.contains(component.getClassName());
+
+        if (mKeyguardDone && isLocked) {
+            if (!isAlreadyUnlocked && !isExcluded) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void lockTopApp(Task task, String reason) {
+        if (task == null || !hasLockedPackages()) return;
+
+        ActivityRecord r = task.topRunningActivityLocked();
+        if (!isAppLocked(r)) return;
+
+        if (mUnlockedApps.contains(sessionKey(r))
+                && mLockBehavior != LOCK_BEHAVIOR_ON_LEAVE) {
+            return;
+        }
+
+        Slog.i(TAG, "lockTopApp: blocking " + r + " reason=" + reason);
+        startAuthPrompt(r, reason);
+    }
+
+    @Override
+    public boolean checkLockApp(ActivityRecord prev, ActivityRecord next) {
+        if (next == null) return false;
+
+        clearUnlockedApp(next);
+
+        if (!isAppLocked(next)) return false;
+
+        Slog.i(TAG, "checkLockApp: blocking resume " + next + " app=" + next.app);
+        if (!startAuthPrompt(next, "lockApp->AxSandbox")) {
+            return false;
+        }
+
+        if (prev != null && prev.finishing) {
+            prev.setVisibility(false);
+        }
+        next.mRootWindowContainer.ensureActivitiesVisible();
+        return true;
+    }
+
+    private boolean startAuthPrompt(ActivityRecord target, String reason) {
+        if (target == null) return false;
+
+        String pendingKey = sessionKey(target);
+        synchronized (mPendingUnlocks) {
+            if (!mPendingUnlocks.add(pendingKey)) {
+                Slog.d(TAG, "startAuthPrompt: re-launching prompt for " + pendingKey);
+            }
+        }
+
+        try {
+            Intent intent = new Intent(getConfirmIntent());
+            intent.putExtra(EXTRA_LOCKED_UID, target.getUid());
+            intent.putExtra(EXTRA_LOCKED_PACKAGE, target.packageName);
+            intent.putExtra(EXTRA_LOCKED_COMPONENT,
+                    target.intent.getComponent() != null
+                            ? target.intent.getComponent().flattenToString() : "");
+            intent.putExtra("app_label", resolveAppLabel(target.packageName, target.mUserId));
+
+            WindowProcessController wpc = target.app;
+            Slog.d(TAG, "startAuthPrompt: launching AuthenticateActivity"
+                    + " target=" + target.packageName
+                    + " targetToken=" + target.token
+                    + " targetTask=" + (target.getTask() != null ? target.getTask().mTaskId : -1)
+                    + " wpc=" + (wpc == null ? "null" : "attached")
+                    + " reason=" + reason);
+            if (wpc == null) {
+                mAtms.getActivityStartController()
+                        .obtainStarter(intent, reason)
+                        .setCallingUid(0)
+                        .setResultTo(target.token)
+                        .setRequestCode(mRequestCode)
+                        .setActivityInfo(mSandboxResolveInfo != null
+                                ? mSandboxResolveInfo.activityInfo : null)
+                        .execute();
+            } else {
+                startActivityAsCaller(wpc.getThread(), target.packageName, intent,
+                        "", target.token, target.resultWho, mRequestCode);
+            }
+
+            abortAnimation(target);
+            return true;
+        } catch (Exception e) {
+            Slog.w(TAG, "startAuthPrompt: failed for " + target, e);
+            synchronized (mPendingUnlocks) {
+                mPendingUnlocks.remove(pendingKey);
+            }
+            return false;
+        }
+    }
+
+    private String resolveAppLabel(String packageName, int userId) {
+        try {
+            PackageManager pm = mContext.getPackageManager();
+            ApplicationInfo ai = pm.getApplicationInfoAsUser(packageName, 0, userId);
+            CharSequence label = pm.getApplicationLabel(ai);
+            return label != null ? label.toString() : packageName;
+        } catch (Exception e) {
+            return packageName;
+        }
+    }
+
+    @Override
+    public boolean checkUnlockApp(ActivityRecord r, int resultCode, Intent data) {
+        if (r.requestCode != mRequestCode) {
+            return false;
+        }
+        if (data == null) {
+            return true;
+        }
+        try {
+            int userId = UserHandle.getUserId(data.getIntExtra(EXTRA_LOCKED_UID, 0));
+            String packageName = data.getStringExtra(EXTRA_LOCKED_PACKAGE);
+            String pendingKey = sessionKey(userId, packageName);
+
+            Slog.d(TAG, "checkUnlockApp: unlocking pkg=" + packageName
+                    + " userId=" + userId + " resultCode=" + resultCode);
+
+            synchronized (mPendingUnlocks) {
+                mPendingUnlocks.remove(pendingKey);
+            }
+
+            if (resultCode == Activity.RESULT_OK && packageName != null) {
+                markSessionUnlocked(packageName, userId);
+            } else if (r.resultTo != null) {
+                Slog.d(TAG, "checkUnlockApp: finishing target " + r.resultTo + " on cancel");
+                r.resultTo.finishIfPossible("applock-canceled", false);
+            }
+            return true;
+        } catch (Exception e) {
+            Slog.w(TAG, "checkUnlockApp: failed", e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isSandboxActivity(ComponentName component) {
+        return component != null
+                && SANDBOX_PACKAGE.equals(component.getPackageName())
+                && SANDBOX_ACTIVITY.equals(component.getClassName());
+    }
+
+    @Override
+    public boolean isTopAppLocked(ActivityManager.RecentTaskInfo rti, int topUserId) {
+        rti.isTopAppLocked = false;
+        if (mCheckRecentTasks) {
+            ComponentName component = rti.baseIntent.getComponent();
+            String packageName;
+            int uid = topUserId;
+            if (component != null) {
+                packageName = component.getPackageName();
+            } else {
+                packageName = "";
+                uid = 0;
+            }
+
+            long identity = Binder.clearCallingIdentity();
+            try {
+                int userId = UserHandle.getUserId(uid);
+                if (isSandboxActivity(component)) {
+                    rti.isTopAppLocked = true;
+                } else {
+                    if (mAppControlController.isAppLocked(packageName)) {
+                        if (mLockBehavior == LOCK_BEHAVIOR_ON_LEAVE
+                                && mUnlockedApps.contains(sessionKey(userId, packageName))) {
+                            rti.isTopAppLocked = false;
+                        } else {
+                            rti.isTopAppLocked = true;
+                        }
+                    }
+                }
+            } finally {
+                Binder.restoreCallingIdentity(identity);
+            }
+        }
+        return rti.isTopAppLocked;
+    }
+
+    @Override
+    public void getRecentTasksCheck(int callingUid, int userId) {
+        mCheckRecentTasks = callingUid != 1000 && mAtms.mWindowManager.isKeyguardSecure(userId);
+    }
+
+    @Override
+    public void setKeyguardDoneLocked(boolean done) {
+        try {
+            if (done) {
+                mKeyguardDone = true;
+                mAtms.mWindowManager.getDefaultDisplayContentLocked()
+                        .getDefaultTaskDisplayArea().forAllTasks(this::addVisibleTaskToUnlocked);
+            } else {
+                mKeyguardDone = false;
+
+                if (mLockBehavior == LOCK_BEHAVIOR_TIMEOUT && mLastFocusedAppKey != null) {
+                    scheduleTimeoutLock(mLastFocusedAppKey);
+                }
+
+                if (mLockBehavior == LOCK_BEHAVIOR_ON_SCREEN_OFF) {
+                    lockAllSessionsAndNotify();
+                }
+            }
+        } catch (Exception e) {
+            Slog.w(TAG, "setKeyguardDoneLocked: failed", e);
+            mKeyguardDone = done;
+        }
+    }
+
+    @Override
+    public void onAppFocusChanged(ActivityRecord newFocus, Task newTask) {
+        if (!hasLockedPackages()) {
+            mLastFocusedAppKey = null;
+            return;
+        }
+
+        String newKey = (newFocus != null) ? sessionKey(newFocus) : null;
+
+        if (mLastFocusedAppKey != null && !mLastFocusedAppKey.equals(newKey)) {
+            scheduleTimeoutLock(mLastFocusedAppKey);
+            if (mLockBehavior == LOCK_BEHAVIOR_ON_LEAVE
+                    && mUnlockedApps.contains(mLastFocusedAppKey)) {
+                int colon = mLastFocusedAppKey.indexOf(':');
+                if (colon > 0 && colon < mLastFocusedAppKey.length() - 1) {
+                    try {
+                        int oldUserId = Integer.parseInt(
+                                mLastFocusedAppKey.substring(0, colon));
+                        String oldPkg = mLastFocusedAppKey.substring(colon + 1);
+                        markSessionLocked(oldPkg, oldUserId);
+                    } catch (NumberFormatException ignored) { }
+                }
+            }
+        }
+
+        if (newKey != null) {
+            cancelTimeoutLock(newKey);
+            mUnlockTimestamps.put(newKey, SystemClock.elapsedRealtime());
+        }
+
+        mLastFocusedAppKey = newKey;
+        lockTopApp(newTask, "onAppFocusChanged");
+    }
+
+    @Override
+    public void onWindowingModeChanged(Task task, int prevWindowingMode) {
+        if (task == null || mLockBehavior != LOCK_BEHAVIOR_ON_LEAVE) {
+            return;
+        }
+
+        int currMode = task.getWindowingMode();
+
+        if (!WindowConfiguration.isFloating(prevWindowingMode)
+                && WindowConfiguration.isFloating(currMode) && task.isVisible()) {
+            ActivityRecord r = task.topRunningActivityLocked();
+            if (isAppLocked(r)) {
+                markSessionUnlocked(r.packageName, r.mUserId);
+            }
+            return;
+        }
+
+        if (mUnlockedApps.size() > 0) {
+            if ((!WindowConfiguration.inMultiWindowMode(prevWindowingMode)
+                    && !WindowConfiguration.isFloating(prevWindowingMode))
+                    || WindowConfiguration.inMultiWindowMode(currMode)
+                    || WindowConfiguration.isFloating(currMode)) {
+                return;
+            }
+
+            ActivityRecord r = task.topRunningActivityLocked();
+            if (task.isVisible()) {
+                if (currMode == WindowConfiguration.WINDOWING_MODE_FULLSCREEN) {
+                    if (r != null) {
+                        clearUnlockedApp(r);
+                    } else {
+                        clearUnlockedApp();
+                    }
+                }
+            } else {
+                if (r != null) {
+                    markSessionLocked(r.packageName, r.mUserId);
+                }
+                ActivityRecord lastPaused = task.mLastPausedActivity;
+                if (lastPaused != null) {
+                    markSessionLocked(lastPaused.packageName, lastPaused.mUserId);
+                }
+                ComponentName realActivity = task.realActivity;
+                if (realActivity != null) {
+                    markSessionLocked(realActivity.getPackageName(), task.effectiveUid);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void clearUnlockedApp() {
+        boolean tracksUnlockSession = mLockBehavior == LOCK_BEHAVIOR_ON_LEAVE;
+        if (!tracksUnlockSession || mUnlockedApps.size() <= 0) {
+            return;
+        }
+        int size = mUnlockedApps.size();
+        lockAllSessionsAndNotify();
+        lockVisibleMultiWindowApps(mAtms.mWindowManager.getDefaultDisplayContentLocked());
+        Slog.d(TAG, "clearUnlockedApp: size=" + size);
+    }
+
+    @Override
+    public void clearUnlockedApp(ActivityRecord r) {
+        if (r == null || mLockBehavior != LOCK_BEHAVIOR_ON_LEAVE) {
+            return;
+        }
+
+        if (r.occludesParent() || r.isActivityTypeHomeOrRecents()) {
+            if (r.isActivityTypeHomeOrRecents() && r.mTransitionController.isTransientLaunch(r)) {
+                return;
+            }
+            boolean wasUnlocked = mUnlockedApps.contains(sessionKey(r));
+            clearUnlockedApp();
+            if (wasUnlocked) {
+                markSessionUnlocked(r.packageName, r.mUserId);
+            } else {
+                markSessionLocked(r.packageName, r.mUserId);
+            }
+            if (WindowConfiguration.isFloating(r.getWindowingMode())) {
+                lockVisibleFullscreenApps(mAtms.mWindowManager.getDefaultDisplayContentLocked());
+            }
+        }
+    }
+
+    @Override
+    public void removeTask(Task task, String reason) {
+        if (task == null || !"remove-task".equals(reason)
+                || mLockBehavior != LOCK_BEHAVIOR_ON_LEAVE || mUnlockedApps.size() <= 0) {
+            return;
+        }
+
+        if (WindowConfiguration.inMultiWindowMode(task.getWindowingMode())
+                || WindowConfiguration.isFloating(task.getWindowingMode())) {
+            ActivityRecord r = task.topRunningActivityLocked();
+            if (r != null) {
+                markSessionLocked(r.packageName, r.mUserId);
+            }
+            ActivityRecord lastPaused = task.mLastPausedActivity;
+            if (lastPaused != null) {
+                markSessionLocked(lastPaused.packageName, lastPaused.mUserId);
+            }
+            ComponentName realActivity = task.realActivity;
+            if (realActivity != null) {
+                markSessionLocked(realActivity.getPackageName(), task.effectiveUid);
+            }
+        }
+    }
+
+    @Override
+    public void onAppDied(String packageName, int userId) {
+        if (SANDBOX_PACKAGE.equals(packageName)) {
+            synchronized (mPendingUnlocks) {
+                if (!mPendingUnlocks.isEmpty()) {
+                    Slog.d(TAG, "onAppDied: clearing " + mPendingUnlocks.size() + " pending unlocks");
+                    mPendingUnlocks.clear();
+                }
+            }
+            return;
+        }
+        if (mLockBehavior == LOCK_BEHAVIOR_ON_KILL) {
+            markSessionLocked(packageName, userId);
+        }
+    }
+
+    private static String sessionKey(int userId, String packageName) {
+        return userId + ":" + packageName;
+    }
+
+    private static String sessionKey(ActivityRecord r) {
+        return sessionKey(r.mUserId, r.packageName);
+    }
+
+    private boolean hasLockedPackages() {
+        return mAppControlController != null && mAppControlController.hasLockedPackages();
+    }
+
+    private void markSessionUnlocked(String packageName, int userId) {
+        String key = sessionKey(userId, packageName);
+        if (mUnlockedApps.add(key)) {
+            mUnlockTimestamps.put(key, SystemClock.elapsedRealtime());
+            Slog.d(TAG, "markSessionUnlocked: " + packageName + " userId=" + userId);
+            notifyAppUnlocked(packageName, userId);
+        }
+    }
+
+    private void notifyAppUnlocked(String packageName, int userId) {
+        final int count = mAppSessionListeners.beginBroadcast();
+        for (int i = 0; i < count; i++) {
+            try {
+                mAppSessionListeners.getBroadcastItem(i).onAppUnlocked(packageName, userId);
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Failed to notify app session listener", e);
+            }
+        }
+        mAppSessionListeners.finishBroadcast();
+    }
+
+    private void markSessionLocked(String packageName, int userId) {
+        String key = sessionKey(userId, packageName);
+        if (mUnlockedApps.remove(key)) {
+            mUnlockTimestamps.remove(key);
+            cancelTimeoutLock(key);
+            Slog.d(TAG, "markSessionLocked: " + packageName + " userId=" + userId);
+            notifyAppLocked(packageName, userId);
+        }
+    }
+
+    private void notifyAppLocked(String packageName, int userId) {
+        final int count = mAppSessionListeners.beginBroadcast();
+        for (int i = 0; i < count; i++) {
+            try {
+                mAppSessionListeners.getBroadcastItem(i).onAppLocked(packageName, userId);
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Failed to notify app session listener (locked)", e);
+            }
+        }
+        mAppSessionListeners.finishBroadcast();
+    }
+
+    private void lockAllSessionsAndNotify() {
+        if (mUnlockedApps.isEmpty()) return;
+        String[] keys = mUnlockedApps.toArray(new String[0]);
+        mUnlockedApps.clear();
+        mUnlockTimestamps.clear();
+        clearAllTimeouts();
+        for (String key : keys) {
+            int colon = key.indexOf(':');
+            if (colon <= 0 || colon >= key.length() - 1) continue;
+            try {
+                int userId = Integer.parseInt(key.substring(0, colon));
+                String pkg = key.substring(colon + 1);
+                notifyAppLocked(pkg, userId);
+            } catch (NumberFormatException ignored) { }
+        }
+    }
+
+    private void scheduleTimeoutLock(String key) {
+        if (mLockBehavior != LOCK_BEHAVIOR_TIMEOUT || !mUnlockedApps.contains(key)) {
+            return;
+        }
+
+        cancelTimeoutLock(key);
+
+        Runnable r = () -> {
+            synchronized (mAtms.mGlobalLock) {
+                ActivityRecord top = mAtms.mRootWindowContainer.getTopResumedActivity();
+                String topKey = (top != null) ? sessionKey(top) : null;
+
+                if (!key.equals(topKey)) {
+                    int index = key.indexOf(":");
+                    if (index != -1) {
+                        try {
+                            int userId = Integer.parseInt(key.substring(0, index));
+                            String packageName = key.substring(index + 1);
+                            markSessionLocked(packageName, userId);
+                        } catch (NumberFormatException ignored) {}
+                    }
+                }
+                mTimeoutRunnables.remove(key);
+            }
+        };
+
+        mTimeoutRunnables.put(key, r);
+        mAtms.mH.postDelayed(r, mLockTimeout * 1000L);
+    }
+
+    private void cancelTimeoutLock(String key) {
+        Runnable r = mTimeoutRunnables.remove(key);
+        if (r != null) {
+            mAtms.mH.removeCallbacks(r);
+        }
+    }
+
+    private void clearAllTimeouts() {
+        for (Runnable r : mTimeoutRunnables.values()) {
+            mAtms.mH.removeCallbacks(r);
+        }
+        mTimeoutRunnables.clear();
+    }
+
+    private void broadcastPackageChanged(String packageName) {
+        final long token = Binder.clearCallingIdentity();
+        try {
+            int uid = getPackageUid(packageName);
+            int userId = uid >= 0 ? UserHandle.getUserId(uid) : mCurrentUserId;
+
+            Intent intent = new Intent(Intent.ACTION_PACKAGE_CHANGED);
+            intent.setData(Uri.fromParts("package", packageName, null));
+            intent.putExtra(Intent.EXTRA_UID, uid);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
+            String[] components = { packageName };
+            intent.putExtra(Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST, components);
+
+            mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));
+            Slog.d(TAG, "broadcastPackageChanged: " + packageName);
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to broadcast package change for " + packageName, e);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    private void notifyAppLockStateChanged(String packageName, boolean locked) {
+        final int count = mAppLockStateListeners.beginBroadcast();
+        for (int i = 0; i < count; i++) {
+            try {
+                mAppLockStateListeners.getBroadcastItem(i).onAppLockStateChanged(packageName, locked);
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Failed to notify app lock state listener", e);
+            }
+        }
+        mAppLockStateListeners.finishBroadcast();
+    }
+
+    private void lockVisibleTask(Task task) {
+        if (task.isLeafTask() && task.shouldBeVisible(null) && isAppLocked(task.topRunningActivityLocked())) {
+            lockTopApp(task, "setKeyguardDone");
+        }
+    }
+
+    private void addVisibleTaskToUnlocked(Task task) {
+        if (task.isLeafTask() && task.isVisible()) {
+            ActivityRecord r = task.topRunningActivityLocked();
+            if (isAppLocked(r)) {
+                lockVisibleTask(task);
+                Slog.d(TAG, "addVisibleTaskToUnlocked: should be locked pkg: " + r.packageName + " userId=" + r.mUserId);
+            }
+        }
+    }
+
+    private void lockVisibleMultiWindowApps(DisplayContent dc) {
+        if (dc == null) {
+            dc = mAtms.mWindowManager.getDefaultDisplayContentLocked();
+        }
+        dc.getDefaultTaskDisplayArea().forAllTasks(task -> {
+            if (task.isLeafTask()
+                    && (WindowConfiguration.inMultiWindowMode(task.getWindowingMode())
+                            || WindowConfiguration.isFloating(task.getWindowingMode()))
+                    && task.isVisible()) {
+                ActivityRecord r = task.topRunningActivityLocked();
+                if (isAppLocked(r)) {
+                    markSessionUnlocked(r.packageName, r.mUserId);
+                }
+            }
+        });
+    }
+
+    private void lockVisibleFullscreenApps(DisplayContent dc) {
+        if (dc == null) {
+            dc = mAtms.mWindowManager.getDefaultDisplayContentLocked();
+        }
+        dc.getDefaultTaskDisplayArea().forAllTasks(task -> {
+            if (task.isLeafTask() && task.getWindowingMode() == WindowConfiguration.WINDOWING_MODE_FULLSCREEN
+                    && task.isVisible()) {
+                ActivityRecord r = task.topRunningActivityLocked();
+                if (isAppLocked(r)) {
+                    markSessionUnlocked(r.packageName, r.mUserId);
+                }
+            }
+        });
+    }
+
+    private void abortAnimation(ActivityRecord r) {
+        if (r == null) return;
+        try {
+            if (r.getOptions() != null && r.getOptions().getRemoteAnimationAdapter() != null) {
+                r.getOptions().getRemoteAnimationAdapter().getRunner().onAnimationCancelled();
+            }
+        } catch (Exception e) {
+            Slog.w(TAG, "abortAnimation failed for " + r, e);
+        }
+        r.abortAndClearOptionsAnimation();
+    }
+
+    private int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+            Intent intent, String resolvedType, IBinder resultTo, String resultWho,
+            int requestCode) {
+        return mAtms.getActivityStartController()
+                .obtainStarter(intent, "startActivityAsCaller")
+                .setCaller(caller)
+                .setCallingPackage(callingPackage)
+                .setResolvedType(resolvedType)
+                .setResultTo(resultTo)
+                .setResultWho(resultWho)
+                .setRequestCode(requestCode)
+                .execute();
+    }
+
+    private int getPackageUid(String packageName) {
+        try {
+            return mContext.getPackageManager()
+                    .getApplicationInfo(packageName, 0).uid;
+        } catch (PackageManager.NameNotFoundException e) {
+            return -1;
+        }
+    }
+
+    public boolean isAppLockerActivity(ComponentName componentName) {
+        return componentName != null &&
+               SANDBOX_PACKAGE.equals(componentName.getPackageName()) &&
+               SANDBOX_ACTIVITY.equals(componentName.getClassName());
+    }
+    @Override
+    public String getFileVaultPath() {
+        File vaultDir = new File(Environment.getDataSystemCeDirectory(UserHandle.getCallingUserId()), "sandbox/vault");
+        if (!vaultDir.exists()) {
+            vaultDir.mkdirs();
+            try {
+                Os.chmod(vaultDir.getPath(), 0700);
+            } catch (Exception e) {
+                Slog.e(TAG, "Failed to set vault permissions", e);
+            }
+        }
+        return vaultDir.getAbsolutePath();
+    }
+}
diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
index 70f075658df45..6828d3be3c45a 100644
--- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java
+++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
@@ -20,6 +20,7 @@
 
 import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_SYNC_ENGINE;
 import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION;
+import static android.view.WindowManager.TRANSIT_TO_FRONT;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -207,9 +208,14 @@ private boolean tryFinish() {
             for (int i = mRootMembers.size() - 1; i >= 0; --i) {
                 final WindowContainer wc = mRootMembers.valueAt(i);
                 if (!wc.isSyncFinished(this)) {
-                    ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d:  Unfinished container: %s",
-                            mSyncId, wc);
-                    return false;
+                    if(canIgnoreFromRecents(wc)){
+                        //if wallpaper has drawn, ignore unfinished container when window is animating by recents.
+                        Slog.w(TAG, "Sync group " + mSyncId + " ignoring " + wc + "when wallpaper has drawn");
+                    } else {
+                        ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "SyncGroup %d:  Unfinished container: %s",
+                                mSyncId, wc);
+                        return false;
+                    }
                 }
             }
             finishNow();
@@ -427,6 +433,10 @@ private void onTimeout() {
                                     .mUnknownAppVisibilityController.getDebugMessage());
                         }
                     });
+                    ActivityRecord r = wc.asActivityRecord();
+                    if (r != null) {
+                        r.checkSyncTimeout(this);
+                    }
                 }
             }
 
@@ -656,4 +666,17 @@ boolean hasPendingSyncSets() {
     void addOnIdleListener(Runnable onIdleListener) {
         mOnIdleListeners.add(onIdleListener);
     }
+
+    /** @return {@code true} if wallpaper has drawn when window is animating by recents.*/
+    private boolean canIgnoreFromRecents(WindowContainer wc){
+
+        if(wc.asActivityRecord() != null && wc.getDisplayContent() != null
+            && wc.asActivityRecord().isActivityTypeHomeOrRecents()
+            && mWm.mAtmService.getTransitionController().getCollectingTransitionType() == TRANSIT_TO_FRONT
+            && wc.getDisplayContent().mWallpaperController.wallpaperTransitionReady()
+            && wc.getDisplayContent().mWallpaperController.getTopVisibleWallpaper() != null){
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/services/core/java/com/android/server/wm/BlurController.java b/services/core/java/com/android/server/wm/BlurController.java
index 3ef31acd8365d..886ff6ca44a21 100644
--- a/services/core/java/com/android/server/wm/BlurController.java
+++ b/services/core/java/com/android/server/wm/BlurController.java
@@ -16,7 +16,6 @@
 
 package com.android.server.wm;
 
-import static android.os.PowerManager.THERMAL_STATUS_SEVERE;
 import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
 
 import android.content.BroadcastReceiver;
@@ -46,7 +45,6 @@ final class BlurController {
     private final Object mLock = new Object();
     private volatile boolean mBlurEnabled;
     private boolean mInPowerSaveMode;
-    private boolean mDisabledByThermal;
     private boolean mBlurDisabledSetting;
     private boolean mTunnelModeEnabled = false;
 
@@ -91,12 +89,6 @@ public void onChange(boolean selfChange) {
                 });
         mBlurDisabledSetting = getBlurDisabledSetting();
 
-        powerManager.addThermalStatusListener((status) -> {
-            mDisabledByThermal = status >= THERMAL_STATUS_SEVERE;
-            updateBlurEnabled();
-        });
-        mDisabledByThermal = powerManager.getCurrentThermalStatus() >= THERMAL_STATUS_SEVERE;
-
         TunnelModeEnabledListener.register(mTunnelModeListener);
 
         updateBlurEnabled();
@@ -120,7 +112,7 @@ boolean getBlurEnabled() {
     private void updateBlurEnabled() {
         synchronized (mLock) {
             final boolean newEnabled = CROSS_WINDOW_BLUR_SUPPORTED && !mBlurDisabledSetting
-                    && !mInPowerSaveMode && !mTunnelModeEnabled && !mDisabledByThermal;
+                    && !mInPowerSaveMode && !mTunnelModeEnabled;
             if (mBlurEnabled == newEnabled) {
                 return;
             }
@@ -144,7 +136,8 @@ private void notifyBlurEnabledChangedLocked(boolean enabled) {
     }
 
     private boolean getBlurDisabledSetting() {
+        boolean blurEnabledByDefault = android.os.SystemProperties.getBoolean("ro.custom.blur.enable", false);
         return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DISABLE_WINDOW_BLURS, 0) == 1;
+                Settings.Global.DISABLE_WINDOW_BLURS, blurEnabledByDefault ? 0 : 1) == 1;
     }
 }
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 27427724f0c3e..701ec2a2c3401 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -130,6 +130,7 @@
 import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_SLEEP_TOKEN;
 import static com.android.internal.protolog.WmProtoLogGroups.WM_SHOW_TRANSACTIONS;
 import static com.android.internal.util.LatencyTracker.ACTION_ROTATE_SCREEN;
+import static com.android.server.display.LMOFreeformDisplayAdapter.UNIQUE_ID_PREFIX;
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM;
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT;
 import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
@@ -563,6 +564,8 @@ public void onIdMatch(InsetsSource source1, InsetsSource source2) {
     // TODO(multi-display): remove some of the usages.
     boolean isDefaultDisplay;
 
+    private boolean isFreeformDisplay;
+
     /** Save allocating when calculating rects */
     private final Rect mTmpRect = new Rect();
     private final Region mTmpRegion = new Region();
@@ -796,6 +799,8 @@ public void onIdMatch(InsetsSource source1, InsetsSource source2) {
     /** Last window to hold the screen locked. */
     private WindowState mLastWakeLockHoldingWindow;
 
+    private boolean mHasSecureContent;
+
     /**
      * Whether display is allowed to ignore all activity size restrictions.
      * @see #isDisplayIgnoreActivitySizeRestrictions
@@ -1107,7 +1112,11 @@ public void onIdMatch(InsetsSource source1, InsetsSource source2) {
 
         final ActivityRecord activity = w.mActivityRecord;
         if (activity != null && activity.isVisibleRequested()) {
-            activity.updateLetterboxSurfaceIfNeeded(w);
+            final int type = w.mAttrs.type;
+            if (!w.mAnimatingExit
+                    && (type == TYPE_BASE_APPLICATION || type == TYPE_APPLICATION_STARTING)) {
+                activity.updateLetterboxSurfaceIfNeeded(w);
+            }
             final boolean updateAllDrawn = activity.updateDrawnWindowStates(w);
             if (updateAllDrawn && !mTmpUpdateAllDrawn.contains(activity)) {
                 mTmpUpdateAllDrawn.add(activity);
@@ -1169,6 +1178,7 @@ public void onLowMemory() {
         mSystemGestureExclusionLimit = mWmService.mConstants.mSystemGestureExclusionLimitDp
                 * mDisplayMetrics.densityDpi / DENSITY_DEFAULT;
         isDefaultDisplay = mDisplayId == DEFAULT_DISPLAY;
+        isFreeformDisplay = mDisplayInfo.uniqueId.startsWith(UNIQUE_ID_PREFIX);
         mInsetsStateController = new InsetsStateController(this);
         initializeDisplayBaseInfo();
         mDisplayFrames = new DisplayFrames(mInsetsStateController.getRawInsetsState(),
@@ -2147,7 +2157,9 @@ void continueUpdateOrientationForDiffOrienLaunchingApp() {
             return;
         }
         // The orientation of display is not changed.
-        clearFixedRotationLaunchingApp();
+        if (!mTransitionController.isCollecting(this)) {
+            clearFixedRotationLaunchingApp();
+        }
     }
 
     /**
@@ -4142,6 +4154,11 @@ boolean setFocusedApp(ActivityRecord newFocus) {
             if (newTask != null) newTask.onAppFocusChanged(true);
         }
 
+        if (mDisplayId == DEFAULT_DISPLAY && newFocus != null) {
+            AxSandboxService.get().onAppFocusChanged(newFocus, newTask);
+            GameSpaceService.get().onAppFocusChanged(newFocus, newTask);
+        }
+
         getInputMonitor().setFocusedAppLw(newFocus);
         return true;
     }
@@ -4362,6 +4379,11 @@ InsetsControlTarget getImeControlTarget() {
         return mWmService.mDisplayWindowSettings.getImePolicyLocked(this);
     }
 
+    boolean forceDesktopMode() {
+        return ("VNC".equals(mDisplay.getName()) || mWmService.mForceDesktopModeOnExternalDisplays)
+            && !isDefaultDisplay && !isFreeformDisplay && !isPrivate();
+    }
+
     /** @see WindowManagerInternal#onToggleImeRequested */
     void onShowImeRequested() {
         if (mInputMethodWindow == null) {
@@ -5151,6 +5173,11 @@ boolean isInputMethodClientFocus(int uid, int pid) {
         return imeLayeringTarget.mSession.mUid == uid && imeLayeringTarget.mSession.mPid == pid;
     }
 
+    boolean hasSecureWindowOnScreen() {
+        final WindowState win = getWindow(w -> w.isOnScreen() && w.isSecureLocked());
+        return win != null;
+    }
+
     // TODO: Super unexpected long method that should be broken down...
     void applySurfaceChangesTransaction() {
         final WindowSurfacePlacer surfacePlacer = mWmService.mWindowPlacerLocked;
@@ -5286,6 +5313,13 @@ private void performLayoutNoTrace(boolean initial, boolean updateInputWindows) {
         if (updateInputWindows) {
             mInputMonitor.updateInputWindowsLw(false /*force*/);
         }
+
+        // Notify if display added or removed a secure window
+        final boolean hasSecureContent = hasSecureWindowOnScreen();
+        if (hasSecureContent != mHasSecureContent) {
+            mHasSecureContent = hasSecureContent;
+            mWmService.notifyDisplaySecureContentChange(mDisplayId, hasSecureContent);
+        }
     }
 
     /**
@@ -5780,7 +5814,7 @@ && isPublicSecondaryDisplayWithDesktopModeForceEnabled()) {
      * also check {@link #isSystemDecorationsSupported()} to avoid breaking any security policy.
      */
     boolean isPublicSecondaryDisplayWithDesktopModeForceEnabled() {
-        if (!mWmService.mForceDesktopModeOnExternalDisplays || isDefaultDisplay || isPrivate()) {
+        if (!mWmService.mForceDesktopModeOnExternalDisplays || isDefaultDisplay || isPrivate() && !isFreeformDisplay) {
             return false;
         }
         if (!isWindowingModeSupported(WINDOWING_MODE_FREEFORM)) {
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 66f47d7b46be1..8ce8b8cf57e69 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -106,10 +106,12 @@
 import android.os.SystemProperties;
 import android.os.Trace;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Slog;
 import android.util.SparseArray;
+import android.view.Display;
 import android.view.DisplayInfo;
 import android.view.InsetsFlags;
 import android.view.InsetsFrameProvider;
@@ -138,6 +140,7 @@
 import com.android.internal.policy.GestureNavigationSettingsObserver;
 import com.android.internal.protolog.ProtoLog;
 import com.android.internal.statusbar.LetterboxDetails;
+import com.android.internal.util.matrixx.Utils;
 import com.android.internal.util.function.TriFunction;
 import com.android.internal.view.AppearanceRegion;
 import com.android.internal.widget.PointerLocationView;
@@ -256,7 +259,7 @@ UiModeManagerInternal getUiModeManagerInternal() {
 
     private volatile boolean mHasStatusBar;
     private volatile boolean mHasNavigationBar;
-    private volatile boolean mForceNavbar;
+    private volatile boolean mTaskBarEnabled;
     // Can the navigation bar ever move to the side?
     private volatile boolean mNavigationBarCanMove;
     private volatile boolean mNavigationBarAlwaysShowOnSideGesture;
@@ -420,6 +423,8 @@ UiModeManagerInternal getUiModeManagerInternal() {
     private final ForceShowNavBarSettingsObserver mForceShowNavBarSettingsObserver;
     private boolean mForceShowNavigationBarEnabled;
 
+    private volatile boolean mGamingGestureLocked;
+
     private class PolicyHandler extends Handler {
 
         PolicyHandler(Looper looper) {
@@ -447,6 +452,9 @@ public SettingsObserver(Handler handler) {
             resolver.registerContentObserver(LineageSettings.System.getUriFor(
                     LineageSettings.System.FORCE_SHOW_NAVBAR), false, this,
                     UserHandle.USER_ALL);
+            resolver.registerContentObserver(LineageSettings.System.getUriFor(
+                    LineageSettings.System.ENABLE_TASKBAR), false, this,
+                    UserHandle.USER_ALL);
 
             updateSettings();
         }
@@ -515,6 +523,9 @@ private Insets getControllableInsets(WindowState win) {
 
                 @Override
                 public void onSwipeFromTop() {
+                    if (isGamingGestureLocked()) {
+                        return;
+                    }
                     synchronized (mLock) {
                         requestTransientBars(mTopGestureHost,
                                 getControllableInsets(mTopGestureHost).top > 0);
@@ -523,6 +534,9 @@ public void onSwipeFromTop() {
 
                 @Override
                 public void onSwipeFromBottom() {
+                    if (isGamingGestureLocked()) {
+                        return;
+                    }
                     synchronized (mLock) {
                         requestTransientBars(mBottomGestureHost,
                                 getControllableInsets(mBottomGestureHost).bottom > 0);
@@ -530,12 +544,18 @@ public void onSwipeFromBottom() {
                 }
 
                 private boolean allowsSideSwipe(Region excludedRegion) {
+                    if (isGamingGestureLocked()) {
+                        return false;
+                    }
                     return mNavigationBarAlwaysShowOnSideGesture
                             && !mSystemGestures.currentGestureStartedInRegion(excludedRegion);
                 }
 
                 @Override
                 public void onSwipeFromRight() {
+                    if (isGamingGestureLocked()) {
+                        return;
+                    }
                     final Region excludedRegion = Region.obtain();
                     synchronized (mLock) {
                         mDisplayContent.calculateSystemGestureExclusion(
@@ -551,6 +571,9 @@ public void onSwipeFromRight() {
 
                 @Override
                 public void onSwipeFromLeft() {
+                    if (isGamingGestureLocked()) {
+                        return;
+                    }
                     final Region excludedRegion = Region.obtain();
                     synchronized (mLock) {
                         mDisplayContent.calculateSystemGestureExclusion(
@@ -572,6 +595,32 @@ public void onFling(int duration) {
                     }
                 }
 
+                @Override
+                public void onVerticalFling(int duration) {
+                    if (mService.mPowerManagerInternal != null) {
+                        mService.mPowerManagerInternal.setPowerBoost(
+                                Boost.INTERACTION, duration);
+                    }
+                }
+
+                @Override
+                public void onHorizontalFling(int duration) {
+                    if (mService.mPowerManagerInternal != null) {
+                        mService.mPowerManagerInternal.setPowerBoost(
+                                Boost.INTERACTION, duration);
+                    }
+                }
+
+                @Override
+                public void onScroll(boolean started) {
+                    if (mService.mPowerManagerInternal != null) {
+                        if (started) {
+                            mService.mPowerManagerInternal.setPowerBoost(
+                                    Boost.INTERACTION, 700);
+                        }
+                    }
+                }
+
                 @Override
                 public void onDebug() {
                     // no-op
@@ -701,19 +750,10 @@ public void onAppTransitionFinishedLocked(IBinder token) {
 
         if (mDisplayContent.isDefaultDisplay) {
             mHasStatusBar = true;
-            mHasNavigationBar = mContext.getResources().getBoolean(R.bool.config_showNavigationBar);
-
-            // Allow a system property to override this. Used by the emulator.
-            // See also hasNavigationBar().
-            String navBarOverride = SystemProperties.get("qemu.hw.mainkeys");
-            if ("1".equals(navBarOverride)) {
-                mHasNavigationBar = false;
-            } else if ("0".equals(navBarOverride)) {
-                mHasNavigationBar = true;
-            }
 
             // Register content observer only for main display
             mSettingsObserver = new SettingsObserver(mHandler);
+            updateSettings();
         } else {
             mHasStatusBar = false;
             mHasNavigationBar = mDisplayContent.isSystemDecorationsSupported();
@@ -741,6 +781,20 @@ public void onAppTransitionFinishedLocked(IBinder token) {
         mForceShowNavBarSettingsObserver.setOnChangeRunnable(this::updateForceShowNavBarSettings);
         mForceShowNavigationBarEnabled = mForceShowNavBarSettingsObserver.isEnabled();
         mHandler.post(mForceShowNavBarSettingsObserver::register);
+
+        ContentResolver resolver = mContext.getContentResolver();
+        mGamingGestureLocked = Settings.Secure.getIntForUser(resolver,
+                "ax_gaming_gesture_lock", 0, UserHandle.USER_CURRENT) == 1;
+        ContentObserver gestureLockObserver = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange) {
+                mGamingGestureLocked = Settings.Secure.getIntForUser(
+                        mContext.getContentResolver(),
+                        "ax_gaming_gesture_lock", 0, UserHandle.USER_CURRENT) == 1;
+            }
+        };
+        resolver.registerContentObserver(Settings.Secure.getUriFor(
+                "ax_gaming_gesture_lock"), false, gestureLockObserver, UserHandle.USER_ALL);
     }
 
     private void updateForceShowNavBarSettings() {
@@ -763,9 +817,16 @@ void systemReady() {
     public void updateSettings() {
         ContentResolver resolver = mContext.getContentResolver();
 
-        mForceNavbar = LineageSettings.System.getIntForUser(resolver,
-                LineageSettings.System.FORCE_SHOW_NAVBAR, 0,
-                UserHandle.USER_CURRENT) == 1;
+        mHasNavigationBar = LineageSettings.System.getIntForUser(resolver,
+                LineageSettings.System.FORCE_SHOW_NAVBAR, Utils.hasNavbarByDefault(mContext) ? 1 : 0,
+                UserHandle.USER_CURRENT) != 0;
+        mTaskBarEnabled = LineageSettings.System.getIntForUser(resolver,
+                LineageSettings.System.ENABLE_TASKBAR, isTablet() ? 1 : 0,
+                UserHandle.USER_CURRENT) != 0;
+    }
+    
+    private boolean isTablet() {
+        return getCurrentUserResources().getConfiguration().smallestScreenWidthDp >= 600;
     }
 
     private int getDisplayId() {
@@ -815,8 +876,12 @@ public int getDockMode() {
         return mDockMode;
     }
 
+    public boolean isGamingGestureLocked() {
+        return mGamingGestureLocked;
+    }
+
     public boolean hasNavigationBar() {
-        return mHasNavigationBar || mForceNavbar;
+        return mHasNavigationBar;
     }
 
     void updateHasNavigationBarIfNeeded() {
@@ -1572,7 +1637,7 @@ public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams
 
         // Check if the freeform window overlaps with the navigation bar area.
         if (!mIsFreeformWindowOverlappingWithNavBar && win.inFreeformWindowingMode()
-                && win.mActivityRecord != null && isOverlappingWithNavBar(win)) {
+                && win.mActivityRecord != null && win.isOverlappingWithNavBar()) {
             mIsFreeformWindowOverlappingWithNavBar = true;
         }
 
@@ -1687,7 +1752,8 @@ && fillsDisplayWindowingMode(win)) {
             // mode; if it's in gesture navigation mode, the navigation bar will be
             // NAV_BAR_FORCE_TRANSPARENT and its appearance won't be decided by overlapping
             // windows.
-            if (isOverlappingWithNavBar(win)) {
+            if ((mNavBarColorWindowCandidate == null || mNavBarBackgroundWindowCandidate == null)
+                    && win.isOverlappingWithNavBar()) {
                 if (mNavBarColorWindowCandidate == null) {
                     mNavBarColorWindowCandidate = win;
                     addSystemBarColorApp(win);
@@ -1720,7 +1786,7 @@ && addStatusBarAppearanceRegionsForDimmingWindow(
                     addSystemBarColorApp(win);
                 }
             }
-            if (isOverlappingWithNavBar(win) && mNavBarColorWindowCandidate == null) {
+            if (win.isOverlappingWithNavBar() && mNavBarColorWindowCandidate == null) {
                 mNavBarColorWindowCandidate = win;
                 addSystemBarColorApp(win);
             }
@@ -1913,10 +1979,12 @@ public void onConfigurationChanged() {
                 R.bool.config_remoteInsetsControllerControlsSystemBars);
 
         updateConfigurationAndScreenSizeDependentBehaviors();
+        
+        final boolean isMobileTaskbarEnabled = !isTablet() && mTaskBarEnabled;
 
         final boolean shouldAttach =
                 res.getBoolean(R.bool.config_attachNavBarToAppDuringTransition)
-                        && !Flags.enableTinyTaskbar();
+                        && !isMobileTaskbarEnabled;
         if (mShouldAttachNavBarToAppDuringTransition != shouldAttach) {
             mShouldAttachNavBarToAppDuringTransition = shouldAttach;
         }
@@ -2416,6 +2484,9 @@ void requestTransientBars(WindowState swipeTarget, boolean isGestureOnSystemBar)
         if (CLIENT_TRANSIENT) {
             return;
         }
+        if (isGamingGestureLocked()) {
+            return;
+        }
         if (swipeTarget == null || !mService.mPolicy.isUserSetupComplete()) {
             // Swipe-up for navigation bar is disabled during setup
             return;
@@ -2880,8 +2951,9 @@ private Rect getBarContentFrameForWindow(WindowState win, @InsetsType int type)
         final Rect df = displayFrames.mUnrestricted;
         final Rect safe = sTmpDisplayCutoutSafe;
         final Insets waterfallInsets = state.getDisplayCutout().getWaterfallInsets();
-        final Rect outRect = new Rect();
+        final Rect outRect = sTmpRect2;
         final Rect sourceContent = sTmpRect;
+        outRect.setEmpty();
         safe.set(displayFrames.mDisplayCutoutSafe);
         for (int i = state.sourceSize() - 1; i >= 0; i--) {
             final InsetsSource source = state.sourceAt(i);
@@ -2949,6 +3021,9 @@ private int configureStatusBarOpacity(int appearance) {
             final WindowState window = mStatusBarBackgroundWindows.get(i);
             drawBackground &= drawsBarBackground(window, Type.statusBars());
             isFullyTransparentAllowed &= isFullyTransparentAllowed(window, Type.statusBars());
+            if (!drawBackground && !isFullyTransparentAllowed) {
+                break;
+            }
         }
 
         if (drawBackground) {
diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java
index 1a70d3a6867b6..ab0fbd4f401d2 100644
--- a/services/core/java/com/android/server/wm/DisplayRotation.java
+++ b/services/core/java/com/android/server/wm/DisplayRotation.java
@@ -1865,7 +1865,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy) {
                         }
                     };
                     mSensorManager.registerListener(mHingeAngleSensorEventListener,
-                            hingeAngleSensor, SensorManager.SENSOR_DELAY_FASTEST, getHandler());
+                            hingeAngleSensor, SensorManager.SENSOR_DELAY_NORMAL, getHandler());
                 }
             }
         }
diff --git a/services/core/java/com/android/server/wm/GameListManager.java b/services/core/java/com/android/server/wm/GameListManager.java
new file mode 100644
index 0000000000000..324de9307c95b
--- /dev/null
+++ b/services/core/java/com/android/server/wm/GameListManager.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+class GameListManager {
+
+    interface GameListChangeListener {
+        void onGameListChanged();
+    }
+
+    private static final String GAME_LIST_KEY = "gamespace_game_list";
+    private static final String DENIED_LIST_KEY = "gamespace_denied_list";
+
+    private final Context mContext;
+    private final Map<String, String> mGameList = Collections.synchronizedMap(new HashMap<>());
+    private final List<GameListChangeListener> mListeners = new ArrayList<>();
+
+    private final Set<String> mDeniedList =
+            Collections.synchronizedSet(new HashSet<>());
+
+    GameListManager(Context context) {
+        mContext = context;
+        loadGameList();
+        loadDeniedList();
+    }
+
+    void loadGameList() {
+        String raw = Settings.System.getStringForUser(mContext.getContentResolver(),
+                GAME_LIST_KEY, UserHandle.USER_CURRENT);
+        Map<String, String> parsed = parseGameList(raw);
+        synchronized (mGameList) {
+            mGameList.clear();
+            mGameList.putAll(parsed);
+        }
+        notifyListeners();
+    }
+
+    void loadDeniedList() {
+        String raw = Settings.System.getStringForUser(mContext.getContentResolver(),
+                DENIED_LIST_KEY, UserHandle.USER_CURRENT);
+        Set<String> parsed = parseDeniedList(raw);
+        synchronized (mDeniedList) {
+            mDeniedList.clear();
+            mDeniedList.addAll(parsed);
+        }
+    }
+
+    private Set<String> parseDeniedList(String raw) {
+        Set<String> set = new HashSet<>();
+        if (raw == null || raw.isEmpty()) return set;
+        for (String pkg : raw.split(";")) {
+            String trimmed = pkg.trim();
+            if (!trimmed.isEmpty() && trimmed.matches("[a-zA-Z0-9_.]+")) {
+                set.add(trimmed);
+            }
+        }
+        return set;
+    }
+
+    private void writeDeniedList() {
+        StringBuilder sb = new StringBuilder();
+        synchronized (mDeniedList) {
+            for (String pkg : mDeniedList) {
+                if (sb.length() > 0) sb.append(';');
+                sb.append(pkg);
+            }
+        }
+        Settings.System.putStringForUser(mContext.getContentResolver(),
+                DENIED_LIST_KEY, sb.toString(), UserHandle.USER_CURRENT);
+    }
+
+    boolean isDenied(String packageName) {
+        synchronized (mDeniedList) {
+            return mDeniedList.contains(packageName);
+        }
+    }
+
+    void addDenied(String packageName) {
+        synchronized (mDeniedList) {
+            if (!mDeniedList.add(packageName)) return;
+        }
+        writeDeniedList();
+    }
+
+    void removeDenied(String packageName) {
+        synchronized (mDeniedList) {
+            if (!mDeniedList.remove(packageName)) return;
+        }
+        writeDeniedList();
+    }
+
+    boolean isGame(String packageName) {
+        synchronized (mGameList) {
+            return mGameList.containsKey(packageName);
+        }
+    }
+
+    boolean isGameInPerfMode(String packageName) {
+        synchronized (mGameList) {
+            return "2".equals(mGameList.get(packageName));
+        }
+    }
+
+    void registerGameListObserver(Handler handler) {
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(GAME_LIST_KEY),
+                false,
+                new ContentObserver(handler) {
+                    @Override
+                    public void onChange(boolean selfChange) {
+                        loadGameList();
+                    }
+                },
+                UserHandle.USER_ALL
+        );
+
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(DENIED_LIST_KEY),
+                false,
+                new ContentObserver(handler) {
+                    @Override
+                    public void onChange(boolean selfChange) {
+                        loadDeniedList();
+                    }
+                },
+                UserHandle.USER_ALL
+        );
+    }
+
+    private Map<String, String> parseGameList(String raw) {
+        Map<String, String> map = new HashMap<>();
+        if (raw == null || raw.isEmpty()) return map;
+
+        for (String entry : raw.split(";")) {
+            String[] parts = entry.split("=");
+            if (parts.length == 2
+                    && parts[0].matches("[a-zA-Z0-9_.]+")
+                    && parts[1].matches("\\d+")) {
+                map.put(parts[0].trim(), parts[1].trim());
+            }
+        }
+        return map;
+    }
+
+    void addGame(String packageName) {
+        updateGameList(packageName, true);
+    }
+
+    void removeGame(String packageName) {
+        updateGameList(packageName, false);
+    }
+
+    private void updateGameList(String packageName, boolean add) {
+        ContentResolver cr = mContext.getContentResolver();
+        String raw = Settings.System.getStringForUser(cr, GAME_LIST_KEY, UserHandle.USER_CURRENT);
+        Map<String, String> gameMap = parseGameList(raw);
+
+        boolean modified;
+        if (add) {
+            modified = !"2".equals(gameMap.get(packageName));
+            if (modified) gameMap.put(packageName, "2");
+        } else {
+            modified = gameMap.remove(packageName) != null;
+        }
+
+        if (modified) {
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, String> e : gameMap.entrySet()) {
+                if (sb.length() > 0) sb.append(';');
+                sb.append(e.getKey()).append('=').append(e.getValue());
+            }
+            Settings.System.putStringForUser(cr, GAME_LIST_KEY, sb.toString(),
+                    UserHandle.USER_CURRENT);
+            synchronized (mGameList) {
+                if (add) mGameList.put(packageName, "2");
+                else mGameList.remove(packageName);
+            }
+            notifyListeners();
+        }
+    }
+
+    void addListener(GameListChangeListener listener) {
+        synchronized (mListeners) {
+            mListeners.add(listener);
+        }
+    }
+
+    private void notifyListeners() {
+        synchronized (mListeners) {
+            for (GameListChangeListener listener : mListeners) {
+                listener.onGameListChanged();
+            }
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/wm/GamePackageHandler.java b/services/core/java/com/android/server/wm/GamePackageHandler.java
new file mode 100644
index 0000000000000..929b76ded8153
--- /dev/null
+++ b/services/core/java/com/android/server/wm/GamePackageHandler.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.widget.Toast;
+
+import com.android.internal.R;
+import com.android.server.UiThread;
+
+class GamePackageHandler {
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+    private final GameListManager mGameListManager;
+    private final Handler mBgHandler;
+
+    GamePackageHandler(Context context, GameListManager manager, Handler bgHandler) {
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+        mGameListManager = manager;
+        mBgHandler = bgHandler;
+    }
+
+    private boolean isAutoDetectEnabled() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+                "gamespace_auto_game_detect", 1,
+                UserHandle.USER_CURRENT) != 0;
+    }
+
+    void registerPackageReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED);
+        filter.addDataScheme("package");
+
+        mContext.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final String pkg = intent.getData() != null
+                        ? intent.getData().getSchemeSpecificPart() : null;
+                if (pkg == null) return;
+
+                mBgHandler.post(() -> {
+                    String action = intent.getAction();
+                    if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
+                        if (!isAutoDetectEnabled()) return;
+                        if (mGameListManager.isDenied(pkg)) return;
+                        if (mGameListManager.isGame(pkg)) return;
+                        if (isGame(pkg)) {
+                            String label = getAppLabel(pkg);
+                            mGameListManager.addGame(pkg);
+                            UiThread.getHandler().post(
+                                    () -> showGameAddedToast(label));
+                        }
+                    } else if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) {
+                        mGameListManager.removeGame(pkg);
+                    }
+                });
+            }
+        }, filter);
+    }
+
+    private boolean isGame(String pkg) {
+        try {
+            ApplicationInfo info = mPackageManager.getApplicationInfo(
+                    pkg, PackageManager.ApplicationInfoFlags.of(PackageManager.GET_META_DATA));
+            return info.category == ApplicationInfo.CATEGORY_GAME;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    private String getAppLabel(String pkg) {
+        try {
+            return mPackageManager
+                    .getApplicationLabel(mPackageManager.getApplicationInfo(
+                            pkg, PackageManager.ApplicationInfoFlags.of(0)))
+                    .toString();
+        } catch (PackageManager.NameNotFoundException e) {
+            return pkg;
+        }
+    }
+
+    private void showGameAddedToast(String appLabel) {
+        Toast.makeText(
+                mContext,
+                mContext.getString(R.string.gamespace_new_game_added, appLabel),
+                Toast.LENGTH_LONG
+            ).show();
+    }
+}
diff --git a/services/core/java/com/android/server/wm/GameSpaceService.java b/services/core/java/com/android/server/wm/GameSpaceService.java
new file mode 100644
index 0000000000000..82bbf1de90a67
--- /dev/null
+++ b/services/core/java/com/android/server/wm/GameSpaceService.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+
+import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Slog;
+
+import com.android.internal.app.IGameSpaceCallback;
+import com.android.internal.app.IGameSpaceService;
+import com.android.server.NtServiceInjector;
+import com.android.server.UiThread;
+import com.android.server.am.ActivityManagerService;
+
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class GameSpaceService extends IGameSpaceService.Stub {
+
+    private static final String TAG = "GameSpaceService";
+    private static final boolean DEBUG = false;
+
+    private static GameSpaceService sInstance;
+
+    private final Context mContext;
+    private final ActivityManagerService mActivityManager;
+    private final CopyOnWriteArrayList<IGameSpaceCallback> mCallbacks = new CopyOnWriteArrayList<>();
+    private final GameListManager mGameListManager;
+    private final GameStateDispatcher mGameStateDispatcher;
+    private final GamePackageHandler mGamePackageHandler;
+
+    private final HandlerThread mBgThread = new HandlerThread("GameSpaceBg");
+    private final Handler mBgHandler;
+
+    private String mCurrentGame;
+    private Runnable mPendingBoost;
+
+    private GameSpaceService(Context context, ActivityManagerService am) {
+        mContext = context;
+        mActivityManager = am;
+        mGameListManager = new GameListManager(context);
+        mGameStateDispatcher = new GameStateDispatcher(context, mCallbacks);
+
+        mBgThread.start();
+        mBgHandler = new Handler(mBgThread.getLooper());
+
+        mGamePackageHandler = new GamePackageHandler(context, mGameListManager, mBgHandler);
+        mGamePackageHandler.registerPackageReceiver();
+
+        mGameListManager.registerGameListObserver(mBgHandler);
+        mGameListManager.addListener(() -> {
+            mBgHandler.post(() -> {
+                if (mCurrentGame != null && mGameListManager.isGame(mCurrentGame)) {
+                    boolean inPerfMode = mGameListManager.isGameInPerfMode(mCurrentGame);
+                    mGameStateDispatcher.boostGame(inPerfMode);
+                }
+            });
+        });
+    }
+
+    public static void systemReady() {
+        if (sInstance == null) {
+            sInstance = new GameSpaceService(NtServiceInjector.getCtx(), NtServiceInjector.getAm());
+            ServiceManager.addService("game_space", sInstance);
+            Slog.i(TAG, "GameSpaceService initialized");
+        }
+    }
+
+    public static GameSpaceService get() {
+        return sInstance;
+    }
+
+    private void startOverlay() {
+        final String currentGame = mCurrentGame;
+        if (currentGame == null) return;
+
+        mBgHandler.post(() -> {
+            if (mPendingBoost != null) {
+                mBgHandler.removeCallbacks(mPendingBoost);
+            }
+
+            if (mGameListManager.isGameInPerfMode(currentGame)) {
+                mPendingBoost = () -> mGameStateDispatcher.boostGame(true);
+                mBgHandler.postDelayed(mPendingBoost, 500);
+            }
+
+            UiThread.getHandler().post(
+                    () -> mGameStateDispatcher.dispatchGameState(true, currentGame));
+        });
+    }
+
+    private void stopOverlay() {
+        mBgHandler.post(() -> {
+            if (mPendingBoost != null) {
+                mBgHandler.removeCallbacks(mPendingBoost);
+                mPendingBoost = null;
+            }
+            UiThread.getHandler().post(
+                    () -> mGameStateDispatcher.dispatchGameState(false, null));
+            mGameStateDispatcher.boostGame(false);
+        });
+    }
+
+    public void onAppFocusChanged(ActivityRecord record, Task task) {
+        if (record == null || record.packageName == null) return;
+
+        String packageName = record.packageName;
+
+        mBgHandler.post(() -> {
+            boolean gameActive = mCurrentGame != null
+                    && mActivityManager.isPackageTopApp(mCurrentGame);
+
+            if (task != null && task.getWindowingMode() == WINDOWING_MODE_FREEFORM && gameActive) {
+                if (DEBUG) Slog.d(TAG, "Freeform focused but game still TOP_APP, ignoring.");
+                return;
+            }
+
+            boolean isGame = mGameListManager.isGame(packageName);
+            boolean shouldStartOverlay = false;
+            boolean shouldStopOverlay = false;
+
+            if (isGame) {
+                if (!packageName.equals(mCurrentGame)) {
+                    if (mCurrentGame != null) {
+                        shouldStopOverlay = true;
+                    }
+                    mCurrentGame = packageName;
+                    shouldStartOverlay = true;
+                }
+            } else if (mCurrentGame != null) {
+                mCurrentGame = null;
+                shouldStopOverlay = true;
+            }
+
+            if (shouldStopOverlay) stopOverlay();
+            if (shouldStartOverlay) startOverlay();
+        });
+    }
+
+    public void removeTask(Task task, String reason) {
+        if (task == null) return;
+
+        mBgHandler.post(() -> {
+            ActivityRecord top = task.getTopMostActivity();
+
+            if (mCurrentGame != null && top != null
+                    && mCurrentGame.equals(top.packageName)) {
+                if (DEBUG) Slog.d(TAG, "removeTask: clearing active game " + mCurrentGame);
+                mCurrentGame = null;
+                stopOverlay();
+            }
+        });
+    }
+
+    public void onKeyguardChanged(boolean showing) {
+        mBgHandler.post(() -> {
+            if (mCurrentGame == null) return;
+
+            if (showing) {
+                stopOverlay();
+            } else {
+                startOverlay();
+            }
+        });
+    }
+
+    @Override
+    public void registerCallback(IGameSpaceCallback callback) {
+        if (callback == null || mCallbacks.contains(callback)) return;
+
+        mCallbacks.add(callback);
+
+        try {
+            IBinder binder = callback.asBinder();
+            binder.linkToDeath(() -> {
+                mCallbacks.remove(callback);
+                if (DEBUG) Slog.d(TAG, "Callback died, removed");
+            }, 0);
+        } catch (RemoteException e) {
+            mCallbacks.remove(callback);
+        }
+    }
+
+    @Override
+    public void unregisterCallback(IGameSpaceCallback callback) {
+        mCallbacks.remove(callback);
+    }
+}
diff --git a/services/core/java/com/android/server/wm/GameStateDispatcher.java b/services/core/java/com/android/server/wm/GameStateDispatcher.java
new file mode 100644
index 0000000000000..12f5f63d4ef49
--- /dev/null
+++ b/services/core/java/com/android/server/wm/GameStateDispatcher.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+
+import android.content.Context;
+import android.os.BatteryManager;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+
+import lineageos.health.HealthInterface;
+
+import com.android.internal.app.IGameSpaceCallback;
+
+import java.util.List;
+
+class GameStateDispatcher {
+
+    private static final String TAG = "GameStateDispatcher";
+    private static final String KEY_GAMING_MODE_ACTIVE = "ax_gaming_mode_active";
+    private static final String KEY_BYPASS_CHARGE_ENABLED = "bypass_charge_enabled";
+
+    private final Context mContext;
+    private final List<IGameSpaceCallback> mCallbacks;
+
+    private int mChargeControlLimit = 100;
+    private boolean mWasChargingControlEnabled = false;
+
+    GameStateDispatcher(Context context, List<IGameSpaceCallback> callbacks) {
+        mContext = context;
+        mCallbacks = callbacks;
+    }
+
+    void dispatchGameState(boolean active, String packageName) {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                KEY_GAMING_MODE_ACTIVE, active ? 1 : 0, UserHandle.USER_CURRENT);
+
+        for (IGameSpaceCallback callback : mCallbacks) {
+            try {
+                if (active && packageName != null) {
+                    callback.onGameStart(packageName);
+                } else {
+                    callback.onGameLeave();
+                }
+            } catch (Exception e) {
+                Slog.w(TAG, "Removing dead callback", e);
+                mCallbacks.remove(callback);
+            }
+        }
+
+        if (active) {
+            if (bypassChargeEnabled()) {
+                mChargeControlLimit = getChargingLimit();
+                setBypassActive(true);
+                setSmartChargeLvl(battLevel());
+            }
+        } else {
+            if (bypassChargeEnabled()) {
+                setBypassActive(false);
+                setSmartChargeLvl(mChargeControlLimit);
+            }
+        }
+    }
+
+    void boostGame(boolean enable) {
+        int perfByUser = Settings.System.getIntForUser(
+                mContext.getContentResolver(), "power_mode_perf_by_user", 0,
+                UserHandle.USER_CURRENT);
+        if (perfByUser == 1) return;
+
+        Settings.System.putIntForUser(mContext.getContentResolver(),
+                "persist.sys.power_mode_perf", enable ? 1 : 0,
+                UserHandle.USER_CURRENT);
+        SystemProperties.set("persist.sys.power_mode_perf", enable ? "1" : "0");
+    }
+
+    void setBypassCharge(boolean enable) {
+        if (!bypassChargeEnabled()) return;
+
+        if (enable) {
+            mChargeControlLimit = getChargingLimit();
+        }
+
+        setBypassActive(enable);
+        setSmartChargeLvl(enable ? battLevel() : mChargeControlLimit);
+    }
+
+    private boolean bypassChargeEnabled() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+                KEY_BYPASS_CHARGE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
+    }
+
+    private int getChargingLimit() {
+        try {
+            HealthInterface health = HealthInterface.getInstance(mContext);
+            mWasChargingControlEnabled = health.getEnabled();
+            if (mWasChargingControlEnabled) {
+                return health.getLimit();
+            }
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to get charging limit", e);
+        }
+        return 100;
+    }
+
+    private int battLevel() {
+        BatteryManager bm = mContext.getSystemService(BatteryManager.class);
+        return bm != null ? bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) : -1;
+    }
+
+    private void setSmartChargeLvl(int value) {
+        try {
+            HealthInterface health = HealthInterface.getInstance(mContext);
+            health.setMode(HealthInterface.MODE_LIMIT);
+            health.setLimit(value);
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to set charging limit", e);
+        }
+    }
+
+    private void setBypassActive(boolean value) {
+        try {
+            HealthInterface health = HealthInterface.getInstance(mContext);
+            health.setEnabled(value || mWasChargingControlEnabled);
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to set charging bypass", e);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/wm/IAxSandboxService.java b/services/core/java/com/android/server/wm/IAxSandboxService.java
new file mode 100644
index 0000000000000..53cc107dc8330
--- /dev/null
+++ b/services/core/java/com/android/server/wm/IAxSandboxService.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Intent;
+
+/**
+ * @hide
+ */
+public interface IAxSandboxService {
+
+    public static final IAxSandboxService DEFAULT = new IAxSandboxService() {};
+
+    default void systemReadyInternal() {
+    }
+
+    default void setKeyguardDoneLocked(boolean done) {
+    }
+
+    default void onAppFocusChanged(ActivityRecord newFocus, Task newTask) {
+    }
+
+    default void onWindowingModeChanged(Task task, int prevWindowingMode) {
+    }
+
+    default boolean isAppLocked(String packageName, int uid, ComponentName componentName) {
+        return false;
+    }
+
+    default boolean isAppLocked(ActivityRecord r) {
+        return false;
+    }
+
+    default void lockTopApp(Task task, String reason) {
+    }
+
+    default boolean isSandboxActivity(ComponentName componentName) {
+        return false;
+    }
+
+    default boolean checkLockApp(ActivityRecord prev, ActivityRecord next) {
+        return false;
+    }
+
+    default boolean checkUnlockApp(ActivityRecord r, int resultCode, Intent resultData) {
+        return false;
+    }
+
+    default boolean isTopAppLocked(ActivityManager.RecentTaskInfo rti, int topUserId) {
+        return false;
+    }
+
+    default void getRecentTasksCheck(int callingUid, int userId) {
+    }
+
+    default void clearUnlockedApp() {
+    }
+
+    default void clearUnlockedApp(ActivityRecord r) {
+    }
+
+    default void removeTask(Task task, String reason) {
+    }
+
+    default void onAppDied(String packageName, int userId) {
+    }
+}
diff --git a/services/core/java/com/android/server/wm/InputManagerCallback.java b/services/core/java/com/android/server/wm/InputManagerCallback.java
index bfbdef1a92cef..9d24cba7b9ba1 100644
--- a/services/core/java/com/android/server/wm/InputManagerCallback.java
+++ b/services/core/java/com/android/server/wm/InputManagerCallback.java
@@ -259,16 +259,13 @@ public int getPointerLayer() {
     @Override
     public int getPointerDisplayId() {
         synchronized (mService.mGlobalLock) {
-            // If desktop mode is not enabled, show on the default display.
-            if (!mService.mForceDesktopModeOnExternalDisplays) {
-                return DEFAULT_DISPLAY;
-            }
-
             // Look for the topmost freeform display.
             int firstExternalDisplayId = DEFAULT_DISPLAY;
             for (int i = mService.mRoot.mChildren.size() - 1; i >= 0; --i) {
                 final DisplayContent displayContent = mService.mRoot.mChildren.get(i);
-                if (displayContent.getDisplayInfo().state == Display.STATE_OFF) {
+                if (displayContent.getDisplayInfo().state == Display.STATE_OFF
+                            || !displayContent.forceDesktopMode()) {
+                    // If desktop mode is not enabled, show on the default display.
                     continue;
                 }
                 // Heuristic solution here. Currently when "Freeform windows" developer option is
diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java
index 10e30d7d376ff..c3f4ef6211298 100644
--- a/services/core/java/com/android/server/wm/InsetsStateController.java
+++ b/services/core/java/com/android/server/wm/InsetsStateController.java
@@ -49,6 +49,9 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.function.Consumer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Manages global window inset state in the system represented by {@link InsetsState}.
@@ -66,11 +69,11 @@ class InsetsStateController {
     @NonNull
     private final SparseLongArray mSurfaceTransactionIds = new SparseLongArray();
     @NonNull
-    private final ArrayMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>>
-            mControlTargetProvidersMap = new ArrayMap<>();
+    private final HashMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>>
+            mControlTargetProvidersMap = new HashMap<>();
     @NonNull
-    private final ArrayMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>>
-            mPendingTargetProvidersMap = new ArrayMap<>();
+    private final HashMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>>
+            mPendingTargetProvidersMap = new HashMap<>();
     @NonNull
     private final SparseArray<InsetsControlTarget> mIdControlTargetMap = new SparseArray<>();
     @NonNull
@@ -468,11 +471,14 @@ private void notifyPendingInsetsControlChanged() {
             }
             final ArraySet<InsetsControlTarget> newControlTargets = new ArraySet<>();
             int displayId = mDisplayContent.getDisplayId();
-            final ArrayMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>> pendingControlMap =
+            final HashMap<InsetsControlTarget, ArrayList<InsetsSourceProvider>> pendingControlMap =
                     mPendingTargetProvidersMap;
-            for (int i = pendingControlMap.size() - 1; i >= 0; i--) {
-                final InsetsControlTarget target = pendingControlMap.keyAt(i);
-                final ArrayList<InsetsSourceProvider> providers = pendingControlMap.valueAt(i);
+            Iterator<Map.Entry<InsetsControlTarget, ArrayList<InsetsSourceProvider>>> iterator =
+                    pendingControlMap.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<InsetsControlTarget, ArrayList<InsetsSourceProvider>> entry = iterator.next();
+                InsetsControlTarget target = entry.getKey();
+                ArrayList<InsetsSourceProvider> providers = entry.getValue();
                 for (int p = providers.size() - 1; p >= 0; p--) {
                     final InsetsSourceProvider provider = providers.get(p);
                     if (provider.isLeashInitialized() || provider.getControlTarget() != target) {
@@ -481,7 +487,7 @@ private void notifyPendingInsetsControlChanged() {
                     }
                 }
                 if (providers.isEmpty()) {
-                    pendingControlMap.removeAt(i);
+                    iterator.remove();
 
                     // All controls of this target are ready to be dispatched.
                     target.notifyInsetsControlChanged(displayId);
@@ -529,12 +535,13 @@ void dump(@NonNull String prefix, @NonNull PrintWriter pw) {
         prefix = prefix + "  ";
         mState.dump(prefix, pw);
         pw.println(prefix + "Control map:");
-        for (int i = mControlTargetProvidersMap.size() - 1; i >= 0; i--) {
-            final InsetsControlTarget controlTarget = mControlTargetProvidersMap.keyAt(i);
+        for (Map.Entry<InsetsControlTarget, ArrayList<InsetsSourceProvider>> entry :
+                mControlTargetProvidersMap.entrySet()) {
+            final InsetsControlTarget controlTarget = entry.getKey();
             pw.print(prefix + "  ");
             pw.print(controlTarget);
             pw.println(":");
-            final ArrayList<InsetsSourceProvider> providers = mControlTargetProvidersMap.valueAt(i);
+            final ArrayList<InsetsSourceProvider> providers = entry.getValue();
             for (int j = providers.size() - 1; j >= 0; j--) {
                 final InsetsSourceProvider provider = providers.get(j);
                 if (provider != null) {
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 01e141ed731d7..a8e6f24b30a33 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -244,6 +244,10 @@ void setKeyguardShown(int displayId, boolean keyguardShowing, boolean aodShowing
         state.mAodShowing = aodShowing;
         state.writeEventLog("setKeyguardShown");
 
+        if (displayId == DEFAULT_DISPLAY && keyguardChanged) {
+            GameSpaceService.get().onKeyguardChanged(keyguardShowing);
+        }
+
         if (keyguardChanged || (mWindowManager.mFlags.mAodTransition && aodChanged)) {
             if (keyguardChanged) {
                 // Irrelevant to AOD.
@@ -273,6 +277,10 @@ void setKeyguardShown(int displayId, boolean keyguardShowing, boolean aodShowing
             scheduleGoingAwayTimeout(displayId);
         }
 
+        if (displayId == DEFAULT_DISPLAY && keyguardChanged) {
+            AxSandboxService.get().setKeyguardDoneLocked(!keyguardShowing);
+        }
+
         // Update the sleep token first such that ensureActivitiesVisible has correct sleep token
         // state when evaluating visibilities.
         updateKeyguardSleepToken();
@@ -289,7 +297,9 @@ void setKeyguardShown(int displayId, boolean keyguardShowing, boolean aodShowing
 
     private void setWakeTransitionReady() {
         if (mWindowManager.mAtmService.getTransitionController().getCollectingTransitionType()
-                == WindowManager.TRANSIT_WAKE) {
+                == WindowManager.TRANSIT_WAKE
+                || mWindowManager.mAtmService.getTransitionController().getCollectingTransitionType()
+                        == WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE) {
             mWindowManager.mAtmService.getTransitionController().setReady(
                     mRootWindowContainer.getDefaultDisplay());
         }
diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java
index 6f3f08cf4ed74..782c2786d7c37 100644
--- a/services/core/java/com/android/server/wm/RecentTasks.java
+++ b/services/core/java/com/android/server/wm/RecentTasks.java
@@ -69,6 +69,7 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.IntArray;
@@ -408,8 +409,8 @@ void loadParametersFromResources(Resources res) {
      * any dependent services (like SystemUI) is started.
      */
     void loadRecentsComponent(Resources res) {
-        final String rawRecentsComponent = res.getString(
-                com.android.internal.R.string.config_recentsComponentName);
+        int defaultLauncher = android.os.SystemProperties.getInt("persist.sys.default_launcher", 0);
+        final String rawRecentsComponent = res.getStringArray(com.android.internal.R.array.config_launcherComponents)[defaultLauncher];
         if (TextUtils.isEmpty(rawRecentsComponent)) {
             return;
         }
@@ -768,8 +769,15 @@ void removeTasksByPackageName(String packageName, int userId) {
 
     void removeAllVisibleTasks(int userId) {
         Set<Integer> profileIds = getProfileIds(userId);
+        String lockedTasks = Settings.System.getStringForUser(
+                    mService.mContext.getContentResolver(),
+                    Settings.System.RECENTS_LOCKED_TASKS,
+                    userId);
         for (int i = mTasks.size() - 1; i >= 0; --i) {
             final Task task = mTasks.get(i);
+            ComponentName cn = task.intent != null ? task.intent.getComponent() : null;
+            if (lockedTasks != null && !lockedTasks.isEmpty() &&
+                    cn != null && lockedTasks.contains(cn.getPackageName())) continue;
             if (!profileIds.contains(task.mUserId)) continue;
             if (isVisibleRecentTask(task)) {
                 mTasks.remove(i);
@@ -2050,6 +2058,7 @@ ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr, boolean stripExtras
         if (!getTasksAllowed) {
             Task.trimIneffectiveInfo(tr, rti);
         }
+        AxSandboxService.get().isTopAppLocked(rti, tr.effectiveUid);
         return rti;
     }
 
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 79f33fa948858..930e1d173963a 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -253,7 +253,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
     DeviceStateAutoRotateSettingController mDeviceStateAutoRotateSettingController;
 
     // Whether tasks have moved and we need to rank the tasks before next OOM scoring
-    private boolean mTaskLayersChanged = true;
+    boolean mTaskLayersChanged = true;
     private int mTmpTaskLayerRank;
     private final RankTaskLayersRunnable mRankTaskLayersRunnable = new RankTaskLayersRunnable();
     private Region mTmpOccludingRegion;
@@ -425,7 +425,7 @@ public boolean test(Task task) {
     }
 
     private final Consumer<WindowState> mCloseSystemDialogsConsumer = w -> {
-        if (w.mHasSurface) {
+        if (w.isVisible()) {
             try {
                 w.mClient.closeSystemDialogs(mCloseSystemDialogsReason);
             } catch (RemoteException e) {
@@ -2991,7 +2991,9 @@ void invalidateTaskLayersAndUpdateOomAdjIfNeeded() {
     void invalidateTaskLayers() {
         if (!mTaskLayersChanged) {
             mTaskLayersChanged = true;
-            mService.mH.post(mRankTaskLayersRunnable);
+            if (!mWindowManager.mWindowPlacerLocked.isLayoutDeferred()) {
+                mService.mH.post(mRankTaskLayersRunnable);
+            }
         }
     }
 
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index d591ec3e4c90c..23b9d035073b9 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -65,6 +65,7 @@
 import android.os.UserHandle;
 import android.permission.PermissionManager;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Slog;
 import android.view.IWindow;
@@ -129,6 +130,9 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
     private String mRelayoutTag;
     private final InsetsSourceControl.Array mDummyControls =  new InsetsSourceControl.Array();
     final boolean mSetsUnrestrictedKeepClearAreas;
+    private final ArrayMap<IBinder, Float> mPendingWallpaperZoomOut = new ArrayMap<>();
+    private final Runnable mApplyPendingWallpaperZoomOut = this::applyPendingWallpaperZoomOut;
+    private boolean mApplyWallpaperZoomOutPending;
 
     public Session(WindowManagerService service, IWindowSessionCallback callback) {
         this(service, callback, Binder.getCallingPid(), Binder.getCallingUid());
@@ -603,10 +607,30 @@ public void setWallpaperZoomOut(IBinder window, float zoom) {
                     + zoom);
         }
         synchronized (mService.mGlobalLock) {
+            mPendingWallpaperZoomOut.put(window, zoom);
+            if (!mApplyWallpaperZoomOutPending) {
+                mApplyWallpaperZoomOutPending = true;
+                mService.mH.post(mApplyPendingWallpaperZoomOut);
+            }
+        }
+    }
+
+    private void applyPendingWallpaperZoomOut() {
+        synchronized (mService.mGlobalLock) {
+            mApplyWallpaperZoomOutPending = false;
+            final int size = mPendingWallpaperZoomOut.size();
+            if (size == 0) {
+                return;
+            }
+            final ArrayMap<IBinder, Float> pending = new ArrayMap<>(mPendingWallpaperZoomOut);
+            mPendingWallpaperZoomOut.clear();
             final long ident = Binder.clearCallingIdentity();
             try {
-                actionOnWallpaper(window, (wpController, windowState) ->
-                        wpController.setWallpaperZoomOut(windowState, zoom));
+                for (int i = 0; i < size; i++) {
+                    final float zoom = pending.valueAt(i);
+                    actionOnWallpaper(pending.keyAt(i), (wpController, windowState) ->
+                            wpController.setWallpaperZoomOut(windowState, zoom));
+                }
             } finally {
                 Binder.restoreCallingIdentity(ident);
             }
diff --git a/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java b/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java
index a83e8c7a28bd5..daa022b79666f 100644
--- a/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/SystemGesturesPointerEventListener.java
@@ -91,6 +91,7 @@ class SystemGesturesPointerEventListener implements PointerEventListener {
     private boolean mMouseHoveringAtRight;
     private boolean mMouseHoveringAtBottom;
     private long mLastFlingTime;
+    private boolean mScrollFired;
 
     SystemGesturesPointerEventListener(Context context, Handler handler, Callbacks callbacks) {
         mContext = checkNull("context", context);
@@ -184,6 +185,9 @@ public void onPointerEvent(MotionEvent event) {
             case MotionEvent.ACTION_DOWN:
                 mSwipeFireable = true;
                 mDebugFireable = true;
+                if (mScrollFired)
+                    mCallbacks.onScroll(false);
+                mScrollFired = false;
                 mDownPointers = 0;
                 captureDown(event, 0);
                 if (mMouseHoveringAtLeft) {
@@ -290,6 +294,9 @@ public void onPointerEvent(MotionEvent event) {
             case MotionEvent.ACTION_CANCEL:
                 mSwipeFireable = false;
                 mDebugFireable = false;
+                if (mScrollFired)
+                    mCallbacks.onScroll(false);
+                mScrollFired = false;
                 mCallbacks.onUpOrCancel();
                 break;
             default:
@@ -446,10 +453,24 @@ public boolean onFling(MotionEvent down, MotionEvent up,
             if (duration > MAX_FLING_TIME_MILLIS) {
                 duration = MAX_FLING_TIME_MILLIS;
             }
+            if(Math.abs(velocityY) >= Math.abs(velocityX))
+                mCallbacks.onVerticalFling(duration);
+            else
+                mCallbacks.onHorizontalFling(duration);
             mLastFlingTime = now;
             mCallbacks.onFling(duration);
             return true;
         }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2,
+                                   float distanceX, float distanceY) {
+            if (!mScrollFired) {
+                mCallbacks.onScroll(true);
+                mScrollFired = true;
+            }
+            return true;
+        }
     }
 
     interface Callbacks {
@@ -458,6 +479,9 @@ interface Callbacks {
         void onSwipeFromRight();
         void onSwipeFromLeft();
         void onFling(int durationMs);
+        void onVerticalFling(int durationMs);
+        void onHorizontalFling(int durationMs);
+        void onScroll(boolean started);
         void onDown();
         void onUpOrCancel();
         void onMouseHoverAtLeft();
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index b5698711ed6c5..6098896cf7f04 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -2215,6 +2215,7 @@ public void onConfigurationChanged(Configuration newParentConfig) {
 
         if (prevWindowingMode != getWindowingMode()) {
             taskDisplayArea.onRootTaskWindowingModeChanged(this);
+            AxSandboxService.get().onWindowingModeChanged(this, prevWindowingMode);
         }
 
         if (!isOrganized() && !getRequestedOverrideBounds().isEmpty() && mDisplayContent != null) {
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 6ee790889d594..c1154751d1166 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -705,6 +705,10 @@ void setResumedActivity(ActivityRecord r, String reason) {
             getTask().touchActiveTime();
         }
 
+        if (AxSandboxService.get().checkLockApp(mResumedActivity, r)) {
+            return;
+        }
+
         final ActivityRecord prevR = mResumedActivity;
         mResumedActivity = r;
         final ActivityRecord topResumed = mTaskSupervisor.updateTopResumedActivityIfNeeded(reason);
@@ -1866,6 +1870,10 @@ final boolean resumeTopActivity(ActivityRecord prev, ActivityOptions options,
             mTaskSupervisor.startSpecificActivity(next, true, true);
         }
 
+        if (AxSandboxService.get().checkLockApp(prev, next)) {
+            return true;
+        }
+
         return true;
     }
 
diff --git a/services/core/java/com/android/server/wm/TopActivityRecorder.java b/services/core/java/com/android/server/wm/TopActivityRecorder.java
new file mode 100644
index 0000000000000..155812e2c9b90
--- /dev/null
+++ b/services/core/java/com/android/server/wm/TopActivityRecorder.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2023-2024 The Nameless-AOSP Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.server.wm;
+
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static android.os.Process.THREAD_PRIORITY_DEFAULT;
+
+import android.app.WindowConfiguration;
+import android.content.ComponentName;
+import android.os.Handler;
+import android.util.Slog;
+
+import com.android.server.ServiceThread;
+
+import java.util.ArrayList;
+
+public class TopActivityRecorder {
+
+    private static final String TAG = "TopActivityRecorder";
+
+    private static class InstanceHolder {
+        private static TopActivityRecorder INSTANCE = new TopActivityRecorder();
+    }
+
+    public static TopActivityRecorder getInstance() {
+        return InstanceHolder.INSTANCE;
+    }
+
+    private final Object mFocusLock = new Object();
+
+    private final Handler mHandler;
+    private final ServiceThread mServiceThread;
+
+    private ActivityInfo mTopFullscreenActivity = null;
+
+    private WindowManagerService mWms;
+
+    private TopActivityRecorder() {
+        mServiceThread = new ServiceThread(TAG, THREAD_PRIORITY_DEFAULT, false);
+        mServiceThread.start();
+        mHandler = new Handler(mServiceThread.getLooper());
+    }
+
+    void initWms(WindowManagerService wms) {
+        mWms = wms;
+    }
+
+    void onAppFocusChanged(ActivityRecord focus, Task task) {
+        synchronized (mFocusLock) {
+            final DisplayContent dc = mWms.getDefaultDisplayContentLocked();
+            final ActivityRecord newFocus = focus != null ? focus : dc.topRunningActivity();
+            if (newFocus == null) {
+                return;
+            }
+            final Task newTask = task != null ? task : newFocus.getTask();
+            if (newTask == null) {
+                return;
+            }
+            final int windowingMode = newTask.getWindowConfiguration().getWindowingMode();
+            if (windowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED
+                    || windowingMode == WindowConfiguration.WINDOWING_MODE_FULLSCREEN) {
+                final ComponentName oldComponent = getTopFullscreenComponentLocked();
+                final ComponentName newComponent = newFocus.mActivityComponent;
+                if (!newComponent.equals(oldComponent)) {
+                    if (mTopFullscreenActivity != null &&
+                            mTopFullscreenActivity.task == newTask) {
+                        mTopFullscreenActivity.componentName = newFocus.mActivityComponent;
+                        mTopFullscreenActivity.packageName = newFocus.packageName;
+                    } else {
+                        mTopFullscreenActivity = new ActivityInfo(newFocus, newTask);
+                    }
+                    logD("Top fullscreen window activity changed to " + newFocus);
+                }
+            }
+        }
+    }
+
+    private ComponentName getTopFullscreenComponentLocked() {
+        if (mTopFullscreenActivity == null) {
+            return null;
+        }
+        return mTopFullscreenActivity.componentName;
+    }
+
+    int getTopFullscreenTaskId() {
+        synchronized (mFocusLock) {
+            return getTopFullscreenTaskIdLocked();
+        }
+    }
+
+    int getTopFullscreenTaskIdLocked() {
+        if (mTopFullscreenActivity == null) {
+            return INVALID_TASK_ID;
+        }
+        if (mTopFullscreenActivity.task == null) {
+            return INVALID_TASK_ID;
+        }
+        return mTopFullscreenActivity.task.mTaskId;
+    }
+
+    private static final class ActivityInfo {
+        ComponentName componentName;
+        String packageName;
+        Task task;
+        boolean isHome;
+
+        ActivityInfo(ActivityRecord r, Task task) {
+            this.componentName = r.mActivityComponent;
+            this.packageName = r.packageName;
+            this.task = task;
+            this.isHome = r.isActivityTypeHome();
+        }
+
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder();
+            sb.append("componentName=").append(componentName);
+            sb.append(", task=").append(task);
+            sb.append(", isHome=").append(isHome);
+            return sb.toString();
+        }
+    }
+
+    private static void logD(String msg) {
+        Slog.d(TAG, msg);
+    }
+
+    private static void logE(String msg) {
+        Slog.e(TAG, msg);
+    }
+}
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index ff3cd9989bb00..9569cdd7388b0 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1637,6 +1637,9 @@ void finishTransition(@NonNull ActionChain chain) {
                     mController.mAtm.mRootWindowContainer.getDisplayContent(mRecentsDisplayId);
             dc.getInputMonitor().setActiveRecents(null /* task */, null /* layer */);
             dc.getInputMonitor().updateInputWindowsLw(false /* force */);
+            if (mRecentsDisplayId == DEFAULT_DISPLAY) {
+                AxSandboxService.get().clearUnlockedApp(dc.mFocusedApp);
+            }
         }
         if (mTransientLaunches != null) {
             for (int i = mTransientLaunches.size() - 1; i >= 0; --i) {
diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index ec6d226c85232..04bcfa35dd1d7 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -80,7 +80,9 @@ class WallpaperController {
     // to another, and this is the previous wallpaper target.
     private WindowState mPrevWallpaperTarget = null;
 
+    private static final float WALLPAPER_ZOOM_EPSILON = 0.003f;
     private float mLastWallpaperZoomOut = 0;
+    private WindowState mMaxZoomOutWindow = null;
 
     // Whether COMMAND_FREEZE was dispatched.
     private boolean mLastFrozen = false;
@@ -185,6 +187,7 @@ private boolean isBackNavigationTarget(WindowState w) {
         if (!windowState.mIsWallpaper
                 && Float.compare(windowState.mWallpaperZoomOut, mLastWallpaperZoomOut) > 0) {
             mLastWallpaperZoomOut = windowState.mWallpaperZoomOut;
+            mMaxZoomOutWindow = windowState;
         }
     };
 
@@ -527,9 +530,20 @@ void setWindowWallpaperPosition(
     }
 
     void setWallpaperZoomOut(WindowState window, float zoom) {
-        if (Float.compare(window.mWallpaperZoomOut, zoom) != 0) {
-            window.mWallpaperZoomOut = zoom;
+        if (Math.abs(window.mWallpaperZoomOut - zoom) < WALLPAPER_ZOOM_EPSILON) {
+            return;
+        }
+        final float oldMaxZoom = mLastWallpaperZoomOut;
+        window.mWallpaperZoomOut = zoom;
+
+        if (zoom > mLastWallpaperZoomOut + WALLPAPER_ZOOM_EPSILON) {
+            mLastWallpaperZoomOut = zoom;
+            mMaxZoomOutWindow = window;
+        } else if (window == mMaxZoomOutWindow) {
             computeLastWallpaperZoomOut();
+        }
+
+        if (Math.abs(oldMaxZoom - mLastWallpaperZoomOut) >= WALLPAPER_ZOOM_EPSILON) {
             for (int i = mWallpaperTokens.size() - 1; i >= 0; i--) {
                 final WallpaperWindowToken token = mWallpaperTokens.get(i);
                 token.updateWallpaperOffset();
@@ -796,7 +810,8 @@ void adjustWallpaperWindows() {
         }
 
         final boolean visibleRequested =
-                mWallpaperTarget != null && mWallpaperTarget.isVisibleRequested();
+                (mWallpaperTarget != null && mWallpaperTarget.isVisibleRequested())
+                || (mDisplayContent.mTransitionController.inTransition() && isWallpaperVisible());
         updateWallpaperTokens(visibleRequested,
                 mService.mFlags.mAodTransition
                         ? mDisplayContent.isKeyguardLockedOrAodShowing()
@@ -974,6 +989,7 @@ WindowState getTopVisibleWallpaper() {
      */
     private void computeLastWallpaperZoomOut() {
         mLastWallpaperZoomOut = 0;
+        mMaxZoomOutWindow = null;
         mDisplayContent.forAllWindows(mComputeMaxZoomOutFunction, true);
     }
 
diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java
index 94d24537bd249..937697d0d4fda 100644
--- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java
+++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java
@@ -78,6 +78,9 @@ WallpaperWindowToken asWallpaperToken() {
     @Override
     void setExiting(boolean animateExit) {
         super.setExiting(animateExit);
+        if (mSurfaceControl != null) {
+            getSyncTransaction().setVisibility(mSurfaceControl, false);
+        }
         mDisplayContent.mWallpaperController.removeWallpaperToken(this);
     }
 
diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java
index 8931af7c0474c..726c4eb3271b8 100644
--- a/services/core/java/com/android/server/wm/WindowManagerInternal.java
+++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java
@@ -439,6 +439,14 @@ default void dragRecipientEntered(IWindow window) {}
         default void dragRecipientExited(IWindow window) {}
     }
 
+    /**
+     * Listener interface for secure content showing up on the display.
+     */
+    public interface DisplaySecureContentListener {
+        public void onDisplayHasSecureWindowOnScreenChanged(
+                int displayId, boolean hasSecureWindowOnScreen);
+    }
+
     /**
      * Request the interface to access features implemented by AccessibilityController.
      */
@@ -911,6 +919,8 @@ public abstract void setHomeSupportedOnDisplay(
      */
     public abstract boolean isHomeSupportedOnDisplay(int displayId);
 
+    public abstract boolean isImeInputTargetStaleForUpdate(IBinder windowToken);
+
     /**
      * Sets whether the relevant display content ignores fixed orientation, aspect ratio
      * and resizability of apps.
@@ -1249,4 +1259,12 @@ public abstract void requestAssistScreenshot(IAssistDataReceiver receiver,
      * @throws RuntimeException if the payload cannot be written to the settings file.
      */
     public abstract void restoreDisplayWindowSettings(int userId, byte[] payload);
+
+    /**
+     * Register/unregister callbacks for secure content showing up on the display.
+     */
+    public abstract void registerDisplaySecureContentListener(
+            DisplaySecureContentListener listener);
+    public abstract void unregisterDisplaySecureContentListener(
+            DisplaySecureContentListener listener);
 }
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index dd4c992494b0a..8f095be5db9b3 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -446,8 +446,10 @@ public class WindowManagerService extends IWindowManager.Stub
     /** Indicates we are removing the focused window when updating the focus. */
     static final int UPDATE_FOCUS_REMOVING_FOCUS = 4;
 
-    private static final String SYSTEM_SECURE = "ro.secure";
-    private static final String SYSTEM_DEBUGGABLE = "ro.debuggable";
+    private static final boolean SYSTEM_SECURE = SystemProperties.getBoolean("ro.secure", true);
+    private static final boolean SYSTEM_DEBUGGABLE =
+            SystemProperties.getBoolean("ro.debuggable", false);
+    private static final String WINDOW_IGNORE_SECURE = "window_ignore_secure";
 
     private static final String DENSITY_OVERRIDE = "ro.config.density_override";
     private static final String SIZE_OVERRIDE = "ro.config.size_override";
@@ -797,6 +799,9 @@ public void binderDied() {
     WindowManagerInternal.OnHardKeyboardStatusChangeListener mHardKeyboardStatusChangeListener;
     WindowManagerInternal.OnImeRequestedChangedListener mOnImeRequestedChangedListener;
 
+    private ArraySet<WindowManagerInternal.DisplaySecureContentListener>
+            mDisplaySecureContentListeners = new ArraySet<>();
+
     SettingsObserver mSettingsObserver;
     final EmbeddedWindowController mEmbeddedWindowController;
     final AnrController mAnrController;
@@ -835,6 +840,8 @@ final class SettingsObserver extends ContentObserver {
                 Settings.Secure.getUriFor(Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS);
         private final Uri mDisableSecureWindowsUri =
                 Settings.Secure.getUriFor(Settings.Secure.DISABLE_SECURE_WINDOWS);
+        private final Uri mWindowIgnoreSecureUri =
+                Settings.Secure.getUriFor(WINDOW_IGNORE_SECURE);
         private final Uri mMagnifyImeEnabledUri = Settings.Secure.getUriFor(
                 Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MAGNIFY_NAV_AND_IME);
         private final Uri mPolicyControlUri =
@@ -869,6 +876,8 @@ public SettingsObserver() {
                     UserHandle.USER_ALL);
             resolver.registerContentObserver(mDisableSecureWindowsUri, false, this,
                     UserHandle.USER_ALL);
+            resolver.registerContentObserver(mWindowIgnoreSecureUri, false, this,
+                    UserHandle.USER_ALL);
             if (com.android.server.accessibility.Flags.enableMagnificationMagnifyNavBarAndIme()) {
                 resolver.registerContentObserver(mMagnifyImeEnabledUri, false, this,
                         UserHandle.USER_ALL);
@@ -929,7 +938,7 @@ public void onChange(boolean selfChange, Uri uri) {
                 return;
             }
 
-            if (mDisableSecureWindowsUri.equals(uri)) {
+            if (mDisableSecureWindowsUri.equals(uri) || mWindowIgnoreSecureUri.equals(uri)) {
                 updateDisableSecureWindows();
                 return;
             }
@@ -1051,23 +1060,26 @@ void updateDisplaySettingsLocation() {
         }
 
         void updateDisableSecureWindows() {
-            if (!SystemProperties.getBoolean(SYSTEM_DEBUGGABLE, false)) {
-                return;
-            }
-
-            boolean disableSecureWindows;
-            try {
-                disableSecureWindows = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                        Settings.Secure.DISABLE_SECURE_WINDOWS, 0) != 0;
-            } catch (Settings.SettingNotFoundException e) {
-                disableSecureWindows = false;
+            final ContentResolver resolver = mContext.getContentResolver();
+            final boolean ignoreSecureWindows =
+                    Settings.Secure.getInt(resolver, WINDOW_IGNORE_SECURE, 0) == 1;
+            boolean disableSecureWindows = false;
+            if (SYSTEM_DEBUGGABLE) {
+                try {
+                    disableSecureWindows = Settings.Secure.getIntForUser(resolver,
+                            Settings.Secure.DISABLE_SECURE_WINDOWS, 0) != 0;
+                } catch (Settings.SettingNotFoundException e) {
+                    disableSecureWindows = false;
+                }
             }
-            if (mDisableSecureWindows == disableSecureWindows) {
+            if (mDisableSecureWindows == disableSecureWindows
+                    && mIgnoreSecureWindows == ignoreSecureWindows) {
                 return;
             }
 
             synchronized (mGlobalLock) {
                 mDisableSecureWindows = disableSecureWindows;
+                mIgnoreSecureWindows = ignoreSecureWindows;
                 mRoot.refreshSecureSurfaceState();
             }
         }
@@ -1247,6 +1259,7 @@ public void onAppTransitionFinishedLocked(IBinder token) {
     private final ScreenRecordingCallbackController mScreenRecordingCallbackController;
 
     private volatile boolean mDisableSecureWindows = false;
+    private volatile boolean mIgnoreSecureWindows = false;
 
     /** Creates an instance of the WindowManagerService for the system server. */
     public static WindowManagerService main(@NonNull final Context context,
@@ -4030,6 +4043,12 @@ public void startUserSwitchTransition(@UserIdInt int oldUserId, @UserIdInt int n
                 switchUserInternal(newUserId);
                 moveUserToForeground(newUserId, uss, "startUserSwitchTransition");
             };
+            // Call ActivityIdle in case its already invoked, to ensure mStartingUsers is
+            //handled.
+            mRoot.mTaskSupervisor.activityIdleInternal(null /* idleActivity */,
+              false /* fromTimeout */,true /* processPausingActivities */,
+              null /* configuration */);
+
 
             final TransitionController controller = mAtmService.getTransitionController();
             if (!controller.isShellTransitionsEnabled()) {
@@ -5460,8 +5479,7 @@ public boolean startViewServer(int port) {
     }
 
     private boolean isSystemSecure() {
-        return "1".equals(SystemProperties.get(SYSTEM_SECURE, "1")) &&
-                "0".equals(SystemProperties.get(SYSTEM_DEBUGGABLE, "0"));
+        return SYSTEM_SECURE && !SYSTEM_DEBUGGABLE;
     }
 
     /**
@@ -5817,6 +5835,15 @@ void notifyHardKeyboardStatusChange() {
         }
     }
 
+    void notifyDisplaySecureContentChange(int displayId, boolean hasSecureWindowOnScreen) {
+        synchronized (mGlobalLock) {
+            mDisplaySecureContentListeners.forEach((listener) -> {
+                listener.onDisplayHasSecureWindowOnScreenChanged(
+                        displayId, hasSecureWindowOnScreen);
+            });
+        }
+    }
+
     // -------------------------------------------------------------
     // Input Events and Focus Management
     // -------------------------------------------------------------
@@ -7269,6 +7296,7 @@ private void dumpWindowsLocked(PrintWriter pw, boolean dumpAll,
         });
         pw.print("  mBlurEnabled="); pw.println(mBlurController.getBlurEnabled());
         pw.print("  mDisableSecureWindows="); pw.println(mDisableSecureWindows);
+        pw.print("  mIgnoreSecureWindows="); pw.println(mIgnoreSecureWindows);
 
         mInputManagerCallback.dump(pw, "  ");
         mSnapshotController.dump(pw, " ");
@@ -8904,6 +8932,22 @@ public boolean shouldRestoreImeVisibility(IBinder imeTargetWindowToken) {
             return WindowManagerService.this.shouldRestoreImeVisibility(imeTargetWindowToken);
        }
 
+        @Override
+        public boolean isImeInputTargetStaleForUpdate(IBinder windowToken) {
+            synchronized (mGlobalLock) {
+                InputTarget target = getInputTargetFromWindowTokenLocked(windowToken);
+                if (target != null && target.getDisplayContent() != null
+                        && target.getDisplayContent().getImeInputTarget() != null
+                        && target.getDisplayContent().getImeInputTarget() != target) {
+                    WindowState ws = target.getDisplayContent().getImeInputTarget().getWindowState();
+                    if (ws != null && (ws.mRemoved || ws.mDestroying)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         @Override
         public void addTrustedTaskOverlay(int taskId,
                 SurfaceControlViewHost.SurfacePackage overlay) {
@@ -9214,6 +9258,20 @@ public void requestAssistScreenshot(IAssistDataReceiver receiver, IBinder activi
             }
             WindowManagerService.this.requestAssistScreenshotInternal(receiver, displayId);
         }
+
+        @Override
+        public void registerDisplaySecureContentListener(DisplaySecureContentListener listener) {
+            synchronized (mGlobalLock) {
+                mDisplaySecureContentListeners.add(listener);
+            }
+        }
+
+        @Override
+        public void unregisterDisplaySecureContentListener(DisplaySecureContentListener listener) {
+            synchronized (mGlobalLock) {
+                mDisplaySecureContentListeners.remove(listener);
+            }
+        }
     }
 
     /** Called to inform window manager if non-Vr UI shoul be disabled or not. */
@@ -10732,7 +10790,6 @@ public void markSurfaceSyncGroupReady(IBinder syncGroupToken) {
         mSurfaceSyncGroupController.markSyncGroupReady(syncGroupToken);
     }
 
-
     /**
      * Must be called when a screenshot is taken via hardware chord.
      *
@@ -10746,7 +10803,9 @@ public List<ComponentName> notifyScreenshotListeners(int displayId) {
                 "notifyScreenshotListeners()")) {
             throw new SecurityException("Requires STATUS_BAR_SERVICE permission");
         }
+
         synchronized (mGlobalLock) {
+            if (shouldHideScreenCapture()) return new ArrayList<>();
             final DisplayContent displayContent = mRoot.getDisplayContent(displayId);
             if (displayContent == null) {
                 return new ArrayList<>();
@@ -10848,6 +10907,10 @@ public void unregisterTrustedPresentationListener(ITrustedPresentationListener l
     @EnforcePermission(android.Manifest.permission.DETECT_SCREEN_RECORDING)
     @Override
     public boolean registerScreenRecordingCallback(IScreenRecordingCallback callback) {
+        if (shouldHideScreenCapture()) {
+            return false;
+        }
+
         registerScreenRecordingCallback_enforcePermission();
         return mScreenRecordingCallbackController.register(callback);
     }
@@ -10860,6 +10923,10 @@ public void unregisterScreenRecordingCallback(IScreenRecordingCallback callback)
     }
 
     void onProcessActivityVisibilityChanged(int uid, boolean visible) {
+        if (shouldHideScreenCapture()) {
+            return;
+        }
+
         mScreenRecordingCallbackController.onProcessActivityVisibilityChanged(uid, visible);
     }
 
@@ -10875,7 +10942,7 @@ public void setGlobalDragListener(IGlobalDragListener listener) throws RemoteExc
     }
 
     boolean getDisableSecureWindows() {
-        return mDisableSecureWindows;
+        return mIgnoreSecureWindows || mDisableSecureWindows;
     }
 
     /**
@@ -10988,4 +11055,9 @@ public void apply(@UserIdInt int userId) {
             }
         }
     }
+
+    private boolean shouldHideScreenCapture() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.HIDE_SCREEN_CAPTURE_STATUS, 0) != 0;
+    }
 }
diff --git a/services/core/java/com/android/server/wm/WindowOrientationListener.java b/services/core/java/com/android/server/wm/WindowOrientationListener.java
index d26616edfb44c..0cdd058a09994 100644
--- a/services/core/java/com/android/server/wm/WindowOrientationListener.java
+++ b/services/core/java/com/android/server/wm/WindowOrientationListener.java
@@ -1177,6 +1177,10 @@ public void onSensorChanged(SensorEvent event) {
                         return;
                     }
                 }
+                if (mRotationResolverService == null) {
+                    // Bail out because RotationResolverManagerService wasn't started
+                    return;
+                }
 
                 String packageName = null;
                 if (mActivityTaskManagerInternal != null) {
diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 347b30266298f..2c1978b455514 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -91,6 +91,7 @@
 import com.android.internal.app.HeavyWeightSwitcherActivity;
 import com.android.internal.protolog.ProtoLog;
 import com.android.internal.util.function.pooled.PooledLambda;
+import com.android.server.DisplayThread;
 import com.android.server.Watchdog;
 import com.android.server.am.Flags;
 import com.android.server.am.psc.AsyncBatchSession;
@@ -567,7 +568,7 @@ void postPendingUiCleanMsg(boolean pendingUiClean) {
         // Posting on handler so WM lock isn't held when we call into AM.
         final Message m = PooledLambda.obtainMessage(
                 WindowProcessListener::setPendingUiClean, mListener, pendingUiClean);
-        mAtm.mH.sendMessage(m);
+        DisplayThread.getHandler().sendMessage(m);
     }
 
     long getInteractionEventTime() {
@@ -1458,7 +1459,7 @@ public long getInputDispatchingTimeoutMillis() {
 
     void clearProfilerIfNeeded() {
         // Posting on handler so WM lock isn't held when we call into AM.
-        mAtm.mH.sendMessage(PooledLambda.obtainMessage(
+        DisplayThread.getHandler().sendMessage(PooledLambda.obtainMessage(
                 WindowProcessListener::clearProfilerIfNeeded, mListener));
     }
 
@@ -1505,7 +1506,7 @@ void addToPendingTop() {
 
     void updateServiceConnectionActivities() {
         // Posting on handler so WM lock isn't held when we call into AM.
-        mAtm.mH.sendMessage(PooledLambda.obtainMessage(
+        DisplayThread.getHandler().sendMessage(PooledLambda.obtainMessage(
                 WindowProcessListener::updateServiceConnectionActivities, mListener));
     }
 
@@ -1514,7 +1515,7 @@ void setPendingUiCleanAndForceProcessStateUpTo(int newState) {
         final Message m = PooledLambda.obtainMessage(
                 WindowProcessListener::setPendingUiCleanAndForceProcessStateUpTo,
                 mListener, newState);
-        mAtm.mH.sendMessage(m);
+        DisplayThread.getHandler().sendMessage(m);
     }
 
     boolean isRemoved() {
@@ -1583,7 +1584,7 @@ void appDied(String reason) {
         // Posting on handler so WM lock isn't held when we call into AM.
         final Message m = PooledLambda.obtainMessage(
                 WindowProcessListener::appDied, mListener, reason);
-        mAtm.mH.sendMessage(m);
+        DisplayThread.getHandler().sendMessage(m);
     }
 
     /**
@@ -2226,7 +2227,7 @@ void removeAnimatingReason(@AnimatingReason int reason) {
     /** Applies the animating state to activity manager for updating process priority. */
     private void setAnimating(boolean animating) {
         // Posting on handler so WM lock isn't held when we call into AM.
-        mAtm.mH.post(() -> mListener.setRunningRemoteAnimation(animating));
+        DisplayThread.getHandler().post(() -> mListener.setRunningRemoteAnimation(animating));
     }
 
     boolean isRunningRemoteTransition() {
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 2f25587ee91fe..02ba606536aff 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -598,6 +598,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
 
     /** The time when the window was last requested to redraw for orientation change. */
     private long mOrientationChangeRedrawRequestTime;
+    private int mLastOverlappingWithNavBarSeq = -1;
+    private boolean mIsOverlappingWithNavBar;
 
     /** Is this window now (or just being) removed? */
     boolean mRemoved;
@@ -6090,6 +6092,18 @@ boolean setWallpaperOffset(int dx, int dy, float scale) {
         return true;
     }
 
+    boolean isOverlappingWithNavBar() {
+        if (!isVisible()) {
+            return false;
+        }
+        if (mLastOverlappingWithNavBarSeq == mDisplayContent.mLayoutSeq) {
+            return mIsOverlappingWithNavBar;
+        }
+        mIsOverlappingWithNavBar = DisplayPolicy.isOverlappingWithNavBar(this);
+        mLastOverlappingWithNavBarSeq = mDisplayContent.mLayoutSeq;
+        return mIsOverlappingWithNavBar;
+    }
+
     boolean isTrustedOverlay() {
         WindowState parentWindow = getParentWindow();
         return isWindowTrustedOverlay() || (parentWindow != null
diff --git a/services/core/java/com/android/server/wm/sandbox/AppControlController.java b/services/core/java/com/android/server/wm/sandbox/AppControlController.java
new file mode 100644
index 0000000000000..55e6b6f1c5d68
--- /dev/null
+++ b/services/core/java/com/android/server/wm/sandbox/AppControlController.java
@@ -0,0 +1,563 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm.sandbox;
+
+import android.app.AxSandboxManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Slog;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class AppControlController {
+    private static final String TAG = "AxSandbox.AppControl";
+
+    public static final String SETTING_SANDBOX_CONFIG = AxSandboxManager.SETTING_SANDBOX_CONFIG;
+
+    private static final String KEY_HIDDEN_PKGS = "hidden_pkgs";
+    private static final String KEY_LOCKED_PKGS = "locked_pkgs";
+    private static final String KEY_SANDBOXED_PKGS = "sandboxed_pkgs";
+    private static final String KEY_HIDEDEVOPTS_PKGS = "hidedevopts_pkgs";
+    private static final String KEY_GID_RESTRICTIONS = "gid_restrictions";
+    private static final String KEY_SPOOF_SETTINGS_MAP = "spoof_settings_map";
+    private static final String KEY_DATA_ISOLATION = "data_isolation_pkgs";
+
+    private final Context mContext;
+    private final ContentResolver mContentResolver;
+    private final LauncherApps mLauncherApps;
+    private final Set<String> mBlacklistedPackages;
+    private final Handler mHandler;
+
+    private final Set<String> mLockedPackages = new HashSet<>();
+    private final Set<String> mHiddenPackages = new HashSet<>();
+    private final Set<String> mSandboxedPackages = new HashSet<>();
+    private final Set<String> mHideDevOptsPackages = new HashSet<>();
+    private final Map<String, int[]> mGidRestrictions = new HashMap<>();
+    private final Map<String, Set<String>> mSpoofSettingsMap = new HashMap<>();
+    private final Set<String> mDataIsolationPackages = new HashSet<>();
+
+    private ContentObserver mConfigObserver;
+
+    public interface OnUpdateListener {
+        void onSandboxUpdated();
+    }
+
+    private OnUpdateListener mUpdateListener;
+
+    public AppControlController(Context context, Set<String> blacklistedPackages) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mLauncherApps = context.getSystemService(LauncherApps.class);
+        mBlacklistedPackages = blacklistedPackages;
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    public void setUpdateListener(OnUpdateListener listener) {
+        mUpdateListener = listener;
+    }
+
+    public void init() {
+        registerSettingsObserver();
+        loadConfigFromSettings();
+    }
+
+    private void registerSettingsObserver() {
+        mConfigObserver = new ContentObserver(mHandler) {
+            @Override
+            public void onChange(boolean selfChange) {
+                loadConfigFromSettings();
+                broadcastPackageChanges();
+                notifyUpdate();
+            }
+        };
+
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(SETTING_SANDBOX_CONFIG),
+                false, mConfigObserver, UserHandle.USER_ALL);
+
+        Slog.d(TAG, "Registered Settings observer for sandbox_config");
+    }
+
+    private void loadConfigFromSettings() {
+        String jsonStr = Settings.Secure.getString(mContentResolver, SETTING_SANDBOX_CONFIG);
+
+        synchronized (this) {
+            mLockedPackages.clear();
+            mHiddenPackages.clear();
+            mSandboxedPackages.clear();
+            mHideDevOptsPackages.clear();
+            mGidRestrictions.clear();
+            mSpoofSettingsMap.clear();
+            mDataIsolationPackages.clear();
+
+            if (!TextUtils.isEmpty(jsonStr)) {
+                try {
+                    JSONObject config = new JSONObject(jsonStr);
+
+                    loadPackageSet(config, KEY_LOCKED_PKGS, mLockedPackages);
+                    loadPackageSet(config, KEY_HIDDEN_PKGS, mHiddenPackages);
+                    loadPackageSet(config, KEY_SANDBOXED_PKGS, mSandboxedPackages);
+                    loadPackageSet(config, KEY_HIDEDEVOPTS_PKGS, mHideDevOptsPackages);
+                    loadSpoofSettingsMap(config);
+                    loadPackageSet(config, KEY_DATA_ISOLATION, mDataIsolationPackages);
+                    loadGidRestrictions(config);
+
+                } catch (JSONException e) {
+                    Slog.e(TAG, "Failed to parse sandbox_config JSON", e);
+                }
+            }
+        }
+
+        Slog.i(TAG, "Loaded config: locked=" + mLockedPackages.size()
+                + " hidden=" + mHiddenPackages.size()
+                + " sandboxed=" + mSandboxedPackages.size()
+                + " hideDevOpts=" + mHideDevOptsPackages.size());
+    }
+
+    private void loadPackageSet(JSONObject config, String key, Set<String> target) {
+        JSONArray arr = config.optJSONArray(key);
+        if (arr != null) {
+            for (int i = 0; i < arr.length(); i++) {
+                String pkg = arr.optString(i);
+                if (!TextUtils.isEmpty(pkg) && !mBlacklistedPackages.contains(pkg)) {
+                    target.add(pkg);
+                }
+            }
+        }
+    }
+
+    private void saveConfigToSettings() {
+        try {
+            JSONObject config = new JSONObject();
+
+            synchronized (this) {
+                config.put(KEY_LOCKED_PKGS, new JSONArray(mLockedPackages));
+                config.put(KEY_HIDDEN_PKGS, new JSONArray(mHiddenPackages));
+                config.put(KEY_SANDBOXED_PKGS, new JSONArray(mSandboxedPackages));
+                config.put(KEY_HIDEDEVOPTS_PKGS, new JSONArray(mHideDevOptsPackages));
+                saveSpoofSettingsMap(config);
+                config.put(KEY_DATA_ISOLATION, new JSONArray(mDataIsolationPackages));
+                saveGidRestrictions(config);
+            }
+
+            Settings.Secure.putString(mContentResolver, SETTING_SANDBOX_CONFIG, config.toString());
+
+        } catch (JSONException e) {
+            Slog.e(TAG, "Failed to save sandbox_config JSON", e);
+        }
+    }
+
+    private void broadcastPackageChanges() {
+        Set<String> allPackages = new HashSet<>();
+        synchronized (this) {
+            allPackages.addAll(mHiddenPackages);
+        }
+
+        for (String packageName : allPackages) {
+            int uid = getPackageUid(packageName);
+            if (uid >= 0) {
+                broadcastPackageChange(packageName, uid);
+            }
+        }
+    }
+
+    private void broadcastPackageChange(String packageName, int uid) {
+        try {
+            Intent intent = new Intent(Intent.ACTION_PACKAGE_CHANGED);
+            intent.setData(Uri.fromParts("package", packageName, null));
+            intent.putExtra(Intent.EXTRA_UID, uid);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(uid));
+            intent.putExtra(Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST, new String[]{packageName});
+            intent.putExtra(Intent.EXTRA_DONT_KILL_APP, true);
+            mContext.sendBroadcastAsUser(intent, UserHandle.of(UserHandle.getUserId(uid)));
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to broadcast package change for " + packageName, e);
+        }
+    }
+
+    private void notifyUpdate() {
+        if (mUpdateListener != null) {
+            mUpdateListener.onSandboxUpdated();
+        }
+    }
+
+    public boolean isAppLocked(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        if (mBlacklistedPackages.contains(packageName)) return false;
+        synchronized (this) {
+            return mLockedPackages.contains(packageName);
+        }
+    }
+
+    public boolean hasLockedPackages() {
+        synchronized (this) {
+            return !mLockedPackages.isEmpty();
+        }
+    }
+
+    public boolean isPackageHidden(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        synchronized (this) {
+            final boolean hidden = mHiddenPackages.contains(packageName);
+            return hidden;
+        }
+    }
+
+    public boolean isPackageSandboxed(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        synchronized (this) {
+            return mSandboxedPackages.contains(packageName);
+        }
+    }
+
+    public boolean isDevOptionsHidden(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        synchronized (this) {
+            return mHideDevOptsPackages.contains(packageName);
+        }
+    }
+
+    public void addLockedApp(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return;
+        if (!isPackageLockable(packageName)) {
+            Slog.w(TAG, "Cannot lock package - not lockable: " + packageName);
+            return;
+        }
+        int uid = getPackageUid(packageName);
+        synchronized (this) {
+            if (mLockedPackages.add(packageName)) {
+                saveConfigToSettings();
+                if (uid >= 0) {
+                    broadcastPackageChange(packageName, uid);
+                }
+            }
+        }
+        Slog.d(TAG, "addLockedApp: " + packageName);
+    }
+
+    public void removeLockedApp(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return;
+        int uid = getPackageUid(packageName);
+        synchronized (this) {
+            if (mLockedPackages.remove(packageName)) {
+                saveConfigToSettings();
+                if (uid >= 0) {
+                    broadcastPackageChange(packageName, uid);
+                }
+            }
+        }
+        Slog.d(TAG, "removeLockedApp: " + packageName);
+    }
+
+    public void setPackageHidden(String packageName, boolean hidden) {
+        if (TextUtils.isEmpty(packageName)) return;
+        if (hidden && !isPackageLockable(packageName)) {
+            Slog.w(TAG, "Cannot hide package - not lockable: " + packageName);
+            return;
+        }
+        int uid = getPackageUid(packageName);
+        synchronized (this) {
+            boolean changed = hidden ? mHiddenPackages.add(packageName)
+                                     : mHiddenPackages.remove(packageName);
+            if (changed) {
+                saveConfigToSettings();
+                if (uid >= 0) {
+                    broadcastPackageChange(packageName, uid);
+                }
+            }
+        }
+        Slog.d(TAG, "setPackageHidden: " + packageName + " hidden=" + hidden);
+    }
+
+    public void setPackageSandboxed(String packageName, boolean sandboxed) {
+        if (TextUtils.isEmpty(packageName)) return;
+        synchronized (this) {
+            boolean changed = sandboxed ? mSandboxedPackages.add(packageName)
+                                       : mSandboxedPackages.remove(packageName);
+            if (changed) {
+                saveConfigToSettings();
+            }
+        }
+        Slog.d(TAG, "setPackageSandboxed: " + packageName + " sandboxed=" + sandboxed);
+    }
+
+    public void setDevOptionsHidden(String packageName, boolean hidden) {
+        if (TextUtils.isEmpty(packageName)) return;
+        synchronized (this) {
+            boolean changed = hidden ? mHideDevOptsPackages.add(packageName)
+                                    : mHideDevOptsPackages.remove(packageName);
+            if (changed) {
+                saveConfigToSettings();
+            }
+        }
+        Slog.d(TAG, "setDevOptionsHidden: " + packageName + " hidden=" + hidden);
+    }
+
+    public List<String> getLockedPackages() {
+        synchronized (this) {
+            return new ArrayList<>(mLockedPackages);
+        }
+    }
+
+    public List<String> getHiddenPackages() {
+        synchronized (this) {
+            return new ArrayList<>(mHiddenPackages);
+        }
+    }
+
+    public List<String> getSandboxedPackages() {
+        synchronized (this) {
+            return new ArrayList<>(mSandboxedPackages);
+        }
+    }
+
+    public List<String> getDevOptionsHiddenPackages() {
+        synchronized (this) {
+            return new ArrayList<>(mHideDevOptsPackages);
+        }
+    }
+
+    public boolean isPackageLockable(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        if (mBlacklistedPackages.contains(packageName)) return false;
+
+        if (mLauncherApps == null) return false;
+
+        try {
+            List<LauncherActivityInfo> activities = mLauncherApps.getActivityList(
+                    packageName, UserHandle.of(UserHandle.USER_SYSTEM));
+            return activities != null && !activities.isEmpty();
+        } catch (Exception e) {
+            Slog.w(TAG, "Failed to check if package is lockable: " + packageName, e);
+            return false;
+        }
+    }
+
+    public List<String> getLockablePackages() {
+        List<String> result = new ArrayList<>();
+
+        if (mLauncherApps != null) {
+            try {
+                List<LauncherActivityInfo> activities = mLauncherApps.getActivityList(
+                        null, UserHandle.of(UserHandle.USER_SYSTEM));
+
+                Set<String> seen = new HashSet<>();
+                for (LauncherActivityInfo info : activities) {
+                    String pkgName = info.getApplicationInfo().packageName;
+                    if (!mBlacklistedPackages.contains(pkgName) && !seen.contains(pkgName)) {
+                        result.add(pkgName);
+                        seen.add(pkgName);
+                    }
+                }
+            } catch (Exception e) {
+                Slog.e(TAG, "Failed to get lockable packages from LauncherApps", e);
+            }
+        }
+
+        if (result.isEmpty()) {
+            Slog.w(TAG, "LauncherApps returned empty, using PackageManager fallback");
+            try {
+                PackageManager pm = mContext.getPackageManager();
+                List<ApplicationInfo> apps = pm.getInstalledApplications(0);
+                for (ApplicationInfo appInfo : apps) {
+                    if (mBlacklistedPackages.contains(appInfo.packageName)) continue;
+                    if (isSystemUid(appInfo.uid)) continue;
+                    if (pm.getLaunchIntentForPackage(appInfo.packageName) != null) {
+                        result.add(appInfo.packageName);
+                    }
+                }
+            } catch (Exception e) {
+                Slog.e(TAG, "Failed to get lockable packages from PackageManager", e);
+            }
+        }
+
+        return result;
+    }
+
+    private int getPackageUid(String packageName) {
+        try {
+            return mContext.getPackageManager()
+                    .getApplicationInfo(packageName, 0).uid;
+        } catch (PackageManager.NameNotFoundException e) {
+            return -1;
+        }
+    }
+
+    private static boolean isSystemUid(int uid) {
+        int appId = UserHandle.getAppId(uid);
+        return appId == android.os.Process.ROOT_UID || appId == android.os.Process.SYSTEM_UID;
+    }
+
+    private void loadGidRestrictions(JSONObject config) {
+        JSONObject gidObj = config.optJSONObject(KEY_GID_RESTRICTIONS);
+        if (gidObj == null) return;
+        java.util.Iterator<String> keys = gidObj.keys();
+        while (keys.hasNext()) {
+            String pkg = keys.next();
+            JSONArray arr = gidObj.optJSONArray(pkg);
+            if (arr != null && arr.length() > 0) {
+                int[] gids = new int[arr.length()];
+                for (int i = 0; i < arr.length(); i++) {
+                    gids[i] = arr.optInt(i);
+                }
+                mGidRestrictions.put(pkg, gids);
+            }
+        }
+    }
+
+    private void saveGidRestrictions(JSONObject config) throws JSONException {
+        JSONObject gidObj = new JSONObject();
+        for (Map.Entry<String, int[]> entry : mGidRestrictions.entrySet()) {
+            JSONArray arr = new JSONArray();
+            for (int gid : entry.getValue()) {
+                arr.put(gid);
+            }
+            gidObj.put(entry.getKey(), arr);
+        }
+        config.put(KEY_GID_RESTRICTIONS, gidObj);
+    }
+
+    public void setRestrictedGids(String packageName, int[] gids) {
+        if (TextUtils.isEmpty(packageName)) return;
+        synchronized (this) {
+            if (gids == null || gids.length == 0) {
+                mGidRestrictions.remove(packageName);
+            } else {
+                mGidRestrictions.put(packageName, gids);
+            }
+            saveConfigToSettings();
+        }
+    }
+
+    public int[] getRestrictedGids(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return null;
+        synchronized (this) {
+            return mGidRestrictions.get(packageName);
+        }
+    }
+
+    public boolean isSettingsSpoofEnabled(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        synchronized (this) {
+            return mSpoofSettingsMap.containsKey(packageName);
+        }
+    }
+
+    public boolean isSpoofSettingEnabled(String packageName, String settingKey) {
+        if (TextUtils.isEmpty(packageName) || TextUtils.isEmpty(settingKey)) return false;
+        synchronized (this) {
+            Set<String> settings = mSpoofSettingsMap.get(packageName);
+            return settings != null && settings.contains(settingKey);
+        }
+    }
+
+    public void setSpoofSettingEnabled(String packageName, String settingKey, boolean enabled) {
+        if (TextUtils.isEmpty(packageName) || TextUtils.isEmpty(settingKey)) return;
+        synchronized (this) {
+            Set<String> settings = mSpoofSettingsMap.get(packageName);
+            boolean changed;
+            if (enabled) {
+                if (settings == null) {
+                    settings = new HashSet<>();
+                    mSpoofSettingsMap.put(packageName, settings);
+                }
+                changed = settings.add(settingKey);
+            } else {
+                if (settings == null) return;
+                changed = settings.remove(settingKey);
+                if (settings.isEmpty()) {
+                    mSpoofSettingsMap.remove(packageName);
+                }
+            }
+            if (changed) saveConfigToSettings();
+        }
+    }
+
+    public List<String> getEnabledSpoofSettings(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return java.util.Collections.emptyList();
+        synchronized (this) {
+            Set<String> settings = mSpoofSettingsMap.get(packageName);
+            if (settings == null || settings.isEmpty()) return java.util.Collections.emptyList();
+            return new java.util.ArrayList<>(settings);
+        }
+    }
+
+    private void loadSpoofSettingsMap(JSONObject config) {
+        JSONObject mapObj = config.optJSONObject(KEY_SPOOF_SETTINGS_MAP);
+        if (mapObj == null) return;
+        java.util.Iterator<String> keys = mapObj.keys();
+        while (keys.hasNext()) {
+            String pkg = keys.next();
+            JSONArray arr = mapObj.optJSONArray(pkg);
+            if (arr != null && arr.length() > 0) {
+                Set<String> settings = new HashSet<>();
+                for (int i = 0; i < arr.length(); i++) {
+                    String s = arr.optString(i);
+                    if (!TextUtils.isEmpty(s)) settings.add(s);
+                }
+                if (!settings.isEmpty()) {
+                    mSpoofSettingsMap.put(pkg, settings);
+                }
+            }
+        }
+    }
+
+    private void saveSpoofSettingsMap(JSONObject config) throws JSONException {
+        JSONObject mapObj = new JSONObject();
+        for (Map.Entry<String, Set<String>> entry : mSpoofSettingsMap.entrySet()) {
+            mapObj.put(entry.getKey(), new JSONArray(entry.getValue()));
+        }
+        config.put(KEY_SPOOF_SETTINGS_MAP, mapObj);
+    }
+
+    public boolean isDataIsolationEnabled(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return false;
+        synchronized (this) {
+            return mDataIsolationPackages.contains(packageName);
+        }
+    }
+
+    public void setDataIsolationEnabled(String packageName, boolean enabled) {
+        if (TextUtils.isEmpty(packageName)) return;
+        synchronized (this) {
+            boolean changed = enabled ? mDataIsolationPackages.add(packageName)
+                                      : mDataIsolationPackages.remove(packageName);
+            if (changed) saveConfigToSettings();
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/wm/sandbox/HiddenNotificationController.java b/services/core/java/com/android/server/wm/sandbox/HiddenNotificationController.java
new file mode 100644
index 0000000000000..07f69769459a1
--- /dev/null
+++ b/services/core/java/com/android/server/wm/sandbox/HiddenNotificationController.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm.sandbox;
+
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import com.android.internal.app.HiddenNotificationInfo;
+import com.android.internal.app.IHiddenNotificationListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class HiddenNotificationController {
+    private static final String TAG = "AxSandbox.Notif";
+
+    private final RemoteCallbackList<IHiddenNotificationListener> mListeners = new RemoteCallbackList<>();
+    private final Map<String, HiddenNotificationInfo> mHiddenNotifications = new HashMap<>();
+
+    private Function<String, Boolean> mIsPackageHidden;
+
+    public HiddenNotificationController() {
+    }
+
+    public void setPackageHiddenChecker(Function<String, Boolean> checker) {
+        mIsPackageHidden = checker;
+    }
+
+    public void registerListener(IHiddenNotificationListener listener) {
+        if (listener != null) {
+            mListeners.register(listener);
+        }
+    }
+
+    public void unregisterListener(IHiddenNotificationListener listener) {
+        if (listener != null) {
+            mListeners.unregister(listener);
+        }
+    }
+
+    public List<HiddenNotificationInfo> getHiddenNotifications() {
+        synchronized (mHiddenNotifications) {
+            return new ArrayList<>(mHiddenNotifications.values());
+        }
+    }
+
+    public void onHiddenNotificationPosted(HiddenNotificationInfo info) {
+        if (info == null) return;
+
+        if (mIsPackageHidden != null && !mIsPackageHidden.apply(info.packageName)) {
+            Slog.w(TAG, "Rejecting notification from non-hidden package: " + info.packageName);
+            return;
+        }
+
+        synchronized (mHiddenNotifications) {
+            mHiddenNotifications.put(info.key, info);
+        }
+
+        int count = mListeners.beginBroadcast();
+        for (int i = 0; i < count; i++) {
+            try {
+                mListeners.getBroadcastItem(i).onHiddenNotificationPosted(info);
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Failed to notify hidden notification listener", e);
+            }
+        }
+        mListeners.finishBroadcast();
+    }
+
+    public void onHiddenNotificationRemoved(String key) {
+        if (key == null) return;
+
+        synchronized (mHiddenNotifications) {
+            mHiddenNotifications.remove(key);
+        }
+
+        int count = mListeners.beginBroadcast();
+        for (int i = 0; i < count; i++) {
+            try {
+                mListeners.getBroadcastItem(i).onHiddenNotificationRemoved(key);
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Failed to notify hidden notification listener", e);
+            }
+        }
+        mListeners.finishBroadcast();
+    }
+
+    public void clearNotificationsForPackage(String packageName) {
+        if (packageName == null) return;
+
+        List<String> keysToRemove = new ArrayList<>();
+        synchronized (mHiddenNotifications) {
+            for (Map.Entry<String, HiddenNotificationInfo> entry : mHiddenNotifications.entrySet()) {
+                if (packageName.equals(entry.getValue().packageName)) {
+                    keysToRemove.add(entry.getKey());
+                }
+            }
+        }
+
+        for (String key : keysToRemove) {
+            onHiddenNotificationRemoved(key);
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/wm/sandbox/SettingsSpoofController.java b/services/core/java/com/android/server/wm/sandbox/SettingsSpoofController.java
new file mode 100644
index 0000000000000..9adfc5af18be5
--- /dev/null
+++ b/services/core/java/com/android/server/wm/sandbox/SettingsSpoofController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2025-2026 AxionOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.server.wm.sandbox;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SettingsSpoofController {
+
+    private static final Map<String, String> SPOOFED_SETTINGS = new HashMap<>();
+
+    static {
+        SPOOFED_SETTINGS.put("adb_enabled", "0");
+        SPOOFED_SETTINGS.put("development_settings_enabled", "0");
+        SPOOFED_SETTINGS.put("adb_wifi_enabled", "0");
+        SPOOFED_SETTINGS.put("package_verifier_user_consent", "0");
+        SPOOFED_SETTINGS.put("verify_apps_over_usb", "0");
+        SPOOFED_SETTINGS.put("accessibility_enabled", "0");
+        SPOOFED_SETTINGS.put("enabled_accessibility_services", "");
+        SPOOFED_SETTINGS.put("accessibility_display_inversion_enabled", "0");
+    }
+
+    public static String getSpoofedValue(String settingName) {
+        if (settingName == null) return null;
+        return SPOOFED_SETTINGS.get(settingName);
+    }
+}
diff --git a/services/core/java/org/rising/server/QuickSwitchService.java b/services/core/java/org/rising/server/QuickSwitchService.java
new file mode 100644
index 0000000000000..79b1429ce4f13
--- /dev/null
+++ b/services/core/java/org/rising/server/QuickSwitchService.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2023 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.rising.server;
+
+import static android.os.Process.THREAD_PRIORITY_DEFAULT;
+
+import android.app.ActivityManager;
+import android.app.ActivityThread;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ParceledListSlice;
+import android.content.pm.UserInfo;
+import android.content.om.IOverlayManager;
+import android.os.UserHandle;
+import android.os.Handler;
+import android.os.IUserManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+
+import com.android.server.ServiceThread;
+import com.android.server.SystemService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public final class QuickSwitchService extends SystemService {
+
+    private static final String TAG = "QuickSwitchService";
+    private static final int THREAD_PRIORITY_DEFAULT = android.os.Process.THREAD_PRIORITY_DEFAULT;
+    private static final String WALLPAPER_OVERLAY = "com.android.system.qs.wallpaperoverlay";
+
+    private final Context mContext;
+    private final IPackageManager mPM;
+    private final IUserManager mUM;
+    private final ContentResolver mResolver;
+    private final String mOpPackageName;
+
+    private ServiceThread mWorker;
+    private Handler mHandler;
+
+    private static List<String> LAUNCHER_PACKAGES = null;
+    private static List<String> disabledLaunchersCache = null;
+    private static int lastDefaultLauncher = -1;
+
+    static {
+        if (LAUNCHER_PACKAGES == null) {
+            try {
+                Context context = ActivityThread.currentApplication() != null ?
+                        ActivityThread.currentApplication().getApplicationContext() : null;
+                if (context != null) {
+                    String[] launcherPackages = context.getResources().getStringArray(com.android.internal.R.array.config_launcherPackages);
+                    LAUNCHER_PACKAGES = new ArrayList<>();
+                    for (String packageName : launcherPackages) {
+                        LAUNCHER_PACKAGES.add(packageName);
+                    }
+                } else {
+                    LAUNCHER_PACKAGES = new ArrayList<>();
+                }
+            } catch (Exception e) {
+                LAUNCHER_PACKAGES = new ArrayList<>();
+            }
+        }
+    }
+
+    public static boolean shouldHide(int userId, String packageName) {
+        return packageName != null && getDisabledDefaultLaunchers().contains(packageName);
+    }
+
+    public static ParceledListSlice<PackageInfo> recreatePackageList(
+            int callingUid, Context context, int userId, ParceledListSlice<PackageInfo> list) {
+        List<PackageInfo> appList = list.getList();
+        List<String> disabledLaunchers = getDisabledDefaultLaunchers();
+        appList.removeIf(info -> disabledLaunchers.contains(info.packageName));
+        return new ParceledListSlice<>(appList);
+    }
+
+    public static List<ApplicationInfo> recreateApplicationList(
+            int callingUid, Context context, int userId, List<ApplicationInfo> list) {
+        List<ApplicationInfo> appList = new ArrayList<>(list);
+        List<String> disabledLaunchers = getDisabledDefaultLaunchers();
+        appList.removeIf(info -> disabledLaunchers.contains(info.packageName));
+        return appList;
+    }
+
+    private void updateStateForUser(int userId) {
+        int defaultLauncher = SystemProperties.getInt("persist.sys.default_launcher", 0);
+        try {
+            for (String packageName : LAUNCHER_PACKAGES) {
+                if (packageName.equals("com.android.launcher3") && defaultLauncher == 2) {
+                    mPM.setApplicationEnabledSetting(packageName,
+                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                            0, userId, mOpPackageName);
+                } else if (packageName.equals(LAUNCHER_PACKAGES.get(defaultLauncher))) {
+                    mPM.setApplicationEnabledSetting(packageName,
+                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                            0, userId, mOpPackageName);
+                } else {
+                    mPM.setApplicationEnabledSetting(packageName,
+                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                            0, userId, mOpPackageName);
+                }
+            }
+        } catch (IllegalArgumentException ignored) {}
+        catch (RemoteException e) {}
+    }
+
+    public static List<String> getDisabledDefaultLaunchers() {
+        int defaultLauncher = SystemProperties.getInt("persist.sys.default_launcher", 0);
+        if (defaultLauncher != lastDefaultLauncher || disabledLaunchersCache == null) {
+            lastDefaultLauncher = defaultLauncher;
+            List<String> disabledDefaultLaunchers = new ArrayList<>();
+            for (int i = 0; i < LAUNCHER_PACKAGES.size(); i++) {
+                if (i != defaultLauncher && !(i == 0 && defaultLauncher == 2)) {
+                    disabledDefaultLaunchers.add(LAUNCHER_PACKAGES.get(i));
+                }
+            }
+            disabledLaunchersCache = disabledDefaultLaunchers;
+        }
+        return disabledLaunchersCache;
+    }
+
+    private void updateWallpaperOverlay() {
+    int defaultLauncher =
+            SystemProperties.getInt(
+                    "persist.sys.default_launcher", 0);
+
+    try {
+        IOverlayManager overlayManager =
+                IOverlayManager.Stub.asInterface(
+                        ServiceManager.getService(
+                                Context.OVERLAY_SERVICE));
+
+        if (overlayManager != null) {
+            overlayManager.setEnabled(
+                    WALLPAPER_OVERLAY,
+                    defaultLauncher == 0,
+                    UserHandle.USER_CURRENT);
+        }
+    } catch (Exception ignored) {}
+}
+
+    private void initForUser(int userId) {
+        if (userId < 0)
+            return;
+        updateStateForUser(userId);
+    }
+
+    private void init() {
+        try {
+            for (UserInfo user : mUM.getUsers(false)) {
+                initForUser(user.id);
+            }
+             updateWallpaperOverlay();
+        } catch (RemoteException e) {
+            e.rethrowAsRuntimeException();
+        }
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_USER_ADDED);
+        filter.addAction(Intent.ACTION_USER_REMOVED);
+        mContext.registerReceiver(new UserReceiver(), filter,
+                android.Manifest.permission.MANAGE_USERS, mHandler);
+    }
+
+    @Override
+    public void onStart() {
+        mWorker = new ServiceThread(TAG, THREAD_PRIORITY_DEFAULT, false);
+        mWorker.start();
+        mHandler = new Handler(mWorker.getLooper());
+        init();
+    }
+
+    @Override
+    public void onBootPhase(int phase) {
+        super.onBootPhase(phase);
+        if (phase == SystemService.PHASE_BOOT_COMPLETED) {
+            IntentFilter filter = new IntentFilter(Intent.ACTION_USER_PRESENT);
+        }
+    }
+
+    public QuickSwitchService(Context context) {
+        super(context);
+        mContext = context;
+        mResolver = context.getContentResolver();
+        mPM = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mUM = IUserManager.Stub.asInterface(ServiceManager.getService(Context.USER_SERVICE));
+        mOpPackageName = context.getOpPackageName();
+    }
+
+    private final class UserReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
+            if (Intent.ACTION_USER_ADDED.equals(intent.getAction())) {
+                initForUser(userId);
+            }
+        }
+    }
+}
diff --git a/services/core/java/org/rising/server/RisingServicesStarter.java b/services/core/java/org/rising/server/RisingServicesStarter.java
new file mode 100644
index 0000000000000..1190be4bad0c5
--- /dev/null
+++ b/services/core/java/org/rising/server/RisingServicesStarter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023-2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.rising.server;
+
+import com.android.server.SystemServiceManager;
+
+public class RisingServicesStarter {
+
+    private final SystemServiceManager mSystemServiceManager;
+
+    private static final String QUICKSWITCH_SERVICE_CLASS =
+            "org.rising.server.QuickSwitchService";
+
+    public RisingServicesStarter(SystemServiceManager systemServiceManager) {
+        this.mSystemServiceManager = systemServiceManager;
+    }
+
+    public void startAllServices() {
+        startService(QUICKSWITCH_SERVICE_CLASS);
+    }
+
+    private void startService(String serviceClassName) {
+        try {
+            mSystemServiceManager.startService(serviceClassName);
+        } catch (Exception e) {}
+    }
+}
+
diff --git a/services/core/java/org/rising/server/ShakeGestureService.java b/services/core/java/org/rising/server/ShakeGestureService.java
new file mode 100644
index 0000000000000..6dce9663f1ec5
--- /dev/null
+++ b/services/core/java/org/rising/server/ShakeGestureService.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2023-2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.rising.server;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+public final class ShakeGestureService {
+
+    private static final String TAG = "ShakeGestureService";
+
+    private static final String SHAKE_GESTURES_ENABLED = "shake_gestures_enabled";
+    private static final String SHAKE_GESTURES_ACTION = "shake_gestures_action";
+    private static final int USER_ALL = UserHandle.USER_ALL;
+
+    private final Context mContext;
+    private ShakeGestureUtils mShakeGestureUtils;
+    private static volatile ShakeGestureService instance;
+    private final ShakeGesturesCallbacks mShakeCallbacks;
+
+    private final SettingsObserver mSettingsObserver;
+    private boolean mShakeServiceEnabled = false;
+
+    private ShakeGestureUtils.OnShakeListener mShakeListener;
+
+    public interface ShakeGesturesCallbacks {
+        void onShake();
+    }
+
+    private ShakeGestureService(Context context, ShakeGesturesCallbacks callback) {
+        mContext = context;
+        mShakeCallbacks = callback;
+        mShakeListener = () -> {
+            if (mShakeServiceEnabled && mShakeCallbacks != null) {
+                mShakeCallbacks.onShake();
+            }
+        };
+        mSettingsObserver = new SettingsObserver(null);
+    }
+
+    public static synchronized ShakeGestureService getInstance(Context context, ShakeGesturesCallbacks callback) {
+        if (instance == null) {
+            synchronized (ShakeGestureService.class) {
+                if (instance == null) {
+                    instance = new ShakeGestureService(context, callback);
+                }
+            }
+        }
+        return instance;
+    }
+
+    public void onStart() {
+        if (mShakeGestureUtils == null) {
+            mShakeGestureUtils = new ShakeGestureUtils(mContext);
+        }
+        updateSettings();
+        mSettingsObserver.observe();
+        if (mShakeServiceEnabled) {
+            mShakeGestureUtils.registerListener(mShakeListener);
+        }
+    }
+
+    private void updateSettings() {
+        boolean wasShakeServiceEnabled = mShakeServiceEnabled;
+        mShakeServiceEnabled = Settings.System.getInt(mContext.getContentResolver(),
+                SHAKE_GESTURES_ENABLED, 0) == 1;
+        if (mShakeServiceEnabled && !wasShakeServiceEnabled) {
+            mShakeGestureUtils.registerListener(mShakeListener);
+        } else if (!mShakeServiceEnabled && wasShakeServiceEnabled) {
+            mShakeGestureUtils.unregisterListener(mShakeListener);
+        }
+    }
+
+    class SettingsObserver extends ContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+        void observe() {
+            mContext.getContentResolver().registerContentObserver(
+                    Settings.System.getUriFor(SHAKE_GESTURES_ENABLED), false, this, USER_ALL);
+            mContext.getContentResolver().registerContentObserver(
+                    Settings.System.getUriFor(SHAKE_GESTURES_ACTION), false, this, USER_ALL);
+        }
+        @Override
+        public void onChange(boolean selfChange) {
+            updateSettings();
+        }
+    }
+}
diff --git a/services/core/java/org/rising/server/ShakeGestureUtils.java b/services/core/java/org/rising/server/ShakeGestureUtils.java
new file mode 100644
index 0000000000000..76e9e02047d7e
--- /dev/null
+++ b/services/core/java/org/rising/server/ShakeGestureUtils.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2023-2024 The RisingOS Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.rising.server;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.SystemClock;
+import android.provider.Settings;
+
+import java.util.ArrayList;
+
+public class ShakeGestureUtils implements SensorEventListener {
+    
+    private static final String TAG = "ShakeGestureUtils";
+    
+    private static final String SHAKE_GESTURES_SHAKE_INTENSITY = "shake_gestures_intensity";
+
+    private Context mContext;
+    private SensorManager mSensorManager;
+    private Sensor mAccelerometer;
+    private ArrayList<OnShakeListener> mListeners = new ArrayList<>();
+    private long mLastShakeTime = 0L;
+    private long mLastUpdateTime = 0L;
+    private int mShakeCount = 0;
+    private float mLastX = 0f;
+    private float mLastY = 0f;
+    private float mLastZ = 0f;
+
+    public ShakeGestureUtils(Context context) {
+        mContext = context;
+        mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        if (mSensorManager != null) {
+            mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        }
+    }
+
+    public interface OnShakeListener {
+        void onShake();
+    }
+
+    public void registerListener(OnShakeListener listener) {
+        if (!mListeners.contains(listener)) {
+            mListeners.add(listener);
+            startListening();
+        }
+    }
+
+    public void unregisterListener(OnShakeListener listener) {
+        mListeners.remove(listener);
+        if (mListeners.isEmpty()) {
+            stopListening();
+        }
+    }
+
+    private void startListening() {
+        if (mAccelerometer != null) {
+            mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_UI);
+        }
+    }
+
+    private void stopListening() {
+        mSensorManager.unregisterListener(this);
+    }
+
+    private int getShakeIntensity() {
+        return Settings.System.getInt(mContext.getContentResolver(),
+                SHAKE_GESTURES_SHAKE_INTENSITY, 3);
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event == null) {
+            return;
+        }
+        long curUpdateTime = System.currentTimeMillis();
+        long timeInterval = curUpdateTime - mLastUpdateTime;
+        if (timeInterval < (getShakeIntensity() * 14f)) {
+            return;
+        }
+        if (event.values.length < 3) {
+            return;
+        }
+        mLastUpdateTime = curUpdateTime;
+        float x = event.values[0];
+        float y = event.values[1];
+        float z = event.values[2];
+        float deltaX = x - mLastX;
+        float deltaY = y - mLastY;
+        float deltaZ = z - mLastZ;
+        mLastX = x;
+        mLastY = y;
+        mLastZ = z;
+        double speed = Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ) * 1000.0 / timeInterval;
+        if (speed >= getShakeIntensity() * 100f) {
+            notifyShakeListeners();
+        }
+    }
+
+    private void notifyShakeListeners() {
+        if (SystemClock.elapsedRealtime() - mLastShakeTime < 1000) {
+            return;
+        }
+        for (OnShakeListener listener : mListeners) {
+            listener.onShake();
+        }
+        mLastShakeTime = SystemClock.elapsedRealtime();
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
+}
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 109abd5330be9..6bd4e821b3d7d 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -70,7 +70,6 @@ cc_library_static {
         "com_android_server_vibrator_VibratorManagerService.cpp",
         "com_android_server_pdb_PersistentDataBlockService.cpp",
         "com_android_server_am_LowMemDetector.cpp",
-        "com_android_server_pm_ComputerEngine.cpp",
         "com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",
         "com_android_server_sensor_SensorService.cpp",
         "com_android_server_utils_LongMethodTracer.cpp",
@@ -96,12 +95,6 @@ cc_library_static {
     header_libs: [
         "bionic_libc_platform_headers",
     ],
-
-    product_variables: {
-        debuggable: {
-            cflags: ["-DANDROID_DEBUGGABLE"],
-        }
-    },
 }
 
 cc_defaults {
diff --git a/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp b/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
index 98ee84a0a3dcc..bea833d2321a2 100644
--- a/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
+++ b/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
@@ -85,6 +85,8 @@ namespace android {
 // before starting next VMA batch
 static std::atomic<bool> cancelRunningCompaction;
 
+static bool inSystemCompaction = false;
+
 // A VmaBatch represents a set of VMAs that can be processed
 // as VMAs are processed by client code it is expected that the
 // VMAs get consumed which means they are discarded as they are
@@ -328,12 +330,16 @@ static int getAnonPageAdvice(const Vma& vma) {
     bool hasReadFlag = (vma.flags & PROT_READ) > 0;
     bool hasWriteFlag = (vma.flags & PROT_WRITE) > 0;
     bool hasExecuteFlag = (vma.flags & PROT_EXEC) > 0;
-    if ((hasReadFlag || hasWriteFlag) && !hasExecuteFlag && !vma.is_shared) {
+    if ((hasReadFlag || hasWriteFlag) && !hasExecuteFlag) {
         return MADV_PAGEOUT;
     }
     return -1;
 }
 static int getAnyPageAdvice(const Vma& vma) {
+    if (inSystemCompaction == true) {
+        return MADV_PAGEOUT;
+    }
+
     if (vma.inode == 0 && !vma.is_shared) {
         return MADV_PAGEOUT;
     }
@@ -461,6 +467,7 @@ static void compactMemcg(int uid, int pid, int compactionFlags) {
 static void com_android_server_am_CachedAppOptimizer_compactSystem(JNIEnv *, jobject) {
     std::unique_ptr<DIR, decltype(&closedir)> proc(opendir("/proc"), closedir);
     struct dirent* current;
+    inSystemCompaction = true;
     while ((current = readdir(proc.get()))) {
         if (current->d_type != DT_DIR) {
             continue;
@@ -489,6 +496,7 @@ static void com_android_server_am_CachedAppOptimizer_compactSystem(JNIEnv *, job
 
         compactMemcg(status_info.st_uid, pid, COMPACT_ACTION_ANON_FLAG | COMPACT_ACTION_FILE_FLAG);
     }
+    inSystemCompaction = false;
 }
 
 static void com_android_server_am_CachedAppOptimizer_cancelCompaction(JNIEnv*, jobject) {
diff --git a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp
index 3dfce3aec059f..a18851329058d 100644
--- a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp
+++ b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp
@@ -53,6 +53,7 @@ static struct {
 
 static sp<Looper> gLooper;
 static jobject gCallback;
+static sp<IKeystoreService> gService;
 
 class CallbackHandler : public MessageHandler {
     int type;
@@ -70,12 +71,13 @@ class CallbackHandler : public MessageHandler {
 
 static void notifyKeystore(uint8_t *auth_token, size_t auth_token_length) {
     if (auth_token != NULL && auth_token_length > 0) {
-        // TODO: cache service?
-        sp<IServiceManager> sm = defaultServiceManager();
-        sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
-        sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
-        if (service != NULL) {
-            status_t ret = service->addAuthToken(auth_token, auth_token_length);
+        if(gService == NULL) {
+            sp<IServiceManager> sm = defaultServiceManager();
+            sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
+            gService = interface_cast<IKeystoreService>(binder);
+        }
+        if (gService != NULL) {
+            status_t ret = gService->addAuthToken(auth_token, auth_token_length);
             if (ret != ResponseCode::NO_ERROR) {
                 ALOGE("Falure sending auth token to KeyStore: %d", ret);
             }
diff --git a/services/core/jni/com_android_server_pm_ComputerEngine.cpp b/services/core/jni/com_android_server_pm_ComputerEngine.cpp
deleted file mode 100644
index bbe298097a2a0..0000000000000
--- a/services/core/jni/com_android_server_pm_ComputerEngine.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <nativehelper/JNIHelp.h>
-
-namespace android {
-
-static bool isDebuggable(JNIEnv* env) {
-#ifdef ANDROID_DEBUGGABLE
-    return true;
-#else
-    return false;
-#endif
-}
-
-static const JNINativeMethod method_table[] = {
-        {"isDebuggable", "()Z", (void*)isDebuggable},
-};
-
-int register_android_server_com_android_server_pm_ComputerEngine(JNIEnv* env) {
-    return jniRegisterNativeMethods(env, "com/android/server/pm/ComputerEngine",
-                                    method_table, NELEM(method_table));
-}
-
-} // namespace android
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index f9d952e164692..d50b0f909ab67 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -58,7 +58,6 @@ int register_android_server_utils_AnrTimer(JNIEnv *env);
 int register_android_server_utils_LazyJniRegistrar(JNIEnv* env);
 int register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(JNIEnv* env);
 int register_com_android_server_soundtrigger_middleware_ExternalCaptureStateTracker(JNIEnv* env);
-int register_android_server_com_android_server_pm_ComputerEngine(JNIEnv* env);
 int register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(JNIEnv* env);
 int register_android_server_AdbDebuggingManager(JNIEnv* env);
 int register_android_server_FaceService(JNIEnv* env);
@@ -126,7 +125,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
     register_android_server_utils_LazyJniRegistrar(env);
     register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(env);
     register_com_android_server_soundtrigger_middleware_ExternalCaptureStateTracker(env);
-    register_android_server_com_android_server_pm_ComputerEngine(env);
     register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(env);
     register_android_server_AdbDebuggingManager(env);
     register_android_server_FaceService(env);
diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleClosedStatePredicate.java b/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleClosedStatePredicate.java
index 87ed18fc8b1bd..45b89142ab065 100644
--- a/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleClosedStatePredicate.java
+++ b/services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleClosedStatePredicate.java
@@ -249,6 +249,8 @@ private static class PostureEstimator implements SensorEventListener,
 
         private boolean mScreenTurnedOn = false;
         private boolean mDeviceClosed = false;
+        private boolean mLastTentOrWedge = false;
+        private boolean mLastLeftFlat = false;
 
         public PostureEstimator(Handler handler, FeatureFlags featureFlags,
                 SensorManager sensorManager, @Nullable Sensor leftAccelerometerSensor,
@@ -308,7 +310,14 @@ public void onSensorChanged(SensorEvent event) {
                 mLastDeviceOrientationSensorEvent = event;
             }
 
-            mOnEstimationChanged.run();
+            boolean tentOrWedge = isLikelyTentOrWedgeMode();
+            boolean leftFlat = Objects.equals(
+                    isGravityVectorMostlyFlat(mLeftGravityVector), Boolean.TRUE);
+            if (tentOrWedge != mLastTentOrWedge || leftFlat != mLastLeftFlat) {
+                mLastTentOrWedge = tentOrWedge;
+                mLastLeftFlat = leftFlat;
+                mOnEstimationChanged.run();
+            }
         }
 
         @Override
diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
index 69e856de401a3..ed67f626eae49 100644
--- a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
+++ b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
@@ -17,6 +17,7 @@
 package com.android.server.policy;
 
 import static android.hardware.SensorManager.SENSOR_DELAY_FASTEST;
+import static android.hardware.SensorManager.SENSOR_DELAY_NORMAL;
 import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_UNSUPPORTED_WHEN_POWER_SAVE_MODE;
 import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL;
 import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER;
@@ -150,9 +151,9 @@ public FoldableDeviceStateProvider(
         mConfigurations = deviceStatePredicateWrappers;
         mIsDualDisplayBlockingEnabled = featureFlags.enableDualDisplayBlocking();
 
-        sensorManager.registerListener(this, mHingeAngleSensor, SENSOR_DELAY_FASTEST);
+        sensorManager.registerListener(this, mHingeAngleSensor, SENSOR_DELAY_NORMAL);
         if (hallSensor != null) {
-            sensorManager.registerListener(this, mHallSensor, SENSOR_DELAY_FASTEST);
+            sensorManager.registerListener(this, mHallSensor, SENSOR_DELAY_NORMAL);
         }
 
         mOrderedStates = new DeviceState[deviceStatePredicateWrappers.length];
diff --git a/services/freeform/Android.bp b/services/freeform/Android.bp
new file mode 100644
index 0000000000000..3920451176ca5
--- /dev/null
+++ b/services/freeform/Android.bp
@@ -0,0 +1,27 @@
+//
+// SPDX-FileCopyrightText: 2023 The LibreMobileOS Foundation
+// SPDX-FileCopyrightText: 2024-2025 crDroid Android Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+filegroup {
+    name: "services.freeform-sources",
+    srcs: [
+        "java/**/*.java",
+        "java/**/*.kt"
+    ],
+    path: "java",
+    visibility: ["//frameworks/base/services"],
+}
+
+java_library_static {
+    name: "services.freeform",
+    defaults: ["platform_service_defaults"],
+    srcs: [":services.freeform-sources"],
+    libs: ["services.core"],
+    static_libs: [
+        "kotlinx_coroutines",
+        "lmofreeform-server",
+    ],
+    jarjar_rules: "jarjar-rules.txt",
+}
diff --git a/services/freeform/jarjar-rules.txt b/services/freeform/jarjar-rules.txt
new file mode 100644
index 0000000000000..a50af24f3dddc
--- /dev/null
+++ b/services/freeform/jarjar-rules.txt
@@ -0,0 +1,2 @@
+rule kotlin.** com.libremobileos.server.jarjar.@0
+rule kotlinx.** com.libremobileos.server.jarjar.@0
diff --git a/services/freeform/java/com/android/server/display/FreeformService.java b/services/freeform/java/com/android/server/display/FreeformService.java
new file mode 100644
index 0000000000000..af5c3a5484ecc
--- /dev/null
+++ b/services/freeform/java/com/android/server/display/FreeformService.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023-2024 LibreMobileOS Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.display;
+
+import android.content.Context;
+import android.hardware.display.DisplayManagerInternal;
+import android.util.Slog;
+
+import com.android.server.SystemService;
+
+import com.libremobileos.freeform.server.LMOFreeformService;
+import com.libremobileos.freeform.server.LMOFreeformServiceHolder;
+import com.libremobileos.freeform.server.LMOFreeformUIService;
+
+public class FreeformService extends SystemService {
+
+    private static final String TAG = "FreeformService";
+
+    public FreeformService(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onStart() {
+        // noop
+    }
+
+    @Override
+    public void onBootPhase(@BootPhase int phase) {
+        if (phase != PHASE_ACTIVITY_MANAGER_READY || isSafeMode()) return;
+
+        Slog.d(TAG, "PHASE_ACTIVITY_MANAGER_READY, going to init!");
+
+        DisplayManagerInternal displayManager = getLocalService(DisplayManagerInternal.class);
+        if (displayManager == null) {
+            Slog.e(TAG, "Cannot init: DisplayManagerInternal is null!");
+            return;
+        }
+
+        LMOFreeformService service = new LMOFreeformService(displayManager);
+        LMOFreeformUIService uiService =
+                new LMOFreeformUIService(getContext(), displayManager, service);
+        LMOFreeformServiceHolder.init(uiService, service);
+    }
+}
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index a184d6a7efe8e..24022ea704959 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -169,14 +169,19 @@
 import com.android.server.coverage.CoverageService;
 import com.android.server.cpu.CpuMonitorService;
 import com.android.server.crashrecovery.CrashRecoveryAdaptor;
+import com.android.server.matrixx.VbmetaHashService;
 import com.android.server.credentials.CredentialManagerService;
 import com.android.server.criticalevents.CriticalEventLog;
 import com.android.server.devicepolicy.DevicePolicyManagerService;
 import com.android.server.devicestate.DeviceStateManagerService;
+import com.android.server.display.AutoAODService;
+import com.android.server.display.brightness.HbmService;
 import com.android.server.display.DisplayManagerService;
+import com.android.server.display.FreeformService;
 import com.android.server.display.color.ColorDisplayService;
 import com.android.server.dreams.DreamManagerService;
 import com.android.server.emergency.EmergencyAffordanceService;
+import com.android.server.matrixx.CustomDeviceConfigService;
 import com.android.server.flags.FeatureFlagsService;
 import com.android.server.gpu.GpuService;
 import com.android.server.grammaticalinflection.GrammaticalInflectionService;
@@ -234,12 +239,15 @@
 import com.android.server.pm.permission.PermissionMigrationHelper;
 import com.android.server.pm.permission.PermissionMigrationHelperImpl;
 import com.android.server.pm.verify.domain.DomainVerificationService;
+import com.android.server.pocket.PocketBridgeService;
+import com.android.server.pocket.PocketService;
 import com.android.server.policy.AppOpsPolicy;
 import com.android.server.policy.PermissionPolicyService;
 import com.android.server.policy.PhoneWindowManager;
 import com.android.server.policy.role.RoleServicePlatformHelperImpl;
 import com.android.server.power.PowerManagerService;
 import com.android.server.power.ShutdownThread;
+import com.android.server.power.SleepModeService;
 import com.android.server.power.hint.HintManagerService;
 import com.android.server.power.thermal.ThermalManagerService;
 import com.android.server.powerstats.PowerStatsService;
@@ -281,6 +289,7 @@
 import com.android.server.supervision.SupervisionService;
 import com.android.server.systemcaptions.SystemCaptionsManagerService;
 import com.android.server.telecom.TelecomLoaderService;
+import com.android.server.telephony.Smart5gService;
 import com.android.server.testharness.TestHarnessModeService;
 import com.android.server.textclassifier.TextClassificationManagerService;
 import com.android.server.textservices.TextServicesManagerService;
@@ -319,6 +328,8 @@
 import dalvik.system.VMDebug;
 import dalvik.system.VMRuntime;
 
+import org.rising.server.RisingServicesStarter;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -339,6 +350,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 
+import com.android.server.DerpFestSystemExService;
+
 /**
  * Entry point to {@code system_server}.
  */
@@ -528,6 +541,8 @@ public final class SystemServer implements Dumpable {
     private final long mRuntimeStartElapsedTime;
     private final long mRuntimeStartUptime;
 
+    public boolean safeMode = false;
+
     private static final String START_HIDL_SERVICES = "StartHidlServices";
     private static final String START_SENSOR_MANAGER_SERVICE = "StartISensorManagerService";
     private static final String START_BLOB_STORE_SERVICE = "startBlobStoreManagerService";
@@ -985,6 +1000,8 @@ private void run() {
 
             LocalServices.addService(SystemServiceManager.class, mSystemServiceManager);
 
+            AxExtServiceFactory.init(mSystemContext);
+
             // Lazily load the pre-installed system font map in SystemServer only if we're not doing
             // the optimized font loading in the FontManagerService.
             if (!com.android.text.flags.Flags.useOptimizedBoottimeFontLoading()
@@ -994,7 +1011,7 @@ private void run() {
             }
 
             // Attach JVMTI agent if this is a debuggable build and the system property is set.
-            if (Build.IS_DEBUGGABLE) {
+            if (Build.IS_ENG) {
                 // Property is of the form "library_path=parameters".
                 String jvmtiAgent = SystemProperties.get("persist.sys.dalvik.jvmtiagent");
                 if (!jvmtiAgent.isEmpty()) {
@@ -1283,6 +1300,7 @@ private void startBootstrapServices(@NonNull TimingsTraceAndSlog t) {
         mActivityManagerService.setSystemServiceManager(mSystemServiceManager);
         mActivityManagerService.setInstaller(installer);
         mWindowManagerGlobalLock = atm.getGlobalLock();
+        AxExtServiceFactory.injectActivityManagerService(mActivityManagerService);
         t.traceEnd();
 
         // Data loader manager service needs to be started before package manager
@@ -1390,6 +1408,8 @@ private void startBootstrapServices(@NonNull TimingsTraceAndSlog t) {
                     SystemClock.elapsedRealtime());
         }
 
+        AxExtServiceFactory.injectPackageManagerservice(mPackageManagerService);
+
         if (Build.IS_ARC) {
             t.traceBegin("StartArcSystemHealthService");
             mSystemServiceManager.startService(ARC_SYSTEM_HEALTH_SERVICE);
@@ -1429,6 +1449,14 @@ private void startBootstrapServices(@NonNull TimingsTraceAndSlog t) {
         mSystemServiceManager.startService(new OverlayManagerService(mSystemContext));
         t.traceEnd();
 
+        t.traceBegin("InitVBMetaDigest");
+        try {
+            android.security.trickystore.AttestationUtils.initBootHash();
+        } catch (Throwable e) {
+            Slog.e(TAG, "Failed to init VBMeta digest", e);
+        }
+        t.traceEnd();
+
         // Manages Resources packages
         t.traceBegin("StartResourcesManagerService");
         ResourcesManagerService resourcesService = new ResourcesManagerService(mSystemContext);
@@ -1727,6 +1755,7 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             mSystemServiceManager.startBootPhase(t, SystemService.PHASE_WAIT_FOR_SENSOR_SERVICE);
             wm = WindowManagerService.main(context, inputManager, !mFirstBoot,
                     new PhoneWindowManager(), mActivityManagerService.mActivityTaskManager);
+            AxExtServiceFactory.injectWindowManagerService(wm);
             ServiceManager.addService(Context.WINDOW_SERVICE, wm, /* allowIsolated= */ false,
                     DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_HIGH
                             | DUMP_FLAG_PROTO);
@@ -1740,6 +1769,10 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             wm.onInitReady();
             t.traceEnd();
 
+            t.traceBegin("StartDerpFestSystemExService");
+            mSystemServiceManager.startService(DerpFestSystemExService.class);
+            t.traceEnd();
+
             // Start receiving calls from SensorManager services. Start in a separate thread
             // because it need to connect to SensorManager. This has to start
             // after PHASE_WAIT_FOR_SENSOR_SERVICE is done.
@@ -1851,7 +1884,10 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
 
         // Before things start rolling, be sure we have decided whether
         // we are in safe mode.
-        final boolean safeMode = wm.detectSafeMode();
+
+        if(wm != null) {
+            safeMode = wm.detectSafeMode();
+        }
         if (safeMode) {
             // If yes, immediately turn on the global setting for airplane mode.
             // Note that this does not send broadcasts at this stage because
@@ -2202,8 +2238,9 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             }
             t.traceEnd();
 
-            if (context.getPackageManager().hasSystemFeature(
-                    PackageManager.FEATURE_WIFI)) {
+            final boolean wifiSupported = context.getPackageManager().hasSystemFeature(
+                    PackageManager.FEATURE_WIFI);
+            if (wifiSupported) {
                 // Wifi Service must be started first for wifi-related services.
                 t.traceBegin("StartWifi");
                 mSystemServiceManager.startServiceFromJar(
@@ -2223,7 +2260,7 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 t.traceEnd();
             }
 
-            if (context.getPackageManager().hasSystemFeature(
+            if (wifiSupported && context.getPackageManager().hasSystemFeature(
                     PackageManager.FEATURE_WIFI_RTT)) {
                 t.traceBegin("StartRttService");
                 mSystemServiceManager.startServiceFromJar(
@@ -2231,7 +2268,7 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 t.traceEnd();
             }
 
-            if (context.getPackageManager().hasSystemFeature(
+            if (wifiSupported && context.getPackageManager().hasSystemFeature(
                     PackageManager.FEATURE_WIFI_AWARE)) {
                 t.traceBegin("StartWifiAware");
                 mSystemServiceManager.startServiceFromJar(
@@ -2239,7 +2276,7 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 t.traceEnd();
             }
 
-            if (context.getPackageManager().hasSystemFeature(
+            if (wifiSupported && context.getPackageManager().hasSystemFeature(
                     PackageManager.FEATURE_WIFI_DIRECT)) {
                 t.traceBegin("StartWifiP2P");
                 mSystemServiceManager.startServiceFromJar(
@@ -2806,6 +2843,10 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 t.traceEnd();
             }
 
+            t.traceBegin("FreeformService");
+            mSystemServiceManager.startService(FreeformService.class);
+            t.traceEnd();
+
             if (!isWatch) {
                 // We don't run this on watches as there are no plans to use the data logged
                 // on watch devices.
@@ -2849,6 +2890,20 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             mSystemServiceManager.startService(CrossProfileAppsService.class);
             t.traceEnd();
 
+            if (context.getResources().getBoolean(
+                    com.android.internal.R.bool.config_pocketModeSupported)) {
+                t.traceBegin("StartPocketService");
+                mSystemServiceManager.startService(PocketService.class);
+                t.traceEnd();
+            }
+
+            if (!context.getResources().getString(
+                    com.android.internal.R.string.config_pocketBridgeSysfsInpocket).isEmpty()) {
+                t.traceBegin("StartPocketBridgeService");
+                mSystemServiceManager.startService(PocketBridgeService.class);
+                t.traceEnd();
+            }
+
             t.traceBegin("StartPeopleService");
             mSystemServiceManager.startService(PeopleService.class);
             t.traceEnd();
@@ -2863,6 +2918,33 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 mSystemServiceManager.startService(BackgroundInstallControlService.class);
                 t.traceEnd();
             }
+
+            // CustomDeviceConfigService
+            t.traceBegin("StartCustomDeviceConfigService");
+            mSystemServiceManager.startService(CustomDeviceConfigService.class);
+            t.traceEnd();
+
+            t.traceBegin("StartSmart5gService");
+            mSystemServiceManager.startService(Smart5gService.class);
+            t.traceEnd();
+
+            if (context.getResources().getBoolean(R.bool.config_dozeAlwaysOnDisplayAvailable)) {
+                t.traceBegin("AutoAODService");
+                mSystemServiceManager.startService(AutoAODService.class);
+                t.traceEnd();
+            }
+
+            boolean hbmSupported = SystemProperties.getBoolean("persist.sys.hbmservice_support", false);
+            String hbmFile = SystemProperties.get("persist.sys.hbmservice_file");
+            if (hbmSupported && hbmFile != null && !hbmFile.isEmpty()) {
+                mSystemServiceManager.startService(HbmService.class);
+            }
+
+            // VbmetaHashService
+            t.traceBegin("VbmetaHashService");
+            mSystemServiceManager.startService(VbmetaHashService.class);
+            t.traceEnd();
+
         }
 
         t.traceBegin("StartMediaProjectionManager");
@@ -3177,6 +3259,15 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
         mSystemServiceManager.startBootPhase(t, SystemService.PHASE_SYSTEM_SERVICES_READY);
         t.traceEnd();
 
+        // Relieve heap pressure from transient boot-service allocations before
+        // the next wave of init work.  On 512 MB heaps the boot storm can push
+        // usage close to the limit; an early GC here reclaims ~100-170 MB of
+        // garbage that accumulated during startBootstrapServices/startCoreServices.
+        t.traceBegin("BootGcAfterSystemServicesReady");
+        Slog.i(TAG, "Triggering GC after PHASE_SYSTEM_SERVICES_READY");
+        Runtime.getRuntime().gc();
+        t.traceEnd();
+
         t.traceBegin("MakeWindowManagerServiceReady");
         try {
             wm.systemReady();
@@ -3320,10 +3411,17 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
         mSystemServiceManager.startService(AppCompatOverridesService.Lifecycle.class);
         t.traceEnd();
 
+        t.traceBegin("SleepModeService");
+        mSystemServiceManager.startService(SleepModeService.class.getName());
+        t.traceEnd();
+
         t.traceBegin("HealthConnectManagerService");
         mSystemServiceManager.startService(HEALTHCONNECT_MANAGER_SERVICE_CLASS);
         t.traceEnd();
 
+        RisingServicesStarter risingServiceStarter = new RisingServicesStarter(mSystemServiceManager);
+        risingServiceStarter.startAllServices();
+
         if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_LOCK)) {
             t.traceBegin("DeviceLockService");
             mSystemServiceManager.startServiceFromJar(DEVICE_LOCK_SERVICE_CLASS,
@@ -3352,6 +3450,14 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
         final ConnectivityManager connectivityF = (ConnectivityManager)
                 context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
+        // Second GC pass before AMS.systemReady() — the heaviest boot phase.
+        // By now all other-services have been created; reclaim their transient
+        // allocations so the AMS ready callback has headroom on 512 MB heaps.
+        t.traceBegin("BootGcBeforeAmsReady");
+        Slog.i(TAG, "Triggering GC before AMS.systemReady()");
+        Runtime.getRuntime().gc();
+        t.traceEnd();
+
         // We now tell the activity manager it is okay to run third party
         // code.  It will call back into us once it has gotten to the state
         // where third party code can really run (but before it has actually
@@ -3487,6 +3593,15 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             // Wait for all packages to be prepared
             mPackageManagerService.waitForAppDataPrepared();
 
+            // Third GC pass before launching third-party apps.  After
+            // PHASE_ACTIVITY_MANAGER_READY the service-ready callbacks can
+            // spike heap usage to 300+ MB on 512 MB heaps; reclaim that
+            // garbage before the next wave of allocations.
+            t.traceBegin("BootGcBeforeThirdPartyApps");
+            Slog.i(TAG, "Triggering GC before PHASE_THIRD_PARTY_APPS_CAN_START");
+            Runtime.getRuntime().gc();
+            t.traceEnd();
+
             // It is now okay to let the various system services start their
             // third party code...
             t.traceBegin("PhaseThirdPartyAppsCanStart");
diff --git a/services/people/java/com/android/server/people/data/DataManager.java b/services/people/java/com/android/server/people/data/DataManager.java
index db84b6c4a17d0..9d7b9faa40b64 100644
--- a/services/people/java/com/android/server/people/data/DataManager.java
+++ b/services/people/java/com/android/server/people/data/DataManager.java
@@ -504,7 +504,8 @@ public void reportShareTargetEvent(@NonNull AppTargetEvent event,
             return;
         }
         PackageData packageData = userData.getOrCreatePackageData(appTarget.getPackageName());
-        @Event.EventType int eventType = mimeTypeToShareEventType(intentFilter.getDataType(0));
+        @Event.EventType int eventType = mimeTypeToShareEventType(
+            (intentFilter.countDataTypes() > 0) ? intentFilter.getDataType(0) : null);
         EventHistoryImpl eventHistory;
         if (ChooserActivity.LAUNCH_LOCATION_DIRECT_SHARE.equals(event.getLaunchLocation())) {
             // Direct share event
diff --git a/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt b/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
index 73f1033f36cff..6fdf97bf0e282 100644
--- a/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
+++ b/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
@@ -269,11 +269,6 @@ class AppOpService(private val service: AccessCheckingService) : AppOpsCheckingS
                     " mode = ${AppOpsManager.modeToName(mode)}," +
                     " callingUid = ${Binder.getCallingUid()}," +
                     " oldMode = ${AppOpsManager.modeToName(oldMode)}"
-            if (wouldHaveChanged) {
-                Slog.e(LOG_TAG, logMessage, RuntimeException())
-            } else {
-                Slog.w(LOG_TAG, logMessage)
-            }
             return false
         }
 
diff --git a/services/proguard.flags b/services/proguard.flags
index b10aa7ef79f12..accfe5f729183 100644
--- a/services/proguard.flags
+++ b/services/proguard.flags
@@ -138,3 +138,6 @@
 -keep,allowoptimization,allowaccessmodification class lineageos.** { *; }
 -keep,allowoptimization,allowaccessmodification class org.lineageos.** { *; }
 -keep,allowoptimization,allowaccessmodification class vendor.lineage.** { *; }
+
+# DerpFest
+-keep,allowoptimization,allowaccessmodification class com.android.server.DerpFestSystemExService { *; }
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java b/services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java
index b33e22eb63c3d..7a707cf757ae5 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java
@@ -137,6 +137,15 @@ public void testClearAconfigStorageOverride() {
                 "test_package", "test_flag", true);
     }
 
+    @Test
+    public void testSendAconfigdRequests_socketUnavailable() {
+        doReturn(false).when(() -> SettingsToPropertiesMapper.isAconfigdSocketAvailable(
+                "aconfigd_test"));
+
+        Assert.assertNull(SettingsToPropertiesMapper.sendAconfigdRequests(
+                "aconfigd_test", new ProtoOutputStream()));
+    }
+
     @Test
     public void validateRegisteredGlobalSettings() {
         HashSet<String> hashSet = new HashSet<>();
diff --git a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java
index a9ae5f7dfc3f7..e4e13965eceee 100644
--- a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java
+++ b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java
@@ -152,6 +152,10 @@ public void disconnect() {
         protected void onServiceConnectionStatusChanged(
                 ITextToSpeechService service, boolean connected) {
             if (!connected) {
+                if (mCallback == null) {
+                    Slog.w(TAG, "Client disconnected, not sending engine disconnect callback!");
+                    return;
+                }
                 Slog.w(TAG, "Disconnected from TTS engine");
                 runSessionCallbackMethod(mCallback::onDisconnected);
 
diff --git a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java
index a8fd6f29f862f..d2fbfbb6ac439 100644
--- a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java
+++ b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java
@@ -44,8 +44,7 @@
 
 public class BroadcastResponseStatsLogger {
 
-    private static final int MAX_LOG_SIZE =
-            ActivityManager.isLowRamDeviceStatic() ? 20 : 50;
+    private static final int MAX_LOG_SIZE = 20;
 
     private final Object mLock = new Object();
 
diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
index ba33eab5331a4..a2c613268860c 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
@@ -1105,7 +1105,12 @@ private void readLocked(AtomicFile file, IntervalStats statsOut, boolean skipEve
             Slog.wtf(TAG, "Reading UsageStats as XML; current database version: "
                     + mCurrentVersion);
         }
-        readLocked(file, statsOut, mCurrentVersion, mPackagesTokenData, skipEvents);
+        try {
+            readLocked(file, statsOut, mCurrentVersion, mPackagesTokenData, skipEvents);
+        } catch (OutOfMemoryError e) {
+            file.delete();
+            Slog.e(TAG, "unable to parse " + file, e);
+        }
     }
 
     /**
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 9a2183128c3fb..208056397c647 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -33,6 +33,7 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -699,6 +700,9 @@ abstract static class UsbHandler extends Handler {
         protected int mCurrentGadgetHalVersion;
         protected boolean mPendingBootAccessoryHandshakeBroadcast;
         protected boolean mUserUnlockedAfterBoot;
+        protected boolean mShowedFunctionDialog;
+        protected boolean mIsFirstUnlock = true;
+
         /**
          * The persistent property which stores whether adb is enabled or not.
          * May also contain vendor-specific default functions for testing purposes.
@@ -1289,6 +1293,12 @@ public void handleMessage(Message msg) {
                             }
                         }
                         updateUsbFunctions();
+                        if (mConnected && !mScreenLocked) {
+                            showFunctionDialog();
+                        } else if (!mConnected) {
+                            // reset for the next usb connection
+                            mShowedFunctionDialog = false;
+                        }
                     } else {
                         mPendingBootBroadcast = true;
                     }
@@ -1452,6 +1462,15 @@ public void handleMessage(Message msg) {
                             // Set the screen unlocked functions if current function is charging.
                             setScreenUnlockedFunctions(operationId);
                         }
+                        if (mIsFirstUnlock) {
+                            // skip showing function dialog at the first unlock
+                            if (mConnected) {
+                                mShowedFunctionDialog = true;
+                            }
+                            mIsFirstUnlock = false;
+                        } else if (mConnected) {
+                            showFunctionDialog();
+                        }
                     }
                     break;
                 case MSG_UPDATE_USER_RESTRICTIONS:
@@ -1781,6 +1800,23 @@ protected void updateUsbNotification(boolean force) {
             }
         }
 
+        private void showFunctionDialog() {
+            if (mShowedFunctionDialog) return;
+
+            Intent intent = new Intent();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setComponent(ComponentName.unflattenFromString(mContext.getString(
+                    com.android.internal.R.string.config_usbFunctionActivity)));
+
+            try {
+                mContext.startActivityAsUser(intent, UserHandle.CURRENT);
+            } catch (ActivityNotFoundException e) {
+                Slog.e(TAG, "unable to start activity " + intent, e);
+            }
+
+            mShowedFunctionDialog = true;
+        }
+
         protected boolean isAdbEnabled() {
             return LocalServices.getService(AdbManagerInternal.class)
                     .isAdbEnabled(AdbTransportType.USB);
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 6823d85762cda..d82e04aea5e8f 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -108,6 +108,7 @@
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.os.BackgroundThread;
 import com.android.internal.util.DumpUtils;
+import com.android.internal.util.matrixx.Utils;
 import com.android.server.FgThread;
 import com.android.server.LocalServices;
 import com.android.server.SoundTriggerInternal;
@@ -636,7 +637,7 @@ private void initForUserNoTracing(@UserIdInt int userHandle) {
             // If forceInteractorPackage exists, try to apply the interactor from this package if
             // possible and ignore the regular interactor setting.
             String forceInteractorPackage =
-                    getForceVoiceInteractionServicePackage(mContext.getResources());
+                    getForceVoiceInteractionServicePackage(mContext);
             if (forceInteractorPackage != null) {
                 curInteractorInfo = findAvailInteractor(userHandle, forceInteractorPackage);
                 if (curInteractorInfo != null) {
@@ -734,17 +735,18 @@ private boolean shouldEnableService(Context context) {
             // recognition feature (including low-ram devices where notLowRam="true" takes effect),
             // unless the device's configuration has explicitly set the config flag for a fixed
             // voice interaction service.
-            if (getForceVoiceInteractionServicePackage(context.getResources()) != null) {
+            if (getForceVoiceInteractionServicePackage(context) != null) {
                 return true;
             }
             return context.getPackageManager()
                     .hasSystemFeature(PackageManager.FEATURE_VOICE_RECOGNIZERS);
         }
 
-        private String getForceVoiceInteractionServicePackage(Resources res) {
-            String interactorPackage = res.getString(
+        private String getForceVoiceInteractionServicePackage(Context context) {
+            String interactorPackage = context.getResources().getString(
                     com.android.internal.R.string.config_forceVoiceInteractionServicePackage);
-            return TextUtils.isEmpty(interactorPackage) ? null : interactorPackage;
+            return TextUtils.isEmpty(interactorPackage)
+                || !Utils.isPackageInstalled(context, interactorPackage) ? null : interactorPackage;
         }
 
         public void systemRunning(boolean safeMode) {
@@ -1117,7 +1119,7 @@ public boolean showSessionFromSession(@NonNull IBinder token, @Nullable Bundle s
                                 .getString(R.string.config_defaultContextualSearchPackageName);
                         ComponentName currInteractor =
                                 getCurInteractor(Binder.getCallingUserHandle().getIdentifier());
-                        if (currInteractor == null
+                        if (currInteractor == null || !Utils.isPackageInstalled(mContext, csPkgName)
                                 || !csPkgName.equals(currInteractor.getPackageName())) {
                             // Check if the interactor can handle Contextual Search.
                             // If not, return failure.
@@ -2775,7 +2777,7 @@ public void onSomePackagesChanged() {
         private Intent getContextualSearchIntent(Bundle args) {
             String csPkgName = mContext.getResources()
                     .getString(R.string.config_defaultContextualSearchPackageName);
-            if (csPkgName.isEmpty()) {
+            if (csPkgName.isEmpty() || !Utils.isPackageInstalled(mContext, csPkgName)) {
                 // Return null if csPackageName is not specified.
                 return null;
             }
diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
index b69a25d8fd208..979be34a6ed60 100644
--- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
+++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
@@ -483,7 +483,7 @@ private static ApplicationInfo getApplicationInfoIfSystemApp(
                 return ai;
             }
         } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "Could not reach PackageManager", e);
+            Log.i(TAG, "Not installed: " + packageName);
         }
         return null;
     }
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index a10fae15c0532..6ac664d399678 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -11184,7 +11184,7 @@ private static PersistableBundle getDefaults() {
         sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);
         sDefaults.putBoolean(KEY_PREFER_3G_VISIBILITY_BOOL, true);
         sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);
-        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
+        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
         sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
         sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
         sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
@@ -11217,9 +11217,9 @@ private static PersistableBundle getDefaults() {
         sDefaults.putBoolean(KEY_VVM_PREFETCH_BOOL, true);
         sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");
         sDefaults.putStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY, null);
-        sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false);
+        sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, true);
         sDefaults.putBoolean(KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, true);
-        sDefaults.putBoolean(KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
+        sDefaults.putBoolean(KEY_INFLATE_SIGNAL_STRENGTH_BOOL, true);
         sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);
         sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");
         sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, "");
@@ -11422,8 +11422,8 @@ private static PersistableBundle getDefaults() {
         sDefaults.putInt(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 0);
         sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);
         sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);
-        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);
-        sDefaults.putBoolean(KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL, false);
+        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, true);
+        sDefaults.putBoolean(KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL, true);
         sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);
         sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);
         sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index 3d3c2e8a92300..c0ee9f0cb6d92 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -561,7 +561,7 @@ public boolean isValid() {
             }
             return isTxPowerValid
                     && isRxPowerValid
-                    && ((getIdleTimeMillis() >= 0) && (getSleepTimeMillis() >= 0) && !isEmpty());
+                    && ((getIdleTimeMillis() >= 0) && (getSleepTimeMillis() >= 0));
         }
     }
 
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 3208f8c8adb2f..6cabae02feb19 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -344,6 +344,8 @@ public class ServiceState implements Parcelable {
     private String mOperatorAlphaShortRaw;
     private boolean mIsDataRoamingFromRegistration;
     private boolean mIsIwlanPreferred;
+    /** Force LTE CA flag per SIM @hide */
+    private Boolean mForceLteCA = null;
 
     /**
      * get String description of roaming type
@@ -426,6 +428,7 @@ protected void copyFrom(ServiceState s) {
         mOperatorAlphaShortRaw = s.mOperatorAlphaShortRaw;
         mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration;
         mIsIwlanPreferred = s.mIsIwlanPreferred;
+        mForceLteCA = (s.mForceLteCA != null) ? Boolean.valueOf(s.mForceLteCA) : null;
     }
 
     /**
@@ -455,6 +458,8 @@ public ServiceState(Parcel in) {
         mOperatorAlphaShortRaw = in.readString();
         mIsDataRoamingFromRegistration = in.readBoolean();
         mIsIwlanPreferred = in.readBoolean();
+        int forceLteCAByte = in.readInt();
+        mForceLteCA = (forceLteCAByte == -1) ? null : (forceLteCAByte == 1);
     }
 
     public void writeToParcel(Parcel out, int flags) {
@@ -478,6 +483,7 @@ public void writeToParcel(Parcel out, int flags) {
         out.writeString(mOperatorAlphaShortRaw);
         out.writeBoolean(mIsDataRoamingFromRegistration);
         out.writeBoolean(mIsIwlanPreferred);
+        out.writeInt(mForceLteCA == null ? -1 : (mForceLteCA ? 1 : 0));
     }
 
     public int describeContents() {
@@ -933,7 +939,8 @@ public int hashCode() {
                     mOperatorAlphaLongRaw,
                     mOperatorAlphaShortRaw,
                     mIsDataRoamingFromRegistration,
-                    mIsIwlanPreferred);
+                    mIsIwlanPreferred,
+                    mForceLteCA);
         }
     }
 
@@ -959,7 +966,8 @@ && equalsHandlesNulls(mOperatorAlphaShortRaw, s.mOperatorAlphaShortRaw)
                     && mNetworkRegistrationInfos.containsAll(s.mNetworkRegistrationInfos)
                     && mNrFrequencyRange == s.mNrFrequencyRange
                     && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration
-                    && mIsIwlanPreferred == s.mIsIwlanPreferred;
+                    && mIsIwlanPreferred == s.mIsIwlanPreferred
+                    && Objects.equals(mForceLteCA, s.mForceLteCA);
         }
     }
 
@@ -1139,6 +1147,7 @@ public String toString() {
                     .append(", mIsDataRoamingFromRegistration=")
                     .append(mIsDataRoamingFromRegistration)
                     .append(", mIsIwlanPreferred=").append(mIsIwlanPreferred)
+                    .append(", mForceLteCA=").append(mForceLteCA)
                     .append(", mIsUsingNonTerrestrialNetwork=")
                     .append(isUsingNonTerrestrialNetwork())
                     .append("}").toString();
@@ -1184,6 +1193,7 @@ private void init() {
         mOperatorAlphaShortRaw = null;
         mIsDataRoamingFromRegistration = false;
         mIsIwlanPreferred = false;
+        mForceLteCA = null;
     }
 
     public void setStateOutOfService() {
@@ -1376,6 +1386,7 @@ public void fillInNotifierBundle(@NonNull Bundle m) {
         m.putBoolean("isDataRoamingFromRegistration", getDataRoamingFromRegistration());
         m.putBoolean("isUsingCarrierAggregation", isUsingCarrierAggregation());
         m.putInt("ArfcnRsrpBoost", mArfcnRsrpBoost);
+        m.putInt("forceLteCA", mForceLteCA == null ? -1 : (mForceLteCA ? 1 : 0));
         m.putInt("ChannelNumber", mChannelNumber);
         m.putIntArray("CellBandwidths", mCellBandwidths);
         m.putInt("mNrFrequencyRange", mNrFrequencyRange);
@@ -1423,15 +1434,30 @@ public void setRilDataRadioTechnology(@RilRadioTechnology int rt) {
         addNetworkRegistrationInfo(regInfo);
     }
 
-    /** @hide */
+    /** 
+     * @return true if using carrier aggregation, false otherwise
+     * Checks both hardware CA and per-SIM forced CA
+     * @hide 
+     */
     public boolean isUsingCarrierAggregation() {
-        if (getCellBandwidths().length > 1) return true;
+        // Check hardware-based carrier aggregation
+        boolean hardwareCA = getCellBandwidths().length > 1;
 
         synchronized (mNetworkRegistrationInfos) {
             for (NetworkRegistrationInfo nri : mNetworkRegistrationInfos) {
-                if (nri.isUsingCarrierAggregation()) return true;
+                if (nri.isUsingCarrierAggregation()) {
+                    hardwareCA = true;
+                    break;
+                }
             }
         }
+        
+        // Apply override if explicitly set
+        if (mForceLteCA != null) {
+            return mForceLteCA.booleanValue();
+        }
+        
+        // Default: return false (LTE+ requires toggle to be ON)
         return false;
     }
 
@@ -2069,6 +2095,27 @@ public void setIwlanPreferred(boolean isIwlanPreferred) {
         mIsIwlanPreferred = isIwlanPreferred;
     }
 
+    /**
+     * Set Force LTE Carrier Aggregation for this ServiceState instance.
+     * This is used for per-SIM Force LTE_CA feature.
+     * 
+     * @param force true to force LTE CA, false otherwise
+     * @hide
+     */
+    public void setForceLteCA(Boolean force) {
+        mForceLteCA = force;
+    }
+
+    /**
+     * Get Force LTE Carrier Aggregation setting for this ServiceState.
+     * 
+     * @return true if Force LTE CA is enabled for this SIM, false otherwise
+     * @hide
+     */
+    public Boolean getForceLteCA() {
+        return mForceLteCA;
+    }
+
     /**
      * @return {@code true} if any data network is preferred on IWLAN.
      *
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 8b926fadb456d..8aff3c6228d4e 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2970,6 +2970,20 @@ public boolean isNetworkRoaming(int subId) {
         return TelephonyManager.getDefault().isNetworkRoaming(subId);
     }
 
+    /**
+     * Returns a constant indicating the state of sim for the slot index.
+     *
+     * @param slotIndex Logical SIM slot index.
+     *
+     * @see TelephonyManager.SimState
+     *
+     * @hide
+     */
+    @TelephonyManager.SimState
+    public static int getSimStateForSlotIndex(int slotIndex) {
+        return TelephonyManager.getSimStateForSlotIndex(slotIndex);
+    }
+
     /**
      * Set a field in the subscription database. Note not all fields are supported.
      *
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index b8087c3b0213c..a0baf495889f5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -10285,7 +10285,8 @@ public void setAllowedNetworkTypesForReason(@AllowedNetworkTypesReason int reaso
             if (telephony != null) {
                 return telephony.getAllowedNetworkTypesForReason(getSubId(), reason);
             } else {
-                throw new IllegalStateException("telephony service is null.");
+                Rlog.d(TAG, "telephony service is null.");
+                return -1; // NETWORK_MODE_UNKNOWN
             }
         } catch (RemoteException ex) {
             Rlog.e(TAG, "getAllowedNetworkTypesForReason RemoteException", ex);
@@ -14497,7 +14498,8 @@ private boolean isDataEnabledForReason(int subId, @DataEnabledReason int reason)
             if (service != null) {
                 return service.isDataEnabledForReason(subId, reason);
             } else {
-                throw new IllegalStateException("telephony service is null.");
+                Log.d(TAG, "Telephony service is null.");
+                return false;
             }
         } catch (RemoteException ex) {
             Log.e(TAG, "Telephony#isDataEnabledForReason RemoteException", ex);
@@ -15250,7 +15252,6 @@ public String getEmergencyAssistancePackageName() {
         PackageManager.FEATURE_TELEPHONY_MESSAGING
     })
     public Map<Integer, List<EmergencyNumber>> getEmergencyNumberList() {
-        Map<Integer, List<EmergencyNumber>> emergencyNumberList = new HashMap<>();
         try {
             ITelephony telephony = getITelephony();
             if (telephony != null) {
@@ -15263,7 +15264,7 @@ public Map<Integer, List<EmergencyNumber>> getEmergencyNumberList() {
             Log.e(TAG, "getEmergencyNumberList RemoteException", ex);
             ex.rethrowAsRuntimeException();
         }
-        return emergencyNumberList;
+        return Collections.emptyMap();
     }
 
     /**
@@ -16144,7 +16145,8 @@ public Pair<Integer, Integer> getRadioHalVersion() {
                     return new Pair<Integer, Integer>(version / 100, version % 100);
                 }
             } else {
-                throw new IllegalStateException("telephony service is null.");
+                Log.d(TAG, "telephony service is null.");
+                return HAL_VERSION_UNKNOWN;
             }
         } catch (RemoteException e) {
             Log.e(TAG, "getHalVersion() RemoteException", e);
@@ -19259,7 +19261,8 @@ public boolean isNullCipherNotificationsEnabled() {
             if (telephony != null) {
                 return telephony.isNullCipherNotificationsEnabled();
             } else {
-                throw new IllegalStateException("telephony service is null.");
+                Log.d(TAG, "Telephony service is null.");
+                return false;
             }
         } catch (RemoteException ex) {
             Rlog.e(TAG, "isNullCipherNotificationsEnabled RemoteException", ex);
diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index 547cda2e6b104..9aac076bbbdfc 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -25,9 +25,12 @@
 import static com.android.internal.telephony.SmsConstants.MAX_USER_DATA_SEPTETS;
 import static com.android.internal.telephony.SmsConstants.MessageClass;
 
+import android.app.ActivityThread;
 import android.compat.annotation.UnsupportedAppUsage;
+import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
+import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
@@ -140,6 +143,17 @@ public boolean isTypeZero() {
         return (mProtocolIdentifier == 0x40);
     }
 
+    public static SmsMessage newFromCDS(byte[] pdu) {
+        try {
+            SmsMessage msg = new SmsMessage();
+            msg.parsePdu(pdu);
+            return msg;
+        } catch (RuntimeException ex) {
+            Rlog.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex);
+            return null;
+        }
+    }
+
     /**
      * Creates an SmsMessage from an SMS EF record.
      *
@@ -1671,7 +1685,23 @@ private void parseUserData(PduParser p, boolean hasUserDataHeader) {
         } else {
             switch (mDataCodingScheme & 0x3) {
             case 0:
-                messageClass = MessageClass.CLASS_0;
+                boolean disableFlash = false;
+                try {
+                    Context context = ActivityThread.currentApplication();
+                    if (context != null) {
+                        disableFlash = Settings.System.getInt(
+                                context.getContentResolver(), "disable_flash_sms", 0) == 1;
+                    }
+                } catch (Exception e) {
+                    Rlog.e(LOG_TAG, "Failed to read disable_flash_sms setting", e);
+                    disableFlash = false;
+                }
+
+                if (disableFlash) {
+                    messageClass = MessageClass.CLASS_1;
+                } else {
+                    messageClass = MessageClass.CLASS_0;
+                }
                 break;
             case 1:
                 messageClass = MessageClass.CLASS_1;
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 4d833aa213a19..541c5d40d4d5e 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -1472,6 +1472,11 @@ status_t compileResourceFile(Bundle* bundle,
                     }
                 }
             } else if (strcmp16(block.getElementName(&len), string_array16.c_str()) == 0) {
+                // Note the existence and locale of every string array we process
+                char rawLocale[RESTABLE_MAX_LOCALE_LEN];
+                curParams.getBcp47Locale(rawLocale);
+                String8 locale(rawLocale);
+                String16 name;
                 // Check whether these strings need valid formats.
                 // (simplified form of what string16 does above)
                 bool isTranslatable = false;
@@ -1482,7 +1487,9 @@ status_t compileResourceFile(Bundle* bundle,
                 for (size_t i = 0; i < n; i++) {
                     size_t length;
                     const char16_t* attr = block.getAttributeName(i, &length);
-                    if (strcmp16(attr, formatted16.c_str()) == 0) {
+                    if (strcmp16(attr, name16.c_str()) == 0) {
+                        name.setTo(block.getAttributeStringValue(i, &length));
+                    } else if (strcmp16(attr, formatted16.c_str()) == 0) {
                         const char16_t* value = block.getAttributeStringValue(i, &length);
                         if (strcmp16(value, false16.c_str()) == 0) {
                             curIsFormatted = false;
@@ -1491,6 +1498,15 @@ status_t compileResourceFile(Bundle* bundle,
                         const char16_t* value = block.getAttributeStringValue(i, &length);
                         if (strcmp16(value, false16.c_str()) == 0) {
                             isTranslatable = false;
+                            // Untranslatable string arrays must only exist
+                            // in the default [empty] locale
+                            if (locale.size() > 0) {
+                                SourcePos(in->getPrintableSource(), block.getLineNumber()).warning(
+                                        "string-array '%s' marked untranslatable but exists"
+                                        " in locale '%s'\n", String8(name).c_str(),
+                                        locale.c_str());
+                                // hasErrors = localHasErrors = true;
+                            }
                         }
                     }
                 }
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp
index b2e48bd74e8aa..1fa73bd36058a 100644
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -116,7 +116,7 @@ int StringPool::entry::compare(const entry& o) const {
 }
 
 StringPool::StringPool(bool utf8) :
-        mUTF8(utf8), mValues(-1)
+        mUTF8(utf8)
 {
 }
 
@@ -133,8 +133,8 @@ ssize_t StringPool::add(const String16& value, const Vector<entry_style_span>& s
 ssize_t StringPool::add(const String16& value,
         bool mergeDuplicates, const String8* configTypeName, const ResTable_config* config)
 {
-    ssize_t vidx = mValues.indexOfKey(value);
-    ssize_t pos = vidx >= 0 ? mValues.valueAt(vidx) : -1;
+    auto it = mValues.find(value);
+    ssize_t pos = it != mValues.end() ? it->second : -1;
     ssize_t eidx = pos >= 0 ? mEntryArray.itemAt(pos) : -1;
     if (eidx < 0) {
         eidx = mEntries.add(entry(value));
@@ -181,21 +181,21 @@ ssize_t StringPool::add(const String16& value,
         }
     }
 
-    const bool first = vidx < 0;
+    const bool first = (it == mValues.end());
     const bool styled = (pos >= 0 && (size_t)pos < mEntryStyleArray.size()) ?
         mEntryStyleArray[pos].spans.size() : 0;
     if (first || styled || !mergeDuplicates) {
         pos = mEntryArray.add(eidx);
         if (first) {
-            vidx = mValues.add(value, pos);
+            mValues[value] = pos;
         }
         entry& ent = mEntries.editItemAt(eidx);
         ent.indices.add(pos);
     }
 
     if (kIsDebug) {
-        printf("Adding string %s to pool: pos=%zd eidx=%zd vidx=%zd\n",
-                String8(value).c_str(), pos, eidx, vidx);
+        printf("Adding string %s to pool: pos=%zd eidx=%zd\n",
+                String8(value).c_str(), pos, eidx);
     }
 
     return pos;
@@ -338,14 +338,18 @@ void StringPool::sortByConfig()
 
     // Now trim any entries at the end of the new style array that are
     // not needed.
-    for (ssize_t i=newEntryStyleArray.size()-1; i>=0; i--) {
+    ssize_t i;
+    for (i=newEntryStyleArray.size()-1; i>=0; i--) {
         const entry_style& style = newEntryStyleArray[i];
         if (style.spans.size() > 0) {
             // That's it.
             break;
         }
-        // This one is not needed; remove.
-        newEntryStyleArray.removeAt(i);
+    }
+
+    ssize_t nToRemove=newEntryStyleArray.size()-(i+1);
+    if (nToRemove) {
+        newEntryStyleArray.removeItemsAt(i+1, nToRemove);
     }
 
     // All done, install the new data structures and upate mValues with
@@ -356,7 +360,7 @@ void StringPool::sortByConfig()
     mValues.clear();
     for (size_t i=0; i<mEntries.size(); i++) {
         const entry& ent = mEntries[i];
-        mValues.add(ent.value, ent.indices[0]);
+        mValues[ent.value] = ent.indices[0];
     }
 
 #if 0
@@ -599,9 +603,10 @@ ssize_t StringPool::offsetForString(const String16& val) const
 
 const Vector<size_t>* StringPool::offsetsForString(const String16& val) const
 {
-    ssize_t pos = mValues.valueFor(val);
-    if (pos < 0) {
+    auto it = mValues.find(val);
+    if (it == mValues.end()) {
         return NULL;
     }
+    ssize_t pos = it->second;
     return &mEntries[mEntryArray[pos]].indices;
 }
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h
index 253bcca4f5070..e17c865e39a6b 100644
--- a/tools/aapt/StringPool.h
+++ b/tools/aapt/StringPool.h
@@ -18,6 +18,7 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
+#include <map>
 
 using namespace android;
 
@@ -172,7 +173,7 @@ class StringPool
 
     // Unique set of all the strings added to the pool, mapped to
     // the first index of mEntryArray where the value was added.
-    DefaultKeyedVector<String16, ssize_t>   mValues;
+    std::map<String16, ssize_t>             mValues;
     // This array maps from the original position a string was placed at
     // in mEntryArray to its new position after being sorted with sortByConfig().
     Vector<size_t>                          mOriginalPosToNewPos;
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index ee8ccaa284294..c7284a1b645cd 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -1135,6 +1135,17 @@ bool ResourceParser::ParseSymbolImpl(xml::XmlPullParser* parser,
     return false;
   }
 
+  if (std::optional<StringPiece> maybe_id_str = xml::FindNonEmptyAttribute(parser, "id")) {
+    std::optional<ResourceId> maybe_id = ResourceUtils::ParseResourceId(maybe_id_str.value());
+    if (!maybe_id) {
+      diag_->Error(android::DiagMessage(out_resource->source)
+                   << "invalid resource ID '" << maybe_id_str.value() << "' in <"
+                   << parser->element_name() << "> tag");
+      return false;
+    }
+    out_resource->id = maybe_id.value();
+  }
+
   out_resource->name.type = parsed_type->ToResourceNamedType();
   return true;
 }
diff --git a/tools/aapt2/link/TableMerger.cpp b/tools/aapt2/link/TableMerger.cpp
index d43fc052c1477..a17c9eb3493ee 100644
--- a/tools/aapt2/link/TableMerger.cpp
+++ b/tools/aapt2/link/TableMerger.cpp
@@ -107,10 +107,7 @@ static bool MergeEntry(IAaptContext* context, const android::Source& src, Resour
 
   // Copy over the strongest visibility.
   if (src_entry->visibility.level > dst_entry->visibility.level) {
-    // Only copy the ID if the source is public, or else the ID is meaningless.
-    if (src_entry->visibility.level == Visibility::Level::kPublic) {
-      dst_entry->id = src_entry->id;
-    }
+    dst_entry->id = src_entry->id;
     dst_entry->visibility = std::move(src_entry->visibility);
   } else if (src_entry->visibility.level == Visibility::Level::kPublic &&
              dst_entry->visibility.level == Visibility::Level::kPublic && dst_entry->id &&
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
index e1f765126e60e..9552db5ba63da 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
@@ -269,7 +269,12 @@ public final void setCountdownLatch(@Nullable CountDownLatch latch) {
     }
 
     private void onRegisterCallback(ISharedConnectivityCallback callback) {
-        mRemoteCallbackList.register(callback);
+        if (callback != null) {
+            mRemoteCallbackList.register(callback);
+        } else {
+            if (DEBUG) Log.w(TAG, "Attempted to register null callback");
+            return;
+        }
         try {
             callback.onServiceConnected();
         } catch (RemoteException e) {
@@ -281,7 +286,11 @@ private void onRegisterCallback(ISharedConnectivityCallback callback) {
     }
 
     private void onUnregisterCallback(ISharedConnectivityCallback callback) {
-        mRemoteCallbackList.unregister(callback);
+        if (callback != null) {
+            mRemoteCallbackList.unregister(callback);
+        } else {
+            if (DEBUG) Log.w(TAG, "Attempted to unregister null callback");
+        }
         if (mCountDownLatch != null) {
             mCountDownLatch.countDown();
         }